diff --git a/adwaita-dark-theme.el b/adwaita-dark-theme.el
index cc9677c..518b83a 100644
--- a/adwaita-dark-theme.el
+++ b/adwaita-dark-theme.el
@@ -190,7 +190,7 @@
    `(tooltip ((,class (:background ,base-3 :foreground ,fg))))
    `(secondary-selection ((,class (:background ,gray))))
    `(fill-column-indicator ((,class (:foreground ,base-3))))
-   `(match ((,class (:background ,base-0 :foreground ,green :weight bold))))
+   `(match ((,class (:foreground ,green :weight bold))))
    `(trailing-whitespace ((,class (:background ,red))))
    `(nobreak-space ((,class (:inherit default :underline t))))
    `(nobreak-hyphen ((,class (:inherit nobreak-space))))
@@ -291,7 +291,7 @@
    `(custom-themed ((,class (:foreground ,yellow))))
    `(custom-invalid ((,class (:foreground ,red :bold bold))))
    `(custom-variable-obsolete ((,class (:foreground ,gray))))
-   `(custom-state ((,class (:foreground ,green :bold bold))))
+   `(custom-state ((,class (:foreground ,green))))
    `(custom-changed ((,class (:foreground ,blue))))
 
    ;; diff-mode
@@ -299,7 +299,7 @@
    `(diff-changed ((,class (:foreground ,yellow))))
    `(diff-context ((,class (:foreground ,fg-alt))))
    `(diff-removed ((,class (:foreground ,red))))
-   `(diff-header ((,class (:foreground ,base-7 :weight bold))))
+   `(diff-header ((,class (:foreground ,base-8 :weight bold))))
    `(diff-file-header ((,class (:foreground ,fg))))
    `(diff-hunk-header ((,class (:foreground ,base-7))))
    `(diff-indicator-added ((,class (:inherit diff-added :bold t))))
@@ -694,7 +694,7 @@
    `(magit-reflog-remote ((,class (:foreground ,cyan))))
    `(magit-reflog-reset ((,class (:inherit error))))
    `(magit-refname ((,class (:foreground ,base-5))))
-   `(magit-section-heading ((,class (:foreground ,base-7 :weight bold :box ,(when flat-button-available-p '(:line-width 4 :style flat-button))))))
+   `(magit-section-heading ((,class (:foreground ,base-8 :weight bold :box ,(when flat-button-available-p '(:line-width 4 :style flat-button))))))
    `(magit-section-heading-selection ((,class (:foreground ,base-8 :weight bold))))
    `(magit-section-highlight ((,class (:inherit hl-line))))
    `(magit-sequence-drop ((,class (:foreground ,red))))