diff --git a/havoc-theme.el b/havoc-theme.el
index 96c31aa..ba98ac1 100644
--- a/havoc-theme.el
+++ b/havoc-theme.el
@@ -196,16 +196,16 @@
    `(rainbow-delimiters-depth-9-face  ((t (:foreground ,*rdd-9*))))
 
    ;;;;; magit
-   `(magit-blame-culprit ((t :background ,*cyan-bg* :foreground ,*yellow*)))
-   `(magit-blame-date    ((t :background ,*cyan-bg* :foreground ,*green*)))
+   `(magit-blame-culprit ((t :background ,*cyan-bg* :foreground ,*fg-standout*)))
+   `(magit-blame-date    ((t :background ,*cyan-bg* :foreground ,*string*)))
    `(magit-blame-hash    ((t :background ,*cyan-bg* :foreground ,*method-declaration*)))
-   `(magit-blame-header  ((t :background ,*cyan-bg* :foreground ,*green*)))
-   `(magit-blame-heading ((t :background ,*cyan-bg* :foreground ,*green*)))
-   `(magit-blame-name    ((t :background ,*cyan-bg* :foreground ,*yellow*)))
+   `(magit-blame-header  ((t :background ,*cyan-bg* :foreground ,*string*)))
+   `(magit-blame-heading ((t :background ,*cyan-bg* :foreground ,*string*)))
+   `(magit-blame-name    ((t :background ,*cyan-bg* :foreground ,*fg-standout*)))
    `(magit-blame-sha1    ((t :background ,*cyan-bg* :foreground ,*method-declaration*)))
-   `(magit-blame-subject ((t :background ,*cyan-bg* :foreground ,*yellow*)))
-   `(magit-blame-summary ((t :background ,*cyan-bg* :foreground ,*yellow*)))
-   `(magit-blame-time    ((t :background ,*cyan-bg* :foreground ,*green*)))
+   `(magit-blame-subject ((t :background ,*cyan-bg* :foreground ,*fg-standout*)))
+   `(magit-blame-summary ((t :background ,*cyan-bg* :foreground ,*fg-standout*)))
+   `(magit-blame-time    ((t :background ,*cyan-bg* :foreground ,*string*)))
    `(magit-branch ((t (:foreground ,*constant* :inherit bold))))
    `(magit-branch-current ((t (:foreground ,*blue* :inherit bold :box t))))
    `(magit-branch-local ((t (:foreground ,*blue* :inherit bold))))
@@ -223,14 +223,14 @@
    `(magit-diff-base-highlight ((t (:background ,*diff-base-hl-bg* :foreground ,*diff-base-hl-fg*))))
    `(magit-diff-removed ((t (:background ,*diff-rmvd-bg* :foreground ,*diff-rmvd-fg*))))
    `(magit-diff-removed-highlight ((t (:background ,*diff-rmvd-hl-bg* :foreground ,*diff-rmvd-hl-fg*))))
-   `(magit-diffstat-added ((t (:foreground ,*green*))))
-   `(magit-diffstat-removed ((t (:foreground ,*red*))))
+   `(magit-diffstat-added ((t (:foreground ,*string*))))
+   `(magit-diffstat-removed ((t (:foreground ,*warning*))))
    `(magit-hash ((t (:foreground ,*variable*))))
    `(magit-hunk-heading ((t (:background ,*bg-3*))))
    `(magit-hunk-heading-highlight ((t (:background ,*bg-3*))))
    `(magit-item-highlight ((t :background ,*bg-2*)))
    `(magit-log-author ((t (:foreground ,*method-declaration*))))
-   `(magit-log-head-label-head ((t (:background ,*yellow* :foreground ,*bg-1* :inherit bold))))
+   `(magit-log-head-label-head ((t (:background ,*fg-standout* :foreground ,*bg-1* :inherit bold))))
    `(magit-log-head-label-local ((t (:background ,*keywords* :foreground ,*bg-1* :inherit bold))))
    `(magit-log-head-label-remote ((t (:background ,*success* :foreground ,*bg-1* :inherit bold))))
    `(magit-log-head-label-tags ((t (:background ,*magenta* :foreground ,*bg-1* :inherit bold))))
@@ -240,9 +240,9 @@
    `(magit-process-ok ((t (:foreground ,*method-declaration* :inherit bold))))
    `(magit-reflog-amend ((t (:foreground ,*magenta*))))
    `(magit-reflog-checkout ((t (:foreground ,*blue*))))
-   `(magit-reflog-cherry-pick ((t (:foreground ,*green*))))
-   `(magit-reflog-commit ((t (:foreground ,*green*))))
-   `(magit-reflog-merge ((t (:foreground ,*green*))))
+   `(magit-reflog-cherry-pick ((t (:foreground ,*string*))))
+   `(magit-reflog-commit ((t (:foreground ,*string*))))
+   `(magit-reflog-merge ((t (:foreground ,*string*))))
    `(magit-reflog-other ((t (:foreground ,*cyan*))))
    `(magit-reflog-rebase ((t (:foreground ,*magenta*))))
    `(magit-reflog-remote ((t (:foreground ,*cyan*))))