diff --git a/mood-adwaita-theme.el b/mood-adwaita-theme.el
index 7eb607e..091526f 100644
--- a/mood-adwaita-theme.el
+++ b/mood-adwaita-theme.el
@@ -196,17 +196,17 @@
    `(custom-comment ((,class (:foreground ,fg :background ,dark-blue))))
    `(custom-comment-tag ((,class (:foreground ,gray))))
    `(custom-modified ((,class (:foreground ,blue :bold bold))))
-   `(custom-variable-tag ((,class (:foreground ,magenta))))
+   `(custom-variable-tag ((,class (:foreground ,teal))))
    `(custom-visibility ((,class (:foreground ,blue :underline nil))))
-   `(custom-group-subtitle ((,class (:foreground ,red))))
-   `(custom-group-tag ((,class (:foreground ,violet))))
-   `(custom-group-tag-1 ((,class (:foreground ,blue))))
-   `(custom-set ((,class (:foreground ,yellow :background ,bg))))
-   `(custom-themed ((,class (:foreground ,yellow :background ,bg))))
+   `(custom-group-subtitle ((,class (:foreground ,base-8 :weight bold))))
+   `(custom-group-tag ((,class (:foreground ,base-8 :weight bold))))
+   `(custom-group-tag-1 ((,class (:inherit 'custom-group-tag))))
+   `(custom-set ((,class (:foreground ,yellow))))
+   `(custom-themed ((,class (:foreground ,yellow))))
    `(custom-invalid ((,class (:foreground ,red :bold bold))))
-   `(custom-variable-obsolete ((,class (:foreground ,gray :background ,bg))))
+   `(custom-variable-obsolete ((,class (:foreground ,gray))))
    `(custom-state ((,class (:foreground ,green :bold bold))))
-   `(custom-changed ((,class (:foreground ,blue :background ,bg))))
+   `(custom-changed ((,class (:foreground ,blue))))
 
    ;; diff-mode
    `(diff-added ((,class (:inherit 'hl-line :foreground ,green))))