emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/modus-vivendi-theme 776977c 30/35: Use modern (DISPLAY


From: Stefan Monnier
Subject: [elpa] externals/modus-vivendi-theme 776977c 30/35: Use modern (DISPLAY . PLIST) face spec entries
Date: Wed, 24 Jun 2020 12:42:51 -0400 (EDT)

branch: externals/modus-vivendi-theme
commit 776977c7e4d54b3c704acf2a074872b5b5163117
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Use modern (DISPLAY . PLIST) face spec entries
    
    Rather than the form (DISPLAY PLIST), which is for backward
    compatibility according to "(elisp) Defining Faces".
---
 modus-operandi-theme.el | 4802 +++++++++++++++++++++++------------------------
 modus-vivendi-theme.el  | 4802 +++++++++++++++++++++++------------------------
 2 files changed, 4802 insertions(+), 4802 deletions(-)

diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 0ad3f37..339f256 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -791,2697 +791,2697 @@ Also bind `class' to ((class color) (min-colors 89))."
    ;; custom faces that are inherited by other constructs below ;;
    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    ;;; subtle coloured backgrounds
-   `(modus-theme-subtle-red ((,class (:background ,red-subtle-bg :foreground 
,fg-dim))))
-   `(modus-theme-subtle-green ((,class (:background ,green-subtle-bg 
:foreground ,fg-dim))))
-   `(modus-theme-subtle-yellow ((,class (:background ,yellow-subtle-bg 
:foreground ,fg-dim))))
-   `(modus-theme-subtle-blue ((,class (:background ,blue-subtle-bg :foreground 
,fg-dim))))
-   `(modus-theme-subtle-magenta ((,class (:background ,magenta-subtle-bg 
:foreground ,fg-dim))))
-   `(modus-theme-subtle-cyan ((,class (:background ,cyan-subtle-bg :foreground 
,fg-dim))))
-   `(modus-theme-subtle-neutral ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
+   `(modus-theme-subtle-red ((,class :background ,red-subtle-bg :foreground 
,fg-dim)))
+   `(modus-theme-subtle-green ((,class :background ,green-subtle-bg 
:foreground ,fg-dim)))
+   `(modus-theme-subtle-yellow ((,class :background ,yellow-subtle-bg 
:foreground ,fg-dim)))
+   `(modus-theme-subtle-blue ((,class :background ,blue-subtle-bg :foreground 
,fg-dim)))
+   `(modus-theme-subtle-magenta ((,class :background ,magenta-subtle-bg 
:foreground ,fg-dim)))
+   `(modus-theme-subtle-cyan ((,class :background ,cyan-subtle-bg :foreground 
,fg-dim)))
+   `(modus-theme-subtle-neutral ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
    ;;; intense coloured backgrounds
-   `(modus-theme-intense-red ((,class (:background ,red-intense-bg :foreground 
,fg-main))))
-   `(modus-theme-intense-green ((,class (:background ,green-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-yellow ((,class (:background ,yellow-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-blue ((,class (:background ,blue-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-magenta ((,class (:background ,magenta-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-cyan ((,class (:background ,cyan-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-neutral ((,class (:background ,bg-active :foreground 
,fg-main))))
+   `(modus-theme-intense-red ((,class :background ,red-intense-bg :foreground 
,fg-main)))
+   `(modus-theme-intense-green ((,class :background ,green-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-yellow ((,class :background ,yellow-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-blue ((,class :background ,blue-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-magenta ((,class :background ,magenta-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-cyan ((,class :background ,cyan-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-neutral ((,class :background ,bg-active :foreground 
,fg-main)))
    ;;; refined background and foreground combinations
-   `(modus-theme-refine-red ((,class (:background ,red-refine-bg :foreground 
,red-refine-fg))))
-   `(modus-theme-refine-green ((,class (:background ,green-refine-bg 
:foreground ,green-refine-fg))))
-   `(modus-theme-refine-yellow ((,class (:background ,yellow-refine-bg 
:foreground ,yellow-refine-fg))))
-   `(modus-theme-refine-blue ((,class (:background ,blue-refine-bg :foreground 
,blue-refine-fg))))
-   `(modus-theme-refine-magenta ((,class (:background ,magenta-refine-bg 
:foreground ,magenta-refine-fg))))
-   `(modus-theme-refine-cyan ((,class (:background ,cyan-refine-bg :foreground 
,cyan-refine-fg))))
+   `(modus-theme-refine-red ((,class :background ,red-refine-bg :foreground 
,red-refine-fg)))
+   `(modus-theme-refine-green ((,class :background ,green-refine-bg 
:foreground ,green-refine-fg)))
+   `(modus-theme-refine-yellow ((,class :background ,yellow-refine-bg 
:foreground ,yellow-refine-fg)))
+   `(modus-theme-refine-blue ((,class :background ,blue-refine-bg :foreground 
,blue-refine-fg)))
+   `(modus-theme-refine-magenta ((,class :background ,magenta-refine-bg 
:foreground ,magenta-refine-fg)))
+   `(modus-theme-refine-cyan ((,class :background ,cyan-refine-bg :foreground 
,cyan-refine-fg)))
    ;;; invert the colours used on the "active" backgrounds
    ;;; mostly for use on the mode line
-   `(modus-theme-active-red ((,class (:background ,red-active :foreground 
,bg-active))))
-   `(modus-theme-active-green ((,class (:background ,green-active :foreground 
,bg-active))))
-   `(modus-theme-active-yellow ((,class (:background ,yellow-active 
:foreground ,bg-active))))
-   `(modus-theme-active-blue ((,class (:background ,blue-active :foreground 
,bg-active))))
-   `(modus-theme-active-magenta ((,class (:background ,magenta-active 
:foreground ,bg-active))))
-   `(modus-theme-active-cyan ((,class (:background ,cyan-active :foreground 
,bg-active))))
+   `(modus-theme-active-red ((,class :background ,red-active :foreground 
,bg-active)))
+   `(modus-theme-active-green ((,class :background ,green-active :foreground 
,bg-active)))
+   `(modus-theme-active-yellow ((,class :background ,yellow-active :foreground 
,bg-active)))
+   `(modus-theme-active-blue ((,class :background ,blue-active :foreground 
,bg-active)))
+   `(modus-theme-active-magenta ((,class :background ,magenta-active 
:foreground ,bg-active)))
+   `(modus-theme-active-cyan ((,class :background ,cyan-active :foreground 
,bg-active)))
    ;;; for fringe indicators
-   `(modus-theme-fringe-red ((,class (:background ,red-fringe-bg :foreground 
,fg-dim))))
-   `(modus-theme-fringe-green ((,class (:background ,green-fringe-bg 
:foreground ,fg-dim))))
-   `(modus-theme-fringe-yellow ((,class (:background ,yellow-fringe-bg 
:foreground ,fg-dim))))
-   `(modus-theme-fringe-blue ((,class (:background ,blue-fringe-bg :foreground 
,fg-dim))))
-   `(modus-theme-fringe-magenta ((,class (:background ,magenta-fringe-bg 
:foreground ,fg-dim))))
-   `(modus-theme-fringe-cyan ((,class (:background ,cyan-fringe-bg :foreground 
,fg-dim))))
+   `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground 
,fg-dim)))
+   `(modus-theme-fringe-green ((,class :background ,green-fringe-bg 
:foreground ,fg-dim)))
+   `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg 
:foreground ,fg-dim)))
+   `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground 
,fg-dim)))
+   `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg 
:foreground ,fg-dim)))
+   `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground 
,fg-dim)))
    ;;; special base values that are closer to the grayscale than
    ;;; the accents defined above
-   `(modus-theme-special-cold ((,class (:background ,bg-special-cold 
:foreground ,fg-special-cold))))
-   `(modus-theme-special-mild ((,class (:background ,bg-special-mild 
:foreground ,fg-special-mild))))
-   `(modus-theme-special-warm ((,class (:background ,bg-special-warm 
:foreground ,fg-special-warm))))
-   `(modus-theme-special-calm ((,class (:background ,bg-special-calm 
:foreground ,fg-special-calm))))
+   `(modus-theme-special-cold ((,class :background ,bg-special-cold 
:foreground ,fg-special-cold)))
+   `(modus-theme-special-mild ((,class :background ,bg-special-mild 
:foreground ,fg-special-mild)))
+   `(modus-theme-special-warm ((,class :background ,bg-special-warm 
:foreground ,fg-special-warm)))
+   `(modus-theme-special-calm ((,class :background ,bg-special-calm 
:foreground ,fg-special-calm)))
    ;;; colour combinations intended for `diff-mode' or equivalent
-   `(modus-theme-diff-added ((,class (:background ,bg-diff-added :foreground 
,fg-diff-added))))
-   `(modus-theme-diff-changed ((,class (:background ,bg-diff-changed 
:foreground ,fg-diff-changed))))
-   `(modus-theme-diff-removed ((,class (:background ,bg-diff-removed 
:foreground ,fg-diff-removed))))
-   `(modus-theme-diff-refine-added ((,class (:background ,bg-diff-refine-added 
:foreground ,fg-diff-refine-added))))
-   `(modus-theme-diff-refine-changed ((,class (:background 
,bg-diff-refine-changed :foreground ,fg-diff-refine-changed))))
-   `(modus-theme-diff-refine-removed ((,class (:background 
,bg-diff-refine-removed :foreground ,fg-diff-refine-removed))))
-   `(modus-theme-diff-focus-added ((,class (:background ,bg-diff-focus-added 
:foreground ,fg-diff-focus-added))))
-   `(modus-theme-diff-focus-changed ((,class (:background 
,bg-diff-focus-changed :foreground ,fg-diff-focus-changed))))
-   `(modus-theme-diff-focus-removed ((,class (:background 
,bg-diff-focus-removed :foreground ,fg-diff-focus-removed))))
-   `(modus-theme-diff-heading ((,class (:background ,bg-diff-heading 
:foreground ,fg-diff-heading))))
+   `(modus-theme-diff-added ((,class :background ,bg-diff-added :foreground 
,fg-diff-added)))
+   `(modus-theme-diff-changed ((,class :background ,bg-diff-changed 
:foreground ,fg-diff-changed)))
+   `(modus-theme-diff-removed ((,class :background ,bg-diff-removed 
:foreground ,fg-diff-removed)))
+   `(modus-theme-diff-refine-added ((,class :background ,bg-diff-refine-added 
:foreground ,fg-diff-refine-added)))
+   `(modus-theme-diff-refine-changed ((,class :background 
,bg-diff-refine-changed :foreground ,fg-diff-refine-changed)))
+   `(modus-theme-diff-refine-removed ((,class :background 
,bg-diff-refine-removed :foreground ,fg-diff-refine-removed)))
+   `(modus-theme-diff-focus-added ((,class :background ,bg-diff-focus-added 
:foreground ,fg-diff-focus-added)))
+   `(modus-theme-diff-focus-changed ((,class :background 
,bg-diff-focus-changed :foreground ,fg-diff-focus-changed)))
+   `(modus-theme-diff-focus-removed ((,class :background 
,bg-diff-focus-removed :foreground ,fg-diff-focus-removed)))
+   `(modus-theme-diff-heading ((,class :background ,bg-diff-heading 
:foreground ,fg-diff-heading)))
    ;;; colour combinations intended for Dired, Ibuffer, or equivalent
-   `(modus-theme-header ((,class (:foreground ,fg-main :weight bold))))
-   `(modus-theme-mark-alt ((,class (:background ,bg-mark-alt :foreground 
,fg-mark-alt :weight bold))))
-   `(modus-theme-mark-del ((,class (:background ,bg-mark-del :foreground 
,fg-mark-del :weight bold))))
-   `(modus-theme-mark-sel ((,class (:background ,bg-mark-sel :foreground 
,fg-mark-sel :weight bold))))
-   `(modus-theme-mark-symbol ((,class (:foreground ,blue-alt :weight bold))))
+   `(modus-theme-header ((,class :foreground ,fg-main :weight bold)))
+   `(modus-theme-mark-alt ((,class :background ,bg-mark-alt :foreground 
,fg-mark-alt :weight bold)))
+   `(modus-theme-mark-del ((,class :background ,bg-mark-del :foreground 
,fg-mark-del :weight bold)))
+   `(modus-theme-mark-sel ((,class :background ,bg-mark-sel :foreground 
,fg-mark-sel :weight bold)))
+   `(modus-theme-mark-symbol ((,class :foreground ,blue-alt :weight bold)))
    ;;;;;;;;;;;;;;;;;;;
    ;; actual styles ;;
    ;;;;;;;;;;;;;;;;;;;
    ;;; default constructs
    ;;;; absolute essentials
-   `(default ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(cursor ((,class (:background ,fg-main))))
-   `(fringe ((,class (:background
-                      ,(if modus-operandi-theme-visible-fringes bg-inactive 
bg-main)
-                      :foreground ,fg-main))))
-   `(vertical-border ((,class (:foreground ,fg-window-divider-inner))))
+   `(default ((,class :background ,bg-main :foreground ,fg-main)))
+   `(cursor ((,class :background ,fg-main)))
+   `(fringe ((,class :background
+                     ,(if modus-operandi-theme-visible-fringes bg-inactive 
bg-main)
+                     :foreground ,fg-main)))
+   `(vertical-border ((,class :foreground ,fg-window-divider-inner)))
    ;;;; basic and/or ungrouped styles
-   `(error ((,class (:foreground ,red :weight bold))))
-   `(escape-glyph ((,class (:foreground ,fg-escape-char-construct))))
-   `(header-line ((,class (:background ,bg-header :foreground ,fg-header))))
-   `(homoglyph ((,class (:foreground ,fg-escape-char-construct))))
-   `(ibuffer-locked-buffer ((,class (:foreground ,yellow-alt-other))))
-   `(italic ((,class (:foreground ,fg-special-cold :slant italic))))
-   `(nobreak-hyphen ((,class (:foreground ,fg-escape-char-construct))))
-   `(nobreak-space ((,class (:foreground ,fg-escape-char-construct :underline 
t))))
-   `(minibuffer-prompt ((,class (:foreground ,cyan-alt-other))))
-   `(mm-command-output ((,class (:foreground ,red-alt-other))))
-   `(mm-uu-extract ((,class (:background ,bg-dim :foreground 
,fg-special-mild))))
-   `(next-error ((,class (:inherit modus-theme-subtle-red))))
-   `(shadow ((,class (:foreground ,fg-alt))))
-   `(success ((,class (:foreground ,green :weight bold))))
-   `(trailing-whitespace ((,class (:background ,red-intense-bg))))
-   `(warning ((,class (:foreground ,yellow :weight bold))))
+   `(error ((,class :foreground ,red :weight bold)))
+   `(escape-glyph ((,class :foreground ,fg-escape-char-construct)))
+   `(header-line ((,class :background ,bg-header :foreground ,fg-header)))
+   `(homoglyph ((,class :foreground ,fg-escape-char-construct)))
+   `(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other)))
+   `(italic ((,class :foreground ,fg-special-cold :slant italic)))
+   `(nobreak-hyphen ((,class :foreground ,fg-escape-char-construct)))
+   `(nobreak-space ((,class :foreground ,fg-escape-char-construct :underline 
t)))
+   `(minibuffer-prompt ((,class :foreground ,cyan-alt-other)))
+   `(mm-command-output ((,class :foreground ,red-alt-other)))
+   `(mm-uu-extract ((,class :background ,bg-dim :foreground ,fg-special-mild)))
+   `(next-error ((,class :inherit modus-theme-subtle-red)))
+   `(shadow ((,class :foreground ,fg-alt)))
+   `(success ((,class :foreground ,green :weight bold)))
+   `(trailing-whitespace ((,class :background ,red-intense-bg)))
+   `(warning ((,class :foreground ,yellow :weight bold)))
    ;;;; ag
-   `(ag-hit-face ((,class (:foreground ,fg-special-cold))))
-   `(ag-match-face ((,class (:inherit modus-theme-special-calm))))
+   `(ag-hit-face ((,class :foreground ,fg-special-cold)))
+   `(ag-match-face ((,class :inherit modus-theme-special-calm)))
    ;;;; alert
-   `(alert-high-face ((,class (:foreground ,red-alt :weight bold))))
-   `(alert-low-face ((,class (:foreground ,fg-special-mild))))
-   `(alert-moderate-face ((,class (:foreground ,yellow :weight bold))))
-   `(alert-trivial-face ((,class (:foreground ,fg-special-calm))))
-   `(alert-urgent-face ((,class (:foreground ,red-intense :weight bold))))
+   `(alert-high-face ((,class :foreground ,red-alt :weight bold)))
+   `(alert-low-face ((,class :foreground ,fg-special-mild)))
+   `(alert-moderate-face ((,class :foreground ,yellow :weight bold)))
+   `(alert-trivial-face ((,class :foreground ,fg-special-calm)))
+   `(alert-urgent-face ((,class :foreground ,red-intense :weight bold)))
    ;;;; all-the-icons
-   `(all-the-icons-blue ((,class (:foreground ,blue))))
-   `(all-the-icons-blue-alt ((,class (:foreground ,blue-alt))))
-   `(all-the-icons-cyan ((,class (:foreground ,cyan))))
-   `(all-the-icons-cyan-alt ((,class (:foreground ,cyan-alt))))
-   `(all-the-icons-dblue ((,class (:foreground ,blue-alt-other))))
-   `(all-the-icons-dcyan ((,class (:foreground ,cyan-alt-other))))
-   `(all-the-icons-dgreen ((,class (:foreground ,green-alt-other))))
-   `(all-the-icons-dired-dir-face ((,class (:foreground ,blue))))
-   `(all-the-icons-dmaroon ((,class (:foreground ,magenta-alt-other))))
-   `(all-the-icons-dorange ((,class (:foreground ,red-alt-other))))
-   `(all-the-icons-dpink ((,class (:foreground ,magenta))))
-   `(all-the-icons-dpurple ((,class (:foreground ,magenta-alt))))
-   `(all-the-icons-dred ((,class (:foreground ,red))))
-   `(all-the-icons-dsilver ((,class (:foreground ,fg-special-cold))))
-   `(all-the-icons-dyellow ((,class (:foreground ,yellow))))
-   `(all-the-icons-green ((,class (:foreground ,green))))
-   `(all-the-icons-lblue ((,class (:foreground ,blue-refine-fg))))
-   `(all-the-icons-lcyan ((,class (:foreground ,cyan-refine-fg))))
-   `(all-the-icons-lgreen ((,class (:foreground ,green-refine-fg))))
-   `(all-the-icons-lmaroon ((,class (:foreground ,magenta-refine-fg))))
-   `(all-the-icons-lorange ((,class (:foreground ,red-refine-fg))))
-   `(all-the-icons-lpink ((,class (:foreground ,magenta-refine-fg))))
-   `(all-the-icons-lpurple ((,class (:foreground ,magenta-refine-fg))))
-   `(all-the-icons-lred ((,class (:foreground ,red-refine-fg))))
-   `(all-the-icons-lsilver ((,class (:foreground ,fg-special-cold))))
-   `(all-the-icons-lyellow ((,class (:foreground ,yellow-refine-fg))))
-   `(all-the-icons-maroon ((,class (:foreground ,magenta))))
-   `(all-the-icons-orange ((,class (:foreground ,red-alt))))
-   `(all-the-icons-pink ((,class (:foreground ,magenta))))
-   `(all-the-icons-purple ((,class (:foreground ,magenta-alt))))
-   `(all-the-icons-purple-alt ((,class (:foreground ,magenta-alt-other))))
-   `(all-the-icons-red ((,class (:foreground ,red))))
-   `(all-the-icons-red-alt ((,class (:foreground ,red-alt))))
-   `(all-the-icons-silver ((,class (:foreground ,fg-special-cold))))
-   `(all-the-icons-yellow ((,class (:foreground ,yellow))))
+   `(all-the-icons-blue ((,class :foreground ,blue)))
+   `(all-the-icons-blue-alt ((,class :foreground ,blue-alt)))
+   `(all-the-icons-cyan ((,class :foreground ,cyan)))
+   `(all-the-icons-cyan-alt ((,class :foreground ,cyan-alt)))
+   `(all-the-icons-dblue ((,class :foreground ,blue-alt-other)))
+   `(all-the-icons-dcyan ((,class :foreground ,cyan-alt-other)))
+   `(all-the-icons-dgreen ((,class :foreground ,green-alt-other)))
+   `(all-the-icons-dired-dir-face ((,class :foreground ,blue)))
+   `(all-the-icons-dmaroon ((,class :foreground ,magenta-alt-other)))
+   `(all-the-icons-dorange ((,class :foreground ,red-alt-other)))
+   `(all-the-icons-dpink ((,class :foreground ,magenta)))
+   `(all-the-icons-dpurple ((,class :foreground ,magenta-alt)))
+   `(all-the-icons-dred ((,class :foreground ,red)))
+   `(all-the-icons-dsilver ((,class :foreground ,fg-special-cold)))
+   `(all-the-icons-dyellow ((,class :foreground ,yellow)))
+   `(all-the-icons-green ((,class :foreground ,green)))
+   `(all-the-icons-lblue ((,class :foreground ,blue-refine-fg)))
+   `(all-the-icons-lcyan ((,class :foreground ,cyan-refine-fg)))
+   `(all-the-icons-lgreen ((,class :foreground ,green-refine-fg)))
+   `(all-the-icons-lmaroon ((,class :foreground ,magenta-refine-fg)))
+   `(all-the-icons-lorange ((,class :foreground ,red-refine-fg)))
+   `(all-the-icons-lpink ((,class :foreground ,magenta-refine-fg)))
+   `(all-the-icons-lpurple ((,class :foreground ,magenta-refine-fg)))
+   `(all-the-icons-lred ((,class :foreground ,red-refine-fg)))
+   `(all-the-icons-lsilver ((,class :foreground ,fg-special-cold)))
+   `(all-the-icons-lyellow ((,class :foreground ,yellow-refine-fg)))
+   `(all-the-icons-maroon ((,class :foreground ,magenta)))
+   `(all-the-icons-orange ((,class :foreground ,red-alt)))
+   `(all-the-icons-pink ((,class :foreground ,magenta)))
+   `(all-the-icons-purple ((,class :foreground ,magenta-alt)))
+   `(all-the-icons-purple-alt ((,class :foreground ,magenta-alt-other)))
+   `(all-the-icons-red ((,class :foreground ,red)))
+   `(all-the-icons-red-alt ((,class :foreground ,red-alt)))
+   `(all-the-icons-silver ((,class :foreground ,fg-special-cold)))
+   `(all-the-icons-yellow ((,class :foreground ,yellow)))
    ;;;; annotate
-   `(annotate-annotation ((,class (:inherit modus-theme-intense-blue))))
-   `(annotate-annotation-secondary ((,class (:inherit 
modus-theme-intense-yellow))))
-   `(annotate-highlight ((,class (:underline (:color ,blue-intense :style 
line)))))
-   `(annotate-highlight-secondary ((,class (:underline (:color ,yellow-intense 
:style line)))))
+   `(annotate-annotation ((,class :inherit modus-theme-intense-blue)))
+   `(annotate-annotation-secondary ((,class :inherit 
modus-theme-intense-yellow)))
+   `(annotate-highlight ((,class :underline (:color ,blue-intense :style 
line))))
+   `(annotate-highlight-secondary ((,class :underline (:color ,yellow-intense 
:style line))))
    ;;;; anzu
-   `(anzu-match-1 ((,class (:inherit modus-theme-subtle-cyan))))
-   `(anzu-match-2 ((,class (:inherit modus-theme-subtle-green))))
-   `(anzu-match-3 ((,class (:inherit modus-theme-subtle-yellow))))
-   `(anzu-mode-line ((,class (:foreground ,green-active :weight bold))))
-   `(anzu-mode-line-no-match ((,class (:foreground ,red-active :weight bold))))
-   `(anzu-replace-highlight ((,class (:inherit modus-theme-refine-yellow 
:underline t))))
-   `(anzu-replace-to ((,class (:inherit modus-theme-intense-green :weight 
bold))))
+   `(anzu-match-1 ((,class :inherit modus-theme-subtle-cyan)))
+   `(anzu-match-2 ((,class :inherit modus-theme-subtle-green)))
+   `(anzu-match-3 ((,class :inherit modus-theme-subtle-yellow)))
+   `(anzu-mode-line ((,class :foreground ,green-active :weight bold)))
+   `(anzu-mode-line-no-match ((,class :foreground ,red-active :weight bold)))
+   `(anzu-replace-highlight ((,class :inherit modus-theme-refine-yellow 
:underline t)))
+   `(anzu-replace-to ((,class :inherit modus-theme-intense-green :weight 
bold)))
    ;;;; apropos
-   `(apropos-function-button ((,class (:foreground ,magenta-alt-other 
:underline t))))
-   `(apropos-keybinding ((,class (:foreground ,cyan :weight bold))))
-   `(apropos-misc-button ((,class (:foreground ,cyan-alt-other :underline t))))
-   `(apropos-property ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(apropos-symbol ((,class (:foreground ,blue-nuanced :weight 
,modus-theme-bold :underline t))))
-   `(apropos-user-option-button ((,class (:foreground ,green-alt-other 
:underline t))))
-   `(apropos-variable-button ((,class (:foreground ,blue :underline t))))
+   `(apropos-function-button ((,class :foreground ,magenta-alt-other 
:underline t)))
+   `(apropos-keybinding ((,class :foreground ,cyan :weight bold)))
+   `(apropos-misc-button ((,class :foreground ,cyan-alt-other :underline t)))
+   `(apropos-property ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(apropos-symbol ((,class :foreground ,blue-nuanced :weight 
,modus-theme-bold :underline t)))
+   `(apropos-user-option-button ((,class :foreground ,green-alt-other 
:underline t)))
+   `(apropos-variable-button ((,class :foreground ,blue :underline t)))
    ;;;; apt-sources-list
-   `(apt-sources-list-components ((,class (:foreground ,cyan))))
-   `(apt-sources-list-options ((,class (:foreground ,yellow))))
-   `(apt-sources-list-suite ((,class (:foreground ,green))))
-   `(apt-sources-list-type ((,class (:foreground ,magenta))))
-   `(apt-sources-list-uri ((,class (:foreground ,blue))))
+   `(apt-sources-list-components ((,class :foreground ,cyan)))
+   `(apt-sources-list-options ((,class :foreground ,yellow)))
+   `(apt-sources-list-suite ((,class :foreground ,green)))
+   `(apt-sources-list-type ((,class :foreground ,magenta)))
+   `(apt-sources-list-uri ((,class :foreground ,blue)))
    ;;;; artbollocks-mode
-   `(artbollocks-face ((,class (:foreground ,cyan-nuanced :underline (:color 
,fg-lang-note :style line)))))
-   `(artbollocks-lexical-illusions-face ((,class (:background ,bg-alt 
:foreground ,red-alt :underline t))))
-   `(artbollocks-passive-voice-face ((,class (:foreground ,yellow-nuanced 
:underline (:color ,fg-lang-warning :style line)))))
-   `(artbollocks-weasel-words-face ((,class (:foreground ,red-nuanced 
:underline (:color ,fg-lang-error :style line)))))
+   `(artbollocks-face ((,class :foreground ,cyan-nuanced :underline (:color 
,fg-lang-note :style line))))
+   `(artbollocks-lexical-illusions-face ((,class :background ,bg-alt 
:foreground ,red-alt :underline t)))
+   `(artbollocks-passive-voice-face ((,class :foreground ,yellow-nuanced 
:underline (:color ,fg-lang-warning :style line))))
+   `(artbollocks-weasel-words-face ((,class :foreground ,red-nuanced 
:underline (:color ,fg-lang-error :style line))))
    ;;;; auctex and Tex
-   `(font-latex-bold-face ((,class (:foreground ,fg-special-calm :weight 
bold))))
-   `(font-latex-doctex-documentation-face ((,class (:foreground 
,fg-special-cold :slant ,modus-theme-slant))))
-   `(font-latex-doctex-preprocessor-face ((,class (:foreground ,magenta-alt 
:weight ,modus-theme-bold))))
-   `(font-latex-italic-face ((,class (:foreground ,fg-special-calm :slant 
italic))))
-   `(font-latex-math-face ((,class (:foreground ,cyan-alt-other))))
-   `(font-latex-script-char-face ((,class (:foreground ,cyan-alt-other))))
-   `(font-latex-sectioning-0-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold
-                                                     
,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))))
-   `(font-latex-sectioning-1-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold
-                                                     
,@(modus-operandi-theme-scale modus-operandi-theme-scale-3)))))
-   `(font-latex-sectioning-2-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold
-                                                     
,@(modus-operandi-theme-scale modus-operandi-theme-scale-2)))))
-   `(font-latex-sectioning-3-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold
-                                                     
,@(modus-operandi-theme-scale modus-operandi-theme-scale-1)))))
-   `(font-latex-sectioning-4-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold))))
-   `(font-latex-sectioning-5-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground 
,blue-nuanced))))
-   `(font-latex-sedate-face ((,class (:foreground ,magenta-alt-other :weight 
,modus-theme-bold))))
-   `(font-latex-slide-title-face ((,class (:inherit ,modus-theme-variable-pitch
-                                                    :foreground ,cyan-nuanced 
:weight bold
-                                                    
,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))))
-   `(font-latex-string-face ((,class (:foreground ,blue-alt))))
-   `(font-latex-subscript-face ((,class (:height 0.95))))
-   `(font-latex-superscript-face ((,class (:height 0.95))))
-   `(font-latex-verbatim-face ((,class (:background ,bg-dim :foreground 
,fg-special-mild))))
-   `(font-latex-warning-face ((,class (:foreground ,yellow-alt-other))))
-   `(tex-match ((,class (:foreground ,blue-alt-other))))
-   `(tex-verbatim ((,class (:background ,bg-dim :foreground 
,fg-special-mild))))
-   `(texinfo-heading ((,class (:foreground ,magenta))))
-   `(TeX-error-description-error ((,class (:foreground ,red :weight bold))))
-   `(TeX-error-description-help ((,class (:foreground ,blue))))
-   `(TeX-error-description-tex-said ((,class (:foreground ,blue))))
-   `(TeX-error-description-warning ((,class (:foreground ,yellow :weight 
bold))))
+   `(font-latex-bold-face ((,class :foreground ,fg-special-calm :weight bold)))
+   `(font-latex-doctex-documentation-face ((,class :foreground 
,fg-special-cold :slant ,modus-theme-slant)))
+   `(font-latex-doctex-preprocessor-face ((,class :foreground ,magenta-alt 
:weight ,modus-theme-bold)))
+   `(font-latex-italic-face ((,class :foreground ,fg-special-calm :slant 
italic)))
+   `(font-latex-math-face ((,class :foreground ,cyan-alt-other)))
+   `(font-latex-script-char-face ((,class :foreground ,cyan-alt-other)))
+   `(font-latex-sectioning-0-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold
+                                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(font-latex-sectioning-1-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold
+                                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3))))
+   `(font-latex-sectioning-2-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold
+                                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2))))
+   `(font-latex-sectioning-3-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold
+                                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-1))))
+   `(font-latex-sectioning-4-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold)))
+   `(font-latex-sectioning-5-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced)))
+   `(font-latex-sedate-face ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold)))
+   `(font-latex-slide-title-face ((,class :inherit ,modus-theme-variable-pitch
+                                          :foreground ,cyan-nuanced :weight 
bold
+                                          ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(font-latex-string-face ((,class :foreground ,blue-alt)))
+   `(font-latex-subscript-face ((,class :height 0.95)))
+   `(font-latex-superscript-face ((,class :height 0.95)))
+   `(font-latex-verbatim-face ((,class :background ,bg-dim :foreground 
,fg-special-mild)))
+   `(font-latex-warning-face ((,class :foreground ,yellow-alt-other)))
+   `(tex-match ((,class :foreground ,blue-alt-other)))
+   `(tex-verbatim ((,class :background ,bg-dim :foreground ,fg-special-mild)))
+   `(texinfo-heading ((,class :foreground ,magenta)))
+   `(TeX-error-description-error ((,class :foreground ,red :weight bold)))
+   `(TeX-error-description-help ((,class :foreground ,blue)))
+   `(TeX-error-description-tex-said ((,class :foreground ,blue)))
+   `(TeX-error-description-warning ((,class :foreground ,yellow :weight bold)))
    ;;;; auto-dim-other-buffers
-   `(auto-dim-other-buffers-face ((,class (:background ,bg-alt))))
+   `(auto-dim-other-buffers-face ((,class :background ,bg-alt)))
    ;;;; avy
-   `(avy-background-face ((,class (:background ,bg-dim :foreground ,fg-dim))))
-   `(avy-goto-char-timer-face ((,class (:inherit modus-theme-intense-yellow 
:weight bold))))
-   `(avy-lead-face ((,class (:inherit modus-theme-intense-magenta :weight 
bold))))
-   `(avy-lead-face-0 ((,class (:inherit modus-theme-intense-blue :weight 
bold))))
-   `(avy-lead-face-1 ((,class (:inherit modus-theme-intense-red :weight 
bold))))
-   `(avy-lead-face-2 ((,class (:inherit modus-theme-intense-green :weight 
bold))))
+   `(avy-background-face ((,class :background ,bg-dim :foreground ,fg-dim)))
+   `(avy-goto-char-timer-face ((,class :inherit modus-theme-intense-yellow 
:weight bold)))
+   `(avy-lead-face ((,class :inherit modus-theme-intense-magenta :weight 
bold)))
+   `(avy-lead-face-0 ((,class :inherit modus-theme-intense-blue :weight bold)))
+   `(avy-lead-face-1 ((,class :inherit modus-theme-intense-red :weight bold)))
+   `(avy-lead-face-2 ((,class :inherit modus-theme-intense-green :weight 
bold)))
    ;;;; aw (ace-window)
-   `(aw-background-face ((,class (:background ,bg-dim :foreground ,fg-dim))))
-   `(aw-key-face ((,class (:foreground ,blue-intense :weight bold))))
-   `(aw-leading-char-face ((,class (:height 1.5 :background ,bg-main 
:foreground ,red-intense :weight bold))))
-   `(aw-minibuffer-leading-char-face ((,class (:foreground ,magenta-active))))
-   `(aw-mode-line-face ((,class (:weight bold))))
+   `(aw-background-face ((,class :background ,bg-dim :foreground ,fg-dim)))
+   `(aw-key-face ((,class :foreground ,blue-intense :weight bold)))
+   `(aw-leading-char-face ((,class :height 1.5 :background ,bg-main 
:foreground ,red-intense :weight bold)))
+   `(aw-minibuffer-leading-char-face ((,class :foreground ,magenta-active)))
+   `(aw-mode-line-face ((,class :weight bold)))
    ;;;; bm
-   `(bm-face ((,class (:inherit modus-theme-subtle-yellow
-                                ,@(and (>= emacs-major-version 27) '(:extend 
t))))))
-   `(bm-fringe-face ((,class (:inherit modus-theme-fringe-yellow))))
-   `(bm-fringe-persistent-face ((,class (:inherit modus-theme-fringe-blue))))
-   `(bm-persistent-face ((,class (:inherit modus-theme-intense-blue
-                                           ,@(and (>= emacs-major-version 27) 
'(:extend t))))))
+   `(bm-face ((,class :inherit modus-theme-subtle-yellow
+                      ,@(and (>= emacs-major-version 27) '(:extend t)))))
+   `(bm-fringe-face ((,class :inherit modus-theme-fringe-yellow)))
+   `(bm-fringe-persistent-face ((,class :inherit modus-theme-fringe-blue)))
+   `(bm-persistent-face ((,class :inherit modus-theme-intense-blue
+                                 ,@(and (>= emacs-major-version 27) '(:extend 
t)))))
    ;;;; buttons, links, widgets
-   `(button ((,class (:foreground ,blue-alt-other :underline t))))
-   `(link ((,class (:foreground ,blue-alt-other :underline t))))
-   `(link-visited ((,class (:foreground ,magenta-alt-other :underline t))))
-   `(tooltip ((,class (:background ,bg-special-cold :foreground ,fg-main))))
-   `(widget-button ((,class (:inherit button))))
-   `(widget-button-pressed ((,class (:inherit button :foreground ,magenta))))
-   `(widget-documentation ((,class (:foreground ,green))))
-   `(widget-field ((,class (:background ,bg-alt :foreground ,fg-dim))))
-   `(widget-inactive ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(widget-single-line-field ((,class (:inherit widget-field))))
+   `(button ((,class :foreground ,blue-alt-other :underline t)))
+   `(link ((,class :foreground ,blue-alt-other :underline t)))
+   `(link-visited ((,class :foreground ,magenta-alt-other :underline t)))
+   `(tooltip ((,class :background ,bg-special-cold :foreground ,fg-main)))
+   `(widget-button ((,class :inherit button)))
+   `(widget-button-pressed ((,class :inherit button :foreground ,magenta)))
+   `(widget-documentation ((,class :foreground ,green)))
+   `(widget-field ((,class :background ,bg-alt :foreground ,fg-dim)))
+   `(widget-inactive ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(widget-single-line-field ((,class :inherit widget-field)))
    ;;;; breakpoint (built-in gdb-mi.el)
-   `(breakpoint-disabled ((,class (:foreground ,fg-alt))))
-   `(breakpoint-enabled ((,class (:foreground ,red :weight bold))))
+   `(breakpoint-disabled ((,class :foreground ,fg-alt)))
+   `(breakpoint-enabled ((,class :foreground ,red :weight bold)))
    ;;;; buffer-expose
-   `(buffer-expose-ace-char-face ((,class (:foreground ,red-active :weight 
bold))))
-   `(buffer-expose-mode-line-face ((,class (:foreground ,cyan-active))))
-   `(buffer-expose-selected-face ((,class (:inherit 
modus-theme-special-mild))))
+   `(buffer-expose-ace-char-face ((,class :foreground ,red-active :weight 
bold)))
+   `(buffer-expose-mode-line-face ((,class :foreground ,cyan-active)))
+   `(buffer-expose-selected-face ((,class :inherit modus-theme-special-mild)))
    ;;;; calendar and diary
-   `(calendar-month-header ((,class (:foreground ,fg-main :weight bold))))
-   `(calendar-today ((,class (:background ,bg-alt :underline t))))
-   `(calendar-weekday-header ((,class (:foreground ,blue-alt))))
-   `(calendar-weekend-header ((,class (:foreground ,fg-alt))))
-   `(diary ((,class (:foreground ,green-alt-other))))
-   `(diary-anniversary ((,class (:foreground ,yellow-alt-other))))
-   `(diary-time ((,class (:foreground ,red-alt))))
-   `(holiday ((,class (:foreground ,magenta-alt))))
+   `(calendar-month-header ((,class :foreground ,fg-main :weight bold)))
+   `(calendar-today ((,class :background ,bg-alt :underline t)))
+   `(calendar-weekday-header ((,class :foreground ,blue-alt)))
+   `(calendar-weekend-header ((,class :foreground ,fg-alt)))
+   `(diary ((,class :foreground ,green-alt-other)))
+   `(diary-anniversary ((,class :foreground ,yellow-alt-other)))
+   `(diary-time ((,class :foreground ,red-alt)))
+   `(holiday ((,class :foreground ,magenta-alt)))
    ;;;; calfw
-   `(cfw:face-annotation ((,class (:background ,bg-alt :foreground ,fg-alt))))
-   `(cfw:face-day-title ((,class (:background ,bg-alt :foreground ,fg-main))))
-   `(cfw:face-default-content ((,class (:foreground ,green-alt))))
-   `(cfw:face-default-day ((,class (:inherit cfw:face-day-title :weight 
bold))))
-   `(cfw:face-disable ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(cfw:face-grid ((,class (:foreground ,fg-inactive))))
-   `(cfw:face-header ((,class (::foreground ,fg-main :weight bold))))
-   `(cfw:face-holiday ((,class (:background ,bg-alt :foreground ,magenta 
:weight bold))))
-   `(cfw:face-periods ((,class (:foreground ,cyan-alt-other))))
-   `(cfw:face-saturday ((,class (:background ,bg-alt :foreground ,magenta-alt 
:weight bold))))
-   `(cfw:face-select ((,class (:inherit modus-theme-intense-blue))))
-   `(cfw:face-sunday ((,class (:background ,bg-alt :foreground 
,magenta-alt-other :weight bold))))
-   `(cfw:face-title ((,class (:inherit ,modus-theme-variable-pitch
-                                       :foreground ,fg-special-warm :weight 
bold
-                                       ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)))))
-   `(cfw:face-today ((,class (:foreground ,blue :weight bold))))
-   `(cfw:face-today-title ((,class (:inherit modus-theme-special-mild :box 
t))))
-   `(cfw:face-toolbar ((,class (:background ,bg-active :foreground 
,bg-active))))
-   `(cfw:face-toolbar-button-off ((,class (:background ,bg-alt :foreground 
,cyan))))
-   `(cfw:face-toolbar-button-on ((,class (:background ,bg-main :foreground 
,blue-intense :weight bold))))
+   `(cfw:face-annotation ((,class :background ,bg-alt :foreground ,fg-alt)))
+   `(cfw:face-day-title ((,class :background ,bg-alt :foreground ,fg-main)))
+   `(cfw:face-default-content ((,class :foreground ,green-alt)))
+   `(cfw:face-default-day ((,class :inherit cfw:face-day-title :weight bold)))
+   `(cfw:face-disable ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(cfw:face-grid ((,class :foreground ,fg-inactive)))
+   `(cfw:face-header ((,class ::foreground ,fg-main :weight bold)))
+   `(cfw:face-holiday ((,class :background ,bg-alt :foreground ,magenta 
:weight bold)))
+   `(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
+   `(cfw:face-saturday ((,class :background ,bg-alt :foreground ,magenta-alt 
:weight bold)))
+   `(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
+   `(cfw:face-sunday ((,class :background ,bg-alt :foreground 
,magenta-alt-other :weight bold)))
+   `(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch
+                             :foreground ,fg-special-warm :weight bold
+                             ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(cfw:face-today ((,class :foreground ,blue :weight bold)))
+   `(cfw:face-today-title ((,class :inherit modus-theme-special-mild :box t)))
+   `(cfw:face-toolbar ((,class :background ,bg-active :foreground ,bg-active)))
+   `(cfw:face-toolbar-button-off ((,class :background ,bg-alt :foreground 
,cyan)))
+   `(cfw:face-toolbar-button-on ((,class :background ,bg-main :foreground 
,blue-intense :weight bold)))
    ;;;; centaur-tabs
-   `(centaur-tabs-active-bar-face ((,class (:background ,fg-tab-active))))
-   `(centaur-tabs-close-mouse-face ((,class (:foreground ,red-active :weight 
bold :underline t))))
-   `(centaur-tabs-close-selected ((,class (:inherit centaur-tabs-selected))))
-   `(centaur-tabs-close-unselected ((,class (:inherit 
centaur-tabs-unselected))))
-   `(centaur-tabs-modified-marker-selected ((,class (:inherit 
centaur-tabs-selected))))
-   `(centaur-tabs-modified-marker-unselected ((,class (:inherit 
centaur-tabs-unselected))))
-   `(centaur-tabs-default ((,class (:background ,bg-main :foreground 
,bg-main))))
-   `(centaur-tabs-selected ((,class (:background ,bg-tab-active :foreground 
,fg-main :weight bold))))
-   `(centaur-tabs-selected-modified ((,class (:background ,bg-tab-active 
:foreground ,fg-main :slant italic))))
-   `(centaur-tabs-unselected ((,class (:background ,bg-tab-inactive 
:foreground ,fg-dim))))
-   `(centaur-tabs-unselected-modified ((,class (:background ,bg-tab-inactive 
:foreground ,fg-dim :slant italic))))
+   `(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
+   `(centaur-tabs-close-mouse-face ((,class :foreground ,red-active :weight 
bold :underline t)))
+   `(centaur-tabs-close-selected ((,class :inherit centaur-tabs-selected)))
+   `(centaur-tabs-close-unselected ((,class :inherit centaur-tabs-unselected)))
+   `(centaur-tabs-modified-marker-selected ((,class :inherit 
centaur-tabs-selected)))
+   `(centaur-tabs-modified-marker-unselected ((,class :inherit 
centaur-tabs-unselected)))
+   `(centaur-tabs-default ((,class :background ,bg-main :foreground ,bg-main)))
+   `(centaur-tabs-selected ((,class :background ,bg-tab-active :foreground 
,fg-main :weight bold)))
+   `(centaur-tabs-selected-modified ((,class :background ,bg-tab-active 
:foreground ,fg-main :slant italic)))
+   `(centaur-tabs-unselected ((,class :background ,bg-tab-inactive :foreground 
,fg-dim)))
+   `(centaur-tabs-unselected-modified ((,class :background ,bg-tab-inactive 
:foreground ,fg-dim :slant italic)))
    ;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log')
-   `(change-log-acknowledgment ((,class (:foreground ,fg-special-warm))))
-   `(change-log-conditionals ((,class (:foreground ,magenta-alt))))
-   `(change-log-date ((,class (:foreground ,magenta))))
-   `(change-log-email ((,class (:foreground ,cyan))))
-   `(change-log-file ((,class (:foreground ,blue))))
-   `(change-log-function ((,class (:foreground ,green-alt-other))))
-   `(change-log-list ((,class (:foreground ,magenta-alt-other))))
-   `(change-log-name ((,class (:foreground ,cyan))))
-   `(log-edit-header ((,class (:foreground ,green-alt-other :weight bold))))
-   `(log-edit-summary ((,class (:foreground ,magenta-alt-other))))
-   `(log-edit-unknown-header ((,class (:foreground ,fg-alt))))
-   `(log-view-file ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(log-view-message ((,class (:foreground ,fg-special-warm))))
+   `(change-log-acknowledgment ((,class :foreground ,fg-special-warm)))
+   `(change-log-conditionals ((,class :foreground ,magenta-alt)))
+   `(change-log-date ((,class :foreground ,magenta)))
+   `(change-log-email ((,class :foreground ,cyan)))
+   `(change-log-file ((,class :foreground ,blue)))
+   `(change-log-function ((,class :foreground ,green-alt-other)))
+   `(change-log-list ((,class :foreground ,magenta-alt-other)))
+   `(change-log-name ((,class :foreground ,cyan)))
+   `(log-edit-header ((,class :foreground ,green-alt-other :weight bold)))
+   `(log-edit-summary ((,class :foreground ,magenta-alt-other)))
+   `(log-edit-unknown-header ((,class :foreground ,fg-alt)))
+   `(log-view-file ((,class :foreground ,fg-special-cold :weight bold)))
+   `(log-view-message ((,class :foreground ,fg-special-warm)))
    ;;;; cider
-   `(cider-debug-code-overlay-face ((,class (:background ,bg-alt))))
-   `(cider-debug-prompt-face ((,class (:foreground ,magenta-alt :underline 
t))))
-   `(cider-deprecated-face ((,class (:inherit modus-theme-refine-yellow))))
-   `(cider-docview-emphasis-face ((,class (:foreground ,fg-special-cold :slant 
italic))))
-   `(cider-docview-literal-face ((,class (:foreground ,blue-alt))))
-   `(cider-docview-strong-face ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(cider-docview-table-border-face ((,class (:foreground ,fg-alt))))
-   `(cider-enlightened-face ((,class (:box (:line-width -1 :color ,yellow-alt 
:style nil) :background ,bg-dim))))
-   `(cider-enlightened-local-face ((,class (:foreground ,yellow-alt-other 
:weight bold))))
-   `(cider-error-highlight-face ((,class (:foreground ,red :underline t))))
-   `(cider-fragile-button-face ((,class (:box (:line-width 3 :color ,fg-alt 
:style released-button)) :foreground ,yellow)))
-   `(cider-fringe-good-face ((,class (:foreground ,green-active))))
-   `(cider-instrumented-face ((,class (:box (:line-width -1 :color ,red :style 
nil) :background ,bg-dim))))
-   `(cider-reader-conditional-face ((,class (:foreground ,fg-special-warm 
:slant italic))))
-   `(cider-repl-input-face ((,class (:weight bold))))
-   `(cider-repl-prompt-face ((,class (:foreground ,cyan-alt-other))))
-   `(cider-repl-stderr-face ((,class (:foreground ,red :weight bold))))
-   `(cider-repl-stdout-face ((,class (:foreground ,blue))))
-   `(cider-result-overlay-face ((,class (:box (:line-width -1 :color ,blue 
:style nil) :background ,bg-dim))))
-   `(cider-stacktrace-error-class-face ((,class (:foreground ,red :weight 
bold))))
-   `(cider-stacktrace-error-message-face ((,class (:foreground ,red-alt-other 
:slant italic))))
-   `(cider-stacktrace-face ((,class (:foreground ,fg-main))))
-   `(cider-stacktrace-filter-active-face ((,class (:foreground ,cyan-alt 
:underline t))))
-   `(cider-stacktrace-filter-inactive-face ((,class (:foreground ,cyan-alt))))
-   `(cider-stacktrace-fn-face ((,class (:foreground ,fg-main :weight bold))))
-   `(cider-stacktrace-ns-face ((,class (:foreground ,fg-alt :slant italic))))
-   `(cider-stacktrace-promoted-button-face ((,class (:box (:line-width 3 
:color ,fg-alt :style released-button)) :foreground ,red)))
-   `(cider-stacktrace-suppressed-button-face ((,class (:box (:line-width 3 
:color ,fg-alt :style pressed-button))
+   `(cider-debug-code-overlay-face ((,class :background ,bg-alt)))
+   `(cider-debug-prompt-face ((,class :foreground ,magenta-alt :underline t)))
+   `(cider-deprecated-face ((,class :inherit modus-theme-refine-yellow)))
+   `(cider-docview-emphasis-face ((,class :foreground ,fg-special-cold :slant 
italic)))
+   `(cider-docview-literal-face ((,class :foreground ,blue-alt)))
+   `(cider-docview-strong-face ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(cider-docview-table-border-face ((,class :foreground ,fg-alt)))
+   `(cider-enlightened-face ((,class :box (:line-width -1 :color ,yellow-alt 
:style nil) :background ,bg-dim)))
+   `(cider-enlightened-local-face ((,class :foreground ,yellow-alt-other 
:weight bold)))
+   `(cider-error-highlight-face ((,class :foreground ,red :underline t)))
+   `(cider-fragile-button-face ((,class :box (:line-width 3 :color ,fg-alt 
:style released-button) :foreground ,yellow)))
+   `(cider-fringe-good-face ((,class :foreground ,green-active)))
+   `(cider-instrumented-face ((,class :box (:line-width -1 :color ,red :style 
nil) :background ,bg-dim)))
+   `(cider-reader-conditional-face ((,class :foreground ,fg-special-warm 
:slant italic)))
+   `(cider-repl-input-face ((,class :weight bold)))
+   `(cider-repl-prompt-face ((,class :foreground ,cyan-alt-other)))
+   `(cider-repl-stderr-face ((,class :foreground ,red :weight bold)))
+   `(cider-repl-stdout-face ((,class :foreground ,blue)))
+   `(cider-result-overlay-face ((,class :box (:line-width -1 :color ,blue 
:style nil) :background ,bg-dim)))
+   `(cider-stacktrace-error-class-face ((,class :foreground ,red :weight 
bold)))
+   `(cider-stacktrace-error-message-face ((,class :foreground ,red-alt-other 
:slant italic)))
+   `(cider-stacktrace-face ((,class :foreground ,fg-main)))
+   `(cider-stacktrace-filter-active-face ((,class :foreground ,cyan-alt 
:underline t)))
+   `(cider-stacktrace-filter-inactive-face ((,class :foreground ,cyan-alt)))
+   `(cider-stacktrace-fn-face ((,class :foreground ,fg-main :weight bold)))
+   `(cider-stacktrace-ns-face ((,class :foreground ,fg-alt :slant italic)))
+   `(cider-stacktrace-promoted-button-face ((,class :box (:line-width 3 :color 
,fg-alt :style released-button) :foreground ,red)))
+   `(cider-stacktrace-suppressed-button-face ((,class :box (:line-width 3 
:color ,fg-alt :style pressed-button)
                                                       :background ,bg-alt 
:foreground ,fg-alt)))
-   `(cider-test-error-face ((,class (:inherit modus-theme-subtle-red))))
-   `(cider-test-failure-face ((,class (:inherit modus-theme-intense-red 
:weight bold))))
-   `(cider-test-success-face ((,class (:inherit modus-theme-intense-green))))
-   `(cider-traced-face ((,class (:box (:line-width -1 :color ,cyan :style nil) 
:background ,bg-dim))))
-   `(cider-warning-highlight-face ((,class (:foreground ,yellow :underline 
t))))
+   `(cider-test-error-face ((,class :inherit modus-theme-subtle-red)))
+   `(cider-test-failure-face ((,class :inherit modus-theme-intense-red :weight 
bold)))
+   `(cider-test-success-face ((,class :inherit modus-theme-intense-green)))
+   `(cider-traced-face ((,class :box (:line-width -1 :color ,cyan :style nil) 
:background ,bg-dim)))
+   `(cider-warning-highlight-face ((,class :foreground ,yellow :underline t)))
    ;;;; circe (and lui)
-   `(circe-fool-face ((,class (:foreground ,fg-alt))))
-   `(circe-highlight-nick-face ((,class (:foreground ,blue :weight bold))))
-   `(circe-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(circe-server-face ((,class (:foreground ,fg-unfocused))))
-   `(lui-button-face ((,class (:foreground ,blue :underline t))))
-   `(lui-highlight-face ((,class (:foreground ,magenta-alt))))
-   `(lui-time-stamp-face ((,class (:foreground ,blue-nuanced))))
+   `(circe-fool-face ((,class :foreground ,fg-alt)))
+   `(circe-highlight-nick-face ((,class :foreground ,blue :weight bold)))
+   `(circe-prompt-face ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(circe-server-face ((,class :foreground ,fg-unfocused)))
+   `(lui-button-face ((,class :foreground ,blue :underline t)))
+   `(lui-highlight-face ((,class :foreground ,magenta-alt)))
+   `(lui-time-stamp-face ((,class :foreground ,blue-nuanced)))
    ;;;; color-rg
-   `(color-rg-font-lock-column-number ((,class (:foreground 
,magenta-alt-other))))
-   `(color-rg-font-lock-command ((,class (:foreground ,fg-main :weight bold))))
-   `(color-rg-font-lock-file ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(color-rg-font-lock-flash ((,class (:inherit modus-theme-intense-blue))))
-   `(color-rg-font-lock-function-location ((,class (:inherit 
modus-theme-special-calm))))
-   `(color-rg-font-lock-header-line-directory ((,class (:foreground 
,blue-active))))
-   `(color-rg-font-lock-header-line-edit-mode ((,class (:foreground 
,magenta-active))))
-   `(color-rg-font-lock-header-line-keyword ((,class (:foreground 
,green-active))))
-   `(color-rg-font-lock-header-line-text ((,class (:foreground ,fg-active))))
-   `(color-rg-font-lock-line-number ((,class (:foreground ,fg-special-warm))))
-   `(color-rg-font-lock-mark-changed ((,class (:foreground ,blue :weight 
bold))))
-   `(color-rg-font-lock-mark-deleted ((,class (:foreground ,red :weight 
bold))))
-   `(color-rg-font-lock-match ((,class (:inherit modus-theme-special-calm))))
-   `(color-rg-font-lock-position-splitter ((,class (:foreground ,fg-alt))))
+   `(color-rg-font-lock-column-number ((,class :foreground 
,magenta-alt-other)))
+   `(color-rg-font-lock-command ((,class :foreground ,fg-main :weight bold)))
+   `(color-rg-font-lock-file ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(color-rg-font-lock-flash ((,class :inherit modus-theme-intense-blue)))
+   `(color-rg-font-lock-function-location ((,class :inherit 
modus-theme-special-calm)))
+   `(color-rg-font-lock-header-line-directory ((,class :foreground 
,blue-active)))
+   `(color-rg-font-lock-header-line-edit-mode ((,class :foreground 
,magenta-active)))
+   `(color-rg-font-lock-header-line-keyword ((,class :foreground 
,green-active)))
+   `(color-rg-font-lock-header-line-text ((,class :foreground ,fg-active)))
+   `(color-rg-font-lock-line-number ((,class :foreground ,fg-special-warm)))
+   `(color-rg-font-lock-mark-changed ((,class :foreground ,blue :weight bold)))
+   `(color-rg-font-lock-mark-deleted ((,class :foreground ,red :weight bold)))
+   `(color-rg-font-lock-match ((,class :inherit modus-theme-special-calm)))
+   `(color-rg-font-lock-position-splitter ((,class :foreground ,fg-alt)))
    ;;;; column-enforce-mode
-   `(column-enforce-face ((,class (:inherit modus-theme-refine-yellow))))
+   `(column-enforce-face ((,class :inherit modus-theme-refine-yellow)))
    ;;;; company-mode
-   `(company-echo-common ((,class (:foreground ,magenta-alt-other))))
-   `(company-preview ((,class (:background ,bg-dim :foreground ,fg-dim))))
-   `(company-preview-common ((,class (:foreground ,blue-alt))))
-   `(company-preview-search ((,class (:inherit modus-theme-special-calm))))
-   `(company-scrollbar-bg ((,class (:background ,bg-active))))
-   `(company-scrollbar-fg ((,class (:background ,fg-active))))
-   `(company-template-field ((,class (:inherit modus-theme-intense-magenta))))
-   `(company-tooltip ((,class (:background ,bg-alt :foreground ,fg-alt))))
-   `(company-tooltip-annotation ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(company-tooltip-annotation-selection ((,class (:foreground ,fg-main 
:weight bold))))
-   `(company-tooltip-common ((,class (:foreground ,blue-alt :weight bold))))
-   `(company-tooltip-common-selection ((,class (:foreground ,fg-main))))
-   `(company-tooltip-mouse ((,class (:inherit modus-theme-intense-blue))))
-   `(company-tooltip-search ((,class (:inherit modus-theme-refine-cyan :weight 
bold))))
-   `(company-tooltip-search-selection ((,class (:inherit 
modus-theme-intense-green :weight bold :underline t))))
-   `(company-tooltip-selection ((,class (:inherit modus-theme-subtle-cyan 
:weight bold))))
+   `(company-echo-common ((,class :foreground ,magenta-alt-other)))
+   `(company-preview ((,class :background ,bg-dim :foreground ,fg-dim)))
+   `(company-preview-common ((,class :foreground ,blue-alt)))
+   `(company-preview-search ((,class :inherit modus-theme-special-calm)))
+   `(company-scrollbar-bg ((,class :background ,bg-active)))
+   `(company-scrollbar-fg ((,class :background ,fg-active)))
+   `(company-template-field ((,class :inherit modus-theme-intense-magenta)))
+   `(company-tooltip ((,class :background ,bg-alt :foreground ,fg-alt)))
+   `(company-tooltip-annotation ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(company-tooltip-annotation-selection ((,class :foreground ,fg-main 
:weight bold)))
+   `(company-tooltip-common ((,class :foreground ,blue-alt :weight bold)))
+   `(company-tooltip-common-selection ((,class :foreground ,fg-main)))
+   `(company-tooltip-mouse ((,class :inherit modus-theme-intense-blue)))
+   `(company-tooltip-search ((,class :inherit modus-theme-refine-cyan :weight 
bold)))
+   `(company-tooltip-search-selection ((,class :inherit 
modus-theme-intense-green :weight bold :underline t)))
+   `(company-tooltip-selection ((,class :inherit modus-theme-subtle-cyan 
:weight bold)))
    ;;;; company-posframe
-   `(company-posframe-active-backend-name ((,class (:background ,bg-active 
:foreground ,blue-active :weight bold))))
-   `(company-posframe-inactive-backend-name ((,class (:background ,bg-active 
:foreground ,fg-active))))
-   `(company-posframe-metadata ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
+   `(company-posframe-active-backend-name ((,class :background ,bg-active 
:foreground ,blue-active :weight bold)))
+   `(company-posframe-inactive-backend-name ((,class :background ,bg-active 
:foreground ,fg-active)))
+   `(company-posframe-metadata ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
    ;;;; compilation feedback
-   `(compilation-column-number ((,class (:foreground ,magenta-alt-other))))
-   `(compilation-error ((,class (:foreground ,red :weight ,modus-theme-bold))))
-   `(compilation-info ((,class (:foreground ,fg-special-cold))))
-   `(compilation-line-number ((,class (:foreground ,fg-special-warm))))
-   `(compilation-mode-line-exit ((,class (:foreground ,blue-active :weight 
,modus-theme-bold))))
-   `(compilation-mode-line-fail ((,class (:foreground ,red-active :weight 
,modus-theme-bold))))
-   `(compilation-mode-line-run ((,class (:foreground ,magenta-active :weight 
,modus-theme-bold))))
-   `(compilation-warning ((,class (:foreground ,yellow :weight 
,modus-theme-bold))))
+   `(compilation-column-number ((,class :foreground ,magenta-alt-other)))
+   `(compilation-error ((,class :foreground ,red :weight ,modus-theme-bold)))
+   `(compilation-info ((,class :foreground ,fg-special-cold)))
+   `(compilation-line-number ((,class :foreground ,fg-special-warm)))
+   `(compilation-mode-line-exit ((,class :foreground ,blue-active :weight 
,modus-theme-bold)))
+   `(compilation-mode-line-fail ((,class :foreground ,red-active :weight 
,modus-theme-bold)))
+   `(compilation-mode-line-run ((,class :foreground ,magenta-active :weight 
,modus-theme-bold)))
+   `(compilation-warning ((,class :foreground ,yellow :weight 
,modus-theme-bold)))
    ;;;; completions
-   `(completions-annotations ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(completions-common-part ((,class (,@(modus-operandi-theme-completions
-                                          cyan-alt-other green-refine-bg 
green-refine-fg)))))
-   `(completions-first-difference ((,class (,@(modus-operandi-theme-completions
-                                               blue-alt-other blue-intense-bg 
fg-main)
-                                            :weight bold))))
+   `(completions-annotations ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(completions-common-part ((,class ,@(modus-operandi-theme-completions
+                                         cyan-alt-other green-refine-bg 
green-refine-fg))))
+   `(completions-first-difference ((,class ,@(modus-operandi-theme-completions
+                                              blue-alt-other blue-intense-bg 
fg-main)
+                                           :weight bold)))
    ;;;; counsel
-   `(counsel-active-mode ((,class (:foreground ,magenta-alt-other))))
-   `(counsel-application-name ((,class (:foreground ,red-alt-other))))
-   `(counsel-key-binding ((,class (:foreground ,blue-alt-other :weight bold))))
-   `(counsel-outline-1 ((,class (:inherit outline-1))))
-   `(counsel-outline-2 ((,class (:inherit outline-2))))
-   `(counsel-outline-3 ((,class (:inherit outline-3))))
-   `(counsel-outline-4 ((,class (:inherit outline-4))))
-   `(counsel-outline-5 ((,class (:inherit outline-5))))
-   `(counsel-outline-6 ((,class (:inherit outline-6))))
-   `(counsel-outline-7 ((,class (:inherit outline-7))))
-   `(counsel-outline-8 ((,class (:inherit outline-8))))
-   `(counsel-outline-default ((,class (:foreground ,green-alt-other :weight 
bold))))
-   `(counsel-variable-documentation ((,class (:foreground ,yellow-alt-other 
:slant ,modus-theme-slant))))
+   `(counsel-active-mode ((,class :foreground ,magenta-alt-other)))
+   `(counsel-application-name ((,class :foreground ,red-alt-other)))
+   `(counsel-key-binding ((,class :foreground ,blue-alt-other :weight bold)))
+   `(counsel-outline-1 ((,class :inherit outline-1)))
+   `(counsel-outline-2 ((,class :inherit outline-2)))
+   `(counsel-outline-3 ((,class :inherit outline-3)))
+   `(counsel-outline-4 ((,class :inherit outline-4)))
+   `(counsel-outline-5 ((,class :inherit outline-5)))
+   `(counsel-outline-6 ((,class :inherit outline-6)))
+   `(counsel-outline-7 ((,class :inherit outline-7)))
+   `(counsel-outline-8 ((,class :inherit outline-8)))
+   `(counsel-outline-default ((,class :foreground ,green-alt-other :weight 
bold)))
+   `(counsel-variable-documentation ((,class :foreground ,yellow-alt-other 
:slant ,modus-theme-slant)))
    ;;;; counsel-css
-   `(counsel-css-selector-depth-face-1 ((,class (:foreground ,blue))))
-   `(counsel-css-selector-depth-face-2 ((,class (:foreground ,cyan))))
-   `(counsel-css-selector-depth-face-3 ((,class (:foreground ,green))))
-   `(counsel-css-selector-depth-face-4 ((,class (:foreground ,yellow))))
-   `(counsel-css-selector-depth-face-5 ((,class (:foreground ,magenta))))
-   `(counsel-css-selector-depth-face-6 ((,class (:foreground ,red))))
+   `(counsel-css-selector-depth-face-1 ((,class :foreground ,blue)))
+   `(counsel-css-selector-depth-face-2 ((,class :foreground ,cyan)))
+   `(counsel-css-selector-depth-face-3 ((,class :foreground ,green)))
+   `(counsel-css-selector-depth-face-4 ((,class :foreground ,yellow)))
+   `(counsel-css-selector-depth-face-5 ((,class :foreground ,magenta)))
+   `(counsel-css-selector-depth-face-6 ((,class :foreground ,red)))
    ;;;; counsel-notmuch
-   `(counsel-notmuch-count-face ((,class (:foreground ,cyan))))
-   `(counsel-notmuch-date-face ((,class (:foreground ,blue))))
-   `(counsel-notmuch-people-face ((,class (:foreground ,magenta))))
-   `(counsel-notmuch-subject-face ((,class (:foreground ,magenta-alt-other))))
+   `(counsel-notmuch-count-face ((,class :foreground ,cyan)))
+   `(counsel-notmuch-date-face ((,class :foreground ,blue)))
+   `(counsel-notmuch-people-face ((,class :foreground ,magenta)))
+   `(counsel-notmuch-subject-face ((,class :foreground ,magenta-alt-other)))
    ;;;; counsel-org-capture-string
-   `(counsel-org-capture-string-template-body-face ((,class (:foreground 
,fg-special-cold))))
+   `(counsel-org-capture-string-template-body-face ((,class :foreground 
,fg-special-cold)))
    ;;;; cov
-   `(cov-coverage-not-run-face ((,class (:foreground ,red-intense))))
-   `(cov-coverage-run-face ((,class (:foreground ,green-intense))))
-   `(cov-heavy-face ((,class (:foreground ,magenta-intense))))
-   `(cov-light-face ((,class (:foreground ,blue-intense))))
-   `(cov-med-face ((,class (:foreground ,yellow-intense))))
-   `(cov-none-face ((,class (:foreground ,cyan-intense))))
+   `(cov-coverage-not-run-face ((,class :foreground ,red-intense)))
+   `(cov-coverage-run-face ((,class :foreground ,green-intense)))
+   `(cov-heavy-face ((,class :foreground ,magenta-intense)))
+   `(cov-light-face ((,class :foreground ,blue-intense)))
+   `(cov-med-face ((,class :foreground ,yellow-intense)))
+   `(cov-none-face ((,class :foreground ,cyan-intense)))
    ;;;; csv-mode
-   `(csv-separator-face ((,class (:background ,bg-special-cold :foreground 
,fg-main))))
+   `(csv-separator-face ((,class :background ,bg-special-cold :foreground 
,fg-main)))
    ;;;; ctrlf
-   `(ctrlf-highlight-active ((,class (:inherit modus-theme-intense-green 
:weight bold))))
-   `(ctrlf-highlight-line ((,class (:background ,bg-hl-line))))
-   `(ctrlf-highlight-passive ((,class (:inherit modus-theme-refine-cyan))))
+   `(ctrlf-highlight-active ((,class :inherit modus-theme-intense-green 
:weight bold)))
+   `(ctrlf-highlight-line ((,class :background ,bg-hl-line)))
+   `(ctrlf-highlight-passive ((,class :inherit modus-theme-refine-cyan)))
    ;;;; custom (M-x customize)
-   `(custom-button ((,class (:box (:line-width 2 :color nil :style 
released-button)
-                                  :background ,bg-active :foreground 
,fg-main))))
-   `(custom-button-mouse ((,class (:box (:line-width 2 :color nil :style 
released-button)
-                                        :background ,bg-active :foreground 
,fg-active))))
-   `(custom-button-pressed ((,class (:box (:line-width 2 :color nil :style 
pressed-button)
-                                          :background ,bg-active :foreground 
,fg-main))))
-   `(custom-changed ((,class (:inherit modus-theme-subtle-cyan))))
-   `(custom-comment ((,class (:foreground ,fg-alt))))
-   `(custom-comment-tag ((,class (:background ,bg-alt :foreground 
,yellow-alt-other))))
-   `(custom-face-tag ((,class (:foreground ,blue-intense :weight bold))))
-   `(custom-group-tag ((,class (:foreground ,green-intense :weight bold))))
-   `(custom-group-tag-1 ((,class (:inherit modus-theme-special-warm))))
-   `(custom-invalid ((,class (:inherit modus-theme-intense-red :weight bold))))
-   `(custom-modified ((,class (:inherit modus-theme-subtle-cyan))))
-   `(custom-rogue ((,class (:inherit modus-theme-refine-magenta))))
-   `(custom-set ((,class (:foreground ,blue-alt))))
-   `(custom-state ((,class (:foreground ,cyan-alt-other))))
-   `(custom-themed ((,class (:inherit modus-theme-subtle-blue))))
-   `(custom-variable-tag ((,class (:foreground ,cyan :weight bold))))
+   `(custom-button ((,class :box (:line-width 2 :color nil :style 
released-button)
+                            :background ,bg-active :foreground ,fg-main)))
+   `(custom-button-mouse ((,class :box (:line-width 2 :color nil :style 
released-button)
+                                  :background ,bg-active :foreground 
,fg-active)))
+   `(custom-button-pressed ((,class :box (:line-width 2 :color nil :style 
pressed-button)
+                                    :background ,bg-active :foreground 
,fg-main)))
+   `(custom-changed ((,class :inherit modus-theme-subtle-cyan)))
+   `(custom-comment ((,class :foreground ,fg-alt)))
+   `(custom-comment-tag ((,class :background ,bg-alt :foreground 
,yellow-alt-other)))
+   `(custom-face-tag ((,class :foreground ,blue-intense :weight bold)))
+   `(custom-group-tag ((,class :foreground ,green-intense :weight bold)))
+   `(custom-group-tag-1 ((,class :inherit modus-theme-special-warm)))
+   `(custom-invalid ((,class :inherit modus-theme-intense-red :weight bold)))
+   `(custom-modified ((,class :inherit modus-theme-subtle-cyan)))
+   `(custom-rogue ((,class :inherit modus-theme-refine-magenta)))
+   `(custom-set ((,class :foreground ,blue-alt)))
+   `(custom-state ((,class :foreground ,cyan-alt-other)))
+   `(custom-themed ((,class :inherit modus-theme-subtle-blue)))
+   `(custom-variable-tag ((,class :foreground ,cyan :weight bold)))
    ;;;; dap-mode
-   `(dap-mouse-eval-thing-face ((,class (:box (:line-width -1 :color 
,blue-active :style nil)
-                                              :background ,bg-active 
:foreground ,fg-main))))
-   `(dap-result-overlay-face ((,class (:box (:line-width -1 :color ,bg-active 
:style nil)
-                                            :background ,bg-active :foreground 
,fg-main))))
-   `(dap-ui-breakpoint-verified-fringe ((,class (:foreground ,green-active 
:weight bold))))
-   `(dap-ui-compile-errline ((,class (:foreground ,red-intense :weight bold))))
-   `(dap-ui-locals-scope-face ((,class (:foreground ,magenta :weight bold 
:underline t))))
-   `(dap-ui-locals-variable-face ((,class (:foreground ,cyan :weight bold))))
-   `(dap-ui-locals-variable-leaf-face ((,class (:foreground ,cyan-alt-other 
:slant italic))))
-   `(dap-ui-marker-face ((,class (:inherit modus-theme-subtle-blue))))
-   `(dap-ui-sessions-stack-frame-face ((,class (:foreground ,magenta-alt 
:weight bold))))
-   `(dap-ui-sessions-terminated-active-face ((,class (:foreground ,fg-alt 
:weight bold))))
-   `(dap-ui-sessions-terminated-face ((,class (:foreground ,fg-alt))))
+   `(dap-mouse-eval-thing-face ((,class :box (:line-width -1 :color 
,blue-active :style nil)
+                                        :background ,bg-active :foreground 
,fg-main)))
+   `(dap-result-overlay-face ((,class :box (:line-width -1 :color ,bg-active 
:style nil)
+                                      :background ,bg-active :foreground 
,fg-main)))
+   `(dap-ui-breakpoint-verified-fringe ((,class :foreground ,green-active 
:weight bold)))
+   `(dap-ui-compile-errline ((,class :foreground ,red-intense :weight bold)))
+   `(dap-ui-locals-scope-face ((,class :foreground ,magenta :weight bold 
:underline t)))
+   `(dap-ui-locals-variable-face ((,class :foreground ,cyan :weight bold)))
+   `(dap-ui-locals-variable-leaf-face ((,class :foreground ,cyan-alt-other 
:slant italic)))
+   `(dap-ui-marker-face ((,class :inherit modus-theme-subtle-blue)))
+   `(dap-ui-sessions-stack-frame-face ((,class :foreground ,magenta-alt 
:weight bold)))
+   `(dap-ui-sessions-terminated-active-face ((,class :foreground ,fg-alt 
:weight bold)))
+   `(dap-ui-sessions-terminated-face ((,class :foreground ,fg-alt)))
    ;;;; dashboard (emacs-dashboard)
-   `(dashboard-banner-logo-title ((,class (:foreground ,fg-special-cold 
:weight bold))))
-   `(dashboard-footer ((,class (:foreground ,fg-special-mild :weight bold))))
-   `(dashboard-heading ((,class (:foreground ,fg-special-warm :weight bold))))
-   `(dashboard-navigator ((,class (:foreground ,cyan-alt-other))))
-   `(dashboard-text-banner ((,class (:foreground ,fg-dim))))
+   `(dashboard-banner-logo-title ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(dashboard-footer ((,class :foreground ,fg-special-mild :weight bold)))
+   `(dashboard-heading ((,class :foreground ,fg-special-warm :weight bold)))
+   `(dashboard-navigator ((,class :foreground ,cyan-alt-other)))
+   `(dashboard-text-banner ((,class :foreground ,fg-dim)))
    ;;;; deadgrep
-   `(deadgrep-filename-face ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(deadgrep-match-face ((,class (:inherit modus-theme-special-calm))))
-   `(deadgrep-meta-face ((,class (:foreground ,fg-alt))))
-   `(deadgrep-regexp-metachar-face ((,class (:foreground ,yellow-intense 
:weight bold))))
-   `(deadgrep-search-term-face ((,class (:foreground ,green-intense :weight 
bold))))
+   `(deadgrep-filename-face ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(deadgrep-match-face ((,class :inherit modus-theme-special-calm)))
+   `(deadgrep-meta-face ((,class :foreground ,fg-alt)))
+   `(deadgrep-regexp-metachar-face ((,class :foreground ,yellow-intense 
:weight bold)))
+   `(deadgrep-search-term-face ((,class :foreground ,green-intense :weight 
bold)))
    ;;;; debbugs
-   `(debbugs-gnu-archived ((,class (:inverse-video t))))
-   `(debbugs-gnu-done ((,class (:foreground ,fg-alt))))
-   `(debbugs-gnu-forwarded ((,class (:foreground ,fg-special-warm))))
-   `(debbugs-gnu-handled ((,class (:foreground ,green))))
-   `(debbugs-gnu-new ((,class (:foreground ,red))))
-   `(debbugs-gnu-pending ((,class (:foreground ,cyan))))
-   `(debbugs-gnu-stale-1 ((,class (:foreground ,yellow-nuanced))))
-   `(debbugs-gnu-stale-2 ((,class (:foreground ,yellow))))
-   `(debbugs-gnu-stale-3 ((,class (:foreground ,yellow-alt))))
-   `(debbugs-gnu-stale-4 ((,class (:foreground ,yellow-alt-other))))
-   `(debbugs-gnu-stale-5 ((,class (:foreground ,red-alt))))
-   `(debbugs-gnu-tagged ((,class (:foreground ,magenta-alt))))
+   `(debbugs-gnu-archived ((,class :inverse-video t)))
+   `(debbugs-gnu-done ((,class :foreground ,fg-alt)))
+   `(debbugs-gnu-forwarded ((,class :foreground ,fg-special-warm)))
+   `(debbugs-gnu-handled ((,class :foreground ,green)))
+   `(debbugs-gnu-new ((,class :foreground ,red)))
+   `(debbugs-gnu-pending ((,class :foreground ,cyan)))
+   `(debbugs-gnu-stale-1 ((,class :foreground ,yellow-nuanced)))
+   `(debbugs-gnu-stale-2 ((,class :foreground ,yellow)))
+   `(debbugs-gnu-stale-3 ((,class :foreground ,yellow-alt)))
+   `(debbugs-gnu-stale-4 ((,class :foreground ,yellow-alt-other)))
+   `(debbugs-gnu-stale-5 ((,class :foreground ,red-alt)))
+   `(debbugs-gnu-tagged ((,class :foreground ,magenta-alt)))
    ;;;; define-word
-   `(define-word-face-1 ((,class (:foreground ,yellow))))
-   `(define-word-face-2 ((,class (:foreground ,fg-main))))
+   `(define-word-face-1 ((,class :foreground ,yellow)))
+   `(define-word-face-2 ((,class :foreground ,fg-main)))
    ;;;; deft
-   `(deft-filter-string-error-face ((,class (:inherit 
modus-theme-refine-red))))
-   `(deft-filter-string-face ((,class (:foreground ,green-intense))))
-   `(deft-header-face ((,class (:foreground ,fg-special-warm :weight bold))))
-   `(deft-separator-face ((,class (:foreground ,fg-alt))))
-   `(deft-summary-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(deft-time-face ((,class (:foreground ,fg-special-cold))))
-   `(deft-title-face ((,class (:foreground ,fg-main :weight bold))))
+   `(deft-filter-string-error-face ((,class :inherit modus-theme-refine-red)))
+   `(deft-filter-string-face ((,class :foreground ,green-intense)))
+   `(deft-header-face ((,class :foreground ,fg-special-warm :weight bold)))
+   `(deft-separator-face ((,class :foreground ,fg-alt)))
+   `(deft-summary-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(deft-time-face ((,class :foreground ,fg-special-cold)))
+   `(deft-title-face ((,class :foreground ,fg-main :weight bold)))
    ;;;; diff-hl
-   `(diff-hl-change ((,class (:inherit modus-theme-fringe-blue))))
-   `(diff-hl-delete ((,class (:inherit modus-theme-fringe-red))))
-   `(diff-hl-dired-change ((,class (:inherit diff-hl-change))))
-   `(diff-hl-dired-delete ((,class (:inherit diff-hl-delete))))
-   `(diff-hl-dired-ignored ((,class (:inherit dired-ignored))))
-   `(diff-hl-dired-insert ((,class (:inherit diff-hl-insert))))
-   `(diff-hl-dired-unknown ((,class (:inherit dired-ignored))))
-   `(diff-hl-insert ((,class (:inherit modus-theme-fringe-green))))
-   `(diff-hl-reverted-hunk-highlight ((,class (:inherit 
modus-theme-fringe-magenta :weight bold))))
+   `(diff-hl-change ((,class :inherit modus-theme-fringe-blue)))
+   `(diff-hl-delete ((,class :inherit modus-theme-fringe-red)))
+   `(diff-hl-dired-change ((,class :inherit diff-hl-change)))
+   `(diff-hl-dired-delete ((,class :inherit diff-hl-delete)))
+   `(diff-hl-dired-ignored ((,class :inherit dired-ignored)))
+   `(diff-hl-dired-insert ((,class :inherit diff-hl-insert)))
+   `(diff-hl-dired-unknown ((,class :inherit dired-ignored)))
+   `(diff-hl-insert ((,class :inherit modus-theme-fringe-green)))
+   `(diff-hl-reverted-hunk-highlight ((,class :inherit 
modus-theme-fringe-magenta :weight bold)))
    ;;;; diff-mode
-   `(diff-added ((,class ,(modus-operandi-theme-diffs
-                           bg-main green
-                           bg-diff-focus-added fg-diff-focus-added))))
-   `(diff-changed ((,class ,(modus-operandi-theme-diffs
-                             bg-main yellow
-                             bg-diff-focus-changed fg-diff-focus-changed))))
-   `(diff-context ((,class (:foreground ,fg-unfocused))))
-   `(diff-file-header ((,class (:foreground ,blue :weight bold))))
-   `(diff-function ((,class (:foreground ,fg-special-cold))))
-   `(diff-header ((,class (:foreground ,blue-nuanced))))
-   `(diff-hunk-header ((,class ,(modus-operandi-theme-diffs
-                                 bg-alt blue-alt
-                                 bg-diff-heading fg-diff-heading))))
-   `(diff-index ((,class (:foreground ,blue-alt :weight bold))))
-   `(diff-indicator-added ((,class (:inherit diff-added))))
-   `(diff-indicator-changed ((,class (:inherit diff-changed))))
-   `(diff-indicator-removed ((,class (:inherit diff-removed))))
-   `(diff-nonexistent ((,class (:inherit modus-theme-neutral :weight bold))))
-   `(diff-refine-added ((,class ,(modus-operandi-theme-diffs
-                                  bg-diff-added fg-diff-added
-                                  bg-diff-refine-added fg-diff-refine-added))))
-   `(diff-refine-changed ((,class ,(modus-operandi-theme-diffs
-                                    bg-diff-changed fg-diff-changed
-                                    bg-diff-refine-changed 
fg-diff-refine-changed))))
-   `(diff-refine-removed ((,class ,(modus-operandi-theme-diffs
-                                    bg-diff-removed fg-diff-removed
-                                    bg-diff-refine-removed 
fg-diff-refine-removed))))
-   `(diff-removed ((,class ,(modus-operandi-theme-diffs
-                             bg-main red
-                             bg-diff-focus-removed fg-diff-focus-removed))))
+   `(diff-added ((,class ,@(modus-operandi-theme-diffs
+                            bg-main green
+                            bg-diff-focus-added fg-diff-focus-added))))
+   `(diff-changed ((,class ,@(modus-operandi-theme-diffs
+                              bg-main yellow
+                              bg-diff-focus-changed fg-diff-focus-changed))))
+   `(diff-context ((,class :foreground ,fg-unfocused)))
+   `(diff-file-header ((,class :foreground ,blue :weight bold)))
+   `(diff-function ((,class :foreground ,fg-special-cold)))
+   `(diff-header ((,class :foreground ,blue-nuanced)))
+   `(diff-hunk-header ((,class ,@(modus-operandi-theme-diffs
+                                  bg-alt blue-alt
+                                  bg-diff-heading fg-diff-heading))))
+   `(diff-index ((,class :foreground ,blue-alt :weight bold)))
+   `(diff-indicator-added ((,class :inherit diff-added)))
+   `(diff-indicator-changed ((,class :inherit diff-changed)))
+   `(diff-indicator-removed ((,class :inherit diff-removed)))
+   `(diff-nonexistent ((,class :inherit modus-theme-neutral :weight bold)))
+   `(diff-refine-added ((,class ,@(modus-operandi-theme-diffs
+                                   bg-diff-added fg-diff-added
+                                   bg-diff-refine-added 
fg-diff-refine-added))))
+   `(diff-refine-changed ((,class ,@(modus-operandi-theme-diffs
+                                     bg-diff-changed fg-diff-changed
+                                     bg-diff-refine-changed 
fg-diff-refine-changed))))
+   `(diff-refine-removed ((,class ,@(modus-operandi-theme-diffs
+                                     bg-diff-removed fg-diff-removed
+                                     bg-diff-refine-removed 
fg-diff-refine-removed))))
+   `(diff-removed ((,class ,@(modus-operandi-theme-diffs
+                              bg-main red
+                              bg-diff-focus-removed fg-diff-focus-removed))))
    ;;;; dim-autoload
-   `(dim-autoload-cookie-line ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
+   `(dim-autoload-cookie-line ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
    ;;;; dired
-   `(dired-directory ((,class (:foreground ,blue))))
-   `(dired-flagged ((,class (:inherit modus-theme-mark-del))))
-   `(dired-header ((,class (:inherit modus-theme-header))))
-   `(dired-ignored ((,class (:foreground ,fg-alt))))
-   `(dired-mark ((,class (:inherit modus-theme-mark-symbol))))
-   `(dired-marked ((,class (:inherit modus-theme-mark-sel))))
-   `(dired-perm-write ((,class (:foreground ,fg-special-warm))))
-   `(dired-symlink ((,class (:foreground ,blue-alt :underline t))))
-   `(dired-warning ((,class (:foreground ,yellow :weight bold))))
+   `(dired-directory ((,class :foreground ,blue)))
+   `(dired-flagged ((,class :inherit modus-theme-mark-del)))
+   `(dired-header ((,class :inherit modus-theme-header)))
+   `(dired-ignored ((,class :foreground ,fg-alt)))
+   `(dired-mark ((,class :inherit modus-theme-mark-symbol)))
+   `(dired-marked ((,class :inherit modus-theme-mark-sel)))
+   `(dired-perm-write ((,class :foreground ,fg-special-warm)))
+   `(dired-symlink ((,class :foreground ,blue-alt :underline t)))
+   `(dired-warning ((,class :foreground ,yellow :weight bold)))
    ;;;; dired-async
-   `(dired-async-failures ((,class (:foreground ,red-active :weight 
,modus-theme-bold))))
-   `(dired-async-message ((,class (:foreground ,green-active :weight 
,modus-theme-bold))))
-   `(dired-async-mode-message ((,class (:foreground ,cyan-active :weight 
,modus-theme-bold))))
+   `(dired-async-failures ((,class :foreground ,red-active :weight 
,modus-theme-bold)))
+   `(dired-async-message ((,class :foreground ,green-active :weight 
,modus-theme-bold)))
+   `(dired-async-mode-message ((,class :foreground ,cyan-active :weight 
,modus-theme-bold)))
    ;;;; dired-git
-   `(dired-git-branch-else ((,class (:foreground ,magenta-alt :weight bold))))
-   `(dired-git-branch-master ((,class (:foreground ,magenta-alt-other :weight 
bold))))
+   `(dired-git-branch-else ((,class :foreground ,magenta-alt :weight bold)))
+   `(dired-git-branch-master ((,class :foreground ,magenta-alt-other :weight 
bold)))
    ;;;; dired-git-info
-   `(dgi-commit-message-face ((,class (:foreground ,fg-special-mild))))
+   `(dgi-commit-message-face ((,class :foreground ,fg-special-mild)))
    ;;;; dired-narrow
-   `(dired-narrow-blink ((,class (:inherit modus-theme-subtle-cyan :weight 
bold))))
+   `(dired-narrow-blink ((,class :inherit modus-theme-subtle-cyan :weight 
bold)))
    ;;;; dired-subtree
    ;; remove background from dired-subtree, else it breaks
    ;; dired-{flagged,marked} and any other face that sets a background
    ;; such as hl-line
-   `(dired-subtree-depth-1-face ((,class (:background nil))))
-   `(dired-subtree-depth-2-face ((,class (:background nil))))
-   `(dired-subtree-depth-3-face ((,class (:background nil))))
-   `(dired-subtree-depth-4-face ((,class (:background nil))))
-   `(dired-subtree-depth-5-face ((,class (:background nil))))
-   `(dired-subtree-depth-6-face ((,class (:background nil))))
+   `(dired-subtree-depth-1-face ((,class :background nil)))
+   `(dired-subtree-depth-2-face ((,class :background nil)))
+   `(dired-subtree-depth-3-face ((,class :background nil)))
+   `(dired-subtree-depth-4-face ((,class :background nil)))
+   `(dired-subtree-depth-5-face ((,class :background nil)))
+   `(dired-subtree-depth-6-face ((,class :background nil)))
    ;;;; diredfl
-   `(diredfl-autofile-name ((,class (:inherit modus-theme-special-cold))))
-   `(diredfl-compressed-file-name ((,class (:foreground ,green-alt-other))))
-   `(diredfl-compressed-file-suffix ((,class (:foreground ,green-alt))))
-   `(diredfl-date-time ((,class (:foreground ,fg-special-cold))))
-   `(diredfl-deletion ((,class (:inherit modus-theme-mark-del))))
-   `(diredfl-deletion-file-name ((,class (:inherit modus-theme-mark-del))))
-   `(diredfl-dir-heading ((,class (:inherit modus-theme-header))))
-   `(diredfl-dir-name ((,class (:inherit dired-directory))))
-   `(diredfl-dir-priv ((,class (:foreground ,blue))))
-   `(diredfl-exec-priv ((,class (:foreground ,red-alt-other))))
-   `(diredfl-executable-tag ((,class (:foreground ,red-alt))))
-   `(diredfl-file-name ((,class (:foreground ,fg-main))))
-   `(diredfl-file-suffix ((,class (:foreground ,fg-special-warm))))
-   `(diredfl-flag-mark ((,class (:inherit modus-theme-mark-sel))))
-   `(diredfl-flag-mark-line ((,class (:inherit modus-theme-mark-sel))))
-   `(diredfl-ignored-file-name ((,class (:foreground ,fg-inactive))))
-   `(diredfl-link-priv ((,class (:foreground ,blue-alt-other))))
-   `(diredfl-no-priv ((,class (:foreground ,fg-inactive))))
-   `(diredfl-number ((,class (:foreground ,cyan))))
-   `(diredfl-other-priv ((,class (:foreground ,yellow))))
-   `(diredfl-rare-priv ((,class (:foreground ,magenta-alt-other))))
-   `(diredfl-read-priv ((,class (:foreground ,magenta))))
-   `(diredfl-symlink ((,class (:foreground ,blue-alt :underline t))))
-   `(diredfl-tagged-autofile-name ((,class (:inherit 
modus-theme-refine-magenta))))
-   `(diredfl-write-priv ((,class (:foreground ,cyan-alt-other))))
+   `(diredfl-autofile-name ((,class :inherit modus-theme-special-cold)))
+   `(diredfl-compressed-file-name ((,class :foreground ,green-alt-other)))
+   `(diredfl-compressed-file-suffix ((,class :foreground ,green-alt)))
+   `(diredfl-date-time ((,class :foreground ,fg-special-cold)))
+   `(diredfl-deletion ((,class :inherit modus-theme-mark-del)))
+   `(diredfl-deletion-file-name ((,class :inherit modus-theme-mark-del)))
+   `(diredfl-dir-heading ((,class :inherit modus-theme-header)))
+   `(diredfl-dir-name ((,class :inherit dired-directory)))
+   `(diredfl-dir-priv ((,class :foreground ,blue)))
+   `(diredfl-exec-priv ((,class :foreground ,red-alt-other)))
+   `(diredfl-executable-tag ((,class :foreground ,red-alt)))
+   `(diredfl-file-name ((,class :foreground ,fg-main)))
+   `(diredfl-file-suffix ((,class :foreground ,fg-special-warm)))
+   `(diredfl-flag-mark ((,class :inherit modus-theme-mark-sel)))
+   `(diredfl-flag-mark-line ((,class :inherit modus-theme-mark-sel)))
+   `(diredfl-ignored-file-name ((,class :foreground ,fg-inactive)))
+   `(diredfl-link-priv ((,class :foreground ,blue-alt-other)))
+   `(diredfl-no-priv ((,class :foreground ,fg-inactive)))
+   `(diredfl-number ((,class :foreground ,cyan)))
+   `(diredfl-other-priv ((,class :foreground ,yellow)))
+   `(diredfl-rare-priv ((,class :foreground ,magenta-alt-other)))
+   `(diredfl-read-priv ((,class :foreground ,magenta)))
+   `(diredfl-symlink ((,class :foreground ,blue-alt :underline t)))
+   `(diredfl-tagged-autofile-name ((,class :inherit 
modus-theme-refine-magenta)))
+   `(diredfl-write-priv ((,class :foreground ,cyan-alt-other)))
    ;;;; disk-usage
-   `(disk-usage-children ((,class (:foreground ,yellow))))
-   `(disk-usage-inaccessible ((,class (:foreground ,red :weight bold))))
-   `(disk-usage-percent ((,class (:foreground ,green))))
-   `(disk-usage-size ((,class (:foreground ,cyan))))
-   `(disk-usage-symlink ((,class (:foreground ,blue :underline t))))
-   `(disk-usage-symlink-directory ((,class (:foreground ,blue-alt :weight 
bold))))
+   `(disk-usage-children ((,class :foreground ,yellow)))
+   `(disk-usage-inaccessible ((,class :foreground ,red :weight bold)))
+   `(disk-usage-percent ((,class :foreground ,green)))
+   `(disk-usage-size ((,class :foreground ,cyan)))
+   `(disk-usage-symlink ((,class :foreground ,blue :underline t)))
+   `(disk-usage-symlink-directory ((,class :foreground ,blue-alt :weight 
bold)))
    ;;;; doom-modeline
-   `(doom-modeline-bar ((,class (:inherit modus-theme-active-blue))))
-   `(doom-modeline-bar-inactive ((,class (:background ,fg-inactive :foreground 
,bg-main))))
-   `(doom-modeline-battery-charging ((,class (:foreground ,green-active))))
-   `(doom-modeline-battery-critical ((,class (:foreground ,red-active :weight 
bold))))
-   `(doom-modeline-battery-error ((,class (:inherit modus-theme-active-red))))
-   `(doom-modeline-battery-full ((,class (:foreground ,blue-active))))
-   `(doom-modeline-battery-normal ((,class (:foreground ,fg-active))))
-   `(doom-modeline-battery-warning ((,class (:foreground ,yellow-active 
:weight bold))))
-   `(doom-modeline-buffer-file ((,class (:foreground ,fg-active :weight 
bold))))
-   `(doom-modeline-buffer-major-mode ((,class (:foreground ,cyan-active 
:weight bold))))
-   `(doom-modeline-buffer-minor-mode ((,class (:foreground ,fg-inactive))))
-   `(doom-modeline-buffer-modified ((,class (:foreground ,magenta-active 
:weight bold))))
-   `(doom-modeline-buffer-path ((,class (:foreground ,fg-active :weight 
bold))))
-   `(doom-modeline-debug ((,class (:foreground ,yellow-active :weight bold))))
-   `(doom-modeline-evil-emacs-state ((,class (:foreground ,magenta-active 
:weight bold))))
-   `(doom-modeline-evil-insert-state ((,class (:foreground ,green-active 
:weight bold))))
-   `(doom-modeline-evil-motion-state ((,class (:foreground ,fg-inactive 
:weight bold))))
-   `(doom-modeline-evil-normal-state ((,class (:foreground ,fg-active :weight 
bold))))
-   `(doom-modeline-evil-operator-state ((,class (:foreground ,blue-active 
:weight bold))))
-   `(doom-modeline-evil-replace-state ((,class (:foreground ,red-active 
:weight bold))))
-   `(doom-modeline-evil-visual-state ((,class (:foreground ,cyan-active 
:weight bold))))
-   `(doom-modeline-highlight ((,class (:foreground ,blue-active :weight 
bold))))
-   `(doom-modeline-host ((,class (:slant italic))))
-   `(doom-modeline-info ((,class (:foreground ,green-active))))
-   `(doom-modeline-lsp-error ((,class (:foreground ,red-active :weight bold))))
-   `(doom-modeline-lsp-success ((,class (:foreground ,green-active :weight 
bold))))
-   `(doom-modeline-lsp-warning ((,class (:foreground ,yellow-active :weight 
bold))))
-   `(doom-modeline-panel ((,class (:inherit modus-theme-active-blue))))
-   `(doom-modeline-persp-buffer-not-in-persp ((,class (:foreground 
,yellow-active :slant italic))))
-   `(doom-modeline-persp-name ((,class (:foreground ,fg-active))))
-   `(doom-modeline-project-dir ((,class (:foreground ,blue-active :weight 
bold))))
-   `(doom-modeline-project-parent-dir ((,class (:foreground ,blue-active))))
-   `(doom-modeline-project-root-dir ((,class (:foreground ,fg-active))))
-   `(doom-modeline-unread-number ((,class (:foreground ,fg-active :slant 
italic))))
-   `(doom-modeline-urgent ((,class (:foreground ,red-active :weight bold 
:underline t))))
-   `(doom-modeline-warning ((,class (:foreground ,yellow-active :weight 
bold))))
+   `(doom-modeline-bar ((,class :inherit modus-theme-active-blue)))
+   `(doom-modeline-bar-inactive ((,class :background ,fg-inactive :foreground 
,bg-main)))
+   `(doom-modeline-battery-charging ((,class :foreground ,green-active)))
+   `(doom-modeline-battery-critical ((,class :foreground ,red-active :weight 
bold)))
+   `(doom-modeline-battery-error ((,class :inherit modus-theme-active-red)))
+   `(doom-modeline-battery-full ((,class :foreground ,blue-active)))
+   `(doom-modeline-battery-normal ((,class :foreground ,fg-active)))
+   `(doom-modeline-battery-warning ((,class :foreground ,yellow-active :weight 
bold)))
+   `(doom-modeline-buffer-file ((,class :foreground ,fg-active :weight bold)))
+   `(doom-modeline-buffer-major-mode ((,class :foreground ,cyan-active :weight 
bold)))
+   `(doom-modeline-buffer-minor-mode ((,class :foreground ,fg-inactive)))
+   `(doom-modeline-buffer-modified ((,class :foreground ,magenta-active 
:weight bold)))
+   `(doom-modeline-buffer-path ((,class :foreground ,fg-active :weight bold)))
+   `(doom-modeline-debug ((,class :foreground ,yellow-active :weight bold)))
+   `(doom-modeline-evil-emacs-state ((,class :foreground ,magenta-active 
:weight bold)))
+   `(doom-modeline-evil-insert-state ((,class :foreground ,green-active 
:weight bold)))
+   `(doom-modeline-evil-motion-state ((,class :foreground ,fg-inactive :weight 
bold)))
+   `(doom-modeline-evil-normal-state ((,class :foreground ,fg-active :weight 
bold)))
+   `(doom-modeline-evil-operator-state ((,class :foreground ,blue-active 
:weight bold)))
+   `(doom-modeline-evil-replace-state ((,class :foreground ,red-active :weight 
bold)))
+   `(doom-modeline-evil-visual-state ((,class :foreground ,cyan-active :weight 
bold)))
+   `(doom-modeline-highlight ((,class :foreground ,blue-active :weight bold)))
+   `(doom-modeline-host ((,class :slant italic)))
+   `(doom-modeline-info ((,class :foreground ,green-active)))
+   `(doom-modeline-lsp-error ((,class :foreground ,red-active :weight bold)))
+   `(doom-modeline-lsp-success ((,class :foreground ,green-active :weight 
bold)))
+   `(doom-modeline-lsp-warning ((,class :foreground ,yellow-active :weight 
bold)))
+   `(doom-modeline-panel ((,class :inherit modus-theme-active-blue)))
+   `(doom-modeline-persp-buffer-not-in-persp ((,class :foreground 
,yellow-active :slant italic)))
+   `(doom-modeline-persp-name ((,class :foreground ,fg-active)))
+   `(doom-modeline-project-dir ((,class :foreground ,blue-active :weight 
bold)))
+   `(doom-modeline-project-parent-dir ((,class :foreground ,blue-active)))
+   `(doom-modeline-project-root-dir ((,class :foreground ,fg-active)))
+   `(doom-modeline-unread-number ((,class :foreground ,fg-active :slant 
italic)))
+   `(doom-modeline-urgent ((,class :foreground ,red-active :weight bold 
:underline t)))
+   `(doom-modeline-warning ((,class :foreground ,yellow-active :weight bold)))
    ;;;; dynamic-ruler
-   `(dynamic-ruler-negative-face ((,class (:inherit 
modus-theme-intense-neutral))))
-   `(dynamic-ruler-positive-face ((,class (:inherit 
modus-theme-intense-yellow))))
+   `(dynamic-ruler-negative-face ((,class :inherit 
modus-theme-intense-neutral)))
+   `(dynamic-ruler-positive-face ((,class :inherit 
modus-theme-intense-yellow)))
    ;;;; easy-jekyll
-   `(easy-jekyll-help-face ((,class (:background ,bg-dim :foreground 
,cyan-alt-other))))
+   `(easy-jekyll-help-face ((,class :background ,bg-dim :foreground 
,cyan-alt-other)))
    ;;;; easy-kill
-   `(easy-kill-origin ((,class (:inherit modus-theme-subtle-red))))
-   `(easy-kill-selection ((,class (:inherit modus-theme-subtle-yellow))))
+   `(easy-kill-origin ((,class :inherit modus-theme-subtle-red)))
+   `(easy-kill-selection ((,class :inherit modus-theme-subtle-yellow)))
    ;;;; ebdb
-   `(ebdb-address-default ((,class (:foreground ,fg-main))))
-   `(ebdb-db-char ((,class (:foreground ,fg-special-cold))))
-   `(ebdb-defunct ((,class (:foreground ,fg-alt))))
-   `(ebdb-field-hidden ((,class (:foreground ,magenta))))
-   `(ebdb-field-url ((,class (:foreground ,blue))))
-   `(ebdb-label ((,class (:foreground ,cyan-alt-other))))
-   `(ebdb-mail-default ((,class (:foreground ,fg-main))))
-   `(ebdb-mail-primary ((,class (:foreground ,blue-alt))))
-   `(ebdb-marked ((,class (:background ,cyan-intense-bg))))
-   `(ebdb-organization-name ((,class (:foreground ,fg-special-calm))))
-   `(ebdb-person-name ((,class (:foreground ,magenta-alt-other))))
-   `(ebdb-phone-default ((,class (:foreground ,fg-special-warm))))
-   `(ebdb-role-defunct ((,class (:foreground ,fg-alt))))
-   `(eieio-custom-slot-tag-face ((,class (:foreground ,red-alt))))
+   `(ebdb-address-default ((,class :foreground ,fg-main)))
+   `(ebdb-db-char ((,class :foreground ,fg-special-cold)))
+   `(ebdb-defunct ((,class :foreground ,fg-alt)))
+   `(ebdb-field-hidden ((,class :foreground ,magenta)))
+   `(ebdb-field-url ((,class :foreground ,blue)))
+   `(ebdb-label ((,class :foreground ,cyan-alt-other)))
+   `(ebdb-mail-default ((,class :foreground ,fg-main)))
+   `(ebdb-mail-primary ((,class :foreground ,blue-alt)))
+   `(ebdb-marked ((,class :background ,cyan-intense-bg)))
+   `(ebdb-organization-name ((,class :foreground ,fg-special-calm)))
+   `(ebdb-person-name ((,class :foreground ,magenta-alt-other)))
+   `(ebdb-phone-default ((,class :foreground ,fg-special-warm)))
+   `(ebdb-role-defunct ((,class :foreground ,fg-alt)))
+   `(eieio-custom-slot-tag-face ((,class :foreground ,red-alt)))
    ;;;; ediff
-   `(ediff-current-diff-A ((,class ,(modus-operandi-theme-diffs
-                                     bg-alt red
-                                     bg-diff-removed fg-diff-removed))))
-   `(ediff-current-diff-Ancestor ((,class ,(modus-operandi-theme-diffs
-                                            bg-alt fg-special-cold
-                                            bg-special-cold fg-special-cold))))
-   `(ediff-current-diff-B ((,class ,(modus-operandi-theme-diffs
-                                     bg-alt green
-                                     bg-diff-added fg-diff-added))))
-   `(ediff-current-diff-C ((,class ,(modus-operandi-theme-diffs
-                                     bg-alt yellow
-                                     bg-diff-changed fg-diff-changed))))
-   `(ediff-even-diff-A ((,class (:background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1))))
-   `(ediff-even-diff-Ancestor ((,class (:background ,bg-diff-neutral-2 
:foreground ,fg-diff-neutral-1))))
-   `(ediff-even-diff-B ((,class (:background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1))))
-   `(ediff-even-diff-C ((,class (:background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2))))
-   `(ediff-fine-diff-A ((,class (:background ,bg-diff-focus-removed 
:foreground ,fg-diff-focus-removed))))
-   `(ediff-fine-diff-Ancestor ((,class (:inherit modus-theme-refine-cyan))))
-   `(ediff-fine-diff-B ((,class (:background ,bg-diff-focus-added :foreground 
,fg-diff-focus-added))))
-   `(ediff-fine-diff-C ((,class (:background ,bg-diff-focus-changed 
:foreground ,fg-diff-focus-changed))))
-   `(ediff-odd-diff-A ((,class (:background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2))))
-   `(ediff-odd-diff-Ancestor ((,class (:background ,bg-diff-neutral-0 
:foreground ,fg-diff-neutral-0))))
-   `(ediff-odd-diff-B ((,class (:background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2))))
-   `(ediff-odd-diff-C ((,class (:background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1))))
+   `(ediff-current-diff-A ((,class ,@(modus-operandi-theme-diffs
+                                      bg-alt red
+                                      bg-diff-removed fg-diff-removed))))
+   `(ediff-current-diff-Ancestor ((,class ,@(modus-operandi-theme-diffs
+                                             bg-alt fg-special-cold
+                                             bg-special-cold 
fg-special-cold))))
+   `(ediff-current-diff-B ((,class ,@(modus-operandi-theme-diffs
+                                      bg-alt green
+                                      bg-diff-added fg-diff-added))))
+   `(ediff-current-diff-C ((,class ,@(modus-operandi-theme-diffs
+                                      bg-alt yellow
+                                      bg-diff-changed fg-diff-changed))))
+   `(ediff-even-diff-A ((,class :background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1)))
+   `(ediff-even-diff-Ancestor ((,class :background ,bg-diff-neutral-2 
:foreground ,fg-diff-neutral-1)))
+   `(ediff-even-diff-B ((,class :background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1)))
+   `(ediff-even-diff-C ((,class :background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2)))
+   `(ediff-fine-diff-A ((,class :background ,bg-diff-focus-removed :foreground 
,fg-diff-focus-removed)))
+   `(ediff-fine-diff-Ancestor ((,class :inherit modus-theme-refine-cyan)))
+   `(ediff-fine-diff-B ((,class :background ,bg-diff-focus-added :foreground 
,fg-diff-focus-added)))
+   `(ediff-fine-diff-C ((,class :background ,bg-diff-focus-changed :foreground 
,fg-diff-focus-changed)))
+   `(ediff-odd-diff-A ((,class :background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2)))
+   `(ediff-odd-diff-Ancestor ((,class :background ,bg-diff-neutral-0 
:foreground ,fg-diff-neutral-0)))
+   `(ediff-odd-diff-B ((,class :background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2)))
+   `(ediff-odd-diff-C ((,class :background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1)))
    ;;;; eglot
-   `(eglot-mode-line ((,class (:foreground ,magenta-active :weight 
,modus-theme-bold))))
+   `(eglot-mode-line ((,class :foreground ,magenta-active :weight 
,modus-theme-bold)))
    ;;;; el-search
-   `(el-search-highlight-in-prompt-face ((,class (:foreground ,magenta-alt 
:weight bold))))
-   `(el-search-match ((,class (:inherit modus-theme-intense-green))))
-   `(el-search-other-match ((,class (:inherit modus-theme-special-mild))))
-   `(el-search-occur-match ((,class (:inherit modus-theme-special-calm))))
+   `(el-search-highlight-in-prompt-face ((,class :foreground ,magenta-alt 
:weight bold)))
+   `(el-search-match ((,class :inherit modus-theme-intense-green)))
+   `(el-search-other-match ((,class :inherit modus-theme-special-mild)))
+   `(el-search-occur-match ((,class :inherit modus-theme-special-calm)))
    ;;;; eldoc-box
-   `(eldoc-box-body ((,class (:background ,bg-alt :foreground ,fg-main))))
-   `(eldoc-box-border ((,class (:background ,fg-alt))))
+   `(eldoc-box-body ((,class :background ,bg-alt :foreground ,fg-main)))
+   `(eldoc-box-border ((,class :background ,fg-alt)))
    ;;;; elfeed
-   `(elfeed-log-date-face ((,class (:foreground ,cyan-alt))))
-   `(elfeed-log-debug-level-face ((,class (:foreground ,magenta))))
-   `(elfeed-log-error-level-face ((,class (:foreground ,red))))
-   `(elfeed-log-info-level-face ((,class (:foreground ,green))))
-   `(elfeed-log-warn-level-face ((,class (:foreground ,yellow))))
-   `(elfeed-search-date-face ((,class (:foreground ,cyan))))
-   `(elfeed-search-feed-face ((,class (:foreground ,blue))))
-   `(elfeed-search-filter-face ((,class (:foreground ,magenta-active))))
-   `(elfeed-search-last-update-face ((,class (:foreground ,green-active))))
-   `(elfeed-search-tag-face ((,class (:foreground ,cyan-alt-other))))
-   `(elfeed-search-title-face ((,class (:foreground ,fg-main))))
-   `(elfeed-search-unread-count-face ((,class (:foreground ,blue-active))))
-   `(elfeed-search-unread-title-face ((,class (:weight bold))))
+   `(elfeed-log-date-face ((,class :foreground ,cyan-alt)))
+   `(elfeed-log-debug-level-face ((,class :foreground ,magenta)))
+   `(elfeed-log-error-level-face ((,class :foreground ,red)))
+   `(elfeed-log-info-level-face ((,class :foreground ,green)))
+   `(elfeed-log-warn-level-face ((,class :foreground ,yellow)))
+   `(elfeed-search-date-face ((,class :foreground ,cyan)))
+   `(elfeed-search-feed-face ((,class :foreground ,blue)))
+   `(elfeed-search-filter-face ((,class :foreground ,magenta-active)))
+   `(elfeed-search-last-update-face ((,class :foreground ,green-active)))
+   `(elfeed-search-tag-face ((,class :foreground ,cyan-alt-other)))
+   `(elfeed-search-title-face ((,class :foreground ,fg-main)))
+   `(elfeed-search-unread-count-face ((,class :foreground ,blue-active)))
+   `(elfeed-search-unread-title-face ((,class :weight bold)))
    ;;;; elfeed-score
-   `(elfeed-score-date-face ((,class (:foreground ,blue))))
-   `(elfeed-score-debug-level-face ((,class (:foreground ,magenta-alt-other))))
-   `(elfeed-score-error-level-face ((,class (:foreground ,red))))
-   `(elfeed-score-info-level-face ((,class (:foreground ,cyan))))
-   `(elfeed-score-warn-level-face ((,class (:foreground ,yellow))))
+   `(elfeed-score-date-face ((,class :foreground ,blue)))
+   `(elfeed-score-debug-level-face ((,class :foreground ,magenta-alt-other)))
+   `(elfeed-score-error-level-face ((,class :foreground ,red)))
+   `(elfeed-score-info-level-face ((,class :foreground ,cyan)))
+   `(elfeed-score-warn-level-face ((,class :foreground ,yellow)))
    ;;;; emms
-   `(emms-playlist-track-face ((,class (:foreground ,blue))))
-   `(emms-playlist-selected-face ((,class (:foreground ,magenta :weight 
bold))))
+   `(emms-playlist-track-face ((,class :foreground ,blue)))
+   `(emms-playlist-selected-face ((,class :foreground ,magenta :weight bold)))
    ;;;; enhanced-ruby-mode
-   `(enh-ruby-heredoc-delimiter-face ((,class (:foreground ,blue-alt-other))))
-   `(enh-ruby-op-face ((,class (:foreground ,fg-main))))
-   `(enh-ruby-regexp-delimiter-face ((,class (:foreground ,green))))
-   `(enh-ruby-regexp-face ((,class (:foreground ,magenta))))
-   `(enh-ruby-string-delimiter-face ((,class (:foreground ,blue-alt))))
-   `(erm-syn-errline ((,class (:foreground ,red :underline t))))
-   `(erm-syn-warnline ((,class (:foreground ,yellow :underline t))))
+   `(enh-ruby-heredoc-delimiter-face ((,class :foreground ,blue-alt-other)))
+   `(enh-ruby-op-face ((,class :foreground ,fg-main)))
+   `(enh-ruby-regexp-delimiter-face ((,class :foreground ,green)))
+   `(enh-ruby-regexp-face ((,class :foreground ,magenta)))
+   `(enh-ruby-string-delimiter-face ((,class :foreground ,blue-alt)))
+   `(erm-syn-errline ((,class :foreground ,red :underline t)))
+   `(erm-syn-warnline ((,class :foreground ,yellow :underline t)))
    ;;;; epa
-   `(epa-field-body ((,class (:foreground ,fg-main))))
-   `(epa-field-name ((,class (:foreground ,fg-dim :weight bold))))
-   `(epa-mark ((,class (:foreground ,magenta :weight bold))))
-   `(epa-string ((,class (:foreground ,blue-alt))))
-   `(epa-validity-disabled ((,class (:inherit modus-theme-refine-red))))
-   `(epa-validity-high ((,class (:foreground ,green-alt-other :weight bold))))
-   `(epa-validity-low ((,class (:foreground ,fg-alt))))
-   `(epa-validity-medium ((,class (:foreground ,green-alt))))
+   `(epa-field-body ((,class :foreground ,fg-main)))
+   `(epa-field-name ((,class :foreground ,fg-dim :weight bold)))
+   `(epa-mark ((,class :foreground ,magenta :weight bold)))
+   `(epa-string ((,class :foreground ,blue-alt)))
+   `(epa-validity-disabled ((,class :inherit modus-theme-refine-red)))
+   `(epa-validity-high ((,class :foreground ,green-alt-other :weight bold)))
+   `(epa-validity-low ((,class :foreground ,fg-alt)))
+   `(epa-validity-medium ((,class :foreground ,green-alt)))
    ;;;; equake
-   `(equake-buffer-face ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(equake-shell-type-eshell ((,class (:background ,bg-inactive :foreground 
,green-active))))
-   `(equake-shell-type-rash ((,class (:background ,bg-inactive :foreground 
,red-active))))
-   `(equake-shell-type-shell ((,class (:background ,bg-inactive :foreground 
,cyan-active))))
-   `(equake-shell-type-term ((,class (:background ,bg-inactive :foreground 
,yellow-active))))
-   `(equake-shell-type-vterm ((,class (:background ,bg-inactive :foreground 
,magenta-active))))
-   `(equake-tab-active ((,class (:background ,fg-alt :foreground ,bg-alt))))
-   `(equake-tab-inactive ((,class (:foreground ,fg-inactive))))
+   `(equake-buffer-face ((,class :background ,bg-main :foreground ,fg-main)))
+   `(equake-shell-type-eshell ((,class :background ,bg-inactive :foreground 
,green-active)))
+   `(equake-shell-type-rash ((,class :background ,bg-inactive :foreground 
,red-active)))
+   `(equake-shell-type-shell ((,class :background ,bg-inactive :foreground 
,cyan-active)))
+   `(equake-shell-type-term ((,class :background ,bg-inactive :foreground 
,yellow-active)))
+   `(equake-shell-type-vterm ((,class :background ,bg-inactive :foreground 
,magenta-active)))
+   `(equake-tab-active ((,class :background ,fg-alt :foreground ,bg-alt)))
+   `(equake-tab-inactive ((,class :foreground ,fg-inactive)))
    ;;;; erc
-   `(erc-action-face ((,class (:foreground ,cyan :weight bold))))
-   `(erc-bold-face ((,class (:weight bold))))
-   `(erc-button ((,class (:inherit button))))
-   `(erc-command-indicator-face ((,class (:foreground ,cyan-alt :weight 
bold))))
-   `(erc-current-nick-face ((,class (:foreground ,magenta-alt-other))))
-   `(erc-dangerous-host-face ((,class (:inherit modus-theme-intense-red))))
-   `(erc-direct-msg-face ((,class (:foreground ,magenta))))
-   `(erc-error-face ((,class (:foreground ,red :weight bold))))
-   `(erc-fool-face ((,class (:foreground ,fg-inactive))))
-   `(erc-header-line ((,class (:background ,bg-header :foreground 
,fg-header))))
-   `(erc-input-face ((,class (:foreground ,fg-special-calm))))
-   `(erc-inverse-face ((,class (:inherit erc-default-face :inverse-video t))))
-   `(erc-keyword-face ((,class (:foreground ,magenta-alt :weight bold))))
-   `(erc-my-nick-face ((,class (:foreground ,magenta :weight bold))))
-   `(erc-my-nick-prefix-face ((,class (:inherit erc-my-nick-face))))
-   `(erc-nick-default-face ((,class (:foreground ,blue :weight bold))))
-   `(erc-nick-msg-face ((,class (:foreground ,green :weight bold))))
-   `(erc-nick-prefix-face ((,class (:inherit erc-nick-default-face))))
-   `(erc-notice-face ((,class (:foreground ,fg-unfocused))))
-   `(erc-pal-face ((,class (:foreground ,red-alt :weight bold))))
-   `(erc-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(erc-timestamp-face ((,class (:foreground ,blue-nuanced))))
-   `(erc-underline-face ((,class (:underline t))))
+   `(erc-action-face ((,class :foreground ,cyan :weight bold)))
+   `(erc-bold-face ((,class :weight bold)))
+   `(erc-button ((,class :inherit button)))
+   `(erc-command-indicator-face ((,class :foreground ,cyan-alt :weight bold)))
+   `(erc-current-nick-face ((,class :foreground ,magenta-alt-other)))
+   `(erc-dangerous-host-face ((,class :inherit modus-theme-intense-red)))
+   `(erc-direct-msg-face ((,class :foreground ,magenta)))
+   `(erc-error-face ((,class :foreground ,red :weight bold)))
+   `(erc-fool-face ((,class :foreground ,fg-inactive)))
+   `(erc-header-line ((,class :background ,bg-header :foreground ,fg-header)))
+   `(erc-input-face ((,class :foreground ,fg-special-calm)))
+   `(erc-inverse-face ((,class :inherit erc-default-face :inverse-video t)))
+   `(erc-keyword-face ((,class :foreground ,magenta-alt :weight bold)))
+   `(erc-my-nick-face ((,class :foreground ,magenta :weight bold)))
+   `(erc-my-nick-prefix-face ((,class :inherit erc-my-nick-face)))
+   `(erc-nick-default-face ((,class :foreground ,blue :weight bold)))
+   `(erc-nick-msg-face ((,class :foreground ,green :weight bold)))
+   `(erc-nick-prefix-face ((,class :inherit erc-nick-default-face)))
+   `(erc-notice-face ((,class :foreground ,fg-unfocused)))
+   `(erc-pal-face ((,class :foreground ,red-alt :weight bold)))
+   `(erc-prompt-face ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(erc-timestamp-face ((,class :foreground ,blue-nuanced)))
+   `(erc-underline-face ((,class :underline t)))
    ;;;; eros
-   `(eros-result-overlay-face ((,class (:box (:line-width -1 :color ,blue)
-                                             :background ,bg-dim :foreground 
,fg-dim))))
+   `(eros-result-overlay-face ((,class :box (:line-width -1 :color ,blue)
+                                       :background ,bg-dim :foreground 
,fg-dim)))
    ;;;; ert
-   `(ert-test-result-expected ((,class (:inherit modus-theme-intense-green))))
-   `(ert-test-result-unexpected ((,class (:inherit modus-theme-intense-red))))
+   `(ert-test-result-expected ((,class :inherit modus-theme-intense-green)))
+   `(ert-test-result-unexpected ((,class :inherit modus-theme-intense-red)))
    ;;;; eshell
-   `(eshell-ls-archive ((,class (:foreground ,cyan-alt :weight bold))))
-   `(eshell-ls-backup ((,class (:foreground ,yellow-alt))))
-   `(eshell-ls-clutter ((,class (:foreground ,red-alt))))
-   `(eshell-ls-directory ((,class (:foreground ,blue-alt :weight bold))))
-   `(eshell-ls-executable ((,class (:foreground ,magenta-alt))))
-   `(eshell-ls-missing ((,class (:inherit modus-theme-intense-red))))
-   `(eshell-ls-product ((,class (:foreground ,fg-special-warm))))
-   `(eshell-ls-readonly ((,class (:foreground ,fg-special-cold))))
-   `(eshell-ls-special ((,class (:foreground ,magenta :weight bold))))
-   `(eshell-ls-symlink ((,class (:foreground ,cyan :underline t))))
-   `(eshell-ls-unreadable ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(eshell-prompt ((,class (:foreground ,green-alt-other :weight 
,modus-theme-bold))))
+   `(eshell-ls-archive ((,class :foreground ,cyan-alt :weight bold)))
+   `(eshell-ls-backup ((,class :foreground ,yellow-alt)))
+   `(eshell-ls-clutter ((,class :foreground ,red-alt)))
+   `(eshell-ls-directory ((,class :foreground ,blue-alt :weight bold)))
+   `(eshell-ls-executable ((,class :foreground ,magenta-alt)))
+   `(eshell-ls-missing ((,class :inherit modus-theme-intense-red)))
+   `(eshell-ls-product ((,class :foreground ,fg-special-warm)))
+   `(eshell-ls-readonly ((,class :foreground ,fg-special-cold)))
+   `(eshell-ls-special ((,class :foreground ,magenta :weight bold)))
+   `(eshell-ls-symlink ((,class :foreground ,cyan :underline t)))
+   `(eshell-ls-unreadable ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(eshell-prompt ((,class :foreground ,green-alt-other :weight 
,modus-theme-bold)))
    ;;;; evil-mode
-   `(evil-ex-commands ((,class (:foreground ,magenta-alt-other))))
-   `(evil-ex-info ((,class (:foreground ,cyan-alt-other))))
-   `(evil-ex-lazy-highlight ((,class (:inherit modus-theme-refine-cyan))))
-   `(evil-ex-search ((,class (:inherit modus-theme-intense-green))))
-   `(evil-ex-substitute-matches ((,class (:inherit modus-theme-refine-yellow 
:underline t))))
-   `(evil-ex-substitute-replacement ((,class (:inherit 
modus-theme-intense-green :weight bold))))
+   `(evil-ex-commands ((,class :foreground ,magenta-alt-other)))
+   `(evil-ex-info ((,class :foreground ,cyan-alt-other)))
+   `(evil-ex-lazy-highlight ((,class :inherit modus-theme-refine-cyan)))
+   `(evil-ex-search ((,class :inherit modus-theme-intense-green)))
+   `(evil-ex-substitute-matches ((,class :inherit modus-theme-refine-yellow 
:underline t)))
+   `(evil-ex-substitute-replacement ((,class :inherit 
modus-theme-intense-green :weight bold)))
    ;;;; evil-goggles
-   `(evil-goggles-change-face ((,class (:inherit modus-theme-refine-yellow))))
-   `(evil-goggles-commentary-face ((,class (:inherit 
modus-theme-subtle-neutral :slant ,modus-theme-slant))))
-   `(evil-goggles-default-face ((,class (:inherit 
modus-theme-subtle-neutral))))
-   `(evil-goggles-delete-face ((,class (:inherit modus-theme-refine-red))))
-   `(evil-goggles-fill-and-move-face ((,class (:inherit 
evil-goggles-default-face))))
-   `(evil-goggles-indent-face ((,class (:inherit evil-goggles-default-face))))
-   `(evil-goggles-join-face ((,class (:inherit modus-theme-subtle-green))))
-   `(evil-goggles-nerd-commenter-face ((,class (:inherit 
evil-goggles-commentary-face))))
-   `(evil-goggles-paste-face ((,class (:inherit modus-theme-subtle-cyan))))
-   `(evil-goggles-record-macro-face ((,class (:inherit 
modus-theme-special-cold))))
-   `(evil-goggles-replace-with-register-face ((,class (:inherit 
modus-theme-refine-magenta))))
-   `(evil-goggles-set-marker-face ((,class (:inherit 
modus-theme-intense-magenta))))
-   `(evil-goggles-shift-face ((,class (:inherit evil-goggles-default-face))))
-   `(evil-goggles-surround-face ((,class (:inherit 
evil-goggles-default-face))))
-   `(evil-goggles-yank-face ((,class (:inherit modus-theme-subtle-blue))))
+   `(evil-goggles-change-face ((,class :inherit modus-theme-refine-yellow)))
+   `(evil-goggles-commentary-face ((,class :inherit modus-theme-subtle-neutral 
:slant ,modus-theme-slant)))
+   `(evil-goggles-default-face ((,class :inherit modus-theme-subtle-neutral)))
+   `(evil-goggles-delete-face ((,class :inherit modus-theme-refine-red)))
+   `(evil-goggles-fill-and-move-face ((,class :inherit 
evil-goggles-default-face)))
+   `(evil-goggles-indent-face ((,class :inherit evil-goggles-default-face)))
+   `(evil-goggles-join-face ((,class :inherit modus-theme-subtle-green)))
+   `(evil-goggles-nerd-commenter-face ((,class :inherit 
evil-goggles-commentary-face)))
+   `(evil-goggles-paste-face ((,class :inherit modus-theme-subtle-cyan)))
+   `(evil-goggles-record-macro-face ((,class :inherit 
modus-theme-special-cold)))
+   `(evil-goggles-replace-with-register-face ((,class :inherit 
modus-theme-refine-magenta)))
+   `(evil-goggles-set-marker-face ((,class :inherit 
modus-theme-intense-magenta)))
+   `(evil-goggles-shift-face ((,class :inherit evil-goggles-default-face)))
+   `(evil-goggles-surround-face ((,class :inherit evil-goggles-default-face)))
+   `(evil-goggles-yank-face ((,class :inherit modus-theme-subtle-blue)))
    ;;;; evil-visual-mark-mode
-   `(evil-visual-mark-face ((,class (:inherit modus-theme-intense-magenta))))
+   `(evil-visual-mark-face ((,class :inherit modus-theme-intense-magenta)))
    ;;;; eww
-   `(eww-invalid-certificate ((,class (:foreground ,red-active))))
-   `(eww-valid-certificate ((,class (:foreground ,green-active))))
-   `(eww-form-checkbox ((,class (:box (:line-width 1 :color ,fg-inactive 
:style released-button) :background ,bg-inactive :foreground ,fg-main))))
-   `(eww-form-file ((,class (:box (:line-width 1 :color ,fg-inactive :style 
released-button) :background ,bg-active :foreground ,fg-main))))
-   `(eww-form-select ((,class (:inherit eww-form-checkbox))))
-   `(eww-form-submit ((,class (:inherit eww-form-file))))
-   `(eww-form-text ((,class (:box (:line-width 1 :color ,fg-inactive :style 
none) :background ,bg-active :foreground ,fg-active))))
-   `(eww-form-textarea ((,class (:background ,bg-alt :foreground ,fg-main))))
+   `(eww-invalid-certificate ((,class :foreground ,red-active)))
+   `(eww-valid-certificate ((,class :foreground ,green-active)))
+   `(eww-form-checkbox ((,class :box (:line-width 1 :color ,fg-inactive :style 
released-button) :background ,bg-inactive :foreground ,fg-main)))
+   `(eww-form-file ((,class :box (:line-width 1 :color ,fg-inactive :style 
released-button) :background ,bg-active :foreground ,fg-main)))
+   `(eww-form-select ((,class :inherit eww-form-checkbox)))
+   `(eww-form-submit ((,class :inherit eww-form-file)))
+   `(eww-form-text ((,class :box (:line-width 1 :color ,fg-inactive :style 
none) :background ,bg-active :foreground ,fg-active)))
+   `(eww-form-textarea ((,class :background ,bg-alt :foreground ,fg-main)))
    ;;;; eyebrowse
-   `(eyebrowse-mode-line-active ((,class (:foreground ,blue-active :weight 
bold))))
+   `(eyebrowse-mode-line-active ((,class :foreground ,blue-active :weight 
bold)))
    ;;;; fancy-dabbrev
-   `(fancy-dabbrev-menu-face ((,class (:background ,bg-alt :foreground 
,fg-alt))))
-   `(fancy-dabbrev-preview-face ((,class (:foreground ,fg-alt :underline t))))
-   `(fancy-dabbrev-selection-face ((,class (:inherit modus-theme-intense-cyan 
:weight bold))))
+   `(fancy-dabbrev-menu-face ((,class :background ,bg-alt :foreground 
,fg-alt)))
+   `(fancy-dabbrev-preview-face ((,class :foreground ,fg-alt :underline t)))
+   `(fancy-dabbrev-selection-face ((,class :inherit modus-theme-intense-cyan 
:weight bold)))
    ;;;; flycheck
    `(flycheck-error
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-error :style wave)))
-      (,class (:foreground ,fg-lang-error :underline t))))
-   `(flycheck-error-list-checker-name ((,class (:foreground ,magenta-active))))
-   `(flycheck-error-list-column-number ((,class (:foreground 
,fg-special-cold))))
-   `(flycheck-error-list-error ((,class (:foreground ,red :weight 
,modus-theme-bold))))
-   `(flycheck-error-list-filename ((,class (:foreground ,blue))))
-   `(flycheck-error-list-highlight ((,class (:inherit 
modus-theme-special-warm))))
-   `(flycheck-error-list-id ((,class (:foreground ,magenta-alt-other))))
-   `(flycheck-error-list-id-with-explainer ((,class (:inherit 
flycheck-error-list-id :box t))))
-   `(flycheck-error-list-info ((,class (:foreground ,cyan))))
-   `(flycheck-error-list-line-number ((,class (:foreground ,fg-special-warm))))
-   `(flycheck-error-list-warning ((,class (:foreground ,yellow))))
-   `(flycheck-fringe-error ((,class (:inherit modus-theme-fringe-red))))
-   `(flycheck-fringe-info ((,class (:inherit modus-theme-fringe-cyan))))
-   `(flycheck-fringe-warning ((,class (:inherit modus-theme-fringe-yellow))))
+       :underline (:color ,fg-lang-error :style wave))
+      (,class :foreground ,fg-lang-error :underline t)))
+   `(flycheck-error-list-checker-name ((,class :foreground ,magenta-active)))
+   `(flycheck-error-list-column-number ((,class :foreground ,fg-special-cold)))
+   `(flycheck-error-list-error ((,class :foreground ,red :weight 
,modus-theme-bold)))
+   `(flycheck-error-list-filename ((,class :foreground ,blue)))
+   `(flycheck-error-list-highlight ((,class :inherit 
modus-theme-special-warm)))
+   `(flycheck-error-list-id ((,class :foreground ,magenta-alt-other)))
+   `(flycheck-error-list-id-with-explainer ((,class :inherit 
flycheck-error-list-id :box t)))
+   `(flycheck-error-list-info ((,class :foreground ,cyan)))
+   `(flycheck-error-list-line-number ((,class :foreground ,fg-special-warm)))
+   `(flycheck-error-list-warning ((,class :foreground ,yellow)))
+   `(flycheck-fringe-error ((,class :inherit modus-theme-fringe-red)))
+   `(flycheck-fringe-info ((,class :inherit modus-theme-fringe-cyan)))
+   `(flycheck-fringe-warning ((,class :inherit modus-theme-fringe-yellow)))
    `(flycheck-info
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-note :style wave)))
-      (,class (:foreground ,fg-lang-note :underline t))))
-   `(flycheck-verify-select-checker ((,class (:box (:line-width 1 :color nil 
:style released-button)))))
+       :underline (:color ,fg-lang-note :style wave))
+      (,class :foreground ,fg-lang-note :underline t)))
+   `(flycheck-verify-select-checker ((,class :box (:line-width 1 :color nil 
:style released-button))))
    `(flycheck-warning
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-warning :style wave)))
-      (,class (:foreground ,fg-lang-warning :underline t))))
+       :underline (:color ,fg-lang-warning :style wave))
+      (,class :foreground ,fg-lang-warning :underline t)))
    ;;;; flycheck-indicator
-   `(flycheck-indicator-disabled ((,class (:foreground ,fg-inactive :slant 
,modus-theme-slant))))
-   `(flycheck-indicator-error ((,class (:foreground ,red-active :weight 
,modus-theme-bold))))
-   `(flycheck-indicator-info ((,class (:foreground ,blue-active :weight 
,modus-theme-bold))))
-   `(flycheck-indicator-running ((,class (:foreground ,magenta-active :weight 
,modus-theme-bold))))
-   `(flycheck-indicator-success ((,class (:foreground ,green-active :weight 
,modus-theme-bold))))
-   `(flycheck-indicator-warning ((,class (:foreground ,yellow-active :weight 
,modus-theme-bold))))
+   `(flycheck-indicator-disabled ((,class :foreground ,fg-inactive :slant 
,modus-theme-slant)))
+   `(flycheck-indicator-error ((,class :foreground ,red-active :weight 
,modus-theme-bold)))
+   `(flycheck-indicator-info ((,class :foreground ,blue-active :weight 
,modus-theme-bold)))
+   `(flycheck-indicator-running ((,class :foreground ,magenta-active :weight 
,modus-theme-bold)))
+   `(flycheck-indicator-success ((,class :foreground ,green-active :weight 
,modus-theme-bold)))
+   `(flycheck-indicator-warning ((,class :foreground ,yellow-active :weight 
,modus-theme-bold)))
    ;;;; flycheck-posframe
-   `(flycheck-posframe-background-face ((,class (:background ,bg-alt))))
-   `(flycheck-posframe-border-face ((,class (:foreground ,fg-alt))))
-   `(flycheck-posframe-error-face ((,class (:foreground ,red :weight bold))))
-   `(flycheck-posframe-face ((,class (:foreground ,fg-main :slant 
,modus-theme-slant))))
-   `(flycheck-posframe-info-face ((,class (:foreground ,cyan :weight bold))))
-   `(flycheck-posframe-warning-face ((,class (:foreground ,yellow :weight 
bold))))
+   `(flycheck-posframe-background-face ((,class :background ,bg-alt)))
+   `(flycheck-posframe-border-face ((,class :foreground ,fg-alt)))
+   `(flycheck-posframe-error-face ((,class :foreground ,red :weight bold)))
+   `(flycheck-posframe-face ((,class :foreground ,fg-main :slant 
,modus-theme-slant)))
+   `(flycheck-posframe-info-face ((,class :foreground ,cyan :weight bold)))
+   `(flycheck-posframe-warning-face ((,class :foreground ,yellow :weight 
bold)))
    ;;;; flymake
    `(flymake-error
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-error :style wave)))
-      (,class (:foreground ,fg-lang-error :underline t))))
+       :underline (:color ,fg-lang-error :style wave))
+      (,class :foreground ,fg-lang-error :underline t)))
    `(flymake-note
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-note :style wave)))
-      (,class (:foreground ,fg-lang-note :underline t))))
+       :underline (:color ,fg-lang-note :style wave))
+      (,class :foreground ,fg-lang-note :underline t)))
    `(flymake-warning
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-warning :style wave)))
-      (,class (:foreground ,fg-lang-warning :underline t))))
+       :underline (:color ,fg-lang-warning :style wave))
+      (,class :foreground ,fg-lang-warning :underline t)))
    ;;;; flyspell
    `(flyspell-duplicate
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-warning :style wave)))
-      (,class (:foreground ,fg-lang-warning :underline t))))
+       :underline (:color ,fg-lang-warning :style wave))
+      (,class :foreground ,fg-lang-warning :underline t)))
    `(flyspell-incorrect
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-error :style wave)))
-      (,class (:foreground ,fg-lang-error :underline t))))
+       :underline (:color ,fg-lang-error :style wave))
+      (,class :foreground ,fg-lang-error :underline t)))
    ;;;; flyspell-correct
-   `(flyspell-correct-highlight-face ((,class (:inherit 
modus-theme-refine-green))))
+   `(flyspell-correct-highlight-face ((,class :inherit 
modus-theme-refine-green)))
    ;;;; flx
-   `(flx-highlight-face ((,class (:inherit modus-theme-intense-magenta))))
+   `(flx-highlight-face ((,class :inherit modus-theme-intense-magenta)))
    ;;;; freeze-it
-   `(freeze-it-show ((,class (:background ,bg-dim :foreground 
,fg-special-warm))))
+   `(freeze-it-show ((,class :background ,bg-dim :foreground 
,fg-special-warm)))
    ;;;; frog-menu
-   `(frog-menu-action-keybinding-face ((,class (:foreground ,blue-alt-other))))
-   `(frog-menu-actions-face ((,class (:foreground ,magenta))))
-   `(frog-menu-border ((,class (:background ,bg-active))))
-   `(frog-menu-candidates-face ((,class (:foreground ,fg-main))))
-   `(frog-menu-posframe-background-face ((,class (:background ,bg-dim))))
-   `(frog-menu-prompt-face ((,class (:foreground ,cyan))))
+   `(frog-menu-action-keybinding-face ((,class :foreground ,blue-alt-other)))
+   `(frog-menu-actions-face ((,class :foreground ,magenta)))
+   `(frog-menu-border ((,class :background ,bg-active)))
+   `(frog-menu-candidates-face ((,class :foreground ,fg-main)))
+   `(frog-menu-posframe-background-face ((,class :background ,bg-dim)))
+   `(frog-menu-prompt-face ((,class :foreground ,cyan)))
    ;;;; focus
-   `(focus-unfocused ((,class (:foreground ,fg-unfocused))))
+   `(focus-unfocused ((,class :foreground ,fg-unfocused)))
    ;;;; fold-this
-   `(fold-this-overlay ((,class (:inherit modus-theme-special-mild))))
+   `(fold-this-overlay ((,class :inherit modus-theme-special-mild)))
    ;;;; font-lock
-   `(font-lock-builtin-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(font-lock-comment-delimiter-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(font-lock-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(font-lock-constant-face ((,class (:foreground ,blue-alt-other))))
-   `(font-lock-doc-face ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(font-lock-function-name-face ((,class (:foreground ,magenta))))
-   `(font-lock-keyword-face ((,class (:foreground ,magenta-alt-other :weight 
,modus-theme-bold))))
-   `(font-lock-negation-char-face ((,class (:foreground ,yellow :weight 
,modus-theme-bold))))
-   `(font-lock-preprocessor-face ((,class (:foreground ,magenta))))
-   `(font-lock-regexp-grouping-backslash ((,class (:foreground 
,fg-escape-char-backslash :weight bold))))
-   `(font-lock-regexp-grouping-construct ((,class (:foreground 
,fg-escape-char-construct :weight bold))))
-   `(font-lock-string-face ((,class (:foreground ,blue-alt))))
-   `(font-lock-type-face ((,class (:foreground ,magenta-alt))))
-   `(font-lock-variable-name-face ((,class (:foreground ,cyan))))
-   `(font-lock-warning-face ((,class (:foreground ,yellow-active :weight 
bold))))
+   `(font-lock-builtin-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(font-lock-comment-delimiter-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(font-lock-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(font-lock-constant-face ((,class :foreground ,blue-alt-other)))
+   `(font-lock-doc-face ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(font-lock-function-name-face ((,class :foreground ,magenta)))
+   `(font-lock-keyword-face ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold)))
+   `(font-lock-negation-char-face ((,class :foreground ,yellow :weight 
,modus-theme-bold)))
+   `(font-lock-preprocessor-face ((,class :foreground ,magenta)))
+   `(font-lock-regexp-grouping-backslash ((,class :foreground 
,fg-escape-char-backslash :weight bold)))
+   `(font-lock-regexp-grouping-construct ((,class :foreground 
,fg-escape-char-construct :weight bold)))
+   `(font-lock-string-face ((,class :foreground ,blue-alt)))
+   `(font-lock-type-face ((,class :foreground ,magenta-alt)))
+   `(font-lock-variable-name-face ((,class :foreground ,cyan)))
+   `(font-lock-warning-face ((,class :foreground ,yellow-active :weight bold)))
    ;;;; forge
-   `(forge-post-author ((,class (:foreground ,fg-main :weight bold))))
-   `(forge-post-date ((,class (:foreground ,fg-special-cold))))
-   `(forge-topic-closed ((,class (:foreground ,fg-alt))))
-   `(forge-topic-merged ((,class (:foreground ,fg-alt))))
-   `(forge-topic-open ((,class (:foreground ,fg-special-mild))))
-   `(forge-topic-unmerged ((,class (:foreground ,magenta :slant 
,modus-theme-slant))))
-   `(forge-topic-unread ((,class (:foreground ,fg-main :weight bold))))
+   `(forge-post-author ((,class :foreground ,fg-main :weight bold)))
+   `(forge-post-date ((,class :foreground ,fg-special-cold)))
+   `(forge-topic-closed ((,class :foreground ,fg-alt)))
+   `(forge-topic-merged ((,class :foreground ,fg-alt)))
+   `(forge-topic-open ((,class :foreground ,fg-special-mild)))
+   `(forge-topic-unmerged ((,class :foreground ,magenta :slant 
,modus-theme-slant)))
+   `(forge-topic-unread ((,class :foreground ,fg-main :weight bold)))
    ;;;; fountain-mode
-   `(fountain-character ((,class (:foreground ,magenta-alt-other))))
-   `(fountain-comment ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(fountain-dialog ((,class (:foreground ,blue))))
-   `(fountain-metadata-key ((,class (:foreground ,blue-alt-other))))
-   `(fountain-metadata-value ((,class (:foreground ,cyan-alt-other))))
-   `(fountain-non-printing ((,class (:inherit fountain-comment))))
-   `(fountain-note ((,class (:foreground ,fg-special-warm :slant 
,modus-theme-slant))))
-   `(fountain-page-break ((,class (:foreground ,yellow :weight bold))))
-   `(fountain-page-number ((,class (:foreground ,yellow-alt :weight bold))))
-   `(fountain-paren ((,class (:foreground ,cyan))))
-   `(fountain-scene-heading ((,class (:foreground ,fg-special-calm :weight 
bold))))
-   `(fountain-section-heading ((,class (:inherit ,modus-theme-variable-pitch
-                                                 :foreground ,fg-main :weight 
bold
-                                                 ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)))))
-   `(fountain-section-heading-1 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground ,fg-main 
:weight bold
-                                                   
,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))))
-   `(fountain-section-heading-2 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground 
,fg-special-warm :weight bold
-                                                   
,@(modus-operandi-theme-scale modus-operandi-theme-scale-3)))))
-   `(fountain-section-heading-3 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground 
,fg-special-cold :weight bold
-                                                   
,@(modus-operandi-theme-scale modus-operandi-theme-scale-2)))))
-   `(fountain-section-heading-4 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground 
,fg-special-mild :weight bold
-                                                   
,@(modus-operandi-theme-scale modus-operandi-theme-scale-1)))))
-   `(fountain-section-heading-5 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground 
,fg-special-calm :weight bold))))
-   `(fountain-synopsis ((,class (:foreground ,green))))
-   `(fountain-template ((,class (:foreground ,magenta-alt))))
-   `(fountain-trans ((,class (:foreground ,magenta :weight bold))))
+   `(fountain-character ((,class :foreground ,magenta-alt-other)))
+   `(fountain-comment ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+   `(fountain-dialog ((,class :foreground ,blue)))
+   `(fountain-metadata-key ((,class :foreground ,blue-alt-other)))
+   `(fountain-metadata-value ((,class :foreground ,cyan-alt-other)))
+   `(fountain-non-printing ((,class :inherit fountain-comment)))
+   `(fountain-note ((,class :foreground ,fg-special-warm :slant 
,modus-theme-slant)))
+   `(fountain-page-break ((,class :foreground ,yellow :weight bold)))
+   `(fountain-page-number ((,class :foreground ,yellow-alt :weight bold)))
+   `(fountain-paren ((,class :foreground ,cyan)))
+   `(fountain-scene-heading ((,class :foreground ,fg-special-calm :weight 
bold)))
+   `(fountain-section-heading ((,class :inherit ,modus-theme-variable-pitch
+                                       :foreground ,fg-main :weight bold
+                                       ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(fountain-section-heading-1 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-main :weight bold
+                                         ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(fountain-section-heading-2 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-special-warm :weight 
bold
+                                         ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3))))
+   `(fountain-section-heading-3 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-special-cold :weight 
bold
+                                         ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2))))
+   `(fountain-section-heading-4 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-special-mild :weight 
bold
+                                         ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-1))))
+   `(fountain-section-heading-5 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-special-calm :weight 
bold)))
+   `(fountain-synopsis ((,class :foreground ,green)))
+   `(fountain-template ((,class :foreground ,magenta-alt)))
+   `(fountain-trans ((,class :foreground ,magenta :weight bold)))
    ;;;; geiser
-   `(geiser-font-lock-autodoc-current-arg ((,class (:foreground ,magenta))))
-   `(geiser-font-lock-autodoc-identifier ((,class (:foreground ,blue))))
-   `(geiser-font-lock-doc-button ((,class (:foreground ,cyan-alt :underline 
t))))
-   `(geiser-font-lock-doc-link ((,class (:inherit link))))
-   `(geiser-font-lock-error-link ((,class (:foreground ,red-alt :underline 
t))))
-   `(geiser-font-lock-image-button ((,class (:foreground ,green-alt :underline 
t))))
-   `(geiser-font-lock-repl-input ((,class (:weight bold))))
-   `(geiser-font-lock-repl-output ((,class (:foreground ,magenta-alt-other))))
-   `(geiser-font-lock-repl-prompt ((,class (:foreground ,cyan-alt-other))))
-   `(geiser-font-lock-xref-header ((,class (:weight bold))))
-   `(geiser-font-lock-xref-link ((,class (:inherit link))))
+   `(geiser-font-lock-autodoc-current-arg ((,class :foreground ,magenta)))
+   `(geiser-font-lock-autodoc-identifier ((,class :foreground ,blue)))
+   `(geiser-font-lock-doc-button ((,class :foreground ,cyan-alt :underline t)))
+   `(geiser-font-lock-doc-link ((,class :inherit link)))
+   `(geiser-font-lock-error-link ((,class :foreground ,red-alt :underline t)))
+   `(geiser-font-lock-image-button ((,class :foreground ,green-alt :underline 
t)))
+   `(geiser-font-lock-repl-input ((,class :weight bold)))
+   `(geiser-font-lock-repl-output ((,class :foreground ,magenta-alt-other)))
+   `(geiser-font-lock-repl-prompt ((,class :foreground ,cyan-alt-other)))
+   `(geiser-font-lock-xref-header ((,class :weight bold)))
+   `(geiser-font-lock-xref-link ((,class :inherit link)))
    ;;;; git-commit
-   `(git-commit-comment-action ((,class (:foreground ,fg-special-calm :slant 
,modus-theme-slant))))
-   `(git-commit-comment-branch-local ((,class (:foreground ,cyan :slant 
,modus-theme-slant))))
-   `(git-commit-comment-branch-remote ((,class (:foreground ,blue :slant 
,modus-theme-slant))))
-   `(git-commit-comment-detached ((,class (:foreground ,yellow :slant 
,modus-theme-slant))))
-   `(git-commit-comment-file ((,class (:foreground ,blue :slant 
,modus-theme-slant))))
-   `(git-commit-comment-heading ((,class (:foreground ,fg-main :weight bold 
:slant ,modus-theme-slant))))
-   `(git-commit-keyword ((,class (:foreground ,magenta))))
-   `(git-commit-known-pseudo-header ((,class (:foreground ,fg-special-warm 
:weight bold))))
-   `(git-commit-nonempty-second-line ((,class (:inherit 
modus-theme-refine-yellow :weight bold))))
-   `(git-commit-overlong-summary ((,class (:inherit 
modus-theme-subtle-yellow))))
-   `(git-commit-pseudo-header ((,class (:foreground ,fg-alt :weight bold))))
-   `(git-commit-summary ((,class (:foreground ,magenta-alt-other))))
+   `(git-commit-comment-action ((,class :foreground ,fg-special-calm :slant 
,modus-theme-slant)))
+   `(git-commit-comment-branch-local ((,class :foreground ,cyan :slant 
,modus-theme-slant)))
+   `(git-commit-comment-branch-remote ((,class :foreground ,blue :slant 
,modus-theme-slant)))
+   `(git-commit-comment-detached ((,class :foreground ,yellow :slant 
,modus-theme-slant)))
+   `(git-commit-comment-file ((,class :foreground ,blue :slant 
,modus-theme-slant)))
+   `(git-commit-comment-heading ((,class :foreground ,fg-main :weight bold 
:slant ,modus-theme-slant)))
+   `(git-commit-keyword ((,class :foreground ,magenta)))
+   `(git-commit-known-pseudo-header ((,class :foreground ,fg-special-warm 
:weight bold)))
+   `(git-commit-nonempty-second-line ((,class :inherit 
modus-theme-refine-yellow :weight bold)))
+   `(git-commit-overlong-summary ((,class :inherit modus-theme-subtle-yellow)))
+   `(git-commit-pseudo-header ((,class :foreground ,fg-alt :weight bold)))
+   `(git-commit-summary ((,class :foreground ,magenta-alt-other)))
    ;;;; git-gutter
-   `(git-gutter:added ((,class (:inherit modus-theme-fringe-green))))
-   `(git-gutter:deleted ((,class (:inherit modus-theme-fringe-red))))
-   `(git-gutter:modified ((,class (:inherit modus-theme-fringe-yellow))))
-   `(git-gutter:separator ((,class (:inherit modus-theme-fringe-cyan))))
-   `(git-gutter:unchanged ((,class (:inherit modus-theme-fringe-magenta))))
+   `(git-gutter:added ((,class :inherit modus-theme-fringe-green)))
+   `(git-gutter:deleted ((,class :inherit modus-theme-fringe-red)))
+   `(git-gutter:modified ((,class :inherit modus-theme-fringe-yellow)))
+   `(git-gutter:separator ((,class :inherit modus-theme-fringe-cyan)))
+   `(git-gutter:unchanged ((,class :inherit modus-theme-fringe-magenta)))
    ;;;; git-gutter-fr
-   `(git-gutter-fr:added ((,class (:inherit modus-theme-fringe-green))))
-   `(git-gutter-fr:deleted ((,class (:inherit modus-theme-fringe-red))))
-   `(git-gutter-fr:modified ((,class (:inherit modus-theme-fringe-yellow))))
+   `(git-gutter-fr:added ((,class :inherit modus-theme-fringe-green)))
+   `(git-gutter-fr:deleted ((,class :inherit modus-theme-fringe-red)))
+   `(git-gutter-fr:modified ((,class :inherit modus-theme-fringe-yellow)))
    ;;;; git-{gutter,fringe}+
-   `(git-gutter+-added ((,class (:inherit modus-theme-fringe-green))))
-   `(git-gutter+-deleted ((,class (:inherit modus-theme-fringe-red))))
-   `(git-gutter+-modified ((,class (:inherit modus-theme-fringe-yellow))))
-   `(git-gutter+-separator ((,class (:inherit modus-theme-fringe-cyan))))
-   `(git-gutter+-unchanged ((,class (:inherit modus-theme-fringe-magenta))))
-   `(git-gutter-fr+-added ((,class (:inherit modus-theme-fringe-green))))
-   `(git-gutter-fr+-deleted ((,class (:inherit modus-theme-fringe-red))))
-   `(git-gutter-fr+-modified ((,class (:inherit modus-theme-fringe-yellow))))
+   `(git-gutter+-added ((,class :inherit modus-theme-fringe-green)))
+   `(git-gutter+-deleted ((,class :inherit modus-theme-fringe-red)))
+   `(git-gutter+-modified ((,class :inherit modus-theme-fringe-yellow)))
+   `(git-gutter+-separator ((,class :inherit modus-theme-fringe-cyan)))
+   `(git-gutter+-unchanged ((,class :inherit modus-theme-fringe-magenta)))
+   `(git-gutter-fr+-added ((,class :inherit modus-theme-fringe-green)))
+   `(git-gutter-fr+-deleted ((,class :inherit modus-theme-fringe-red)))
+   `(git-gutter-fr+-modified ((,class :inherit modus-theme-fringe-yellow)))
    ;;;; git-lens
-   `(git-lens-added ((,class (:foreground ,green :weight bold))))
-   `(git-lens-deleted ((,class (:foreground ,red :weight bold))))
-   `(git-lens-header ((,class (:height 1.1 :foreground ,cyan :weight bold))))
-   `(git-lens-modified ((,class (:foreground ,yellow :weight bold))))
-   `(git-lens-renamed ((,class (:foreground ,magenta :weight bold))))
+   `(git-lens-added ((,class :foreground ,green :weight bold)))
+   `(git-lens-deleted ((,class :foreground ,red :weight bold)))
+   `(git-lens-header ((,class :height 1.1 :foreground ,cyan :weight bold)))
+   `(git-lens-modified ((,class :foreground ,yellow :weight bold)))
+   `(git-lens-renamed ((,class :foreground ,magenta :weight bold)))
    ;;;; git-timemachine
-   `(git-timemachine-commit ((,class (:foreground ,yellow-active :weight 
bold))))
-   `(git-timemachine-minibuffer-author-face ((,class (:foreground 
,fg-special-warm))))
-   `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,red-alt))))
+   `(git-timemachine-commit ((,class :foreground ,yellow-active :weight bold)))
+   `(git-timemachine-minibuffer-author-face ((,class :foreground 
,fg-special-warm)))
+   `(git-timemachine-minibuffer-detail-face ((,class :foreground ,red-alt)))
    ;;;; git-walktree
-   `(git-walktree-commit-face ((,class (:foreground ,yellow))))
-   `(git-walktree-symlink-face ((,class (:foreground ,cyan :underline t))))
-   `(git-walktree-tree-face ((,class (:foreground ,magenta))))
+   `(git-walktree-commit-face ((,class :foreground ,yellow)))
+   `(git-walktree-symlink-face ((,class :foreground ,cyan :underline t)))
+   `(git-walktree-tree-face ((,class :foreground ,magenta)))
    ;;;; gnus
-   `(gnus-button ((,class (:inherit button))))
-   `(gnus-cite-1 ((,class (:foreground ,blue-alt))))
-   `(gnus-cite-10 ((,class (:foreground ,magenta-alt-other))))
-   `(gnus-cite-11 ((,class (:foreground ,yellow-alt-other))))
-   `(gnus-cite-2 ((,class (:foreground ,red-alt))))
-   `(gnus-cite-3 ((,class (:foreground ,green-alt))))
-   `(gnus-cite-4 ((,class (:foreground ,magenta-alt))))
-   `(gnus-cite-5 ((,class (:foreground ,yellow-alt))))
-   `(gnus-cite-6 ((,class (:foreground ,cyan-alt))))
-   `(gnus-cite-7 ((,class (:foreground ,blue-alt-other))))
-   `(gnus-cite-8 ((,class (:foreground ,red-alt-other))))
-   `(gnus-cite-9 ((,class (:foreground ,green-alt-other))))
-   `(gnus-cite-attribution ((,class (:foreground ,fg-main :slant italic))))
-   `(gnus-emphasis-highlight-words ((,class (:inherit 
modus-theme-refine-yellow))))
-   `(gnus-group-mail-1 ((,class (:foreground ,magenta :weight bold))))
-   `(gnus-group-mail-1-empty ((,class (:foreground ,magenta))))
-   `(gnus-group-mail-2 ((,class (:foreground ,magenta-alt :weight bold))))
-   `(gnus-group-mail-2-empty ((,class (:foreground ,magenta-alt))))
-   `(gnus-group-mail-3 ((,class (:foreground ,magenta-alt-other :weight 
bold))))
-   `(gnus-group-mail-3-empty ((,class (:foreground ,magenta-alt-other))))
-   `(gnus-group-mail-low ((,class (:foreground ,fg-special-calm :weight 
bold))))
-   `(gnus-group-mail-low-empty ((,class (:foreground ,fg-special-calm))))
-   `(gnus-group-news-1 ((,class (:foreground ,blue-alt-other :weight bold))))
-   `(gnus-group-news-1-empty ((,class (:foreground ,blue-alt))))
-   `(gnus-group-news-2 ((,class (:foreground ,green-alt-other :weight bold))))
-   `(gnus-group-news-2-empty ((,class (:foreground ,green-alt))))
-   `(gnus-group-news-3 ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(gnus-group-news-3-empty ((,class (:foreground ,cyan))))
-   `(gnus-group-news-4 ((,class (:foreground ,yellow-nuanced :weight bold))))
-   `(gnus-group-news-4-empty ((,class (:foreground ,green-nuanced))))
-   `(gnus-group-news-5 ((,class (:foreground ,magenta-nuanced :weight bold))))
-   `(gnus-group-news-5-empty ((,class (:foreground ,magenta-nuanced))))
-   `(gnus-group-news-6 ((,class (:foreground ,red-nuanced :weight bold))))
-   `(gnus-group-news-6-empty ((,class (:foreground ,red-nuanced))))
-   `(gnus-group-news-low ((,class (:foreground ,fg-alt :weight bold))))
-   `(gnus-group-news-low-empty ((,class (:foreground ,fg-alt))))
-   `(gnus-header-content ((,class (:foreground ,fg-special-calm))))
-   `(gnus-header-from ((,class (:foreground ,cyan-alt :weight bold :underline 
nil))))
-   `(gnus-header-name ((,class (:foreground ,cyan-alt-other))))
-   `(gnus-header-newsgroups ((,class (:foreground ,blue-alt :weight bold))))
-   `(gnus-header-subject ((,class (:foreground ,magenta-alt-other :weight 
bold))))
-   `(gnus-server-agent ((,class (:foreground ,cyan :weight bold))))
-   `(gnus-server-closed ((,class (:foreground ,magenta :weight bold))))
-   `(gnus-server-cloud ((,class (:foreground ,cyan-alt :weight bold))))
-   `(gnus-server-cloud-host ((,class (:inherit modus-theme-refine-cyan))))
-   `(gnus-server-denied ((,class (:foreground ,red :weight bold))))
-   `(gnus-server-offline ((,class (:foreground ,yellow :weight bold))))
-   `(gnus-server-opened ((,class (:foreground ,green :weight bold))))
-   `(gnus-signature ((,class (:foreground ,fg-special-cold :slant italic))))
-   `(gnus-splash ((,class (:foreground ,fg-alt))))
-   `(gnus-summary-cancelled ((,class (:inherit modus-theme-mark-alt))))
-   `(gnus-summary-high-ancient ((,class (:foreground ,fg-alt :weight bold))))
-   `(gnus-summary-high-read ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(gnus-summary-high-ticked ((,class (:foreground ,red-alt-other :weight 
bold))))
-   `(gnus-summary-high-undownloaded ((,class (:foreground ,yellow :weight 
bold))))
-   `(gnus-summary-high-unread ((,class (:foreground ,fg-main :weight bold))))
-   `(gnus-summary-low-ancient ((,class (:foreground ,fg-alt :slant italic))))
-   `(gnus-summary-low-read ((,class (:foreground ,fg-special-cold :slant 
italic))))
-   `(gnus-summary-low-ticked ((,class (:foreground ,red-refine-fg :slant 
italic))))
-   `(gnus-summary-low-undownloaded ((,class (:foreground ,yellow-refine-fg 
:slant italic))))
-   `(gnus-summary-low-unread ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(gnus-summary-normal-ancient ((,class (:foreground ,fg-special-calm))))
-   `(gnus-summary-normal-read ((,class (:foreground ,fg-special-cold))))
-   `(gnus-summary-normal-ticked ((,class (:foreground ,red-alt-other))))
-   `(gnus-summary-normal-undownloaded ((,class (:foreground ,yellow))))
-   `(gnus-summary-normal-unread ((,class (:foreground ,fg-main))))
-   `(gnus-summary-selected ((,class (:inherit modus-theme-subtle-blue))))
+   `(gnus-button ((,class :inherit button)))
+   `(gnus-cite-1 ((,class :foreground ,blue-alt)))
+   `(gnus-cite-10 ((,class :foreground ,magenta-alt-other)))
+   `(gnus-cite-11 ((,class :foreground ,yellow-alt-other)))
+   `(gnus-cite-2 ((,class :foreground ,red-alt)))
+   `(gnus-cite-3 ((,class :foreground ,green-alt)))
+   `(gnus-cite-4 ((,class :foreground ,magenta-alt)))
+   `(gnus-cite-5 ((,class :foreground ,yellow-alt)))
+   `(gnus-cite-6 ((,class :foreground ,cyan-alt)))
+   `(gnus-cite-7 ((,class :foreground ,blue-alt-other)))
+   `(gnus-cite-8 ((,class :foreground ,red-alt-other)))
+   `(gnus-cite-9 ((,class :foreground ,green-alt-other)))
+   `(gnus-cite-attribution ((,class :foreground ,fg-main :slant italic)))
+   `(gnus-emphasis-highlight-words ((,class :inherit 
modus-theme-refine-yellow)))
+   `(gnus-group-mail-1 ((,class :foreground ,magenta :weight bold)))
+   `(gnus-group-mail-1-empty ((,class :foreground ,magenta)))
+   `(gnus-group-mail-2 ((,class :foreground ,magenta-alt :weight bold)))
+   `(gnus-group-mail-2-empty ((,class :foreground ,magenta-alt)))
+   `(gnus-group-mail-3 ((,class :foreground ,magenta-alt-other :weight bold)))
+   `(gnus-group-mail-3-empty ((,class :foreground ,magenta-alt-other)))
+   `(gnus-group-mail-low ((,class :foreground ,fg-special-calm :weight bold)))
+   `(gnus-group-mail-low-empty ((,class :foreground ,fg-special-calm)))
+   `(gnus-group-news-1 ((,class :foreground ,blue-alt-other :weight bold)))
+   `(gnus-group-news-1-empty ((,class :foreground ,blue-alt)))
+   `(gnus-group-news-2 ((,class :foreground ,green-alt-other :weight bold)))
+   `(gnus-group-news-2-empty ((,class :foreground ,green-alt)))
+   `(gnus-group-news-3 ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(gnus-group-news-3-empty ((,class :foreground ,cyan)))
+   `(gnus-group-news-4 ((,class :foreground ,yellow-nuanced :weight bold)))
+   `(gnus-group-news-4-empty ((,class :foreground ,green-nuanced)))
+   `(gnus-group-news-5 ((,class :foreground ,magenta-nuanced :weight bold)))
+   `(gnus-group-news-5-empty ((,class :foreground ,magenta-nuanced)))
+   `(gnus-group-news-6 ((,class :foreground ,red-nuanced :weight bold)))
+   `(gnus-group-news-6-empty ((,class :foreground ,red-nuanced)))
+   `(gnus-group-news-low ((,class :foreground ,fg-alt :weight bold)))
+   `(gnus-group-news-low-empty ((,class :foreground ,fg-alt)))
+   `(gnus-header-content ((,class :foreground ,fg-special-calm)))
+   `(gnus-header-from ((,class :foreground ,cyan-alt :weight bold :underline 
nil)))
+   `(gnus-header-name ((,class :foreground ,cyan-alt-other)))
+   `(gnus-header-newsgroups ((,class :foreground ,blue-alt :weight bold)))
+   `(gnus-header-subject ((,class :foreground ,magenta-alt-other :weight 
bold)))
+   `(gnus-server-agent ((,class :foreground ,cyan :weight bold)))
+   `(gnus-server-closed ((,class :foreground ,magenta :weight bold)))
+   `(gnus-server-cloud ((,class :foreground ,cyan-alt :weight bold)))
+   `(gnus-server-cloud-host ((,class :inherit modus-theme-refine-cyan)))
+   `(gnus-server-denied ((,class :foreground ,red :weight bold)))
+   `(gnus-server-offline ((,class :foreground ,yellow :weight bold)))
+   `(gnus-server-opened ((,class :foreground ,green :weight bold)))
+   `(gnus-signature ((,class :foreground ,fg-special-cold :slant italic)))
+   `(gnus-splash ((,class :foreground ,fg-alt)))
+   `(gnus-summary-cancelled ((,class :inherit modus-theme-mark-alt)))
+   `(gnus-summary-high-ancient ((,class :foreground ,fg-alt :weight bold)))
+   `(gnus-summary-high-read ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(gnus-summary-high-ticked ((,class :foreground ,red-alt-other :weight 
bold)))
+   `(gnus-summary-high-undownloaded ((,class :foreground ,yellow :weight 
bold)))
+   `(gnus-summary-high-unread ((,class :foreground ,fg-main :weight bold)))
+   `(gnus-summary-low-ancient ((,class :foreground ,fg-alt :slant italic)))
+   `(gnus-summary-low-read ((,class :foreground ,fg-special-cold :slant 
italic)))
+   `(gnus-summary-low-ticked ((,class :foreground ,red-refine-fg :slant 
italic)))
+   `(gnus-summary-low-undownloaded ((,class :foreground ,yellow-refine-fg 
:slant italic)))
+   `(gnus-summary-low-unread ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(gnus-summary-normal-ancient ((,class :foreground ,fg-special-calm)))
+   `(gnus-summary-normal-read ((,class :foreground ,fg-special-cold)))
+   `(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other)))
+   `(gnus-summary-normal-undownloaded ((,class :foreground ,yellow)))
+   `(gnus-summary-normal-unread ((,class :foreground ,fg-main)))
+   `(gnus-summary-selected ((,class :inherit modus-theme-subtle-blue)))
    ;;;; golden-ratio-scroll-screen
-   `(golden-ratio-scroll-highlight-line-face ((,class (:background 
,cyan-subtle-bg :foreground ,fg-main))))
+   `(golden-ratio-scroll-highlight-line-face ((,class :background 
,cyan-subtle-bg :foreground ,fg-main)))
    ;;;; helm
-   `(helm-M-x-key ((,class (:foreground ,magenta-alt-other :weight bold))))
-   `(helm-action ((,class (:underline t))))
-   `(helm-bookmark-addressbook ((,class (:foreground ,green-alt))))
-   `(helm-bookmark-directory ((,class (:foreground ,blue :weight bold))))
-   `(helm-bookmark-file ((,class (:foreground ,fg-main))))
-   `(helm-bookmark-file-not-found ((,class (:background ,bg-alt :foreground 
,fg-alt))))
-   `(helm-bookmark-gnus ((,class (:foreground ,magenta))))
-   `(helm-bookmark-info ((,class (:foreground ,cyan-alt))))
-   `(helm-bookmark-man ((,class (:foreground ,yellow-alt))))
-   `(helm-bookmark-w3m ((,class (:foreground ,blue-alt))))
-   `(helm-buffer-archive ((,class (:foreground ,cyan :weight bold))))
-   `(helm-buffer-directory ((,class (:foreground ,blue :weight bold))))
-   `(helm-buffer-file ((,class (:foreground ,fg-main))))
-   `(helm-buffer-modified ((,class (:foreground ,yellow-alt))))
-   `(helm-buffer-not-saved ((,class (:foreground ,red-alt))))
-   `(helm-buffer-process ((,class (:foreground ,magenta))))
-   `(helm-buffer-saved-out ((,class (:background ,bg-alt :foreground ,red 
:weight bold))))
-   `(helm-buffer-size ((,class (:foreground ,fg-alt))))
-   `(helm-candidate-number ((,class (:foreground ,cyan-active))))
-   `(helm-candidate-number-suspended ((,class (:foreground ,yellow-active))))
-   `(helm-comint-prompts-buffer-name ((,class (:foreground ,green-active))))
-   `(helm-comint-prompts-promptidx ((,class (:foreground ,cyan-active))))
-   `(helm-delete-async-message ((,class (:foreground ,magenta-active :weight 
bold))))
-   `(helm-eob-line ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(helm-eshell-prompts-buffer-name ((,class (:foreground ,green-active))))
-   `(helm-eshell-prompts-promptidx ((,class (:foreground ,cyan-active))))
-   `(helm-etags-file ((,class (:foreground ,fg-dim :underline t))))
-   `(helm-ff-denied ((,class (:inherit modus-theme-intense-red))))
-   `(helm-ff-directory ((,class (:inherit helm-buffer-directory))))
-   `(helm-ff-dirs ((,class (:foreground ,blue-alt-other :weight bold))))
-   `(helm-ff-dotted-directory ((,class (:background ,bg-alt :foreground 
,fg-alt :weight bold))))
-   `(helm-ff-dotted-symlink-directory ((,class (:inherit 
helm-ff-dotted-directory :underline t))))
-   `(helm-ff-executable ((,class (:foreground ,magenta-alt))))
-   `(helm-ff-file ((,class (:foreground ,fg-main))))
-   `(helm-ff-invalid-symlink ((,class (:foreground ,red :underline t))))
-   `(helm-ff-pipe ((,class (:inherit modus-theme-subtle-magenta))))
-   `(helm-ff-prefix ((,class (:inherit modus-theme-subtle-yellow))))
-   `(helm-ff-socket ((,class (:foreground ,red-alt-other))))
-   `(helm-ff-suid ((,class (:inherit modus-theme-refine-red))))
-   `(helm-ff-symlink ((,class (:foreground ,cyan :underline t))))
-   `(helm-ff-truename ((,class (:foreground ,blue-alt-other))))
-   `(helm-grep-cmd-line ((,class (:foreground ,yellow-alt-other))))
-   `(helm-grep-file ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(helm-grep-finish ((,class (:foreground ,green-active))))
-   `(helm-grep-lineno ((,class (:foreground ,fg-special-warm))))
-   `(helm-grep-match ((,class (:inherit modus-theme-special-calm))))
-   `(helm-header ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(helm-header-line-left-margin ((,class (:foreground ,yellow-intense 
:weight bold))))
-   `(helm-history-deleted ((,class (:inherit modus-theme-intense-red :weight 
bold))))
-   `(helm-history-remote ((,class (:foreground ,red-alt-other))))
-   `(helm-lisp-completion-info ((,class (:foreground ,fg-special-warm))))
-   `(helm-lisp-show-completion ((,class (:inherit modus-theme-refine-yellow))))
-   `(helm-locate-finish ((,class (:foreground ,green-active))))
-   `(helm-match ((,class (:inherit modus-theme-refine-cyan :weight bold))))
-   `(helm-match-item ((,class (:inherit modus-theme-subtle-cyan))))
-   `(helm-minibuffer-prompt ((,class (:inherit minibuffer-prompt))))
-   `(helm-moccur-buffer ((,class (:foreground ,cyan-alt-other :underline t))))
-   `(helm-mode-prefix ((,class (:inherit modus-theme-intense-magenta))))
-   `(helm-non-file-buffer ((,class (:foreground ,fg-alt))))
-   `(helm-prefarg ((,class (:foreground ,red-active))))
-   `(helm-resume-need-update ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                       :inherit modus-theme-refine-magenta))))
-   `(helm-selection ((,class (,@(and (>= emacs-major-version 27) '(:extend t))
-                              :inherit modus-theme-refine-blue :weight bold))))
-   `(helm-selection-line ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                   :inherit modus-theme-special-cold))))
-   `(helm-separator ((,class (:foreground ,fg-special-mild))))
-   `(helm-time-zone-current ((,class (:foreground ,green))))
-   `(helm-time-zone-home ((,class (:foreground ,magenta))))
-   `(helm-source-header ((,class (:foreground ,red-alt :weight bold
-                                              ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)))))
-   `(helm-top-columns ((,class (:inherit helm-header))))
-   `(helm-ucs-char ((,class (:foreground ,yellow-alt-other))))
-   `(helm-visible-mark ((,class (:inherit modus-theme-subtle-cyan))))
+   `(helm-M-x-key ((,class :foreground ,magenta-alt-other :weight bold)))
+   `(helm-action ((,class :underline t)))
+   `(helm-bookmark-addressbook ((,class :foreground ,green-alt)))
+   `(helm-bookmark-directory ((,class :foreground ,blue :weight bold)))
+   `(helm-bookmark-file ((,class :foreground ,fg-main)))
+   `(helm-bookmark-file-not-found ((,class :background ,bg-alt :foreground 
,fg-alt)))
+   `(helm-bookmark-gnus ((,class :foreground ,magenta)))
+   `(helm-bookmark-info ((,class :foreground ,cyan-alt)))
+   `(helm-bookmark-man ((,class :foreground ,yellow-alt)))
+   `(helm-bookmark-w3m ((,class :foreground ,blue-alt)))
+   `(helm-buffer-archive ((,class :foreground ,cyan :weight bold)))
+   `(helm-buffer-directory ((,class :foreground ,blue :weight bold)))
+   `(helm-buffer-file ((,class :foreground ,fg-main)))
+   `(helm-buffer-modified ((,class :foreground ,yellow-alt)))
+   `(helm-buffer-not-saved ((,class :foreground ,red-alt)))
+   `(helm-buffer-process ((,class :foreground ,magenta)))
+   `(helm-buffer-saved-out ((,class :background ,bg-alt :foreground ,red 
:weight bold)))
+   `(helm-buffer-size ((,class :foreground ,fg-alt)))
+   `(helm-candidate-number ((,class :foreground ,cyan-active)))
+   `(helm-candidate-number-suspended ((,class :foreground ,yellow-active)))
+   `(helm-comint-prompts-buffer-name ((,class :foreground ,green-active)))
+   `(helm-comint-prompts-promptidx ((,class :foreground ,cyan-active)))
+   `(helm-delete-async-message ((,class :foreground ,magenta-active :weight 
bold)))
+   `(helm-eob-line ((,class :background ,bg-main :foreground ,fg-main)))
+   `(helm-eshell-prompts-buffer-name ((,class :foreground ,green-active)))
+   `(helm-eshell-prompts-promptidx ((,class :foreground ,cyan-active)))
+   `(helm-etags-file ((,class :foreground ,fg-dim :underline t)))
+   `(helm-ff-denied ((,class :inherit modus-theme-intense-red)))
+   `(helm-ff-directory ((,class :inherit helm-buffer-directory)))
+   `(helm-ff-dirs ((,class :foreground ,blue-alt-other :weight bold)))
+   `(helm-ff-dotted-directory ((,class :background ,bg-alt :foreground ,fg-alt 
:weight bold)))
+   `(helm-ff-dotted-symlink-directory ((,class :inherit 
helm-ff-dotted-directory :underline t)))
+   `(helm-ff-executable ((,class :foreground ,magenta-alt)))
+   `(helm-ff-file ((,class :foreground ,fg-main)))
+   `(helm-ff-invalid-symlink ((,class :foreground ,red :underline t)))
+   `(helm-ff-pipe ((,class :inherit modus-theme-subtle-magenta)))
+   `(helm-ff-prefix ((,class :inherit modus-theme-subtle-yellow)))
+   `(helm-ff-socket ((,class :foreground ,red-alt-other)))
+   `(helm-ff-suid ((,class :inherit modus-theme-refine-red)))
+   `(helm-ff-symlink ((,class :foreground ,cyan :underline t)))
+   `(helm-ff-truename ((,class :foreground ,blue-alt-other)))
+   `(helm-grep-cmd-line ((,class :foreground ,yellow-alt-other)))
+   `(helm-grep-file ((,class :foreground ,fg-special-cold :weight bold)))
+   `(helm-grep-finish ((,class :foreground ,green-active)))
+   `(helm-grep-lineno ((,class :foreground ,fg-special-warm)))
+   `(helm-grep-match ((,class :inherit modus-theme-special-calm)))
+   `(helm-header ((,class :foreground ,fg-special-cold :weight bold)))
+   `(helm-header-line-left-margin ((,class :foreground ,yellow-intense :weight 
bold)))
+   `(helm-history-deleted ((,class :inherit modus-theme-intense-red :weight 
bold)))
+   `(helm-history-remote ((,class :foreground ,red-alt-other)))
+   `(helm-lisp-completion-info ((,class :foreground ,fg-special-warm)))
+   `(helm-lisp-show-completion ((,class :inherit modus-theme-refine-yellow)))
+   `(helm-locate-finish ((,class :foreground ,green-active)))
+   `(helm-match ((,class :inherit modus-theme-refine-cyan :weight bold)))
+   `(helm-match-item ((,class :inherit modus-theme-subtle-cyan)))
+   `(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt)))
+   `(helm-moccur-buffer ((,class :foreground ,cyan-alt-other :underline t)))
+   `(helm-mode-prefix ((,class :inherit modus-theme-intense-magenta)))
+   `(helm-non-file-buffer ((,class :foreground ,fg-alt)))
+   `(helm-prefarg ((,class :foreground ,red-active)))
+   `(helm-resume-need-update ((,class ,@(and (>= emacs-major-version 27) 
'(:extend t))
+                                      :inherit modus-theme-refine-magenta)))
+   `(helm-selection ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
+                             :inherit modus-theme-refine-blue :weight bold)))
+   `(helm-selection-line ((,class ,@(and (>= emacs-major-version 27) '(:extend 
t))
+                                  :inherit modus-theme-special-cold)))
+   `(helm-separator ((,class :foreground ,fg-special-mild)))
+   `(helm-time-zone-current ((,class :foreground ,green)))
+   `(helm-time-zone-home ((,class :foreground ,magenta)))
+   `(helm-source-header ((,class :foreground ,red-alt :weight bold
+                                 ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(helm-top-columns ((,class :inherit helm-header)))
+   `(helm-ucs-char ((,class :foreground ,yellow-alt-other)))
+   `(helm-visible-mark ((,class :inherit modus-theme-subtle-cyan)))
    ;;;; helm-ls-git
-   `(helm-ls-git-added-copied-face ((,class (:foreground ,green-intense))))
-   `(helm-ls-git-added-modified-face ((,class (:foreground ,yellow-intense))))
-   `(helm-ls-git-conflict-face ((,class (:foreground ,red-intense :weight 
bold))))
-   `(helm-ls-git-deleted-and-staged-face ((,class (:foreground ,red-nuanced))))
-   `(helm-ls-git-deleted-not-staged-face ((,class (:foreground ,red))))
-   `(helm-ls-git-modified-and-staged-face ((,class (:foreground 
,yellow-nuanced))))
-   `(helm-ls-git-modified-not-staged-face ((,class (:foreground ,yellow))))
-   `(helm-ls-git-renamed-modified-face ((,class (:foreground ,magenta))))
-   `(helm-ls-git-untracked-face ((,class (:foreground ,fg-special-cold))))
+   `(helm-ls-git-added-copied-face ((,class :foreground ,green-intense)))
+   `(helm-ls-git-added-modified-face ((,class :foreground ,yellow-intense)))
+   `(helm-ls-git-conflict-face ((,class :foreground ,red-intense :weight 
bold)))
+   `(helm-ls-git-deleted-and-staged-face ((,class :foreground ,red-nuanced)))
+   `(helm-ls-git-deleted-not-staged-face ((,class :foreground ,red)))
+   `(helm-ls-git-modified-and-staged-face ((,class :foreground 
,yellow-nuanced)))
+   `(helm-ls-git-modified-not-staged-face ((,class :foreground ,yellow)))
+   `(helm-ls-git-renamed-modified-face ((,class :foreground ,magenta)))
+   `(helm-ls-git-untracked-face ((,class :foreground ,fg-special-cold)))
    ;;;; helm-switch-shell
-   `(helm-switch-shell-new-shell-face ((,class (:inherit 
modus-theme-refine-magenta :weight bold))))
+   `(helm-switch-shell-new-shell-face ((,class :inherit 
modus-theme-refine-magenta :weight bold)))
    ;;;; helm-xref
-   `(helm-xref-file-name ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(helm-xref-file-name ((,class (:foreground ,fg-special-warm))))
+   `(helm-xref-file-name ((,class :foreground ,fg-special-cold :weight bold)))
+   `(helm-xref-file-name ((,class :foreground ,fg-special-warm)))
    ;;;; helpful
-   `(helpful-heading  ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,fg-main :weight bold
-                                         ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)))))
+   `(helpful-heading  ((,class :inherit ,modus-theme-variable-pitch 
:foreground ,fg-main :weight bold
+                               ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
    ;;;; highlight region or ad-hoc regexp
-   `(hi-black-b ((,class (:background ,fg-main :foreground ,bg-main))))
-   `(hi-blue ((,class (:background ,bg-alt :foreground ,blue :underline t))))
-   `(hi-blue-b ((,class (:inherit modus-theme-intense-blue))))
-   `(hi-green ((,class (:background ,bg-alt :foreground ,green :underline t))))
-   `(hi-green-b ((,class (:inherit modus-theme-intense-green))))
-   `(hi-pink ((,class (:background ,bg-alt :foreground ,magenta :underline 
t))))
-   `(hi-red-b ((,class (:inherit modus-theme-intense-red))))
-   `(hi-yellow ((,class (:background ,bg-alt :foreground ,yellow :underline 
t))))
-   `(highlight ((,class (:inherit modus-theme-subtle-blue))))
-   `(highlight-changes ((,class (:foreground ,yellow-alt-other))))
-   `(highlight-changes-delete ((,class (:foreground ,red-alt-other :underline 
t))))
-   `(hl-line ((,class (:background ,bg-hl-line))))
-   `(region ((,class (:background ,bg-region :foreground ,fg-main))))
-   `(secondary-selection ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
+   `(hi-black-b ((,class :background ,fg-main :foreground ,bg-main)))
+   `(hi-blue ((,class :background ,bg-alt :foreground ,blue :underline t)))
+   `(hi-blue-b ((,class :inherit modus-theme-intense-blue)))
+   `(hi-green ((,class :background ,bg-alt :foreground ,green :underline t)))
+   `(hi-green-b ((,class :inherit modus-theme-intense-green)))
+   `(hi-pink ((,class :background ,bg-alt :foreground ,magenta :underline t)))
+   `(hi-red-b ((,class :inherit modus-theme-intense-red)))
+   `(hi-yellow ((,class :background ,bg-alt :foreground ,yellow :underline t)))
+   `(highlight ((,class :inherit modus-theme-subtle-blue)))
+   `(highlight-changes ((,class :foreground ,yellow-alt-other)))
+   `(highlight-changes-delete ((,class :foreground ,red-alt-other :underline 
t)))
+   `(hl-line ((,class :background ,bg-hl-line)))
+   `(region ((,class :background ,bg-region :foreground ,fg-main)))
+   `(secondary-selection ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
    ;;;; highlight-blocks
-   `(highlight-blocks-depth-1-face ((,class (:background ,bg-dim :foreground 
,fg-main))))
-   `(highlight-blocks-depth-2-face ((,class (:background ,bg-alt :foreground 
,fg-main))))
-   `(highlight-blocks-depth-3-face ((,class (:background ,bg-special-cold 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-4-face ((,class (:background ,bg-special-calm 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-5-face ((,class (:background ,bg-special-warm 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-6-face ((,class (:background ,bg-special-mild 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-7-face ((,class (:background ,bg-inactive 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-8-face ((,class (:background ,bg-active 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-9-face ((,class (:background ,cyan-subtle-bg 
:foreground ,fg-main))))
+   `(highlight-blocks-depth-1-face ((,class :background ,bg-dim :foreground 
,fg-main)))
+   `(highlight-blocks-depth-2-face ((,class :background ,bg-alt :foreground 
,fg-main)))
+   `(highlight-blocks-depth-3-face ((,class :background ,bg-special-cold 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-4-face ((,class :background ,bg-special-calm 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-5-face ((,class :background ,bg-special-warm 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-6-face ((,class :background ,bg-special-mild 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-7-face ((,class :background ,bg-inactive 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-8-face ((,class :background ,bg-active :foreground 
,fg-main)))
+   `(highlight-blocks-depth-9-face ((,class :background ,cyan-subtle-bg 
:foreground ,fg-main)))
    ;;;; highlight-defined
-   `(highlight-defined-builtin-function-name-face ((,class (:foreground 
,magenta))))
-   `(highlight-defined-face-name-face ((,class (:foreground ,fg-main))))
-   `(highlight-defined-function-name-face ((,class (:foreground ,magenta))))
-   `(highlight-defined-macro-name-face ((,class (:foreground ,magenta-alt))))
-   `(highlight-defined-special-form-name-face ((,class (:foreground 
,magenta-alt-other))))
-   `(highlight-defined-variable-name-face ((,class (:foreground ,cyan))))
+   `(highlight-defined-builtin-function-name-face ((,class :foreground 
,magenta)))
+   `(highlight-defined-face-name-face ((,class :foreground ,fg-main)))
+   `(highlight-defined-function-name-face ((,class :foreground ,magenta)))
+   `(highlight-defined-macro-name-face ((,class :foreground ,magenta-alt)))
+   `(highlight-defined-special-form-name-face ((,class :foreground 
,magenta-alt-other)))
+   `(highlight-defined-variable-name-face ((,class :foreground ,cyan)))
    ;;;; highlight-escape-sequences (`hes-mode')
-   `(hes-escape-backslash-face ((,class (:foreground ,fg-escape-char-construct 
:weight bold))))
-   `(hes-escape-sequence-face ((,class (:foreground ,fg-escape-char-backslash 
:weight bold))))
+   `(hes-escape-backslash-face ((,class :foreground ,fg-escape-char-construct 
:weight bold)))
+   `(hes-escape-sequence-face ((,class :foreground ,fg-escape-char-backslash 
:weight bold)))
    ;;;; highlight-indentation
-   `(highlight-indentation-face ((,class (:background ,bg-hl-line))))
-   `(highlight-indentation-current-column-face ((,class (:background 
,bg-active))))
+   `(highlight-indentation-face ((,class :background ,bg-hl-line)))
+   `(highlight-indentation-current-column-face ((,class :background 
,bg-active)))
    ;;;; highlight-numbers
-   `(highlight-numbers-number ((,class (:foreground ,blue-alt-other))))
+   `(highlight-numbers-number ((,class :foreground ,blue-alt-other)))
    ;;;; highlight-symbol
-   `(highlight-symbol-face ((,class (:inherit modus-theme-special-mild))))
+   `(highlight-symbol-face ((,class :inherit modus-theme-special-mild)))
    ;;;; highlight-thing
-   `(highlight-thing ((,class (:background ,bg-alt :foreground ,cyan))))
+   `(highlight-thing ((,class :background ,bg-alt :foreground ,cyan)))
    ;;;; hl-fill-column
-   `(hl-fill-column-face ((,class (:background ,bg-active :foreground 
,fg-active))))
+   `(hl-fill-column-face ((,class :background ,bg-active :foreground 
,fg-active)))
    ;;;; hl-todo
-   `(hl-todo ((,class (:foreground ,red-alt-other :weight bold))))
+   `(hl-todo ((,class :foreground ,red-alt-other :weight bold)))
    ;;;; hydra
-   `(hydra-face-amaranth ((,class (:foreground ,yellow :weight bold))))
-   `(hydra-face-blue ((,class (:foreground ,blue-alt :weight bold))))
-   `(hydra-face-pink ((,class (:foreground ,magenta-alt :weight bold))))
-   `(hydra-face-red ((,class (:foreground ,red :weight bold))))
-   `(hydra-face-teal ((,class (:foreground ,cyan :weight bold))))
+   `(hydra-face-amaranth ((,class :foreground ,yellow :weight bold)))
+   `(hydra-face-blue ((,class :foreground ,blue-alt :weight bold)))
+   `(hydra-face-pink ((,class :foreground ,magenta-alt :weight bold)))
+   `(hydra-face-red ((,class :foreground ,red :weight bold)))
+   `(hydra-face-teal ((,class :foreground ,cyan :weight bold)))
    ;;;; hyperlist
-   `(hyperlist-condition ((,class (:foreground ,green))))
-   `(hyperlist-hashtag ((,class (:foreground ,yellow))))
-   `(hyperlist-operator ((,class (:foreground ,blue-alt))))
-   `(hyperlist-paren ((,class (:foreground ,cyan-alt-other))))
-   `(hyperlist-quote ((,class (:foreground ,cyan-alt))))
-   `(hyperlist-ref ((,class (:foreground ,magenta-alt-other))))
-   `(hyperlist-stars ((,class (:foreground ,fg-alt))))
-   `(hyperlist-tag ((,class (:foreground ,red))))
-   `(hyperlist-toplevel ((,class (:foreground ,fg-main :weight bold))))
+   `(hyperlist-condition ((,class :foreground ,green)))
+   `(hyperlist-hashtag ((,class :foreground ,yellow)))
+   `(hyperlist-operator ((,class :foreground ,blue-alt)))
+   `(hyperlist-paren ((,class :foreground ,cyan-alt-other)))
+   `(hyperlist-quote ((,class :foreground ,cyan-alt)))
+   `(hyperlist-ref ((,class :foreground ,magenta-alt-other)))
+   `(hyperlist-stars ((,class :foreground ,fg-alt)))
+   `(hyperlist-tag ((,class :foreground ,red)))
+   `(hyperlist-toplevel ((,class :foreground ,fg-main :weight bold)))
    ;;;; icomplete
-   `(icomplete-first-match ((,class (,@(modus-operandi-theme-completions
-                                        magenta magenta-intense-bg fg-main)
-                                     :weight bold))))
+   `(icomplete-first-match ((,class ,@(modus-operandi-theme-completions
+                                       magenta magenta-intense-bg fg-main)
+                                    :weight bold)))
    ;;;; icomplete-vertical
-   `(icomplete-vertical-separator ((,class (:foreground ,fg-alt))))
+   `(icomplete-vertical-separator ((,class :foreground ,fg-alt)))
    ;;;; ido-mode
-   `(ido-first-match ((,class (,@(modus-operandi-theme-completions
-                                  magenta magenta-subtle-bg fg-main)
-                               :weight bold))))
-   `(ido-incomplete-regexp ((,class (:inherit error))))
-   `(ido-indicator ((,class (:inherit modus-theme-subtle-yellow))))
-   `(ido-only-match ((,class (,@(modus-operandi-theme-completions
-                                 magenta-intense magenta-intense-bg fg-main)
-                              :weight bold))))
-   `(ido-subdir ((,class (:foreground ,blue-alt-other))))
-   `(ido-virtual ((,class (:foreground ,yellow-alt-other))))
+   `(ido-first-match ((,class ,@(modus-operandi-theme-completions
+                                 magenta magenta-subtle-bg fg-main)
+                              :weight bold)))
+   `(ido-incomplete-regexp ((,class :inherit error)))
+   `(ido-indicator ((,class :inherit modus-theme-subtle-yellow)))
+   `(ido-only-match ((,class ,@(modus-operandi-theme-completions
+                                magenta-intense magenta-intense-bg fg-main)
+                             :weight bold)))
+   `(ido-subdir ((,class :foreground ,blue-alt-other)))
+   `(ido-virtual ((,class :foreground ,yellow-alt-other)))
    ;;;; iedit
-   `(iedit-occurrence ((,class (:inherit modus-theme-refine-blue))))
-   `(iedit-read-only-occurrence ((,class (:inherit 
modus-theme-intense-yellow))))
+   `(iedit-occurrence ((,class :inherit modus-theme-refine-blue)))
+   `(iedit-read-only-occurrence ((,class :inherit modus-theme-intense-yellow)))
    ;;;; iflipb
-   `(iflipb-current-buffer-face ((,class (:foreground ,cyan-alt :weight 
bold))))
-   `(iflipb-other-buffer-face ((,class (:foreground ,fg-alt))))
+   `(iflipb-current-buffer-face ((,class :foreground ,cyan-alt :weight bold)))
+   `(iflipb-other-buffer-face ((,class :foreground ,fg-alt)))
    ;;;; imenu-list
-   `(imenu-list-entry-face-0 ((,class (:foreground ,cyan))))
-   `(imenu-list-entry-face-1 ((,class (:foreground ,blue))))
-   `(imenu-list-entry-face-2 ((,class (:foreground ,cyan-alt-other))))
-   `(imenu-list-entry-face-3 ((,class (:foreground ,blue-alt))))
-   `(imenu-list-entry-subalist-face-0 ((,class (:foreground ,magenta-alt-other 
:weight bold :underline t))))
-   `(imenu-list-entry-subalist-face-1 ((,class (:foreground ,magenta :weight 
bold :underline t))))
-   `(imenu-list-entry-subalist-face-2 ((,class (:foreground ,green-alt-other 
:weight bold :underline t))))
-   `(imenu-list-entry-subalist-face-3 ((,class (:foreground ,red-alt-other 
:weight bold :underline t))))
+   `(imenu-list-entry-face-0 ((,class :foreground ,cyan)))
+   `(imenu-list-entry-face-1 ((,class :foreground ,blue)))
+   `(imenu-list-entry-face-2 ((,class :foreground ,cyan-alt-other)))
+   `(imenu-list-entry-face-3 ((,class :foreground ,blue-alt)))
+   `(imenu-list-entry-subalist-face-0 ((,class :foreground ,magenta-alt-other 
:weight bold :underline t)))
+   `(imenu-list-entry-subalist-face-1 ((,class :foreground ,magenta :weight 
bold :underline t)))
+   `(imenu-list-entry-subalist-face-2 ((,class :foreground ,green-alt-other 
:weight bold :underline t)))
+   `(imenu-list-entry-subalist-face-3 ((,class :foreground ,red-alt-other 
:weight bold :underline t)))
    ;;;; indium
-   `(indium-breakpoint-face ((,class (:foreground ,red-active))))
-   `(indium-frame-url-face ((,class (:foreground ,fg-alt :underline t))))
-   `(indium-keyword-face ((,class (:foreground ,magenta-alt-other))))
-   `(indium-litable-face ((,class (:foreground ,fg-special-warm :slant 
,modus-theme-slant))))
-   `(indium-repl-error-face ((,class (:foreground ,red :weight bold))))
-   `(indium-repl-prompt-face ((,class (:foreground ,cyan-alt-other))))
-   `(indium-repl-stdout-face ((,class (:foreground ,fg-main))))
+   `(indium-breakpoint-face ((,class :foreground ,red-active)))
+   `(indium-frame-url-face ((,class :foreground ,fg-alt :underline t)))
+   `(indium-keyword-face ((,class :foreground ,magenta-alt-other)))
+   `(indium-litable-face ((,class :foreground ,fg-special-warm :slant 
,modus-theme-slant)))
+   `(indium-repl-error-face ((,class :foreground ,red :weight bold)))
+   `(indium-repl-prompt-face ((,class :foreground ,cyan-alt-other)))
+   `(indium-repl-stdout-face ((,class :foreground ,fg-main)))
    ;;;; info
-   `(Info-quoted ((,class (:foreground ,magenta)))) ; the capitalisation is 
canonical
-   `(info-header-node ((,class (:foreground ,fg-alt :weight bold))))
-   `(info-header-xref ((,class (:foreground ,blue-active))))
-   `(info-index-match ((,class (:inherit match))))
-   `(info-menu-header ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,fg-main :weight bold
-                                         ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2)))))
-   `(info-menu-star ((,class (:foreground ,fg-main))))
-   `(info-node ((,class (:weight bold))))
-   `(info-title-1 ((,class (:inherit ,modus-theme-variable-pitch :foreground 
,fg-main :weight bold
-                                     ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)))))
-   `(info-title-2 ((,class (:inherit ,modus-theme-variable-pitch :foreground 
,fg-special-warm :weight bold
-                                     ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3)))))
-   `(info-title-3 ((,class (:inherit ,modus-theme-variable-pitch :foreground 
,fg-special-cold :weight bold
-                                     ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2)))))
-   `(info-title-4 ((,class (:inherit ,modus-theme-variable-pitch :foreground 
,fg-special-mild :weight bold
-                                     ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-1)))))
+   `(Info-quoted ((,class :foreground ,magenta))) ; the capitalisation is 
canonical
+   `(info-header-node ((,class :foreground ,fg-alt :weight bold)))
+   `(info-header-xref ((,class :foreground ,blue-active)))
+   `(info-index-match ((,class :inherit match)))
+   `(info-menu-header ((,class :inherit ,modus-theme-variable-pitch 
:foreground ,fg-main :weight bold
+                               ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2))))
+   `(info-menu-star ((,class :foreground ,fg-main)))
+   `(info-node ((,class :weight bold)))
+   `(info-title-1 ((,class :inherit ,modus-theme-variable-pitch :foreground 
,fg-main :weight bold
+                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(info-title-2 ((,class :inherit ,modus-theme-variable-pitch :foreground 
,fg-special-warm :weight bold
+                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3))))
+   `(info-title-3 ((,class :inherit ,modus-theme-variable-pitch :foreground 
,fg-special-cold :weight bold
+                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2))))
+   `(info-title-4 ((,class :inherit ,modus-theme-variable-pitch :foreground 
,fg-special-mild :weight bold
+                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-1))))
    ;;;; info-colors
-   `(info-colors-lisp-code-block ((,class (:inherit fixed-pitch))))
-   `(info-colors-ref-item-command ((,class (:foreground ,magenta))))
-   `(info-colors-ref-item-constant ((,class (:foreground ,blue-alt-other))))
-   `(info-colors-ref-item-function ((,class (:foreground ,magenta))))
-   `(info-colors-ref-item-macro ((,class (:foreground ,magenta-alt-other 
:weight ,modus-theme-bold))))
-   `(info-colors-ref-item-other ((,class (:foreground ,cyan))))
-   `(info-colors-ref-item-special-form ((,class (:foreground 
,magenta-alt-other :weight ,modus-theme-bold))))
-   `(info-colors-ref-item-syntax-class ((,class (:foreground ,magenta))))
-   `(info-colors-ref-item-type ((,class (:foreground ,magenta-alt))))
-   `(info-colors-ref-item-user-option ((,class (:foreground ,cyan))))
-   `(info-colors-ref-item-variable ((,class (:foreground ,cyan))))
+   `(info-colors-lisp-code-block ((,class :inherit fixed-pitch)))
+   `(info-colors-ref-item-command ((,class :foreground ,magenta)))
+   `(info-colors-ref-item-constant ((,class :foreground ,blue-alt-other)))
+   `(info-colors-ref-item-function ((,class :foreground ,magenta)))
+   `(info-colors-ref-item-macro ((,class :foreground ,magenta-alt-other 
:weight ,modus-theme-bold)))
+   `(info-colors-ref-item-other ((,class :foreground ,cyan)))
+   `(info-colors-ref-item-special-form ((,class :foreground ,magenta-alt-other 
:weight ,modus-theme-bold)))
+   `(info-colors-ref-item-syntax-class ((,class :foreground ,magenta)))
+   `(info-colors-ref-item-type ((,class :foreground ,magenta-alt)))
+   `(info-colors-ref-item-user-option ((,class :foreground ,cyan)))
+   `(info-colors-ref-item-variable ((,class :foreground ,cyan)))
    ;;;; interaction-log
-   `(ilog-buffer-face ((,class (:foreground ,magenta-alt-other))))
-   `(ilog-change-face ((,class (:foreground ,magenta-alt))))
-   `(ilog-echo-face ((,class (:foreground ,yellow-alt-other))))
-   `(ilog-load-face ((,class (:foreground ,green))))
-   `(ilog-message-face ((,class (:foreground ,fg-alt))))
-   `(ilog-non-change-face ((,class (:foreground ,blue))))
+   `(ilog-buffer-face ((,class :foreground ,magenta-alt-other)))
+   `(ilog-change-face ((,class :foreground ,magenta-alt)))
+   `(ilog-echo-face ((,class :foreground ,yellow-alt-other)))
+   `(ilog-load-face ((,class :foreground ,green)))
+   `(ilog-message-face ((,class :foreground ,fg-alt)))
+   `(ilog-non-change-face ((,class :foreground ,blue)))
    ;;;; ioccur
-   `(ioccur-cursor ((,class (:foreground ,fg-main))))
-   `(ioccur-invalid-regexp ((,class (:foreground ,red))))
-   `(ioccur-match-face ((,class (:inherit modus-theme-special-calm))))
-   `(ioccur-match-overlay-face ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                         :inherit modus-theme-special-cold))))
-   `(ioccur-num-line-face ((,class (:foreground ,fg-special-warm))))
-   `(ioccur-overlay-face ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                   :inherit modus-theme-refine-blue))))
-   `(ioccur-regexp-face ((,class (:inherit modus-theme-intense-magenta :weight 
bold))))
-   `(ioccur-title-face ((,class (:foreground ,red-alt :weight bold
-                                             ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)))))
+   `(ioccur-cursor ((,class :foreground ,fg-main)))
+   `(ioccur-invalid-regexp ((,class :foreground ,red)))
+   `(ioccur-match-face ((,class :inherit modus-theme-special-calm)))
+   `(ioccur-match-overlay-face ((,class ,@(and (>= emacs-major-version 27) 
'(:extend t))
+                                        :inherit modus-theme-special-cold)))
+   `(ioccur-num-line-face ((,class :foreground ,fg-special-warm)))
+   `(ioccur-overlay-face ((,class ,@(and (>= emacs-major-version 27) '(:extend 
t))
+                                  :inherit modus-theme-refine-blue)))
+   `(ioccur-regexp-face ((,class :inherit modus-theme-intense-magenta :weight 
bold)))
+   `(ioccur-title-face ((,class :foreground ,red-alt :weight bold
+                                ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
    ;;;; isearch, occur, and the like
-   `(isearch ((,class (:inherit modus-theme-intense-green :weight bold))))
-   `(isearch-fail ((,class (:inherit modus-theme-refine-red))))
-   `(lazy-highlight ((,class (:inherit modus-theme-refine-cyan))))
-   `(match ((,class (:inherit modus-theme-special-calm))))
-   `(query-replace ((,class (:inherit modus-theme-intense-yellow :weight 
bold))))
+   `(isearch ((,class :inherit modus-theme-intense-green :weight bold)))
+   `(isearch-fail ((,class :inherit modus-theme-refine-red)))
+   `(lazy-highlight ((,class :inherit modus-theme-refine-cyan)))
+   `(match ((,class :inherit modus-theme-special-calm)))
+   `(query-replace ((,class :inherit modus-theme-intense-yellow :weight bold)))
    ;;;; ivy
-   `(ivy-action ((,class (:foreground ,red-alt :weight bold))))
-   `(ivy-completions-annotations ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(ivy-confirm-face ((,class (:foreground ,cyan))))
-   `(ivy-current-match ((,class (,@(and (>= emacs-major-version 27) '(:extend 
t))
-                                 :inherit modus-theme-intense-cyan :weight 
bold))))
-   `(ivy-cursor ((,class (:background ,fg-main :foreground ,bg-main))))
-   `(ivy-grep-info ((,class (:foreground ,cyan-alt))))
-   `(ivy-grep-line-number ((,class (:foreground ,fg-special-warm))))
-   `(ivy-highlight-face ((,class (:foreground ,magenta))))
-   `(ivy-match-required-face ((,class (:inherit error))))
-   `(ivy-minibuffer-match-face-1 ((,class (:inherit 
modus-theme-intense-neutral))))
-   `(ivy-minibuffer-match-face-2 ((,class (:inherit modus-theme-refine-green 
:weight bold))))
-   `(ivy-minibuffer-match-face-3 ((,class (:inherit modus-theme-refine-cyan 
:weight bold))))
-   `(ivy-minibuffer-match-face-4 ((,class (:inherit modus-theme-refine-magenta 
:weight bold))))
-   `(ivy-minibuffer-match-highlight ((,class (:inherit modus-theme-subtle-blue 
:weight bold))))
-   `(ivy-modified-buffer ((,class (:foreground ,yellow :slant 
,modus-theme-slant))))
-   `(ivy-modified-outside-buffer ((,class (:foreground ,yellow-alt :slant 
,modus-theme-slant))))
-   `(ivy-org ((,class (:foreground ,cyan-alt-other))))
-   `(ivy-prompt-match ((,class (:inherit ivy-current-match))))
-   `(ivy-remote ((,class (:foreground ,magenta))))
-   `(ivy-separator ((,class (:foreground ,fg-alt))))
-   `(ivy-subdir ((,class (:foreground ,blue-alt-other))))
-   `(ivy-virtual ((,class (:foreground ,magenta-alt-other))))
-   `(ivy-yanked-word ((,class (:inherit modus-theme-refine-blue))))
+   `(ivy-action ((,class :foreground ,red-alt :weight bold)))
+   `(ivy-completions-annotations ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(ivy-confirm-face ((,class :foreground ,cyan)))
+   `(ivy-current-match ((,class ,@(and (>= emacs-major-version 27) '(:extend 
t))
+                                :inherit modus-theme-intense-cyan :weight 
bold)))
+   `(ivy-cursor ((,class :background ,fg-main :foreground ,bg-main)))
+   `(ivy-grep-info ((,class :foreground ,cyan-alt)))
+   `(ivy-grep-line-number ((,class :foreground ,fg-special-warm)))
+   `(ivy-highlight-face ((,class :foreground ,magenta)))
+   `(ivy-match-required-face ((,class :inherit error)))
+   `(ivy-minibuffer-match-face-1 ((,class :inherit 
modus-theme-intense-neutral)))
+   `(ivy-minibuffer-match-face-2 ((,class :inherit modus-theme-refine-green 
:weight bold)))
+   `(ivy-minibuffer-match-face-3 ((,class :inherit modus-theme-refine-cyan 
:weight bold)))
+   `(ivy-minibuffer-match-face-4 ((,class :inherit modus-theme-refine-magenta 
:weight bold)))
+   `(ivy-minibuffer-match-highlight ((,class :inherit modus-theme-subtle-blue 
:weight bold)))
+   `(ivy-modified-buffer ((,class :foreground ,yellow :slant 
,modus-theme-slant)))
+   `(ivy-modified-outside-buffer ((,class :foreground ,yellow-alt :slant 
,modus-theme-slant)))
+   `(ivy-org ((,class :foreground ,cyan-alt-other)))
+   `(ivy-prompt-match ((,class :inherit ivy-current-match)))
+   `(ivy-remote ((,class :foreground ,magenta)))
+   `(ivy-separator ((,class :foreground ,fg-alt)))
+   `(ivy-subdir ((,class :foreground ,blue-alt-other)))
+   `(ivy-virtual ((,class :foreground ,magenta-alt-other)))
+   `(ivy-yanked-word ((,class :inherit modus-theme-refine-blue)))
    ;;;; ivy-posframe
-   `(ivy-posframe ((,class (:background ,bg-dim :foreground ,fg-main))))
-   `(ivy-posframe-border ((,class (:background ,bg-active))))
-   `(ivy-posframe-cursor ((,class (:background ,fg-main :foreground 
,bg-main))))
+   `(ivy-posframe ((,class :background ,bg-dim :foreground ,fg-main)))
+   `(ivy-posframe-border ((,class :background ,bg-active)))
+   `(ivy-posframe-cursor ((,class :background ,fg-main :foreground ,bg-main)))
    ;;;; jira (org-jira)
-   `(jiralib-comment-face ((,class (:background ,bg-alt))))
-   `(jiralib-comment-header-face ((,class (:weight bold))))
-   `(jiralib-issue-info-face ((,class (:inherit modus-theme-special-warm))))
-   `(jiralib-issue-info-header-face ((,class (:inherit 
modus-theme-special-warm :weight bold))))
-   `(jiralib-issue-summary-face ((,class (:weight bold))))
-   `(jiralib-link-filter-face ((,class (:underline t))))
-   `(jiralib-link-issue-face ((,class (:underline t))))
-   `(jiralib-link-project-face ((,class (:underline t))))
+   `(jiralib-comment-face ((,class :background ,bg-alt)))
+   `(jiralib-comment-header-face ((,class :weight bold)))
+   `(jiralib-issue-info-face ((,class :inherit modus-theme-special-warm)))
+   `(jiralib-issue-info-header-face ((,class :inherit modus-theme-special-warm 
:weight bold)))
+   `(jiralib-issue-summary-face ((,class :weight bold)))
+   `(jiralib-link-filter-face ((,class :underline t)))
+   `(jiralib-link-issue-face ((,class :underline t)))
+   `(jiralib-link-project-face ((,class :underline t)))
    ;;;; journalctl-mode
-   `(journalctl-error-face ((,class (:foreground ,red :weight bold))))
-   `(journalctl-finished-face ((,class (:foreground ,green :weight bold))))
-   `(journalctl-host-face ((,class (:foreground ,blue))))
-   `(journalctl-process-face ((,class (:foreground ,cyan-alt-other))))
-   `(journalctl-starting-face ((,class (:foreground ,green))))
-   `(journalctl-timestamp-face ((,class (:foreground ,fg-special-cold))))
-   `(journalctl-warning-face ((,class (:foreground ,yellow :weight bold))))
+   `(journalctl-error-face ((,class :foreground ,red :weight bold)))
+   `(journalctl-finished-face ((,class :foreground ,green :weight bold)))
+   `(journalctl-host-face ((,class :foreground ,blue)))
+   `(journalctl-process-face ((,class :foreground ,cyan-alt-other)))
+   `(journalctl-starting-face ((,class :foreground ,green)))
+   `(journalctl-timestamp-face ((,class :foreground ,fg-special-cold)))
+   `(journalctl-warning-face ((,class :foreground ,yellow :weight bold)))
    ;;;; js2-mode
-   `(js2-error ((,class (:foreground ,red))))
-   `(js2-external-variable ((,class (:foreground ,cyan-alt-other))))
-   `(js2-function-call ((,class (:foreground ,magenta))))
-   `(js2-function-param ((,class (:foreground ,blue))))
-   `(js2-instance-member ((,class (:foreground ,magenta-alt-other))))
-   `(js2-jsdoc-html-tag-delimiter ((,class (:foreground ,fg-main))))
-   `(js2-jsdoc-html-tag-name ((,class (:foreground ,cyan))))
-   `(js2-jsdoc-tag ((,class (:foreground ,fg-special-calm))))
-   `(js2-jsdoc-type ((,class (:foreground ,fg-special-cold))))
-   `(js2-jsdoc-value ((,class (:foreground ,fg-special-warm))))
-   `(js2-object-property ((,class (:foreground ,fg-main))))
-   `(js2-object-property-access ((,class (:foreground ,fg-main))))
-   `(js2-private-function-call ((,class (:foreground ,green-alt-other))))
-   `(js2-private-member ((,class (:foreground ,fg-special-mild))))
-   `(js2-warning ((,class (:foreground ,yellow-alt :underline t))))
+   `(js2-error ((,class :foreground ,red)))
+   `(js2-external-variable ((,class :foreground ,cyan-alt-other)))
+   `(js2-function-call ((,class :foreground ,magenta)))
+   `(js2-function-param ((,class :foreground ,blue)))
+   `(js2-instance-member ((,class :foreground ,magenta-alt-other)))
+   `(js2-jsdoc-html-tag-delimiter ((,class :foreground ,fg-main)))
+   `(js2-jsdoc-html-tag-name ((,class :foreground ,cyan)))
+   `(js2-jsdoc-tag ((,class :foreground ,fg-special-calm)))
+   `(js2-jsdoc-type ((,class :foreground ,fg-special-cold)))
+   `(js2-jsdoc-value ((,class :foreground ,fg-special-warm)))
+   `(js2-object-property ((,class :foreground ,fg-main)))
+   `(js2-object-property-access ((,class :foreground ,fg-main)))
+   `(js2-private-function-call ((,class :foreground ,green-alt-other)))
+   `(js2-private-member ((,class :foreground ,fg-special-mild)))
+   `(js2-warning ((,class :foreground ,yellow-alt :underline t)))
    ;;;; julia
-   `(julia-macro-face ((,class (:foreground ,magenta :weight 
,modus-theme-bold))))
-   `(julia-quoted-symbol-face ((,class (:foreground ,blue-alt-other))))
+   `(julia-macro-face ((,class :foreground ,magenta :weight 
,modus-theme-bold)))
+   `(julia-quoted-symbol-face ((,class :foreground ,blue-alt-other)))
    ;;;; jupyter
-   `(jupyter-eval-overlay ((,class (:foreground ,blue :weight bold))))
-   `(jupyter-repl-input-prompt ((,class (:foreground ,cyan-alt-other))))
-   `(jupyter-repl-output-prompt ((,class (:foreground ,magenta-alt-other))))
-   `(jupyter-repl-traceback ((,class (:inherit modus-theme-intense-red))))
+   `(jupyter-eval-overlay ((,class :foreground ,blue :weight bold)))
+   `(jupyter-repl-input-prompt ((,class :foreground ,cyan-alt-other)))
+   `(jupyter-repl-output-prompt ((,class :foreground ,magenta-alt-other)))
+   `(jupyter-repl-traceback ((,class :inherit modus-theme-intense-red)))
    ;;;; kaocha-runner
-   `(kaocha-runner-error-face ((,class (:foreground ,red))))
-   `(kaocha-runner-success-face ((,class (:foreground ,green))))
-   `(kaocha-runner-warning-face ((,class (:foreground ,yellow))))
+   `(kaocha-runner-error-face ((,class :foreground ,red)))
+   `(kaocha-runner-success-face ((,class :foreground ,green)))
+   `(kaocha-runner-warning-face ((,class :foreground ,yellow)))
    ;;;; keycast
-   `(keycast-command ((,class (:foreground ,blue-active :weight bold))))
-   `(keycast-key ((,class (:box ,(modus-operandi-theme-modeline-box 
blue-intense blue-active t -3)
-                                ,@(modus-operandi-theme-modeline-props
-                                   blue-active bg-main
-                                   blue-active bg-active)))))
+   `(keycast-command ((,class :foreground ,blue-active :weight bold)))
+   `(keycast-key ((,class :box ,(modus-operandi-theme-modeline-box 
blue-intense blue-active t -3)
+                          ,@(modus-operandi-theme-modeline-props
+                             blue-active bg-main
+                             blue-active bg-active))))
    ;;;; line numbers (display-line-numbers-mode and global variant)
-   `(line-number ((,class (:background ,bg-dim :foreground ,fg-alt))))
-   `(line-number-current-line ((,class (:background ,bg-active :foreground 
,fg-active :weight bold))))
+   `(line-number ((,class :background ,bg-dim :foreground ,fg-alt)))
+   `(line-number-current-line ((,class :background ,bg-active :foreground 
,fg-active :weight bold)))
    ;;;; lsp-mode
-   `(lsp-face-highlight-read ((,class (:inherit modus-theme-subtle-blue 
:underline t))))
-   `(lsp-face-highlight-textual ((,class (:inherit modus-theme-subtle-blue))))
-   `(lsp-face-highlight-write ((,class (:inherit modus-theme-refine-blue 
:weight bold))))
-   `(lsp-face-semhl-constant ((,class (:foreground ,blue-alt-other))))
+   `(lsp-face-highlight-read ((,class :inherit modus-theme-subtle-blue 
:underline t)))
+   `(lsp-face-highlight-textual ((,class :inherit modus-theme-subtle-blue)))
+   `(lsp-face-highlight-write ((,class :inherit modus-theme-refine-blue 
:weight bold)))
+   `(lsp-face-semhl-constant ((,class :foreground ,blue-alt-other)))
    `(lsp-face-semhl-deprecated
      ((,(append '((supports :underline (:style wave))) class)
-       (:foreground ,yellow :underline (:style wave)))
-      (,class (:foreground ,yellow :underline t))))
-   `(lsp-face-semhl-enummember ((,class (:foreground ,blue-alt-other))))
-   `(lsp-face-semhl-field ((,class (:foreground ,cyan-alt))))
-   `(lsp-face-semhl-field-static ((,class (:foreground ,cyan-alt :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-function ((,class (:foreground ,magenta))))
-   `(lsp-face-semhl-method ((,class (:foreground ,magenta))))
-   `(lsp-face-semhl-namespace ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(lsp-face-semhl-preprocessor ((,class (:foreground ,magenta))))
-   `(lsp-face-semhl-static-method ((,class (:foreground ,magenta :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-type-class ((,class (:foreground ,magenta-alt))))
-   `(lsp-face-semhl-type-enum ((,class (:foreground ,magenta-alt))))
-   `(lsp-face-semhl-type-primitive ((,class (:foreground ,magenta-alt :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-type-template ((,class (:foreground ,magenta-alt :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-type-typedef ((,class (:foreground ,magenta-alt :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-variable ((,class (:foreground ,cyan))))
-   `(lsp-face-semhl-variable-local ((,class (:foreground ,cyan))))
-   `(lsp-face-semhl-variable-parameter ((,class (:foreground 
,cyan-alt-other))))
-   `(lsp-lens-face ((,class (:height 0.8 :foreground ,fg-alt))))
-   `(lsp-lens-mouse-face ((,class (:height 0.8 :foreground ,blue-alt-other 
:underline t))))
-   `(lsp-ui-doc-background ((,class (:background ,bg-alt))))
-   `(lsp-ui-doc-header ((,class (:background ,bg-header :foreground 
,fg-header))))
-   `(lsp-ui-doc-url ((,class (:foreground ,blue-alt-other :underline t))))
-   `(lsp-ui-peek-filename ((,class (:foreground ,fg-special-warm))))
-   `(lsp-ui-peek-footer ((,class (:background ,bg-header :foreground 
,fg-header))))
-   `(lsp-ui-peek-header ((,class (:background ,bg-header :foreground 
,fg-header))))
-   `(lsp-ui-peek-highlight ((,class (:inherit modus-theme-subtle-blue))))
-   `(lsp-ui-peek-line-number ((,class (:foreground ,fg-alt))))
-   `(lsp-ui-peek-list ((,class (:background ,bg-dim))))
-   `(lsp-ui-peek-peek ((,class (:background ,bg-alt))))
-   `(lsp-ui-peek-selection ((,class (:inherit modus-theme-subtle-cyan))))
-   `(lsp-ui-sideline-code-action ((,class (:foreground ,yellow))))
-   `(lsp-ui-sideline-current-symbol ((,class (:height 0.99 :box (:line-width 
-1 :style nil) :foreground ,fg-main :weight bold))))
-   `(lsp-ui-sideline-symbol ((,class (:height 0.99 :box (:line-width -1 :style 
nil) :foreground ,fg-alt :weight bold))))
-   `(lsp-ui-sideline-symbol-info ((,class (:height 0.99 :slant italic))))
+       :foreground ,yellow :underline (:style wave))
+      (,class :foreground ,yellow :underline t)))
+   `(lsp-face-semhl-enummember ((,class :foreground ,blue-alt-other)))
+   `(lsp-face-semhl-field ((,class :foreground ,cyan-alt)))
+   `(lsp-face-semhl-field-static ((,class :foreground ,cyan-alt :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-function ((,class :foreground ,magenta)))
+   `(lsp-face-semhl-method ((,class :foreground ,magenta)))
+   `(lsp-face-semhl-namespace ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(lsp-face-semhl-preprocessor ((,class :foreground ,magenta)))
+   `(lsp-face-semhl-static-method ((,class :foreground ,magenta :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-type-class ((,class :foreground ,magenta-alt)))
+   `(lsp-face-semhl-type-enum ((,class :foreground ,magenta-alt)))
+   `(lsp-face-semhl-type-primitive ((,class :foreground ,magenta-alt :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-type-template ((,class :foreground ,magenta-alt :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-type-typedef ((,class :foreground ,magenta-alt :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-variable ((,class :foreground ,cyan)))
+   `(lsp-face-semhl-variable-local ((,class :foreground ,cyan)))
+   `(lsp-face-semhl-variable-parameter ((,class :foreground ,cyan-alt-other)))
+   `(lsp-lens-face ((,class :height 0.8 :foreground ,fg-alt)))
+   `(lsp-lens-mouse-face ((,class :height 0.8 :foreground ,blue-alt-other 
:underline t)))
+   `(lsp-ui-doc-background ((,class :background ,bg-alt)))
+   `(lsp-ui-doc-header ((,class :background ,bg-header :foreground 
,fg-header)))
+   `(lsp-ui-doc-url ((,class :foreground ,blue-alt-other :underline t)))
+   `(lsp-ui-peek-filename ((,class :foreground ,fg-special-warm)))
+   `(lsp-ui-peek-footer ((,class :background ,bg-header :foreground 
,fg-header)))
+   `(lsp-ui-peek-header ((,class :background ,bg-header :foreground 
,fg-header)))
+   `(lsp-ui-peek-highlight ((,class :inherit modus-theme-subtle-blue)))
+   `(lsp-ui-peek-line-number ((,class :foreground ,fg-alt)))
+   `(lsp-ui-peek-list ((,class :background ,bg-dim)))
+   `(lsp-ui-peek-peek ((,class :background ,bg-alt)))
+   `(lsp-ui-peek-selection ((,class :inherit modus-theme-subtle-cyan)))
+   `(lsp-ui-sideline-code-action ((,class :foreground ,yellow)))
+   `(lsp-ui-sideline-current-symbol ((,class :height 0.99 :box (:line-width -1 
:style nil) :foreground ,fg-main :weight bold)))
+   `(lsp-ui-sideline-symbol ((,class :height 0.99 :box (:line-width -1 :style 
nil) :foreground ,fg-alt :weight bold)))
+   `(lsp-ui-sideline-symbol-info ((,class :height 0.99 :slant italic)))
    ;;;; magit
-   `(magit-bisect-bad ((,class (:foreground ,red-alt-other))))
-   `(magit-bisect-good ((,class (:foreground ,green-alt-other))))
-   `(magit-bisect-skip ((,class (:foreground ,yellow-alt-other))))
-   `(magit-blame-date ((,class (:foreground ,fg-dim))))
-   `(magit-blame-dimmed ((,class (:foreground ,fg-inactive))))
-   `(magit-blame-hash ((,class (:foreground ,fg-special-warm))))
-   `(magit-blame-heading ((,class (:background ,bg-main :foreground 
,fg-special-cold :weight bold))))
-   `(magit-blame-highlight ((,class (:inherit modus-theme-special-cold :weight 
bold))))
-   `(magit-blame-margin ((,class (:inherit magit-blame-highlight))))
-   `(magit-blame-name ((,class (:foreground ,fg-main))))
-   `(magit-blame-summary ((,class (:foreground ,fg-main))))
-   `(magit-branch-current ((,class (:foreground ,blue-alt-other :box t))))
-   `(magit-branch-local ((,class (:foreground ,blue-alt))))
-   `(magit-branch-remote ((,class (:foreground ,magenta-alt))))
-   `(magit-branch-remote-head ((,class (:foreground ,magenta-alt-other :box 
t))))
-   `(magit-branch-upstream ((,class (:slant italic))))
-   `(magit-cherry-equivalent ((,class (:background ,bg-main :foreground 
,magenta-intense))))
-   `(magit-cherry-unmatched ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-diff-added ((,class ,(modus-operandi-theme-diffs
-                                 bg-main green
-                                 bg-diff-added fg-diff-added))))
-   `(magit-diff-added-highlight ((,class ,(modus-operandi-theme-diffs
-                                           bg-dim green
-                                           bg-diff-focus-added 
fg-diff-focus-added))))
-   `(magit-diff-base ((,class ,(modus-operandi-theme-diffs
-                                bg-main yellow
-                                bg-diff-changed fg-diff-changed))))
-   `(magit-diff-base-highlight ((,class ,(modus-operandi-theme-diffs
-                                          bg-dim yellow
-                                          bg-diff-focus-changed 
fg-diff-focus-changed))))
-   `(magit-diff-context ((,class (:foreground ,fg-unfocused))))
-   `(magit-diff-context-highlight ((,class ,(modus-operandi-theme-diffs
-                                             bg-dim fg-dim
-                                             bg-inactive fg-inactive))))
-   `(magit-diff-file-heading ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(magit-diff-file-heading-highlight ((,class (:inherit 
modus-theme-special-cold :weight bold))))
-   `(magit-diff-file-heading-selection ((,class (:background ,bg-alt 
:foreground ,cyan))))
-   `(magit-diff-hunk-heading ((,class (:background ,bg-active :foreground 
,fg-inactive :weight bold))))
-   `(magit-diff-hunk-heading-highlight ((,class (:inherit 
modus-theme-diff-heading :weight bold))))
-   `(magit-diff-hunk-heading-selection ((,class (:inherit 
modus-theme-intense-cyan))))
-   `(magit-diff-hunk-region ((,class (:weight bold))))
-   `(magit-diff-lines-boundary ((,class (:background ,fg-main))))
-   `(magit-diff-lines-heading ((,class (:inherit modus-theme-refine-magenta))))
-   `(magit-diff-removed ((,class ,(modus-operandi-theme-diffs
-                                   bg-main red
-                                   bg-diff-removed fg-diff-removed))))
-   `(magit-diff-removed-highlight ((,class ,(modus-operandi-theme-diffs
-                                             bg-dim red
-                                             bg-diff-focus-removed 
fg-diff-focus-removed))))
-   `(magit-diffstat-added ((,class (:foreground ,green))))
-   `(magit-diffstat-removed ((,class (:foreground ,red))))
-   `(magit-dimmed ((,class (:foreground ,fg-alt))))
-   `(magit-filename ((,class (:foreground ,fg-special-cold))))
-   `(magit-hash ((,class (:foreground ,fg-special-warm))))
-   `(magit-head ((,class (:inherit magit-branch-local))))
-   `(magit-header-line ((,class (:foreground ,cyan-active :weight bold))))
-   `(magit-header-line-key ((,class (:foreground ,red-active :weight bold))))
-   `(magit-header-line-log-select ((,class (:foreground ,fg-main :weight 
bold))))
-   `(magit-keyword ((,class (:foreground ,magenta))))
-   `(magit-keyword-squash ((,class (:foreground ,yellow-alt-other :weight 
bold))))
-   `(magit-log-author ((,class (:foreground ,cyan))))
-   `(magit-log-date ((,class (:foreground ,magenta))))
-   `(magit-log-graph ((,class (:foreground ,fg-dim))))
-   `(magit-mode-line-process ((,class (:foreground ,blue-active :weight 
bold))))
-   `(magit-mode-line-process-error ((,class (:foreground ,red-active :weight 
bold))))
-   `(magit-process-ng ((,class (:inherit error))))
-   `(magit-process-ok ((,class (:inherit success))))
-   `(magit-reflog-amend ((,class (:background ,bg-main :foreground 
,magenta-intense))))
-   `(magit-reflog-checkout ((,class (:background ,bg-main :foreground 
,blue-intense))))
-   `(magit-reflog-cherry-pick ((,class (:background ,bg-main :foreground 
,green-intense))))
-   `(magit-reflog-commit ((,class (:background ,bg-main :foreground 
,green-intense))))
-   `(magit-reflog-merge ((,class (:background ,bg-main :foreground 
,green-intense))))
-   `(magit-reflog-other ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-reflog-rebase ((,class (:background ,bg-main :foreground 
,magenta-intense))))
-   `(magit-reflog-remote ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-reflog-reset ((,class (:background ,bg-main :foreground 
,red-intense))))
-   `(magit-refname ((,class (:foreground ,fg-alt))))
-   `(magit-refname-pullreq ((,class (:foreground ,fg-alt))))
-   `(magit-refname-stash ((,class (:foreground ,fg-alt))))
-   `(magit-refname-wip ((,class (:foreground ,fg-alt))))
-   `(magit-section ((,class (:background ,bg-dim :foreground ,fg-main))))
-   `(magit-section-heading ((,class (:foreground ,cyan-alt-other :weight 
bold))))
-   `(magit-section-heading-selection ((,class (:inherit 
modus-theme-refine-cyan :weight bold))))
-   `(magit-section-highlight ((,class (:background ,bg-alt))))
-   `(magit-sequence-done ((,class (:foreground ,green-alt))))
-   `(magit-sequence-drop ((,class (:foreground ,red-alt))))
-   `(magit-sequence-exec ((,class (:foreground ,magenta-alt))))
-   `(magit-sequence-head ((,class (:foreground ,cyan-alt))))
-   `(magit-sequence-onto ((,class (:foreground ,fg-alt))))
-   `(magit-sequence-part ((,class (:foreground ,yellow-alt))))
-   `(magit-sequence-pick ((,class (:foreground ,blue-alt))))
-   `(magit-sequence-stop ((,class (:foreground ,red))))
-   `(magit-signature-bad ((,class (:background ,bg-main :foreground 
,red-intense :weight bold))))
-   `(magit-signature-error ((,class (:background ,bg-main :foreground 
,red-intense))))
-   `(magit-signature-expired ((,class (:background ,bg-main :foreground 
,yellow-intense))))
-   `(magit-signature-expired-key ((,class (:background ,bg-main :foreground 
,yellow-intense))))
-   `(magit-signature-good ((,class (:background ,bg-main :foreground 
,green-intense))))
-   `(magit-signature-revoked ((,class (:background ,bg-main :foreground 
,magenta-intense))))
-   `(magit-signature-untrusted ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-tag ((,class (:foreground ,green-alt))))
+   `(magit-bisect-bad ((,class :foreground ,red-alt-other)))
+   `(magit-bisect-good ((,class :foreground ,green-alt-other)))
+   `(magit-bisect-skip ((,class :foreground ,yellow-alt-other)))
+   `(magit-blame-date ((,class :foreground ,fg-dim)))
+   `(magit-blame-dimmed ((,class :foreground ,fg-inactive)))
+   `(magit-blame-hash ((,class :foreground ,fg-special-warm)))
+   `(magit-blame-heading ((,class :background ,bg-main :foreground 
,fg-special-cold :weight bold)))
+   `(magit-blame-highlight ((,class :inherit modus-theme-special-cold :weight 
bold)))
+   `(magit-blame-margin ((,class :inherit magit-blame-highlight)))
+   `(magit-blame-name ((,class :foreground ,fg-main)))
+   `(magit-blame-summary ((,class :foreground ,fg-main)))
+   `(magit-branch-current ((,class :foreground ,blue-alt-other :box t)))
+   `(magit-branch-local ((,class :foreground ,blue-alt)))
+   `(magit-branch-remote ((,class :foreground ,magenta-alt)))
+   `(magit-branch-remote-head ((,class :foreground ,magenta-alt-other :box t)))
+   `(magit-branch-upstream ((,class :slant italic)))
+   `(magit-cherry-equivalent ((,class :background ,bg-main :foreground 
,magenta-intense)))
+   `(magit-cherry-unmatched ((,class :background ,bg-main :foreground 
,cyan-intense)))
+   `(magit-diff-added ((,class ,@(modus-operandi-theme-diffs
+                                  bg-main green
+                                  bg-diff-added fg-diff-added))))
+   `(magit-diff-added-highlight ((,class ,@(modus-operandi-theme-diffs
+                                            bg-dim green
+                                            bg-diff-focus-added 
fg-diff-focus-added))))
+   `(magit-diff-base ((,class ,@(modus-operandi-theme-diffs
+                                 bg-main yellow
+                                 bg-diff-changed fg-diff-changed))))
+   `(magit-diff-base-highlight ((,class ,@(modus-operandi-theme-diffs
+                                           bg-dim yellow
+                                           bg-diff-focus-changed 
fg-diff-focus-changed))))
+   `(magit-diff-context ((,class :foreground ,fg-unfocused)))
+   `(magit-diff-context-highlight ((,class ,@(modus-operandi-theme-diffs
+                                              bg-dim fg-dim
+                                              bg-inactive fg-inactive))))
+   `(magit-diff-file-heading ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(magit-diff-file-heading-highlight ((,class :inherit 
modus-theme-special-cold :weight bold)))
+   `(magit-diff-file-heading-selection ((,class :background ,bg-alt 
:foreground ,cyan)))
+   `(magit-diff-hunk-heading ((,class :background ,bg-active :foreground 
,fg-inactive :weight bold)))
+   `(magit-diff-hunk-heading-highlight ((,class :inherit 
modus-theme-diff-heading :weight bold)))
+   `(magit-diff-hunk-heading-selection ((,class :inherit 
modus-theme-intense-cyan)))
+   `(magit-diff-hunk-region ((,class :weight bold)))
+   `(magit-diff-lines-boundary ((,class :background ,fg-main)))
+   `(magit-diff-lines-heading ((,class :inherit modus-theme-refine-magenta)))
+   `(magit-diff-removed ((,class ,@(modus-operandi-theme-diffs
+                                    bg-main red
+                                    bg-diff-removed fg-diff-removed))))
+   `(magit-diff-removed-highlight ((,class ,@(modus-operandi-theme-diffs
+                                              bg-dim red
+                                              bg-diff-focus-removed 
fg-diff-focus-removed))))
+   `(magit-diffstat-added ((,class :foreground ,green)))
+   `(magit-diffstat-removed ((,class :foreground ,red)))
+   `(magit-dimmed ((,class :foreground ,fg-alt)))
+   `(magit-filename ((,class :foreground ,fg-special-cold)))
+   `(magit-hash ((,class :foreground ,fg-special-warm)))
+   `(magit-head ((,class :inherit magit-branch-local)))
+   `(magit-header-line ((,class :foreground ,cyan-active :weight bold)))
+   `(magit-header-line-key ((,class :foreground ,red-active :weight bold)))
+   `(magit-header-line-log-select ((,class :foreground ,fg-main :weight bold)))
+   `(magit-keyword ((,class :foreground ,magenta)))
+   `(magit-keyword-squash ((,class :foreground ,yellow-alt-other :weight 
bold)))
+   `(magit-log-author ((,class :foreground ,cyan)))
+   `(magit-log-date ((,class :foreground ,magenta)))
+   `(magit-log-graph ((,class :foreground ,fg-dim)))
+   `(magit-mode-line-process ((,class :foreground ,blue-active :weight bold)))
+   `(magit-mode-line-process-error ((,class :foreground ,red-active :weight 
bold)))
+   `(magit-process-ng ((,class :inherit error)))
+   `(magit-process-ok ((,class :inherit success)))
+   `(magit-reflog-amend ((,class :background ,bg-main :foreground 
,magenta-intense)))
+   `(magit-reflog-checkout ((,class :background ,bg-main :foreground 
,blue-intense)))
+   `(magit-reflog-cherry-pick ((,class :background ,bg-main :foreground 
,green-intense)))
+   `(magit-reflog-commit ((,class :background ,bg-main :foreground 
,green-intense)))
+   `(magit-reflog-merge ((,class :background ,bg-main :foreground 
,green-intense)))
+   `(magit-reflog-other ((,class :background ,bg-main :foreground 
,cyan-intense)))
+   `(magit-reflog-rebase ((,class :background ,bg-main :foreground 
,magenta-intense)))
+   `(magit-reflog-remote ((,class :background ,bg-main :foreground 
,cyan-intense)))
+   `(magit-reflog-reset ((,class :background ,bg-main :foreground 
,red-intense)))
+   `(magit-refname ((,class :foreground ,fg-alt)))
+   `(magit-refname-pullreq ((,class :foreground ,fg-alt)))
+   `(magit-refname-stash ((,class :foreground ,fg-alt)))
+   `(magit-refname-wip ((,class :foreground ,fg-alt)))
+   `(magit-section ((,class :background ,bg-dim :foreground ,fg-main)))
+   `(magit-section-heading ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(magit-section-heading-selection ((,class :inherit modus-theme-refine-cyan 
:weight bold)))
+   `(magit-section-highlight ((,class :background ,bg-alt)))
+   `(magit-sequence-done ((,class :foreground ,green-alt)))
+   `(magit-sequence-drop ((,class :foreground ,red-alt)))
+   `(magit-sequence-exec ((,class :foreground ,magenta-alt)))
+   `(magit-sequence-head ((,class :foreground ,cyan-alt)))
+   `(magit-sequence-onto ((,class :foreground ,fg-alt)))
+   `(magit-sequence-part ((,class :foreground ,yellow-alt)))
+   `(magit-sequence-pick ((,class :foreground ,blue-alt)))
+   `(magit-sequence-stop ((,class :foreground ,red)))
+   `(magit-signature-bad ((,class :background ,bg-main :foreground 
,red-intense :weight bold)))
+   `(magit-signature-error ((,class :background ,bg-main :foreground 
,red-intense)))
+   `(magit-signature-expired ((,class :background ,bg-main :foreground 
,yellow-intense)))
+   `(magit-signature-expired-key ((,class :background ,bg-main :foreground 
,yellow-intense)))
+   `(magit-signature-good ((,class :background ,bg-main :foreground 
,green-intense)))
+   `(magit-signature-revoked ((,class :background ,bg-main :foreground 
,magenta-intense)))
+   `(magit-signature-untrusted ((,class :background ,bg-main :foreground 
,cyan-intense)))
+   `(magit-tag ((,class :foreground ,green-alt)))
    ;;;; magit-imerge
-   `(magit-imerge-overriding-value ((,class (:foreground ,red-alt :weight 
bold))))
+   `(magit-imerge-overriding-value ((,class :foreground ,red-alt :weight 
bold)))
    ;;;; man
-   `(Man-overstrike ((,class (:foreground ,magenta :weight bold))))
-   `(Man-reverse ((,class (:inherit modus-theme-subtle-magenta))))
-   `(Man-underline ((,class (:foreground ,cyan :underline t))))
+   `(Man-overstrike ((,class :foreground ,magenta :weight bold)))
+   `(Man-reverse ((,class :inherit modus-theme-subtle-magenta)))
+   `(Man-underline ((,class :foreground ,cyan :underline t)))
    ;;;; markdown-mode
-   `(markdown-blockquote-face ((,class (:background ,bg-dim :foreground 
,fg-special-warm :slant ,modus-theme-slant))))
-   `(markdown-bold-face ((,class (:weight bold))))
-   `(markdown-code-face ((,class (:inherit fixed-pitch))))
-   `(markdown-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(markdown-footnote-marker-face ((,class (:foreground ,cyan-alt :weight 
bold))))
-   `(markdown-footnote-text-face ((,class (:foreground ,fg-main :slant 
,modus-theme-slant))))
-   `(markdown-gfm-checkbox-face ((,class (:foreground ,cyan-alt-other))))
-   `(markdown-header-delimiter-face ((,class (:foreground ,fg-dim :weight 
normal))))
-   `(markdown-header-face ((,class (:weight bold))))
-   `(markdown-header-rule-face ((,class (:foreground ,fg-special-warm :weight 
bold))))
-   `(markdown-hr-face ((,class (:foreground ,fg-special-warm :weight bold))))
-   `(markdown-html-attr-name-face ((,class (:foreground ,cyan))))
-   `(markdown-html-attr-value-face ((,class (:foreground ,blue))))
-   `(markdown-html-entity-face ((,class (:foreground ,cyan))))
-   `(markdown-html-tag-delimiter-face ((,class (:foreground 
,fg-special-mild))))
-   `(markdown-html-tag-name-face ((,class (:foreground ,magenta-alt))))
-   `(markdown-inline-code-face ((,class (:foreground ,magenta))))
-   `(markdown-italic-face ((,class (:slant italic))))
-   `(markdown-language-info-face ((,class (:foreground ,fg-special-cold))))
-   `(markdown-language-keyword-face ((,class (:foreground ,green-alt-other))))
-   `(markdown-line-break-face ((,class (:inherit modus-theme-refine-cyan 
:underline t))))
-   `(markdown-link-face ((,class (:inherit link))))
-   `(markdown-link-title-face ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(markdown-list-face ((,class (:foreground ,fg-dim))))
-   `(markdown-markup-face ((,class (:foreground ,fg-alt))))
-   `(markdown-math-face ((,class (:foreground ,magenta-alt-other))))
-   `(markdown-metadata-key-face ((,class (:foreground ,cyan-alt-other))))
-   `(markdown-metadata-value-face ((,class (:foreground ,blue-alt))))
-   `(markdown-missing-link-face ((,class (:foreground ,yellow :weight bold))))
-   `(markdown-plain-url-face ((,class (:inherit markdown-link-face))))
-   `(markdown-pre-face ((,class (:foreground ,fg-special-mild))))
-   `(markdown-reference-face ((,class (:inherit markdown-markup-face))))
-   `(markdown-strike-through-face ((,class (:strike-through t))))
-   `(markdown-table-face ((,class (:foreground ,fg-special-cold))))
-   `(markdown-url-face ((,class (:foreground ,blue))))
+   `(markdown-blockquote-face ((,class :background ,bg-dim :foreground 
,fg-special-warm :slant ,modus-theme-slant)))
+   `(markdown-bold-face ((,class :weight bold)))
+   `(markdown-code-face ((,class :inherit fixed-pitch)))
+   `(markdown-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(markdown-footnote-marker-face ((,class :foreground ,cyan-alt :weight 
bold)))
+   `(markdown-footnote-text-face ((,class :foreground ,fg-main :slant 
,modus-theme-slant)))
+   `(markdown-gfm-checkbox-face ((,class :foreground ,cyan-alt-other)))
+   `(markdown-header-delimiter-face ((,class :foreground ,fg-dim :weight 
normal)))
+   `(markdown-header-face ((,class :weight bold)))
+   `(markdown-header-rule-face ((,class :foreground ,fg-special-warm :weight 
bold)))
+   `(markdown-hr-face ((,class :foreground ,fg-special-warm :weight bold)))
+   `(markdown-html-attr-name-face ((,class :foreground ,cyan)))
+   `(markdown-html-attr-value-face ((,class :foreground ,blue)))
+   `(markdown-html-entity-face ((,class :foreground ,cyan)))
+   `(markdown-html-tag-delimiter-face ((,class :foreground ,fg-special-mild)))
+   `(markdown-html-tag-name-face ((,class :foreground ,magenta-alt)))
+   `(markdown-inline-code-face ((,class :foreground ,magenta)))
+   `(markdown-italic-face ((,class :slant italic)))
+   `(markdown-language-info-face ((,class :foreground ,fg-special-cold)))
+   `(markdown-language-keyword-face ((,class :foreground ,green-alt-other)))
+   `(markdown-line-break-face ((,class :inherit modus-theme-refine-cyan 
:underline t)))
+   `(markdown-link-face ((,class :inherit link)))
+   `(markdown-link-title-face ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(markdown-list-face ((,class :foreground ,fg-dim)))
+   `(markdown-markup-face ((,class :foreground ,fg-alt)))
+   `(markdown-math-face ((,class :foreground ,magenta-alt-other)))
+   `(markdown-metadata-key-face ((,class :foreground ,cyan-alt-other)))
+   `(markdown-metadata-value-face ((,class :foreground ,blue-alt)))
+   `(markdown-missing-link-face ((,class :foreground ,yellow :weight bold)))
+   `(markdown-plain-url-face ((,class :inherit markdown-link-face)))
+   `(markdown-pre-face ((,class :foreground ,fg-special-mild)))
+   `(markdown-reference-face ((,class :inherit markdown-markup-face)))
+   `(markdown-strike-through-face ((,class :strike-through t)))
+   `(markdown-table-face ((,class :foreground ,fg-special-cold)))
+   `(markdown-url-face ((,class :foreground ,blue)))
    ;;;; markup-faces (`adoc-mode')
-   `(markup-anchor-face ((,class (:foreground ,fg-inactive))))
-   `(markup-attribute-face ((,class (:foreground ,fg-inactive :slant italic))))
-   `(markup-big-face ((,class (:height 1.3 :foreground ,blue-nuanced))))
-   `(markup-bold-face ((,class (:foreground ,red-nuanced :weight bold))))
-   `(markup-code-face ((,class (:inherit fixed-pitch :foreground ,magenta))))
-   `(markup-command-face ((,class (:foreground ,fg-inactive))))
-   `(markup-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(markup-complex-replacement-face ((,class (:box (:line-width 2 :color nil 
:style released-button)
-                                                    :inherit 
modus-theme-refine-magenta))))
-   `(markup-emphasis-face ((,class (:foreground ,fg-special-cold :slant 
italic))))
-   `(markup-error-face ((,class (:foreground ,red :weight bold))))
-   `(markup-gen-face ((,class (:foreground ,magenta-alt))))
-   `(markup-internal-reference-face ((,class (:foreground ,fg-inactive 
:underline t))))
-   `(markup-italic-face ((,class (:foreground ,fg-special-cold :slant 
italic))))
-   `(markup-list-face ((,class (:inherit modus-theme-special-calm))))
-   `(markup-meta-face ((,class (:foreground ,fg-inactive))))
-   `(markup-meta-hide-face ((,class (:foreground ,fg-alt))))
-   `(markup-passthrough-face ((,class (:inherit fixed-pitch :foreground 
,cyan))))
-   `(markup-preprocessor-face ((,class (:foreground ,magenta))))
-   `(markup-replacement-face ((,class (:foreground ,yellow-alt-other))))
-   `(markup-secondary-text-face ((,class (:height 0.8 :foreground 
,magenta-nuanced))))
-   `(markup-small-face ((,class (:height 0.8 :foreground ,fg-main))))
-   `(markup-strong-face ((,class (:foreground ,red-nuanced :weight bold))))
-   `(markup-subscript-face ((,class (:height 0.8 :foreground 
,fg-special-cold))))
-   `(markup-superscript-face ((,class (:height 0.8 :foreground 
,fg-special-cold))))
-   `(markup-table-cell-face ((,class (:inherit modus-theme-special-cold))))
-   `(markup-table-face ((,class (:inherit modus-theme-subtle-cyan))))
-   `(markup-table-row-face ((,class (:inherit modus-theme-subtle-cyan))))
-   `(markup-title-0-face ((,class (:height 3.0 :foreground ,blue-nuanced))))
-   `(markup-title-1-face ((,class (:height 2.4 :foreground ,blue-nuanced))))
-   `(markup-title-2-face ((,class (:height 1.8 :foreground ,blue-nuanced))))
-   `(markup-title-3-face ((,class (:height 1.4 :foreground ,blue-nuanced))))
-   `(markup-title-4-face ((,class (:height 1.2 :foreground ,blue-nuanced))))
-   `(markup-title-5-face ((,class (:height 1.2 :foreground ,blue-nuanced 
:underline t))))
-   `(markup-value-face ((,class (:foreground ,fg-inactive))))
-   `(markup-verbatim-face ((,class (:inherit modus-theme-special-mild))))
+   `(markup-anchor-face ((,class :foreground ,fg-inactive)))
+   `(markup-attribute-face ((,class :foreground ,fg-inactive :slant italic)))
+   `(markup-big-face ((,class :height 1.3 :foreground ,blue-nuanced)))
+   `(markup-bold-face ((,class :foreground ,red-nuanced :weight bold)))
+   `(markup-code-face ((,class :inherit fixed-pitch :foreground ,magenta)))
+   `(markup-command-face ((,class :foreground ,fg-inactive)))
+   `(markup-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(markup-complex-replacement-face ((,class :box (:line-width 2 :color nil 
:style released-button)
+                                              :inherit 
modus-theme-refine-magenta)))
+   `(markup-emphasis-face ((,class :foreground ,fg-special-cold :slant 
italic)))
+   `(markup-error-face ((,class :foreground ,red :weight bold)))
+   `(markup-gen-face ((,class :foreground ,magenta-alt)))
+   `(markup-internal-reference-face ((,class :foreground ,fg-inactive 
:underline t)))
+   `(markup-italic-face ((,class :foreground ,fg-special-cold :slant italic)))
+   `(markup-list-face ((,class :inherit modus-theme-special-calm)))
+   `(markup-meta-face ((,class :foreground ,fg-inactive)))
+   `(markup-meta-hide-face ((,class :foreground ,fg-alt)))
+   `(markup-passthrough-face ((,class :inherit fixed-pitch :foreground ,cyan)))
+   `(markup-preprocessor-face ((,class :foreground ,magenta)))
+   `(markup-replacement-face ((,class :foreground ,yellow-alt-other)))
+   `(markup-secondary-text-face ((,class :height 0.8 :foreground 
,magenta-nuanced)))
+   `(markup-small-face ((,class :height 0.8 :foreground ,fg-main)))
+   `(markup-strong-face ((,class :foreground ,red-nuanced :weight bold)))
+   `(markup-subscript-face ((,class :height 0.8 :foreground ,fg-special-cold)))
+   `(markup-superscript-face ((,class :height 0.8 :foreground 
,fg-special-cold)))
+   `(markup-table-cell-face ((,class :inherit modus-theme-special-cold)))
+   `(markup-table-face ((,class :inherit modus-theme-subtle-cyan)))
+   `(markup-table-row-face ((,class :inherit modus-theme-subtle-cyan)))
+   `(markup-title-0-face ((,class :height 3.0 :foreground ,blue-nuanced)))
+   `(markup-title-1-face ((,class :height 2.4 :foreground ,blue-nuanced)))
+   `(markup-title-2-face ((,class :height 1.8 :foreground ,blue-nuanced)))
+   `(markup-title-3-face ((,class :height 1.4 :foreground ,blue-nuanced)))
+   `(markup-title-4-face ((,class :height 1.2 :foreground ,blue-nuanced)))
+   `(markup-title-5-face ((,class :height 1.2 :foreground ,blue-nuanced 
:underline t)))
+   `(markup-value-face ((,class :foreground ,fg-inactive)))
+   `(markup-verbatim-face ((,class :inherit modus-theme-special-mild)))
    ;;;; mentor
-   `(mentor-download-message ((,class (:foreground ,fg-special-warm))))
-   `(mentor-download-name ((,class (:foreground ,fg-special-cold))))
-   `(mentor-download-progress ((,class (:foreground ,blue-alt-other))))
-   `(mentor-download-size ((,class (:foreground ,magenta-alt-other))))
-   `(mentor-download-speed-down ((,class (:foreground ,cyan-alt))))
-   `(mentor-download-speed-up ((,class (:foreground ,red-alt))))
-   `(mentor-download-state ((,class (:foreground ,yellow-alt))))
-   `(mentor-highlight-face ((,class (:inherit modus-theme-subtle-blue))))
-   `(mentor-tracker-name ((,class (:foreground ,magenta-alt))))
+   `(mentor-download-message ((,class :foreground ,fg-special-warm)))
+   `(mentor-download-name ((,class :foreground ,fg-special-cold)))
+   `(mentor-download-progress ((,class :foreground ,blue-alt-other)))
+   `(mentor-download-size ((,class :foreground ,magenta-alt-other)))
+   `(mentor-download-speed-down ((,class :foreground ,cyan-alt)))
+   `(mentor-download-speed-up ((,class :foreground ,red-alt)))
+   `(mentor-download-state ((,class :foreground ,yellow-alt)))
+   `(mentor-highlight-face ((,class :inherit modus-theme-subtle-blue)))
+   `(mentor-tracker-name ((,class :foreground ,magenta-alt)))
    ;;;; messages
-   `(message-cited-text-1 ((,class (:foreground ,cyan))))
-   `(message-cited-text-2 ((,class (:foreground ,green))))
-   `(message-cited-text-3 ((,class (:foreground ,yellow))))
-   `(message-cited-text-4 ((,class (:foreground ,red))))
-   `(message-header-cc ((,class (:foreground ,blue-alt))))
-   `(message-header-name ((,class (:foreground ,green-alt-other))))
-   `(message-header-newsgroups ((,class (:foreground ,blue :weight bold))))
-   `(message-header-other ((,class (:foreground ,cyan-alt-other :weight 
bold))))
-   `(message-header-subject ((,class (:foreground ,magenta-alt-other :weight 
bold))))
-   `(message-header-to ((,class (:foreground ,magenta-alt :weight bold))))
-   `(message-header-xheader ((,class (:foreground ,blue-alt-other))))
-   `(message-mml ((,class (:foreground ,green-alt))))
-   `(message-separator ((,class (:background ,bg-active :foreground 
,fg-special-warm))))
+   `(message-cited-text-1 ((,class :foreground ,cyan)))
+   `(message-cited-text-2 ((,class :foreground ,green)))
+   `(message-cited-text-3 ((,class :foreground ,yellow)))
+   `(message-cited-text-4 ((,class :foreground ,red)))
+   `(message-header-cc ((,class :foreground ,blue-alt)))
+   `(message-header-name ((,class :foreground ,green-alt-other)))
+   `(message-header-newsgroups ((,class :foreground ,blue :weight bold)))
+   `(message-header-other ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(message-header-subject ((,class :foreground ,magenta-alt-other :weight 
bold)))
+   `(message-header-to ((,class :foreground ,magenta-alt :weight bold)))
+   `(message-header-xheader ((,class :foreground ,blue-alt-other)))
+   `(message-mml ((,class :foreground ,green-alt)))
+   `(message-separator ((,class :background ,bg-active :foreground 
,fg-special-warm)))
    ;;;; minibuffer-line
-   `(minibuffer-line ((,class (:foreground ,fg-main))))
+   `(minibuffer-line ((,class :foreground ,fg-main)))
    ;;;; minimap
-   `(minimap-active-region-background ((,class (:background ,bg-active))))
-   `(minimap-current-line-face ((,class (:background ,cyan-intense-bg 
:foreground ,fg-main))))
+   `(minimap-active-region-background ((,class :background ,bg-active)))
+   `(minimap-current-line-face ((,class :background ,cyan-intense-bg 
:foreground ,fg-main)))
    ;;;; modeline
-   `(mode-line ((,class (:box ,(modus-operandi-theme-modeline-box bg-inactive 
fg-inactive t)
-                              ,@(modus-operandi-theme-modeline-props
-                                 bg-active fg-dim
-                                 bg-active fg-active)))))
-   `(mode-line-buffer-id ((,class (:weight bold))))
-   `(mode-line-emphasis ((,class (:foreground ,blue-active :weight bold))))
-   `(mode-line-highlight ((,class (:inherit modus-theme-active-blue :box 
(:line-width -1 :style pressed-button)))))
-   `(mode-line-inactive ((,class (:box ,(modus-operandi-theme-modeline-box 
bg-active bg-active)
-                                       ,@(modus-operandi-theme-modeline-props
-                                          bg-dim fg-inactive
-                                          bg-inactive fg-inactive)))))
+   `(mode-line ((,class :box ,(modus-operandi-theme-modeline-box bg-inactive 
fg-inactive t)
+                        ,@(modus-operandi-theme-modeline-props
+                           bg-active fg-dim
+                           bg-active fg-active))))
+   `(mode-line-buffer-id ((,class :weight bold)))
+   `(mode-line-emphasis ((,class :foreground ,blue-active :weight bold)))
+   `(mode-line-highlight ((,class :inherit modus-theme-active-blue :box 
(:line-width -1 :style pressed-button))))
+   `(mode-line-inactive ((,class :box ,(modus-operandi-theme-modeline-box 
bg-active bg-active)
+                                 ,@(modus-operandi-theme-modeline-props
+                                    bg-dim fg-inactive
+                                    bg-inactive fg-inactive))))
    ;;;; mood-line
-   `(mood-line-modified ((,class (:foreground ,magenta-active))))
-   `(mood-line-status-error ((,class (:foreground ,red-active :weight bold))))
-   `(mood-line-status-info ((,class (:foreground ,cyan-active))))
-   `(mood-line-status-neutral ((,class (:foreground ,blue-active))))
-   `(mood-line-status-success ((,class (:foreground ,green-active))))
-   `(mood-line-status-warning ((,class (:foreground ,yellow-active :weight 
bold))))
-   `(mood-line-unimportant ((,class (:foreground ,fg-inactive))))
+   `(mood-line-modified ((,class :foreground ,magenta-active)))
+   `(mood-line-status-error ((,class :foreground ,red-active :weight bold)))
+   `(mood-line-status-info ((,class :foreground ,cyan-active)))
+   `(mood-line-status-neutral ((,class :foreground ,blue-active)))
+   `(mood-line-status-success ((,class :foreground ,green-active)))
+   `(mood-line-status-warning ((,class :foreground ,yellow-active :weight 
bold)))
+   `(mood-line-unimportant ((,class :foreground ,fg-inactive)))
    ;;;; mu4e
-   `(mu4e-attach-number-face ((,class (:foreground ,cyan-alt :weight bold))))
-   `(mu4e-cited-1-face ((,class (:foreground ,blue-alt))))
-   `(mu4e-cited-2-face ((,class (:foreground ,red-alt))))
-   `(mu4e-cited-3-face ((,class (:foreground ,green-alt))))
-   `(mu4e-cited-4-face ((,class (:foreground ,magenta-alt))))
-   `(mu4e-cited-5-face ((,class (:foreground ,cyan-alt))))
-   `(mu4e-cited-6-face ((,class (:foreground ,blue-alt-other))))
-   `(mu4e-cited-7-face ((,class (:foreground ,red-alt-other))))
-   `(mu4e-compose-header-face ((,class (:foreground ,green-alt))))
-   `(mu4e-compose-separator-face ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(mu4e-contact-face ((,class (:foreground ,cyan))))
-   `(mu4e-context-face ((,class (:foreground ,blue-active))))
-   `(mu4e-draft-face ((,class (:foreground ,magenta-refine-fg))))
-   `(mu4e-flagged-face ((,class (:foreground ,red-alt-other))))
-   `(mu4e-footer-face ((,class (:foreground ,fg-alt))))
-   `(mu4e-forwarded-face ((,class (:foreground ,green-alt-other))))
-   `(mu4e-header-face ((,class (:foreground ,fg-main))))
-   `(mu4e-header-highlight-face ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                          :background ,bg-hl-line))))
-   `(mu4e-header-key-face ((,class (:foreground ,fg-dim :weight bold))))
-   `(mu4e-header-marks-face ((,class (:foreground ,magenta-alt :weight bold))))
-   `(mu4e-header-title-face ((,class (:foreground ,fg-special-warm))))
-   `(mu4e-header-value-face ((,class (:foreground ,magenta-alt-other))))
-   `(mu4e-highlight-face ((,class (:foreground ,blue-intense :weight bold))))
-   `(mu4e-link-face ((,class (:inherit link))))
-   `(mu4e-modeline-face ((,class (:foreground ,magenta-active))))
-   `(mu4e-moved-face ((,class (:foreground ,blue-refine-fg))))
-   `(mu4e-ok-face ((,class (:foreground ,green-intense :weight bold))))
-   `(mu4e-region-code ((,class (:inherit modus-theme-special-calm))))
-   `(mu4e-replied-face ((,class (:foreground ,cyan-refine-fg))))
-   `(mu4e-special-header-value-face ((,class (:foreground ,magenta :weight 
bold))))
-   `(mu4e-system-face ((,class (:foreground ,fg-alt))))
-   `(mu4e-title-face ((,class (:foreground ,fg-main))))
-   `(mu4e-unread-face ((,class (:foreground ,fg-main :weight bold))))
-   `(mu4e-url-number-face ((,class (:foreground ,blue-alt-other :weight 
bold))))
-   `(mu4e-view-body-face ((,class (:background ,bg-main :foreground 
,fg-main))))
-   `(mu4e-warning-face ((,class (:inherit warning))))
+   `(mu4e-attach-number-face ((,class :foreground ,cyan-alt :weight bold)))
+   `(mu4e-cited-1-face ((,class :foreground ,blue-alt)))
+   `(mu4e-cited-2-face ((,class :foreground ,red-alt)))
+   `(mu4e-cited-3-face ((,class :foreground ,green-alt)))
+   `(mu4e-cited-4-face ((,class :foreground ,magenta-alt)))
+   `(mu4e-cited-5-face ((,class :foreground ,cyan-alt)))
+   `(mu4e-cited-6-face ((,class :foreground ,blue-alt-other)))
+   `(mu4e-cited-7-face ((,class :foreground ,red-alt-other)))
+   `(mu4e-compose-header-face ((,class :foreground ,green-alt)))
+   `(mu4e-compose-separator-face ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(mu4e-contact-face ((,class :foreground ,cyan)))
+   `(mu4e-context-face ((,class :foreground ,blue-active)))
+   `(mu4e-draft-face ((,class :foreground ,magenta-refine-fg)))
+   `(mu4e-flagged-face ((,class :foreground ,red-alt-other)))
+   `(mu4e-footer-face ((,class :foreground ,fg-alt)))
+   `(mu4e-forwarded-face ((,class :foreground ,green-alt-other)))
+   `(mu4e-header-face ((,class :foreground ,fg-main)))
+   `(mu4e-header-highlight-face ((,class ,@(and (>= emacs-major-version 27) 
'(:extend t))
+                                         :background ,bg-hl-line)))
+   `(mu4e-header-key-face ((,class :foreground ,fg-dim :weight bold)))
+   `(mu4e-header-marks-face ((,class :foreground ,magenta-alt :weight bold)))
+   `(mu4e-header-title-face ((,class :foreground ,fg-special-warm)))
+   `(mu4e-header-value-face ((,class :foreground ,magenta-alt-other)))
+   `(mu4e-highlight-face ((,class :foreground ,blue-intense :weight bold)))
+   `(mu4e-link-face ((,class :inherit link)))
+   `(mu4e-modeline-face ((,class :foreground ,magenta-active)))
+   `(mu4e-moved-face ((,class :foreground ,blue-refine-fg)))
+   `(mu4e-ok-face ((,class :foreground ,green-intense :weight bold)))
+   `(mu4e-region-code ((,class :inherit modus-theme-special-calm)))
+   `(mu4e-replied-face ((,class :foreground ,cyan-refine-fg)))
+   `(mu4e-special-header-value-face ((,class :foreground ,magenta :weight 
bold)))
+   `(mu4e-system-face ((,class :foreground ,fg-alt)))
+   `(mu4e-title-face ((,class :foreground ,fg-main)))
+   `(mu4e-unread-face ((,class :foreground ,fg-main :weight bold)))
+   `(mu4e-url-number-face ((,class :foreground ,blue-alt-other :weight bold)))
+   `(mu4e-view-body-face ((,class :background ,bg-main :foreground ,fg-main)))
+   `(mu4e-warning-face ((,class :inherit warning)))
    ;;;; mu4e-conversation
-   `(mu4e-conversation-header ((,class (:inherit modus-theme-special-cold))))
-   `(mu4e-conversation-sender-1 ((,class (:foreground ,fg-special-warm))))
-   `(mu4e-conversation-sender-2 ((,class (:foreground ,fg-special-cold))))
-   `(mu4e-conversation-sender-3 ((,class (:foreground ,fg-special-mild))))
-   `(mu4e-conversation-sender-4 ((,class (:foreground ,fg-alt))))
-   `(mu4e-conversation-sender-5 ((,class (:foreground ,yellow-refine-fg))))
-   `(mu4e-conversation-sender-6 ((,class (:foreground ,cyan-refine-fg))))
-   `(mu4e-conversation-sender-7 ((,class (:foreground ,green-refine-fg))))
-   `(mu4e-conversation-sender-8 ((,class (:foreground ,blue-refine-fg))))
-   `(mu4e-conversation-sender-me ((,class (:foreground ,fg-main))))
-   `(mu4e-conversation-unread ((,class (:weight bold))))
+   `(mu4e-conversation-header ((,class :inherit modus-theme-special-cold)))
+   `(mu4e-conversation-sender-1 ((,class :foreground ,fg-special-warm)))
+   `(mu4e-conversation-sender-2 ((,class :foreground ,fg-special-cold)))
+   `(mu4e-conversation-sender-3 ((,class :foreground ,fg-special-mild)))
+   `(mu4e-conversation-sender-4 ((,class :foreground ,fg-alt)))
+   `(mu4e-conversation-sender-5 ((,class :foreground ,yellow-refine-fg)))
+   `(mu4e-conversation-sender-6 ((,class :foreground ,cyan-refine-fg)))
+   `(mu4e-conversation-sender-7 ((,class :foreground ,green-refine-fg)))
+   `(mu4e-conversation-sender-8 ((,class :foreground ,blue-refine-fg)))
+   `(mu4e-conversation-sender-me ((,class :foreground ,fg-main)))
+   `(mu4e-conversation-unread ((,class :weight bold)))
    ;;;; multiple-cursors
-   `(mc/cursor-bar-face ((,class (:height 1 :background ,fg-main))))
-   `(mc/cursor-face ((,class (:inverse-video t))))
-   `(mc/region-face ((,class (:inherit region))))
+   `(mc/cursor-bar-face ((,class :height 1 :background ,fg-main)))
+   `(mc/cursor-face ((,class :inverse-video t)))
+   `(mc/region-face ((,class :inherit region)))
    ;;;; neotree
-   `(neo-banner-face ((,class (:foreground ,magenta))))
-   `(neo-button-face ((,class (:inherit button))))
-   `(neo-dir-link-face ((,class (:foreground ,blue :weight bold))))
-   `(neo-expand-btn-face ((,class (:foreground ,cyan))))
-   `(neo-file-link-face ((,class (:foreground ,fg-main))))
-   `(neo-header-face ((,class (:foreground ,fg-main :weight bold))))
-   `(neo-root-dir-face ((,class (:foreground ,cyan-alt :weight bold))))
-   `(neo-vc-added-face ((,class (:foreground ,green))))
-   `(neo-vc-conflict-face ((,class (:foreground ,red :Weight bold))))
-   `(neo-vc-default-face ((,class (:foreground ,fg-main))))
-   `(neo-vc-edited-face ((,class (:foreground ,yellow))))
-   `(neo-vc-ignored-face ((,class (:foreground ,fg-inactive))))
-   `(neo-vc-missing-face ((,class (:foreground ,red-alt))))
-   `(neo-vc-needs-merge-face ((,class (:foreground ,magenta-alt))))
-   `(neo-vc-needs-update-face ((,class (:underline t))))
-   `(neo-vc-removed-face ((,class (:strike-through t))))
-   `(neo-vc-unlocked-changes-face ((,class (:inherit 
modus-theme-refine-blue))))
-   `(neo-vc-up-to-date-face ((,class (:foreground ,fg-alt))))
-   `(neo-vc-user-face ((,class (:foreground ,magenta))))
+   `(neo-banner-face ((,class :foreground ,magenta)))
+   `(neo-button-face ((,class :inherit button)))
+   `(neo-dir-link-face ((,class :foreground ,blue :weight bold)))
+   `(neo-expand-btn-face ((,class :foreground ,cyan)))
+   `(neo-file-link-face ((,class :foreground ,fg-main)))
+   `(neo-header-face ((,class :foreground ,fg-main :weight bold)))
+   `(neo-root-dir-face ((,class :foreground ,cyan-alt :weight bold)))
+   `(neo-vc-added-face ((,class :foreground ,green)))
+   `(neo-vc-conflict-face ((,class :foreground ,red :Weight bold)))
+   `(neo-vc-default-face ((,class :foreground ,fg-main)))
+   `(neo-vc-edited-face ((,class :foreground ,yellow)))
+   `(neo-vc-ignored-face ((,class :foreground ,fg-inactive)))
+   `(neo-vc-missing-face ((,class :foreground ,red-alt)))
+   `(neo-vc-needs-merge-face ((,class :foreground ,magenta-alt)))
+   `(neo-vc-needs-update-face ((,class :underline t)))
+   `(neo-vc-removed-face ((,class :strike-through t)))
+   `(neo-vc-unlocked-changes-face ((,class :inherit modus-theme-refine-blue)))
+   `(neo-vc-up-to-date-face ((,class :foreground ,fg-alt)))
+   `(neo-vc-user-face ((,class :foreground ,magenta)))
    ;;;; no-emoji
-   `(no-emoji ((,class (:foreground ,cyan))))
+   `(no-emoji ((,class :foreground ,cyan)))
    ;;;; num3-mode
-   `(num3-face-even ((,class (:background ,bg-alt :weight bold))))
+   `(num3-face-even ((,class :background ,bg-alt :weight bold)))
    ;;;; nxml-mode
-   `(nxml-attribute-colon ((,class (:foreground ,fg-main))))
-   `(nxml-attribute-local-name ((,class (:foreground ,cyan-alt))))
-   `(nxml-attribute-prefix ((,class (:foreground ,cyan-alt-other :weight 
,modus-theme-bold))))
-   `(nxml-attribute-value ((,class (:foreground ,blue))))
-   `(nxml-cdata-section-CDATA ((,class (:foreground ,red-alt :weight 
,modus-theme-bold))))
-   `(nxml-cdata-section-delimiter ((,class (:foreground ,red-alt))))
-   `(nxml-char-ref-delimiter ((,class (:foreground ,green-alt-other))))
-   `(nxml-char-ref-number ((,class (:foreground ,green-alt-other :weight 
,modus-theme-bold))))
-   `(nxml-delimited-data ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(nxml-delimiter ((,class (:foreground ,fg-dim))))
-   `(nxml-element-colon ((,class (:foreground ,fg-main))))
-   `(nxml-element-local-name ((,class (:foreground ,magenta))))
-   `(nxml-element-prefix ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(nxml-entity-ref-delimiter ((,class (:foreground ,green-alt-other))))
-   `(nxml-entity-ref-name ((,class (:foreground ,green-alt-other :weight 
,modus-theme-bold))))
-   `(nxml-glyph ((,class (:inherit modus-theme-intense-neutral))))
-   `(nxml-hash ((,class (:foreground ,blue-alt :weight ,modus-theme-bold))))
-   `(nxml-heading ((,class (:weight bold))))
-   `(nxml-name ((,class (:foreground ,magenta-alt :weight ,modus-theme-bold))))
-   `(nxml-namespace-attribute-colon ((,class (:foreground ,fg-main))))
-   `(nxml-namespace-attribute-prefix ((,class (:foreground ,cyan))))
-   `(nxml-processing-instruction-target ((,class (:foreground 
,magenta-alt-other :weight ,modus-theme-bold))))
-   `(nxml-prolog-keyword ((,class (:foreground ,magenta-alt-other :weight 
,modus-theme-bold))))
-   `(nxml-ref ((,class (:foreground ,green-alt-other :weight 
,modus-theme-bold))))
+   `(nxml-attribute-colon ((,class :foreground ,fg-main)))
+   `(nxml-attribute-local-name ((,class :foreground ,cyan-alt)))
+   `(nxml-attribute-prefix ((,class :foreground ,cyan-alt-other :weight 
,modus-theme-bold)))
+   `(nxml-attribute-value ((,class :foreground ,blue)))
+   `(nxml-cdata-section-CDATA ((,class :foreground ,red-alt :weight 
,modus-theme-bold)))
+   `(nxml-cdata-section-delimiter ((,class :foreground ,red-alt)))
+   `(nxml-char-ref-delimiter ((,class :foreground ,green-alt-other)))
+   `(nxml-char-ref-number ((,class :foreground ,green-alt-other :weight 
,modus-theme-bold)))
+   `(nxml-delimited-data ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(nxml-delimiter ((,class :foreground ,fg-dim)))
+   `(nxml-element-colon ((,class :foreground ,fg-main)))
+   `(nxml-element-local-name ((,class :foreground ,magenta)))
+   `(nxml-element-prefix ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(nxml-entity-ref-delimiter ((,class :foreground ,green-alt-other)))
+   `(nxml-entity-ref-name ((,class :foreground ,green-alt-other :weight 
,modus-theme-bold)))
+   `(nxml-glyph ((,class :inherit modus-theme-intense-neutral)))
+   `(nxml-hash ((,class :foreground ,blue-alt :weight ,modus-theme-bold)))
+   `(nxml-heading ((,class :weight bold)))
+   `(nxml-name ((,class :foreground ,magenta-alt :weight ,modus-theme-bold)))
+   `(nxml-namespace-attribute-colon ((,class :foreground ,fg-main)))
+   `(nxml-namespace-attribute-prefix ((,class :foreground ,cyan)))
+   `(nxml-processing-instruction-target ((,class :foreground 
,magenta-alt-other :weight ,modus-theme-bold)))
+   `(nxml-prolog-keyword ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold)))
+   `(nxml-ref ((,class :foreground ,green-alt-other :weight 
,modus-theme-bold)))
    ;;;; orderless
-   `(orderless-match-face-0 ((,class (,@(modus-operandi-theme-completions
-                                         blue-alt blue-refine-bg 
blue-refine-fg)
-                                      :weight bold))))
-   `(orderless-match-face-1 ((,class (,@(modus-operandi-theme-completions
-                                         magenta-alt magenta-refine-bg 
magenta-refine-fg)
-                                      :weight bold))))
-   `(orderless-match-face-2 ((,class (,@(modus-operandi-theme-completions
-                                         green-alt-other green-refine-bg 
green-refine-fg)
-                                      :weight bold))))
-   `(orderless-match-face-3 ((,class (,@(modus-operandi-theme-completions
-                                         yellow-alt-other yellow-refine-bg 
yellow-refine-fg)
-                                      :weight bold))))
+   `(orderless-match-face-0 ((,class ,@(modus-operandi-theme-completions
+                                        blue-alt blue-refine-bg blue-refine-fg)
+                                     :weight bold)))
+   `(orderless-match-face-1 ((,class ,@(modus-operandi-theme-completions
+                                        magenta-alt magenta-refine-bg 
magenta-refine-fg)
+                                     :weight bold)))
+   `(orderless-match-face-2 ((,class ,@(modus-operandi-theme-completions
+                                        green-alt-other green-refine-bg 
green-refine-fg)
+                                     :weight bold)))
+   `(orderless-match-face-3 ((,class ,@(modus-operandi-theme-completions
+                                        yellow-alt-other yellow-refine-bg 
yellow-refine-fg)
+                                     :weight bold)))
    ;;;; org
-   `(org-agenda-calendar-event ((,class (:foreground ,fg-main))))
-   `(org-agenda-calendar-sexp ((,class (:foreground ,cyan-alt))))
-   `(org-agenda-clocking ((,class (:inherit modus-theme-special-cold))))
-   `(org-agenda-column-dateline ((,class (:inherit 
modus-theme-subtle-neutral))))
-   `(org-agenda-current-time ((,class (:inherit modus-theme-intense-cyan))))
-   `(org-agenda-date ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,cyan-alt-other
-                                        ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)
-                                        ,@(modus-operandi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced)))))
-   `(org-agenda-date-today ((,class (:inherit ,modus-theme-variable-pitch 
:background ,cyan-subtle-bg
-                                              :foreground ,fg-main :weight bold
-                                              ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)))))
-   `(org-agenda-date-weekend ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,cyan
-                                                ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)
-                                                
,@(modus-operandi-theme-heading-block blue-nuanced-bg cyan-nuanced)))))
-   `(org-agenda-diary ((,class (:foreground ,fg-main))))
-   `(org-agenda-dimmed-todo-face ((,class (:inherit 
modus-theme-subtle-neutral))))
-   `(org-agenda-done ((,class (,@(modus-operandi-theme-org-todo-block 
green-nuanced-bg green-nuanced green)))))
-   `(org-agenda-filter-category ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(org-agenda-filter-effort ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(org-agenda-filter-regexp ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(org-agenda-filter-tags ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(org-agenda-restriction-lock ((,class (:background ,bg-dim :foreground 
,fg-dim))))
-   `(org-agenda-structure ((,class (:inherit ,modus-theme-variable-pitch
-                                             :foreground ,fg-special-mild
-                                             ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3)))))
-   `(org-archived ((,class (:background ,bg-alt :foreground ,fg-alt))))
-   `(org-block ((,class (,@(modus-operandi-theme-org-src-block bg-dim bg-main)
-                         :inherit fixed-pitch :foreground ,fg-main))))
-   `(org-block-begin-line ((,class (,@(and (>= emacs-major-version 27)
-                                           
modus-operandi-theme-distinct-org-blocks
-                                           '(:extend t))
-                                    :inherit fixed-pitch :background ,bg-alt 
:foreground ,fg-special-mild))))
-   `(org-block-end-line ((,class (:inherit org-block-begin-line))))
-   `(org-checkbox ((,class (:box (:line-width 1 :color ,bg-active)
-                                 :background ,bg-inactive :foreground 
,fg-active))))
-   `(org-checkbox-statistics-done ((,class (:foreground ,green
-                                                        
,@(modus-operandi-theme-heading-block
-                                                           green-nuanced-bg 
green-nuanced)))))
-   `(org-checkbox-statistics-todo ((,class (:foreground ,red-alt
-                                                        
,@(modus-operandi-theme-heading-block
-                                                           red-nuanced-bg 
red-nuanced)))))
-   `(org-clock-overlay ((,class (:inherit modus-theme-special-cold))))
-   `(org-code ((,class (:inherit fixed-pitch :foreground ,magenta))))
-   `(org-column ((,class (:background ,bg-alt))))
-   `(org-column-title ((,class (:underline t :background ,bg-alt :weight 
bold))))
-   `(org-date ((,class (:foreground ,cyan-alt-other :underline t))))
-   `(org-date-selected ((,class (:inherit modus-theme-intense-cyan :weight 
bold))))
-   `(org-default ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(org-document-info ((,class (:foreground ,fg-special-cold))))
-   `(org-document-info-keyword ((,class (:inherit fixed-pitch :foreground 
,fg-alt))))
-   `(org-document-title ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,fg-special-cold :weight bold
-                                           ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-5)))))
-   `(org-done ((,class (,@(modus-operandi-theme-org-todo-block 
green-nuanced-bg green-nuanced green)))))
-   `(org-drawer ((,class (:foreground ,cyan-alt))))
-   `(org-ellipsis ((,class (:foreground nil)))) ; inherits from the heading's 
colour
-   `(org-footnote ((,class (:foreground ,blue-alt :underline t))))
-   `(org-formula ((,class (:foreground ,red-alt))))
-   `(org-habit-alert-face ((,class (:inherit modus-theme-intense-yellow))))
-   `(org-habit-alert-future-face ((,class (:inherit 
modus-theme-refine-yellow))))
-   `(org-habit-clear-face ((,class (:inherit modus-theme-intense-magenta))))
-   `(org-habit-clear-future-face ((,class (:inherit 
modus-theme-refine-magenta))))
-   `(org-habit-overdue-face ((,class (:inherit modus-theme-intense-red))))
-   `(org-habit-overdue-future-face ((,class (:inherit 
modus-theme-refine-red))))
-   `(org-habit-ready-face ((,class (:inherit modus-theme-intense-blue))))
-   `(org-habit-ready-future-face ((,class (:inherit modus-theme-refine-blue))))
-   `(org-headline-done ((,class (:foreground ,green-nuanced
-                                             
,@(modus-operandi-theme-heading-block
-                                                green-nuanced-bg 
green-nuanced)))))
-   `(org-hide ((,class (:foreground ,bg-main))))
-   `(org-indent ((,class (:inherit (fixed-pitch org-hide)))))
-   `(org-latex-and-related ((,class (:foreground ,magenta-refine-fg))))
-   `(org-level-1 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-operandi-theme-heading-foreground 
fg-main magenta-alt-other)
-                                    ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)
-                                    ,@(modus-operandi-theme-heading-block 
magenta-nuanced-bg magenta-nuanced)))))
-   `(org-level-2 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-operandi-theme-heading-foreground 
fg-special-warm magenta-alt)
-                                    ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3)
-                                    ,@(modus-operandi-theme-heading-block 
red-nuanced-bg red-nuanced)))))
-   `(org-level-3 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-operandi-theme-heading-foreground 
fg-special-cold blue)
-                                    ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2)
-                                    ,@(modus-operandi-theme-heading-block 
blue-nuanced-bg blue-nuanced)))))
-   `(org-level-4 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-operandi-theme-heading-foreground 
fg-special-mild cyan-alt-other)
-                                    ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-1)
-                                    ,@(modus-operandi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced)))))
-   `(org-level-5 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-operandi-theme-heading-foreground 
fg-special-calm green-alt)
-                                    ,@(modus-operandi-theme-heading-block 
green-nuanced-bg green-nuanced)))))
-   `(org-level-6 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-operandi-theme-heading-foreground 
yellow-nuanced yellow-alt-other)
-                                    ,@(modus-operandi-theme-heading-block 
yellow-nuanced-bg yellow-nuanced)))))
-   `(org-level-7 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-operandi-theme-heading-foreground 
red-nuanced red-alt)
-                                    ,@(modus-operandi-theme-heading-block 
red-nuanced-bg red-nuanced)))))
-   `(org-level-8 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-operandi-theme-heading-foreground 
fg-dim magenta)
-                                    ,@(modus-operandi-theme-heading-block 
bg-alt fg-alt)))))
-   `(org-link ((,class (:inherit link))))
-   `(org-list-dt ((,class (:weight bold))))
-   `(org-macro ((,class (:inherit org-latex-and-related))))
-   `(org-meta-line ((,class (:inherit fixed-pitch :foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(org-mode-line-clock ((,class (:foreground ,fg-main))))
-   `(org-mode-line-clock-overrun ((,class (:inherit modus-theme-active-red))))
-   `(org-priority ((,class (,@(modus-operandi-theme-org-todo-block 
blue-nuanced-bg blue-nuanced magenta)
-                            ,@(modus-operandi-theme-heading-foreground magenta 
blue-alt)))))
-   `(org-quote ((,class (,@(modus-operandi-theme-org-src-block bg-dim bg-main)
-                         :foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(org-scheduled ((,class (:foreground ,fg-special-cold))))
-   `(org-scheduled-previously ((,class (:foreground ,fg-special-warm))))
-   `(org-scheduled-today ((,class (:foreground ,yellow-alt-other))))
-   `(org-sexp-date ((,class (:inherit org-date))))
-   `(org-special-keyword ((,class (,@(modus-operandi-theme-org-todo-block 
cyan-nuanced-bg cyan-nuanced cyan-alt)))))
-   `(org-table ((,class (:inherit fixed-pitch :foreground ,fg-special-cold))))
-   `(org-tag ((,class (:foreground ,magenta-nuanced :weight normal))))
-   `(org-tag-group ((,class (:foreground ,cyan-nuanced :weight bold))))
-   `(org-target ((,class (:underline t))))
-   `(org-time-grid ((,class (:foreground ,fg-unfocused))))
-   `(org-todo ((,class (,@(modus-operandi-theme-org-todo-block red-nuanced-bg 
red-nuanced red-alt)
-                        ,@(modus-operandi-theme-heading-foreground red-alt 
red-alt-other)))))
-   `(org-upcoming-deadline ((,class (:foreground ,red-alt-other))))
-   `(org-upcoming-distant-deadline ((,class (:foreground ,red-nuanced))))
-   `(org-verbatim ((,class (:inherit fixed-pitch :background ,bg-alt 
:foreground ,fg-special-calm))))
-   `(org-verse ((,class (:inherit org-quote))))
-   `(org-warning ((,class (:foreground ,blue-intense))))
+   `(org-agenda-calendar-event ((,class :foreground ,fg-main)))
+   `(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
+   `(org-agenda-clocking ((,class :inherit modus-theme-special-cold)))
+   `(org-agenda-column-dateline ((,class :inherit modus-theme-subtle-neutral)))
+   `(org-agenda-current-time ((,class :inherit modus-theme-intense-cyan)))
+   `(org-agenda-date ((,class :inherit ,modus-theme-variable-pitch :foreground 
,cyan-alt-other
+                              ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)
+                              ,@(modus-operandi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced))))
+   `(org-agenda-date-today ((,class :inherit ,modus-theme-variable-pitch 
:background ,cyan-subtle-bg
+                                    :foreground ,fg-main :weight bold
+                                    ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(org-agenda-date-weekend ((,class :inherit ,modus-theme-variable-pitch 
:foreground ,cyan
+                                      ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)
+                                      ,@(modus-operandi-theme-heading-block 
blue-nuanced-bg cyan-nuanced))))
+   `(org-agenda-diary ((,class :foreground ,fg-main)))
+   `(org-agenda-dimmed-todo-face ((,class :inherit 
modus-theme-subtle-neutral)))
+   `(org-agenda-done ((,class ,@(modus-operandi-theme-org-todo-block 
green-nuanced-bg green-nuanced green))))
+   `(org-agenda-filter-category ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(org-agenda-filter-effort ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(org-agenda-filter-regexp ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(org-agenda-filter-tags ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(org-agenda-restriction-lock ((,class :background ,bg-dim :foreground 
,fg-dim)))
+   `(org-agenda-structure ((,class :inherit ,modus-theme-variable-pitch
+                                   :foreground ,fg-special-mild
+                                   ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3))))
+   `(org-archived ((,class :background ,bg-alt :foreground ,fg-alt)))
+   `(org-block ((,class ,@(modus-operandi-theme-org-src-block bg-dim bg-main)
+                        :inherit fixed-pitch :foreground ,fg-main)))
+   `(org-block-begin-line ((,class ,@(and (>= emacs-major-version 27)
+                                          
modus-operandi-theme-distinct-org-blocks
+                                          '(:extend t))
+                                   :inherit fixed-pitch :background ,bg-alt 
:foreground ,fg-special-mild)))
+   `(org-block-end-line ((,class :inherit org-block-begin-line)))
+   `(org-checkbox ((,class :box (:line-width 1 :color ,bg-active)
+                           :background ,bg-inactive :foreground ,fg-active)))
+   `(org-checkbox-statistics-done ((,class :foreground ,green
+                                           
,@(modus-operandi-theme-heading-block
+                                              green-nuanced-bg 
green-nuanced))))
+   `(org-checkbox-statistics-todo ((,class :foreground ,red-alt
+                                           
,@(modus-operandi-theme-heading-block
+                                              red-nuanced-bg red-nuanced))))
+   `(org-clock-overlay ((,class :inherit modus-theme-special-cold)))
+   `(org-code ((,class :inherit fixed-pitch :foreground ,magenta)))
+   `(org-column ((,class :background ,bg-alt)))
+   `(org-column-title ((,class :underline t :background ,bg-alt :weight bold)))
+   `(org-date ((,class :foreground ,cyan-alt-other :underline t)))
+   `(org-date-selected ((,class :inherit modus-theme-intense-cyan :weight 
bold)))
+   `(org-default ((,class :background ,bg-main :foreground ,fg-main)))
+   `(org-document-info ((,class :foreground ,fg-special-cold)))
+   `(org-document-info-keyword ((,class :inherit fixed-pitch :foreground 
,fg-alt)))
+   `(org-document-title ((,class :inherit ,modus-theme-variable-pitch 
:foreground ,fg-special-cold :weight bold
+                                 ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-5))))
+   `(org-done ((,class ,@(modus-operandi-theme-org-todo-block green-nuanced-bg 
green-nuanced green))))
+   `(org-drawer ((,class :foreground ,cyan-alt)))
+   `(org-ellipsis ((,class :foreground nil))) ; inherits from the heading's 
colour
+   `(org-footnote ((,class :foreground ,blue-alt :underline t)))
+   `(org-formula ((,class :foreground ,red-alt)))
+   `(org-habit-alert-face ((,class :inherit modus-theme-intense-yellow)))
+   `(org-habit-alert-future-face ((,class :inherit modus-theme-refine-yellow)))
+   `(org-habit-clear-face ((,class :inherit modus-theme-intense-magenta)))
+   `(org-habit-clear-future-face ((,class :inherit 
modus-theme-refine-magenta)))
+   `(org-habit-overdue-face ((,class :inherit modus-theme-intense-red)))
+   `(org-habit-overdue-future-face ((,class :inherit modus-theme-refine-red)))
+   `(org-habit-ready-face ((,class :inherit modus-theme-intense-blue)))
+   `(org-habit-ready-future-face ((,class :inherit modus-theme-refine-blue)))
+   `(org-headline-done ((,class :foreground ,green-nuanced
+                                ,@(modus-operandi-theme-heading-block
+                                   green-nuanced-bg green-nuanced))))
+   `(org-hide ((,class :foreground ,bg-main)))
+   `(org-indent ((,class :inherit (fixed-pitch org-hide))))
+   `(org-latex-and-related ((,class :foreground ,magenta-refine-fg)))
+   `(org-level-1 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-operandi-theme-heading-foreground fg-main 
magenta-alt-other)
+                          ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)
+                          ,@(modus-operandi-theme-heading-block 
magenta-nuanced-bg magenta-nuanced))))
+   `(org-level-2 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-operandi-theme-heading-foreground 
fg-special-warm magenta-alt)
+                          ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3)
+                          ,@(modus-operandi-theme-heading-block red-nuanced-bg 
red-nuanced))))
+   `(org-level-3 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-operandi-theme-heading-foreground 
fg-special-cold blue)
+                          ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2)
+                          ,@(modus-operandi-theme-heading-block 
blue-nuanced-bg blue-nuanced))))
+   `(org-level-4 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-operandi-theme-heading-foreground 
fg-special-mild cyan-alt-other)
+                          ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-1)
+                          ,@(modus-operandi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced))))
+   `(org-level-5 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-operandi-theme-heading-foreground 
fg-special-calm green-alt)
+                          ,@(modus-operandi-theme-heading-block 
green-nuanced-bg green-nuanced))))
+   `(org-level-6 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-operandi-theme-heading-foreground 
yellow-nuanced yellow-alt-other)
+                          ,@(modus-operandi-theme-heading-block 
yellow-nuanced-bg yellow-nuanced))))
+   `(org-level-7 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-operandi-theme-heading-foreground 
red-nuanced red-alt)
+                          ,@(modus-operandi-theme-heading-block red-nuanced-bg 
red-nuanced))))
+   `(org-level-8 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-operandi-theme-heading-foreground fg-dim 
magenta)
+                          ,@(modus-operandi-theme-heading-block bg-alt 
fg-alt))))
+   `(org-link ((,class :inherit link)))
+   `(org-list-dt ((,class :weight bold)))
+   `(org-macro ((,class :inherit org-latex-and-related)))
+   `(org-meta-line ((,class :inherit fixed-pitch :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(org-mode-line-clock ((,class :foreground ,fg-main)))
+   `(org-mode-line-clock-overrun ((,class :inherit modus-theme-active-red)))
+   `(org-priority ((,class ,@(modus-operandi-theme-org-todo-block 
blue-nuanced-bg blue-nuanced magenta)
+                           ,@(modus-operandi-theme-heading-foreground magenta 
blue-alt))))
+   `(org-quote ((,class ,@(modus-operandi-theme-org-src-block bg-dim bg-main)
+                        :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(org-scheduled ((,class :foreground ,fg-special-cold)))
+   `(org-scheduled-previously ((,class :foreground ,fg-special-warm)))
+   `(org-scheduled-today ((,class :foreground ,yellow-alt-other)))
+   `(org-sexp-date ((,class :inherit org-date)))
+   `(org-special-keyword ((,class ,@(modus-operandi-theme-org-todo-block 
cyan-nuanced-bg cyan-nuanced cyan-alt))))
+   `(org-table ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
+   `(org-tag ((,class :foreground ,magenta-nuanced :weight normal)))
+   `(org-tag-group ((,class :foreground ,cyan-nuanced :weight bold)))
+   `(org-target ((,class :underline t)))
+   `(org-time-grid ((,class :foreground ,fg-unfocused)))
+   `(org-todo ((,class ,@(modus-operandi-theme-org-todo-block red-nuanced-bg 
red-nuanced red-alt)
+                       ,@(modus-operandi-theme-heading-foreground red-alt 
red-alt-other))))
+   `(org-upcoming-deadline ((,class :foreground ,red-alt-other)))
+   `(org-upcoming-distant-deadline ((,class :foreground ,red-nuanced)))
+   `(org-verbatim ((,class :inherit fixed-pitch :background ,bg-alt 
:foreground ,fg-special-calm)))
+   `(org-verse ((,class :inherit org-quote)))
+   `(org-warning ((,class :foreground ,blue-intense)))
    ;;;; org-journal
-   `(org-journal-calendar-entry-face ((,class (:foreground ,yellow-alt-other 
:slant ,modus-theme-slant))))
-   `(org-journal-calendar-scheduled-face ((,class (:foreground ,red-alt-other 
:slant ,modus-theme-slant))))
-   `(org-journal-highlight ((,class (:foreground ,magenta-alt))))
+   `(org-journal-calendar-entry-face ((,class :foreground ,yellow-alt-other 
:slant ,modus-theme-slant)))
+   `(org-journal-calendar-scheduled-face ((,class :foreground ,red-alt-other 
:slant ,modus-theme-slant)))
+   `(org-journal-highlight ((,class :foreground ,magenta-alt)))
    ;;;; org-noter
-   `(org-noter-no-notes-exist-face ((,class (:foreground ,red-active :weight 
bold))))
-   `(org-noter-notes-exist-face ((,class (:foreground ,green-active :weight 
bold))))
+   `(org-noter-no-notes-exist-face ((,class :foreground ,red-active :weight 
bold)))
+   `(org-noter-notes-exist-face ((,class :foreground ,green-active :weight 
bold)))
    ;;;; org-pomodoro
-   `(org-pomodoro-mode-line ((,class (:foreground ,red-active))))
-   `(org-pomodoro-mode-line-break ((,class (:foreground ,cyan-active))))
-   `(org-pomodoro-mode-line-overtime ((,class (:foreground ,red-active :weight 
bold))))
+   `(org-pomodoro-mode-line ((,class :foreground ,red-active)))
+   `(org-pomodoro-mode-line-break ((,class :foreground ,cyan-active)))
+   `(org-pomodoro-mode-line-overtime ((,class :foreground ,red-active :weight 
bold)))
    ;;;; org-recur
-   `(org-recur ((,class (:foreground ,magenta-active))))
+   `(org-recur ((,class :foreground ,magenta-active)))
    ;;;; org-roam
-   `(org-roam-link ((,class (:foreground ,blue-alt-other :underline t))))
-   `(org-roam-backlink ((,class (:foreground ,green-alt-other :underline t))))
+   `(org-roam-link ((,class :foreground ,blue-alt-other :underline t)))
+   `(org-roam-backlink ((,class :foreground ,green-alt-other :underline t)))
    ;;;; org-superstar
-   `(org-superstar-item ((,class (:foreground ,fg-main))))
-   `(org-superstar-leading ((,class (:foreground ,fg-whitespace))))
+   `(org-superstar-item ((,class :foreground ,fg-main)))
+   `(org-superstar-leading ((,class :foreground ,fg-whitespace)))
    ;;;; org-treescope
-   `(org-treescope-faces--markerinternal-midday ((,class (:inherit 
modus-theme-intense-blue))))
-   `(org-treescope-faces--markerinternal-range ((,class (:inherit 
modus-theme-special-mild))))
+   `(org-treescope-faces--markerinternal-midday ((,class :inherit 
modus-theme-intense-blue)))
+   `(org-treescope-faces--markerinternal-range ((,class :inherit 
modus-theme-special-mild)))
    ;;;; origami
-   `(origami-fold-header-face ((,class (:background ,bg-dim :foreground 
,fg-dim :box t))))
-   `(origami-fold-replacement-face ((,class (:background ,bg-alt :foreground 
,fg-alt))))
+   `(origami-fold-header-face ((,class :background ,bg-dim :foreground ,fg-dim 
:box t)))
+   `(origami-fold-replacement-face ((,class :background ,bg-alt :foreground 
,fg-alt)))
    ;;;; outline-mode
-   `(outline-1 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-operandi-theme-heading-foreground 
fg-main magenta-alt-other)
-                                  ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)
-                                  ,@(modus-operandi-theme-heading-block 
magenta-nuanced-bg magenta-nuanced)))))
-   `(outline-2 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-operandi-theme-heading-foreground 
fg-special-warm magenta-alt)
-                                  ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3)
-                                  ,@(modus-operandi-theme-heading-block 
red-nuanced-bg red-nuanced)))))
-   `(outline-3 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-operandi-theme-heading-foreground 
fg-special-cold blue)
-                                  ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2)
-                                  ,@(modus-operandi-theme-heading-block 
blue-nuanced-bg blue-nuanced)))))
-   `(outline-4 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-operandi-theme-heading-foreground 
fg-special-mild cyan-alt-other)
-                                  ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-1)
-                                  ,@(modus-operandi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced)))))
-   `(outline-5 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-operandi-theme-heading-foreground 
fg-special-calm green-alt)
-                                  ,@(modus-operandi-theme-heading-block 
green-nuanced-bg green-nuanced)))))
-   `(outline-6 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-operandi-theme-heading-foreground 
yellow-nuanced yellow-alt-other)
-                                  ,@(modus-operandi-theme-heading-block 
yellow-nuanced-bg yellow-nuanced)))))
-   `(outline-7 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-operandi-theme-heading-foreground 
red-nuanced red-alt)
-                                  ,@(modus-operandi-theme-heading-block 
red-nuanced-bg red-nuanced)))))
-   `(outline-8 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-operandi-theme-heading-foreground 
fg-dim magenta)
-                                  ,@(modus-operandi-theme-heading-block bg-alt 
fg-alt)))))
+   `(outline-1 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-operandi-theme-heading-foreground fg-main 
magenta-alt-other)
+                        ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)
+                        ,@(modus-operandi-theme-heading-block 
magenta-nuanced-bg magenta-nuanced))))
+   `(outline-2 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-operandi-theme-heading-foreground 
fg-special-warm magenta-alt)
+                        ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3)
+                        ,@(modus-operandi-theme-heading-block red-nuanced-bg 
red-nuanced))))
+   `(outline-3 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-operandi-theme-heading-foreground 
fg-special-cold blue)
+                        ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-2)
+                        ,@(modus-operandi-theme-heading-block blue-nuanced-bg 
blue-nuanced))))
+   `(outline-4 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-operandi-theme-heading-foreground 
fg-special-mild cyan-alt-other)
+                        ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-1)
+                        ,@(modus-operandi-theme-heading-block cyan-nuanced-bg 
cyan-nuanced))))
+   `(outline-5 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-operandi-theme-heading-foreground 
fg-special-calm green-alt)
+                        ,@(modus-operandi-theme-heading-block green-nuanced-bg 
green-nuanced))))
+   `(outline-6 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-operandi-theme-heading-foreground 
yellow-nuanced yellow-alt-other)
+                        ,@(modus-operandi-theme-heading-block 
yellow-nuanced-bg yellow-nuanced))))
+   `(outline-7 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-operandi-theme-heading-foreground red-nuanced 
red-alt)
+                        ,@(modus-operandi-theme-heading-block red-nuanced-bg 
red-nuanced))))
+   `(outline-8 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-operandi-theme-heading-foreground fg-dim 
magenta)
+                        ,@(modus-operandi-theme-heading-block bg-alt fg-alt))))
    ;;;; outline-minor-faces
-   `(outline-minor-0 ((,class (:background ,bg-alt))))
+   `(outline-minor-0 ((,class :background ,bg-alt)))
    ;;;; package (M-x list-packages)
-   `(package-description ((,class (:foreground ,fg-special-cold))))
-   `(package-help-section-name ((,class (:foreground ,magenta-alt-other 
:weight bold))))
-   `(package-name ((,class (:inherit link))))
-   `(package-status-avail-obso ((,class (:foreground ,red :weight bold))))
-   `(package-status-available ((,class (:foreground ,fg-special-mild))))
-   `(package-status-built-in ((,class (:foreground ,magenta))))
-   `(package-status-dependency ((,class (:foreground ,magenta-alt-other))))
-   `(package-status-disabled ((,class (:inherit modus-theme-subtle-red))))
-   `(package-status-external ((,class (:foreground ,cyan-alt-other))))
-   `(package-status-held ((,class (:foreground ,yellow-alt))))
-   `(package-status-incompat ((,class (:foreground ,yellow :weight bold))))
-   `(package-status-installed ((,class (:foreground ,fg-special-warm))))
-   `(package-status-new ((,class (:foreground ,green :weight bold))))
-   `(package-status-unsigned ((,class (:foreground ,red-alt :weight bold))))
+   `(package-description ((,class :foreground ,fg-special-cold)))
+   `(package-help-section-name ((,class :foreground ,magenta-alt-other :weight 
bold)))
+   `(package-name ((,class :inherit link)))
+   `(package-status-avail-obso ((,class :foreground ,red :weight bold)))
+   `(package-status-available ((,class :foreground ,fg-special-mild)))
+   `(package-status-built-in ((,class :foreground ,magenta)))
+   `(package-status-dependency ((,class :foreground ,magenta-alt-other)))
+   `(package-status-disabled ((,class :inherit modus-theme-subtle-red)))
+   `(package-status-external ((,class :foreground ,cyan-alt-other)))
+   `(package-status-held ((,class :foreground ,yellow-alt)))
+   `(package-status-incompat ((,class :foreground ,yellow :weight bold)))
+   `(package-status-installed ((,class :foreground ,fg-special-warm)))
+   `(package-status-new ((,class :foreground ,green :weight bold)))
+   `(package-status-unsigned ((,class :foreground ,red-alt :weight bold)))
    ;;;; page-break-lines
-   `(page-break-lines ((,class (:inherit default :foreground 
,fg-window-divider-outer))))
+   `(page-break-lines ((,class :inherit default :foreground 
,fg-window-divider-outer)))
    ;;;; paradox
-   `(paradox-archive-face ((,class (:foreground ,fg-special-mild))))
-   `(paradox-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(paradox-commit-tag-face ((,class (:inherit modus-theme-refine-magenta 
:box t))))
-   `(paradox-description-face ((,class (:foreground ,fg-special-cold))))
-   `(paradox-description-face-multiline ((,class (:foreground 
,fg-special-cold))))
-   `(paradox-download-face ((,class (:foreground ,blue-alt-other :weight 
,modus-theme-bold))))
-   `(paradox-highlight-face ((,class (:foreground ,cyan-alt-other :weight 
,modus-theme-bold))))
-   `(paradox-homepage-button-face ((,class (:foreground ,magenta-alt-other 
:underline t))))
-   `(paradox-mode-line-face ((,class (:foreground ,cyan-active :weight bold))))
-   `(paradox-name-face ((,class (:foreground ,blue :underline t))))
-   `(paradox-star-face ((,class (:foreground ,magenta))))
-   `(paradox-starred-face ((,class (:foreground ,magenta-alt))))
+   `(paradox-archive-face ((,class :foreground ,fg-special-mild)))
+   `(paradox-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(paradox-commit-tag-face ((,class :inherit modus-theme-refine-magenta :box 
t)))
+   `(paradox-description-face ((,class :foreground ,fg-special-cold)))
+   `(paradox-description-face-multiline ((,class :foreground 
,fg-special-cold)))
+   `(paradox-download-face ((,class :foreground ,blue-alt-other :weight 
,modus-theme-bold)))
+   `(paradox-highlight-face ((,class :foreground ,cyan-alt-other :weight 
,modus-theme-bold)))
+   `(paradox-homepage-button-face ((,class :foreground ,magenta-alt-other 
:underline t)))
+   `(paradox-mode-line-face ((,class :foreground ,cyan-active :weight bold)))
+   `(paradox-name-face ((,class :foreground ,blue :underline t)))
+   `(paradox-star-face ((,class :foreground ,magenta)))
+   `(paradox-starred-face ((,class :foreground ,magenta-alt)))
    ;;;; paren-face
-   `(parenthesis ((,class (:foreground ,fg-alt))))
+   `(parenthesis ((,class :foreground ,fg-alt)))
    ;;;; parrot
-   `(parrot-rotate-rotation-highlight-face ((,class (:inherit 
modus-theme-refine-magenta))))
+   `(parrot-rotate-rotation-highlight-face ((,class :inherit 
modus-theme-refine-magenta)))
    ;;;; pass
-   `(pass-mode-directory-face ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(pass-mode-entry-face ((,class (:background ,bg-main :foreground 
,fg-main))))
-   `(pass-mode-header-face ((,class (:foreground ,fg-special-warm))))
+   `(pass-mode-directory-face ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(pass-mode-entry-face ((,class :background ,bg-main :foreground ,fg-main)))
+   `(pass-mode-header-face ((,class :foreground ,fg-special-warm)))
    ;;;; persp-mode
-   `(persp-face-lighter-buffer-not-in-persp ((,class (:inherit 
modus-theme-intense-red))))
-   `(persp-face-lighter-default ((,class (:foreground ,blue-active :weight 
bold))))
-   `(persp-face-lighter-nil-persp ((,class (:foreground ,fg-active :weight 
bold))))
+   `(persp-face-lighter-buffer-not-in-persp ((,class :inherit 
modus-theme-intense-red)))
+   `(persp-face-lighter-default ((,class :foreground ,blue-active :weight 
bold)))
+   `(persp-face-lighter-nil-persp ((,class :foreground ,fg-active :weight 
bold)))
    ;;;; perspective
-   `(persp-selected-face ((,class (:foreground ,blue-active :weight bold))))
+   `(persp-selected-face ((,class :foreground ,blue-active :weight bold)))
    ;;;; phi-grep
-   `(phi-grep-heading-face  ((,class (:foreground ,red-alt :weight bold
-                                                  
,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))))
-   `(phi-grep-line-number-face ((,class (:foreground ,fg-special-warm))))
-   `(phi-grep-match-face ((,class (:inherit modus-theme-special-calm))))
-   `(phi-grep-modified-face ((,class (:inherit modus-theme-refine-yellow))))
-   `(phi-grep-overlay-face ((,class (:inherit modus-theme-refine-blue))))
+   `(phi-grep-heading-face  ((,class :foreground ,red-alt :weight bold
+                                     ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(phi-grep-line-number-face ((,class :foreground ,fg-special-warm)))
+   `(phi-grep-match-face ((,class :inherit modus-theme-special-calm)))
+   `(phi-grep-modified-face ((,class :inherit modus-theme-refine-yellow)))
+   `(phi-grep-overlay-face ((,class :inherit modus-theme-refine-blue)))
    ;;;; phi-search
-   `(phi-replace-preview-face ((,class (:inherit 
modus-theme-intense-magenta))))
-   `(phi-search-failpart-face ((,class (:inherit modus-theme-refine-red))))
-   `(phi-search-match-face ((,class (:inherit modus-theme-refine-cyan))))
-   `(phi-search-selection-face ((,class (:inherit modus-theme-intense-green 
:weight bold))))
+   `(phi-replace-preview-face ((,class :inherit modus-theme-intense-magenta)))
+   `(phi-search-failpart-face ((,class :inherit modus-theme-refine-red)))
+   `(phi-search-match-face ((,class :inherit modus-theme-refine-cyan)))
+   `(phi-search-selection-face ((,class :inherit modus-theme-intense-green 
:weight bold)))
    ;;;; pomidor
-   `(pomidor-break-face ((,class (:foreground ,blue-alt-other))))
-   `(pomidor-overwork-face ((,class (:foreground ,red-alt-other))))
-   `(pomidor-skip-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(pomidor-work-face ((,class (:foreground ,green-alt-other))))
+   `(pomidor-break-face ((,class :foreground ,blue-alt-other)))
+   `(pomidor-overwork-face ((,class :foreground ,red-alt-other)))
+   `(pomidor-skip-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(pomidor-work-face ((,class :foreground ,green-alt-other)))
    ;;;; powerline
-   `(powerline-active0 ((,class (:background ,fg-inactive :foreground 
,bg-inactive))))
-   `(powerline-active1 ((,class (:background ,bg-active :foreground 
,fg-active))))
-   `(powerline-active2 ((,class (:background ,bg-alt :foreground ,fg-active))))
-   `(powerline-inactive0 ((,class (:background ,bg-active :foreground 
,fg-inactive))))
-   `(powerline-inactive1 ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(powerline-inactive2 ((,class (:background ,bg-main :foreground ,fg-alt))))
+   `(powerline-active0 ((,class :background ,fg-inactive :foreground 
,bg-inactive)))
+   `(powerline-active1 ((,class :background ,bg-active :foreground 
,fg-active)))
+   `(powerline-active2 ((,class :background ,bg-alt :foreground ,fg-active)))
+   `(powerline-inactive0 ((,class :background ,bg-active :foreground 
,fg-inactive)))
+   `(powerline-inactive1 ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(powerline-inactive2 ((,class :background ,bg-main :foreground ,fg-alt)))
    ;;;; powerline-evil
-   `(powerline-evil-base-face ((,class (:background ,fg-main :foreground 
,bg-main))))
-   `(powerline-evil-emacs-face ((,class (:inherit 
modus-theme-active-magenta))))
-   `(powerline-evil-insert-face ((,class (:inherit modus-theme-active-green))))
-   `(powerline-evil-motion-face ((,class (:inherit modus-theme-active-blue))))
-   `(powerline-evil-normal-face ((,class (:background ,fg-alt :foreground 
,bg-main))))
-   `(powerline-evil-operator-face ((,class (:inherit 
modus-theme-active-yellow))))
-   `(powerline-evil-replace-face ((,class (:inherit modus-theme-active-red))))
-   `(powerline-evil-visual-face ((,class (:inherit modus-theme-active-cyan))))
+   `(powerline-evil-base-face ((,class :background ,fg-main :foreground 
,bg-main)))
+   `(powerline-evil-emacs-face ((,class :inherit modus-theme-active-magenta)))
+   `(powerline-evil-insert-face ((,class :inherit modus-theme-active-green)))
+   `(powerline-evil-motion-face ((,class :inherit modus-theme-active-blue)))
+   `(powerline-evil-normal-face ((,class :background ,fg-alt :foreground 
,bg-main)))
+   `(powerline-evil-operator-face ((,class :inherit 
modus-theme-active-yellow)))
+   `(powerline-evil-replace-face ((,class :inherit modus-theme-active-red)))
+   `(powerline-evil-visual-face ((,class :inherit modus-theme-active-cyan)))
    ;;;; proced
-   `(proced-mark ((,class (:inherit modus-theme-mark-symbol))))
-   `(proced-marked ((,class (:inherit modus-theme-mark-alt))))
-   `(proced-sort-header ((,class (:foreground ,fg-special-calm :weight bold 
:underline t))))
+   `(proced-mark ((,class :inherit modus-theme-mark-symbol)))
+   `(proced-marked ((,class :inherit modus-theme-mark-alt)))
+   `(proced-sort-header ((,class :foreground ,fg-special-calm :weight bold 
:underline t)))
    ;;;; prodigy
-   `(prodigy-green-face ((,class (:foreground ,green))))
-   `(prodigy-red-face ((,class (:foreground ,red))))
-   `(prodigy-yellow-face ((,class (:foreground ,yellow))))
+   `(prodigy-green-face ((,class :foreground ,green)))
+   `(prodigy-red-face ((,class :foreground ,red)))
+   `(prodigy-yellow-face ((,class :foreground ,yellow)))
    ;;;; rainbow-blocks
-   `(rainbow-blocks-depth-1-face ((,class (:foreground ,magenta-alt-other))))
-   `(rainbow-blocks-depth-2-face ((,class (:foreground ,blue))))
-   `(rainbow-blocks-depth-3-face ((,class (:foreground ,magenta-alt))))
-   `(rainbow-blocks-depth-4-face ((,class (:foreground ,green))))
-   `(rainbow-blocks-depth-5-face ((,class (:foreground ,magenta))))
-   `(rainbow-blocks-depth-6-face ((,class (:foreground ,cyan))))
-   `(rainbow-blocks-depth-7-face ((,class (:foreground ,yellow))))
-   `(rainbow-blocks-depth-8-face ((,class (:foreground ,cyan-alt))))
-   `(rainbow-blocks-depth-9-face ((,class (:foreground ,red-alt))))
-   `(rainbow-blocks-unmatched-face ((,class (:foreground ,red))))
+   `(rainbow-blocks-depth-1-face ((,class :foreground ,magenta-alt-other)))
+   `(rainbow-blocks-depth-2-face ((,class :foreground ,blue)))
+   `(rainbow-blocks-depth-3-face ((,class :foreground ,magenta-alt)))
+   `(rainbow-blocks-depth-4-face ((,class :foreground ,green)))
+   `(rainbow-blocks-depth-5-face ((,class :foreground ,magenta)))
+   `(rainbow-blocks-depth-6-face ((,class :foreground ,cyan)))
+   `(rainbow-blocks-depth-7-face ((,class :foreground ,yellow)))
+   `(rainbow-blocks-depth-8-face ((,class :foreground ,cyan-alt)))
+   `(rainbow-blocks-depth-9-face ((,class :foreground ,red-alt)))
+   `(rainbow-blocks-unmatched-face ((,class :foreground ,red)))
    ;;;; rainbow-identifiers
-   `(rainbow-identifiers-identifier-1 ((,class (:foreground 
,green-alt-other))))
-   `(rainbow-identifiers-identifier-2 ((,class (:foreground 
,magenta-alt-other))))
-   `(rainbow-identifiers-identifier-3 ((,class (:foreground ,cyan-alt-other))))
-   `(rainbow-identifiers-identifier-4 ((,class (:foreground 
,yellow-alt-other))))
-   `(rainbow-identifiers-identifier-5 ((,class (:foreground ,blue-alt-other))))
-   `(rainbow-identifiers-identifier-6 ((,class (:foreground ,green-alt))))
-   `(rainbow-identifiers-identifier-7 ((,class (:foreground ,magenta-alt))))
-   `(rainbow-identifiers-identifier-8 ((,class (:foreground ,cyan-alt))))
-   `(rainbow-identifiers-identifier-9 ((,class (:foreground ,yellow-alt))))
-   `(rainbow-identifiers-identifier-10 ((,class (:foreground ,green))))
-   `(rainbow-identifiers-identifier-11 ((,class (:foreground ,magenta))))
-   `(rainbow-identifiers-identifier-12 ((,class (:foreground ,cyan))))
-   `(rainbow-identifiers-identifier-13 ((,class (:foreground ,yellow))))
-   `(rainbow-identifiers-identifier-14 ((,class (:foreground ,blue-alt))))
-   `(rainbow-identifiers-identifier-15 ((,class (:foreground ,red-alt))))
+   `(rainbow-identifiers-identifier-1 ((,class :foreground ,green-alt-other)))
+   `(rainbow-identifiers-identifier-2 ((,class :foreground 
,magenta-alt-other)))
+   `(rainbow-identifiers-identifier-3 ((,class :foreground ,cyan-alt-other)))
+   `(rainbow-identifiers-identifier-4 ((,class :foreground ,yellow-alt-other)))
+   `(rainbow-identifiers-identifier-5 ((,class :foreground ,blue-alt-other)))
+   `(rainbow-identifiers-identifier-6 ((,class :foreground ,green-alt)))
+   `(rainbow-identifiers-identifier-7 ((,class :foreground ,magenta-alt)))
+   `(rainbow-identifiers-identifier-8 ((,class :foreground ,cyan-alt)))
+   `(rainbow-identifiers-identifier-9 ((,class :foreground ,yellow-alt)))
+   `(rainbow-identifiers-identifier-10 ((,class :foreground ,green)))
+   `(rainbow-identifiers-identifier-11 ((,class :foreground ,magenta)))
+   `(rainbow-identifiers-identifier-12 ((,class :foreground ,cyan)))
+   `(rainbow-identifiers-identifier-13 ((,class :foreground ,yellow)))
+   `(rainbow-identifiers-identifier-14 ((,class :foreground ,blue-alt)))
+   `(rainbow-identifiers-identifier-15 ((,class :foreground ,red-alt)))
    ;;;; rainbow-delimiters
-   `(rainbow-delimiters-base-face-error ((,class (:foreground ,red))))
-   `(rainbow-delimiters-base-face ((,class (:foreground ,fg-main))))
-   `(rainbow-delimiters-depth-1-face ((,class (:foreground ,green-alt-other))))
-   `(rainbow-delimiters-depth-2-face ((,class (:foreground 
,magenta-alt-other))))
-   `(rainbow-delimiters-depth-3-face ((,class (:foreground ,cyan-alt-other))))
-   `(rainbow-delimiters-depth-4-face ((,class (:foreground 
,yellow-alt-other))))
-   `(rainbow-delimiters-depth-5-face ((,class (:foreground ,blue-alt-other))))
-   `(rainbow-delimiters-depth-6-face ((,class (:foreground ,green-alt))))
-   `(rainbow-delimiters-depth-7-face ((,class (:foreground ,magenta-alt))))
-   `(rainbow-delimiters-depth-8-face ((,class (:foreground ,cyan-alt))))
-   `(rainbow-delimiters-depth-9-face ((,class (:foreground ,yellow-alt))))
-   `(rainbow-delimiters-mismatched-face ((,class (:foreground ,red-alt :weight 
bold))))
-   `(rainbow-delimiters-unmatched-face ((,class (:foreground ,red :weight 
bold))))
+   `(rainbow-delimiters-base-face-error ((,class :foreground ,red)))
+   `(rainbow-delimiters-base-face ((,class :foreground ,fg-main)))
+   `(rainbow-delimiters-depth-1-face ((,class :foreground ,green-alt-other)))
+   `(rainbow-delimiters-depth-2-face ((,class :foreground ,magenta-alt-other)))
+   `(rainbow-delimiters-depth-3-face ((,class :foreground ,cyan-alt-other)))
+   `(rainbow-delimiters-depth-4-face ((,class :foreground ,yellow-alt-other)))
+   `(rainbow-delimiters-depth-5-face ((,class :foreground ,blue-alt-other)))
+   `(rainbow-delimiters-depth-6-face ((,class :foreground ,green-alt)))
+   `(rainbow-delimiters-depth-7-face ((,class :foreground ,magenta-alt)))
+   `(rainbow-delimiters-depth-8-face ((,class :foreground ,cyan-alt)))
+   `(rainbow-delimiters-depth-9-face ((,class :foreground ,yellow-alt)))
+   `(rainbow-delimiters-mismatched-face ((,class :foreground ,red-alt :weight 
bold)))
+   `(rainbow-delimiters-unmatched-face ((,class :foreground ,red :weight 
bold)))
    ;;;; rcirc
-   `(rcirc-bright-nick ((,class (:foreground ,magenta-alt :weight bold))))
-   `(rcirc-dim-nick ((,class (:foreground ,fg-alt))))
-   `(rcirc-my-nick ((,class (:foreground ,magenta :weight bold))))
-   `(rcirc-nick-in-message ((,class (:foreground ,magenta-alt-other))))
-   `(rcirc-nick-in-message-full-line ((,class (:foreground ,fg-special-mild 
:weight bold))))
-   `(rcirc-other-nick ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(rcirc-prompt ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(rcirc-server ((,class (:foreground ,fg-unfocused))))
-   `(rcirc-timestamp ((,class (:foreground ,blue-nuanced))))
-   `(rcirc-url ((,class (:foreground ,blue :underline t))))
+   `(rcirc-bright-nick ((,class :foreground ,magenta-alt :weight bold)))
+   `(rcirc-dim-nick ((,class :foreground ,fg-alt)))
+   `(rcirc-my-nick ((,class :foreground ,magenta :weight bold)))
+   `(rcirc-nick-in-message ((,class :foreground ,magenta-alt-other)))
+   `(rcirc-nick-in-message-full-line ((,class :foreground ,fg-special-mild 
:weight bold)))
+   `(rcirc-other-nick ((,class :foreground ,fg-special-cold :weight bold)))
+   `(rcirc-prompt ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(rcirc-server ((,class :foreground ,fg-unfocused)))
+   `(rcirc-timestamp ((,class :foreground ,blue-nuanced)))
+   `(rcirc-url ((,class :foreground ,blue :underline t)))
    ;;;; regexp-builder (re-builder)
-   `(reb-match-0 ((,class (:inherit modus-theme-intense-blue))))
-   `(reb-match-1 ((,class (:inherit modus-theme-intense-magenta))))
-   `(reb-match-2 ((,class (:inherit modus-theme-intense-green))))
-   `(reb-match-3 ((,class (:inherit modus-theme-intense-red))))
-   `(reb-regexp-grouping-backslash ((,class (:foreground 
,fg-escape-char-backslash :weight bold))))
-   `(reb-regexp-grouping-construct ((,class (:foreground 
,fg-escape-char-construct :weight bold))))
+   `(reb-match-0 ((,class :inherit modus-theme-intense-blue)))
+   `(reb-match-1 ((,class :inherit modus-theme-intense-magenta)))
+   `(reb-match-2 ((,class :inherit modus-theme-intense-green)))
+   `(reb-match-3 ((,class :inherit modus-theme-intense-red)))
+   `(reb-regexp-grouping-backslash ((,class :foreground 
,fg-escape-char-backslash :weight bold)))
+   `(reb-regexp-grouping-construct ((,class :foreground 
,fg-escape-char-construct :weight bold)))
    ;;;; rg (rg.el)
-   `(rg-column-number-face ((,class (:foreground ,magenta-alt-other))))
-   `(rg-context-face ((,class (:foreground ,fg-unfocused))))
-   `(rg-error-face ((,class (:foreground ,red :weight bold))))
-   `(rg-file-tag-face ((,class (:foreground ,fg-special-cold))))
-   `(rg-filename-face ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(rg-line-number-face ((,class (:foreground ,fg-special-warm))))
-   `(rg-literal-face ((,class (:foreground ,blue-alt))))
-   `(rg-match-face ((,class (:inherit modus-theme-special-calm))))
-   `(rg-regexp-face ((,class (:foreground ,magenta-active))))
-   `(rg-toggle-off-face ((,class (:foreground ,fg-inactive :weight bold))))
-   `(rg-toggle-on-face ((,class (:foreground ,cyan-active :weight bold))))
-   `(rg-warning-face ((,class (:foreground ,yellow :weight bold))))
+   `(rg-column-number-face ((,class :foreground ,magenta-alt-other)))
+   `(rg-context-face ((,class :foreground ,fg-unfocused)))
+   `(rg-error-face ((,class :foreground ,red :weight bold)))
+   `(rg-file-tag-face ((,class :foreground ,fg-special-cold)))
+   `(rg-filename-face ((,class :foreground ,fg-special-cold :weight bold)))
+   `(rg-line-number-face ((,class :foreground ,fg-special-warm)))
+   `(rg-literal-face ((,class :foreground ,blue-alt)))
+   `(rg-match-face ((,class :inherit modus-theme-special-calm)))
+   `(rg-regexp-face ((,class :foreground ,magenta-active)))
+   `(rg-toggle-off-face ((,class :foreground ,fg-inactive :weight bold)))
+   `(rg-toggle-on-face ((,class :foreground ,cyan-active :weight bold)))
+   `(rg-warning-face ((,class :foreground ,yellow :weight bold)))
    ;;;; ripgrep
-   `(ripgrep-context-face ((,class (:foreground ,fg-unfocused))))
-   `(ripgrep-error-face ((,class (:foreground ,red :weight bold))))
-   `(ripgrep-hit-face ((,class (:foreground ,cyan))))
-   `(ripgrep-match-face ((,class (:inherit modus-theme-special-calm))))
+   `(ripgrep-context-face ((,class :foreground ,fg-unfocused)))
+   `(ripgrep-error-face ((,class :foreground ,red :weight bold)))
+   `(ripgrep-hit-face ((,class :foreground ,cyan)))
+   `(ripgrep-match-face ((,class :inherit modus-theme-special-calm)))
    ;;;; rmail
-   `(rmail-header-name ((,class (:foreground ,cyan-alt-other))))
-   `(rmail-highlight ((,class (:foreground ,magenta-alt :weight bold))))
+   `(rmail-header-name ((,class :foreground ,cyan-alt-other)))
+   `(rmail-highlight ((,class :foreground ,magenta-alt :weight bold)))
    ;;;; ruler-mode
-   `(ruler-mode-column-number ((,class (:inherit ruler-mode-default 
:foreground ,fg-main :weight bold))))
-   `(ruler-mode-comment-column ((,class (:inherit ruler-mode-default 
:foreground ,red-active))))
-   `(ruler-mode-current-column ((,class (:inherit ruler-mode-default 
:foreground ,cyan-active :box t))))
-   `(ruler-mode-default ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(ruler-mode-fill-column ((,class (:inherit ruler-mode-default :foreground 
,green-active))))
-   `(ruler-mode-fringes ((,class (:inherit ruler-mode-default :foreground 
,blue-active))))
-   `(ruler-mode-goal-column ((,class (:inherit ruler-mode-default :foreground 
,magenta-active))))
-   `(ruler-mode-margins ((,class (:inherit ruler-mode-default :foreground 
,bg-main))))
-   `(ruler-mode-pad ((,class (:background ,bg-active :foreground 
,fg-inactive))))
-   `(ruler-mode-tab-stop ((,class (:inherit ruler-mode-default :foreground 
,yellow-active))))
+   `(ruler-mode-column-number ((,class :inherit ruler-mode-default :foreground 
,fg-main :weight bold)))
+   `(ruler-mode-comment-column ((,class :inherit ruler-mode-default 
:foreground ,red-active)))
+   `(ruler-mode-current-column ((,class :inherit ruler-mode-default 
:foreground ,cyan-active :box t)))
+   `(ruler-mode-default ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(ruler-mode-fill-column ((,class :inherit ruler-mode-default :foreground 
,green-active)))
+   `(ruler-mode-fringes ((,class :inherit ruler-mode-default :foreground 
,blue-active)))
+   `(ruler-mode-goal-column ((,class :inherit ruler-mode-default :foreground 
,magenta-active)))
+   `(ruler-mode-margins ((,class :inherit ruler-mode-default :foreground 
,bg-main)))
+   `(ruler-mode-pad ((,class :background ,bg-active :foreground ,fg-inactive)))
+   `(ruler-mode-tab-stop ((,class :inherit ruler-mode-default :foreground 
,yellow-active)))
    ;;;; sallet
-   `(sallet-buffer-compressed ((,class (:foreground ,yellow-nuanced :slant 
italic))))
-   `(sallet-buffer-default-directory ((,class (:foreground ,cyan-nuanced))))
-   `(sallet-buffer-directory ((,class (:foreground ,blue-nuanced))))
-   `(sallet-buffer-help ((,class (:foreground ,fg-special-cold))))
-   `(sallet-buffer-modified ((,class (:foreground ,yellow-alt-other :slant 
italic))))
-   `(sallet-buffer-ordinary ((,class (:foreground ,fg-main))))
-   `(sallet-buffer-read-only ((,class (:foreground ,yellow-alt))))
-   `(sallet-buffer-size ((,class (:foreground ,fg-special-calm))))
-   `(sallet-buffer-special ((,class (:foreground ,magenta-alt-other))))
-   `(sallet-flx-match ((,class (:inherit modus-theme-refine-cyan))))
-   `(sallet-recentf-buffer-name ((,class (:foreground ,blue-nuanced))))
-   `(sallet-recentf-file-path ((,class (:foreground ,fg-special-mild))))
-   `(sallet-regexp-match ((,class (:inherit modus-theme-refine-magenta))))
-   `(sallet-source-header ((,class (:foreground ,red-alt :weight bold
-                                                ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4)))))
-   `(sallet-substring-match ((,class (:inherit modus-theme-refine-blue))))
+   `(sallet-buffer-compressed ((,class :foreground ,yellow-nuanced :slant 
italic)))
+   `(sallet-buffer-default-directory ((,class :foreground ,cyan-nuanced)))
+   `(sallet-buffer-directory ((,class :foreground ,blue-nuanced)))
+   `(sallet-buffer-help ((,class :foreground ,fg-special-cold)))
+   `(sallet-buffer-modified ((,class :foreground ,yellow-alt-other :slant 
italic)))
+   `(sallet-buffer-ordinary ((,class :foreground ,fg-main)))
+   `(sallet-buffer-read-only ((,class :foreground ,yellow-alt)))
+   `(sallet-buffer-size ((,class :foreground ,fg-special-calm)))
+   `(sallet-buffer-special ((,class :foreground ,magenta-alt-other)))
+   `(sallet-flx-match ((,class :inherit modus-theme-refine-cyan)))
+   `(sallet-recentf-buffer-name ((,class :foreground ,blue-nuanced)))
+   `(sallet-recentf-file-path ((,class :foreground ,fg-special-mild)))
+   `(sallet-regexp-match ((,class :inherit modus-theme-refine-magenta)))
+   `(sallet-source-header ((,class :foreground ,red-alt :weight bold
+                                   ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(sallet-substring-match ((,class :inherit modus-theme-refine-blue)))
    ;;;; selectrum
-   `(selectrum-current-candidate ((,class (:inherit 
modus-theme-intense-magenta))))
-   `(selectrum-primary-highlight ((,class (:inherit modus-theme-refine-blue 
:weight bold))))
-   `(selectrum-secondary-highlight ((,class (:inherit modus-theme-refine-cyan 
:weight bold))))
+   `(selectrum-current-candidate ((,class :inherit 
modus-theme-intense-magenta)))
+   `(selectrum-primary-highlight ((,class :inherit modus-theme-refine-blue 
:weight bold)))
+   `(selectrum-secondary-highlight ((,class :inherit modus-theme-refine-cyan 
:weight bold)))
    ;;;; sesman
-   `(sesman-browser-button-face ((,class (:foreground ,blue-alt-other 
:underline t))))
-   `(sesman-browser-highligh-face ((,class (:inherit 
modus-theme-subtle-blue))))
-   `(sesman-buffer-face ((,class (:foreground ,magenta))))
-   `(sesman-directory-face ((,class (:foreground ,blue :weight bold))))
-   `(sesman-project-face ((,class (:foreground ,magenta-alt-other :weight 
bold))))
+   `(sesman-browser-button-face ((,class :foreground ,blue-alt-other 
:underline t)))
+   `(sesman-browser-highligh-face ((,class :inherit modus-theme-subtle-blue)))
+   `(sesman-buffer-face ((,class :foreground ,magenta)))
+   `(sesman-directory-face ((,class :foreground ,blue :weight bold)))
+   `(sesman-project-face ((,class :foreground ,magenta-alt-other :weight 
bold)))
    ;;;; shell-script-mode
-   `(sh-heredoc ((,class (:foreground ,blue-alt))))
-   `(sh-quoted-exec ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
+   `(sh-heredoc ((,class :foreground ,blue-alt)))
+   `(sh-quoted-exec ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
    ;;;; show-paren-mode
-   `(show-paren-match ((,class (:background ,bg-paren-match :foreground 
,fg-main))))
-   `(show-paren-match-expression ((,class (:inherit 
modus-theme-special-calm))))
-   `(show-paren-mismatch ((,class (:inherit modus-theme-intense-red))))
+   `(show-paren-match ((,class :background ,bg-paren-match :foreground 
,fg-main)))
+   `(show-paren-match-expression ((,class :inherit modus-theme-special-calm)))
+   `(show-paren-mismatch ((,class :inherit modus-theme-intense-red)))
    ;;;; side-notes
-   `(side-notes ((,class (:background ,bg-dim :foreground ,fg-dim))))
+   `(side-notes ((,class :background ,bg-dim :foreground ,fg-dim)))
    ;;;; skewer-mode
-   `(skewer-error-face ((,class (:foreground ,red :underline t))))
+   `(skewer-error-face ((,class :foreground ,red :underline t)))
    ;;;; smart-mode-line
-   `(sml/charging ((,class (:foreground ,green-active))))
-   `(sml/discharging ((,class (:foreground ,red-active))))
-   `(sml/filename ((,class (:foreground ,blue-active :weight bold))))
-   `(sml/folder ((,class (:foreground ,fg-active))))
-   `(sml/git ((,class (:foreground ,green-active :weight bold))))
-   `(sml/global ((,class (:foreground ,fg-active))))
-   `(sml/line-number ((,class (:inherit sml/global))))
-   `(sml/minor-modes ((,class (:inherit sml/global))))
-   `(sml/modes ((,class (:foreground ,fg-active :weight bold))))
-   `(sml/modified ((,class (:foreground ,magenta-active :weight bold))))
-   `(sml/mule-info ((,class (:inherit sml/global))))
-   `(sml/name-filling ((,class (:foreground ,yellow-active))))
-   `(sml/not-modified ((,class (:inherit sml/global))))
-   `(sml/numbers-separator ((,class (:inherit sml/global))))
-   `(sml/outside-modified ((,class (:inherit modus-theme-intense-red))))
-   `(sml/position-percentage ((,class (:inherit sml/global))))
-   `(sml/prefix ((,class (:foreground ,green-active))))
-   `(sml/process ((,class (:inherit sml/prefix))))
-   `(sml/projectile ((,class (:inherit sml/git))))
-   `(sml/read-only ((,class (:foreground ,cyan-active :weight bold))))
-   `(sml/remote ((,class (:inherit sml/global))))
-   `(sml/sudo ((,class (:inherit modus-theme-subtle-red))))
-   `(sml/time ((,class (:inherit sml/global))))
-   `(sml/vc ((,class (:inherit sml/git))))
-   `(sml/vc-edited ((,class (:foreground ,yellow-active :weight bold))))
+   `(sml/charging ((,class :foreground ,green-active)))
+   `(sml/discharging ((,class :foreground ,red-active)))
+   `(sml/filename ((,class :foreground ,blue-active :weight bold)))
+   `(sml/folder ((,class :foreground ,fg-active)))
+   `(sml/git ((,class :foreground ,green-active :weight bold)))
+   `(sml/global ((,class :foreground ,fg-active)))
+   `(sml/line-number ((,class :inherit sml/global)))
+   `(sml/minor-modes ((,class :inherit sml/global)))
+   `(sml/modes ((,class :foreground ,fg-active :weight bold)))
+   `(sml/modified ((,class :foreground ,magenta-active :weight bold)))
+   `(sml/mule-info ((,class :inherit sml/global)))
+   `(sml/name-filling ((,class :foreground ,yellow-active)))
+   `(sml/not-modified ((,class :inherit sml/global)))
+   `(sml/numbers-separator ((,class :inherit sml/global)))
+   `(sml/outside-modified ((,class :inherit modus-theme-intense-red)))
+   `(sml/position-percentage ((,class :inherit sml/global)))
+   `(sml/prefix ((,class :foreground ,green-active)))
+   `(sml/process ((,class :inherit sml/prefix)))
+   `(sml/projectile ((,class :inherit sml/git)))
+   `(sml/read-only ((,class :foreground ,cyan-active :weight bold)))
+   `(sml/remote ((,class :inherit sml/global)))
+   `(sml/sudo ((,class :inherit modus-theme-subtle-red)))
+   `(sml/time ((,class :inherit sml/global)))
+   `(sml/vc ((,class :inherit sml/git)))
+   `(sml/vc-edited ((,class :foreground ,yellow-active :weight bold)))
    ;;;; smartparens
-   `(sp-pair-overlay-face ((,class (:inherit modus-theme-special-warm))))
-   `(sp-show-pair-enclosing ((,class (:inherit modus-theme-special-mild))))
-   `(sp-show-pair-match-face ((,class (:background ,bg-paren-match :foreground 
,fg-main))))
-   `(sp-show-pair-mismatch-face ((,class (:inherit modus-theme-intense-red))))
-   `(sp-wrap-overlay-closing-pair ((,class (:inherit sp-pair-overlay-face))))
-   `(sp-wrap-overlay-face ((,class (:inherit sp-pair-overlay-face))))
-   `(sp-wrap-overlay-opening-pair ((,class (:inherit sp-pair-overlay-face))))
-   `(sp-wrap-tag-overlay-face ((,class (:inherit sp-pair-overlay-face))))
+   `(sp-pair-overlay-face ((,class :inherit modus-theme-special-warm)))
+   `(sp-show-pair-enclosing ((,class :inherit modus-theme-special-mild)))
+   `(sp-show-pair-match-face ((,class :background ,bg-paren-match :foreground 
,fg-main)))
+   `(sp-show-pair-mismatch-face ((,class :inherit modus-theme-intense-red)))
+   `(sp-wrap-overlay-closing-pair ((,class :inherit sp-pair-overlay-face)))
+   `(sp-wrap-overlay-face ((,class :inherit sp-pair-overlay-face)))
+   `(sp-wrap-overlay-opening-pair ((,class :inherit sp-pair-overlay-face)))
+   `(sp-wrap-tag-overlay-face ((,class :inherit sp-pair-overlay-face)))
    ;;;; smerge
-   `(smerge-base ((,class ,(modus-operandi-theme-diffs
-                            bg-main yellow
-                            bg-diff-focus-changed fg-diff-focus-changed))))
-   `(smerge-lower ((,class ,(modus-operandi-theme-diffs
-                             bg-main green
-                             bg-diff-focus-added fg-diff-focus-added))))
-   `(smerge-markers ((,class (:background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2))))
-   `(smerge-refined-added ((,class ,(modus-operandi-theme-diffs
-                                     bg-diff-added fg-diff-added
-                                     bg-diff-refine-added 
fg-diff-refine-added))))
-   `(smerge-refined-changed ((,class nil)))
-   `(smerge-refined-removed ((,class ,(modus-operandi-theme-diffs
-                                       bg-diff-removed fg-diff-removed
-                                       bg-diff-refine-removed 
fg-diff-refine-removed))))
-   `(smerge-upper ((,class ,(modus-operandi-theme-diffs
-                             bg-main red
-                             bg-diff-focus-removed fg-diff-focus-removed))))
+   `(smerge-base ((,class ,@(modus-operandi-theme-diffs
+                             bg-main yellow
+                             bg-diff-focus-changed fg-diff-focus-changed))))
+   `(smerge-lower ((,class ,@(modus-operandi-theme-diffs
+                              bg-main green
+                              bg-diff-focus-added fg-diff-focus-added))))
+   `(smerge-markers ((,class :background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2)))
+   `(smerge-refined-added ((,class ,@(modus-operandi-theme-diffs
+                                      bg-diff-added fg-diff-added
+                                      bg-diff-refine-added 
fg-diff-refine-added))))
+   `(smerge-refined-changed ((,class)))
+   `(smerge-refined-removed ((,class ,@(modus-operandi-theme-diffs
+                                        bg-diff-removed fg-diff-removed
+                                        bg-diff-refine-removed 
fg-diff-refine-removed))))
+   `(smerge-upper ((,class ,@(modus-operandi-theme-diffs
+                              bg-main red
+                              bg-diff-focus-removed fg-diff-focus-removed))))
    ;;;; speedbar
-   `(speedbar-button-face ((,class (:inherit link))))
-   `(speedbar-directory-face ((,class (:foreground ,blue :weight bold))))
-   `(speedbar-file-face ((,class (:foreground ,fg-main))))
-   `(speedbar-highlight-face ((,class (:inherit modus-theme-subtle-blue))))
-   `(speedbar-selected-face ((,class (:foreground ,cyan :weight bold))))
-   `(speedbar-separator-face ((,class (:inherit modus-theme-intense-neutral))))
-   `(speedbar-tag-face ((,class (:foreground ,yellow-alt-other))))
+   `(speedbar-button-face ((,class :inherit link)))
+   `(speedbar-directory-face ((,class :foreground ,blue :weight bold)))
+   `(speedbar-file-face ((,class :foreground ,fg-main)))
+   `(speedbar-highlight-face ((,class :inherit modus-theme-subtle-blue)))
+   `(speedbar-selected-face ((,class :foreground ,cyan :weight bold)))
+   `(speedbar-separator-face ((,class :inherit modus-theme-intense-neutral)))
+   `(speedbar-tag-face ((,class :foreground ,yellow-alt-other)))
    ;;;; spell-fu
    `(spell-fu-incorrect-face
      ((,(append '((supports :underline (:style wave))) class)
-       (:foreground ,fg-lang-error :underline (:style wave)))
-      (,class (:foreground ,fg-lang-error :underline t))))
+       :foreground ,fg-lang-error :underline (:style wave))
+      (,class :foreground ,fg-lang-error :underline t)))
    ;;;; stripes
-   `(stripes ((,class (:background ,bg-hl-line))))
+   `(stripes ((,class :background ,bg-hl-line)))
    ;;;; success
-   `(suggest-heading ((,class (:foreground ,yellow-alt-other :weight bold))))
+   `(suggest-heading ((,class :foreground ,yellow-alt-other :weight bold)))
    ;;;; switch-window
-   `(switch-window-background ((,class (:background ,bg-dim))))
-   `(switch-window-label ((,class (:height 3.0 :foreground ,blue-intense))))
+   `(switch-window-background ((,class :background ,bg-dim)))
+   `(switch-window-label ((,class :height 3.0 :foreground ,blue-intense)))
    ;;;; swiper
-   `(swiper-background-match-face-1 ((,class (:inherit 
modus-theme-subtle-neutral))))
-   `(swiper-background-match-face-2 ((,class (:inherit 
modus-theme-subtle-cyan))))
-   `(swiper-background-match-face-3 ((,class (:inherit 
modus-theme-subtle-magenta))))
-   `(swiper-background-match-face-4 ((,class (:inherit 
modus-theme-subtle-green))))
-   `(swiper-line-face ((,class (,@(and (>= emacs-major-version 27) '(:extend 
t))
-                                :inherit modus-theme-special-cold))))
-   `(swiper-match-face-1 ((,class (:inherit swiper-line-face))))
-   `(swiper-match-face-2 ((,class (:inherit swiper-line-face))))
-   `(swiper-match-face-3 ((,class (:inherit swiper-line-face))))
-   `(swiper-match-face-4 ((,class (:inherit swiper-line-face))))
+   `(swiper-background-match-face-1 ((,class :inherit 
modus-theme-subtle-neutral)))
+   `(swiper-background-match-face-2 ((,class :inherit 
modus-theme-subtle-cyan)))
+   `(swiper-background-match-face-3 ((,class :inherit 
modus-theme-subtle-magenta)))
+   `(swiper-background-match-face-4 ((,class :inherit 
modus-theme-subtle-green)))
+   `(swiper-line-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
+                               :inherit modus-theme-special-cold)))
+   `(swiper-match-face-1 ((,class :inherit swiper-line-face)))
+   `(swiper-match-face-2 ((,class :inherit swiper-line-face)))
+   `(swiper-match-face-3 ((,class :inherit swiper-line-face)))
+   `(swiper-match-face-4 ((,class :inherit swiper-line-face)))
    ;;;; swoop
-   `(swoop-face-header-format-line ((,class (:foreground ,red-alt :weight bold
-                                                         
,@(modus-operandi-theme-scale modus-operandi-theme-scale-3)))))
-   `(swoop-face-line-buffer-name ((,class (:foreground ,blue-alt :weight bold
-                                                       
,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))))
-   `(swoop-face-line-number ((,class (:foreground ,fg-special-warm))))
-   `(swoop-face-target-line ((,class (:inherit modus-theme-intense-blue
-                                               ,@(and (>= emacs-major-version 
27) '(:extend t))))))
-   `(swoop-face-target-words ((,class (:inherit modus-theme-refine-cyan))))
+   `(swoop-face-header-format-line ((,class :foreground ,red-alt :weight bold
+                                            ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-3))))
+   `(swoop-face-line-buffer-name ((,class :foreground ,blue-alt :weight bold
+                                          ,@(modus-operandi-theme-scale 
modus-operandi-theme-scale-4))))
+   `(swoop-face-line-number ((,class :foreground ,fg-special-warm)))
+   `(swoop-face-target-line ((,class :inherit modus-theme-intense-blue
+                                     ,@(and (>= emacs-major-version 27) 
'(:extend t)))))
+   `(swoop-face-target-words ((,class :inherit modus-theme-refine-cyan)))
    ;;;; sx
-   `(sx-inbox-item-type ((,class (:foreground ,magenta-alt-other))))
-   `(sx-inbox-item-type-unread ((,class (:inherit sx-inbox-item-type :weight 
bold))))
-   `(sx-question-list-answers ((,class (:foreground ,green))))
-   `(sx-question-list-answers-accepted ((,class (:box t :foreground ,green))))
-   `(sx-question-list-bounty ((,class (:background ,bg-alt :foreground ,yellow 
:weight bold))))
-   `(sx-question-list-date ((,class (:foreground ,fg-special-cold))))
-   `(sx-question-list-favorite ((,class (:foreground ,fg-special-warm :weight 
bold))))
-   `(sx-question-list-parent ((,class (:foreground ,fg-main))))
-   `(sx-question-list-read-question ((,class (:foreground ,fg-alt))))
-   `(sx-question-list-score ((,class (:foreground ,fg-special-mild))))
-   `(sx-question-list-score-upvoted ((,class (:inherit sx-question-list-score 
:weight bold))))
-   `(sx-question-list-unread-question ((,class (:foreground ,fg-main :weight 
bold))))
-   `(sx-question-mode-accepted ((,class (:height 1.3 :foreground ,green 
:weight bold))))
-   `(sx-question-mode-closed ((,class (:box (:line-width 2 :color nil) 
:inherit modus-theme-active-yellow))))
-   `(sx-question-mode-closed-reason ((,class (:box (:line-width 2 :color nil) 
:foreground ,fg-main))))
-   `(sx-question-mode-content-face ((,class (:background ,bg-dim))))
-   `(sx-question-mode-date ((,class (:foreground ,blue))))
-   `(sx-question-mode-header ((,class (:foreground ,cyan :weight bold))))
-   `(sx-question-mode-kbd-tag ((,class (:height 0.9 :box (:line-width 3 :color 
,fg-main :style released-button) :foreground ,fg-main :weight bold))))
-   `(sx-question-mode-score ((,class (:foreground ,fg-dim))))
-   `(sx-question-mode-score-downvoted ((,class (:foreground ,yellow))))
-   `(sx-question-mode-score-upvoted ((,class (:foreground ,magenta :weight 
bold))))
-   `(sx-question-mode-title ((,class (:foreground ,fg-main :weight bold))))
-   `(sx-question-mode-title-comments ((,class (:foreground ,fg-alt :weight 
bold))))
-   `(sx-tag ((,class (:foreground ,magenta-alt))))
-   `(sx-user-name ((,class (:foreground ,blue-alt))))
-   `(sx-user-reputation ((,class (:foreground ,fg-alt))))
+   `(sx-inbox-item-type ((,class :foreground ,magenta-alt-other)))
+   `(sx-inbox-item-type-unread ((,class :inherit sx-inbox-item-type :weight 
bold)))
+   `(sx-question-list-answers ((,class :foreground ,green)))
+   `(sx-question-list-answers-accepted ((,class :box t :foreground ,green)))
+   `(sx-question-list-bounty ((,class :background ,bg-alt :foreground ,yellow 
:weight bold)))
+   `(sx-question-list-date ((,class :foreground ,fg-special-cold)))
+   `(sx-question-list-favorite ((,class :foreground ,fg-special-warm :weight 
bold)))
+   `(sx-question-list-parent ((,class :foreground ,fg-main)))
+   `(sx-question-list-read-question ((,class :foreground ,fg-alt)))
+   `(sx-question-list-score ((,class :foreground ,fg-special-mild)))
+   `(sx-question-list-score-upvoted ((,class :inherit sx-question-list-score 
:weight bold)))
+   `(sx-question-list-unread-question ((,class :foreground ,fg-main :weight 
bold)))
+   `(sx-question-mode-accepted ((,class :height 1.3 :foreground ,green :weight 
bold)))
+   `(sx-question-mode-closed ((,class :box (:line-width 2 :color nil) :inherit 
modus-theme-active-yellow)))
+   `(sx-question-mode-closed-reason ((,class :box (:line-width 2 :color nil) 
:foreground ,fg-main)))
+   `(sx-question-mode-content-face ((,class :background ,bg-dim)))
+   `(sx-question-mode-date ((,class :foreground ,blue)))
+   `(sx-question-mode-header ((,class :foreground ,cyan :weight bold)))
+   `(sx-question-mode-kbd-tag ((,class :height 0.9 :box (:line-width 3 :color 
,fg-main :style released-button) :foreground ,fg-main :weight bold)))
+   `(sx-question-mode-score ((,class :foreground ,fg-dim)))
+   `(sx-question-mode-score-downvoted ((,class :foreground ,yellow)))
+   `(sx-question-mode-score-upvoted ((,class :foreground ,magenta :weight 
bold)))
+   `(sx-question-mode-title ((,class :foreground ,fg-main :weight bold)))
+   `(sx-question-mode-title-comments ((,class :foreground ,fg-alt :weight 
bold)))
+   `(sx-tag ((,class :foreground ,magenta-alt)))
+   `(sx-user-name ((,class :foreground ,blue-alt)))
+   `(sx-user-reputation ((,class :foreground ,fg-alt)))
    ;;;; symbol-overlay
-   `(symbol-overlay-default-face ((,class (:inherit modus-theme-refine-blue))))
-   `(symbol-overlay-face-1 ((,class (:inherit modus-theme-intense-blue))))
-   `(symbol-overlay-face-2 ((,class (:inherit modus-theme-refine-magenta))))
-   `(symbol-overlay-face-3 ((,class (:inherit modus-theme-intense-yellow))))
-   `(symbol-overlay-face-4 ((,class (:inherit modus-theme-intense-magenta))))
-   `(symbol-overlay-face-5 ((,class (:inherit modus-theme-intense-red))))
-   `(symbol-overlay-face-6 ((,class (:inherit modus-theme-refine-red))))
-   `(symbol-overlay-face-7 ((,class (:inherit modus-theme-intense-cyan))))
-   `(symbol-overlay-face-8 ((,class (:inherit modus-theme-refine-cyan))))
+   `(symbol-overlay-default-face ((,class :inherit modus-theme-refine-blue)))
+   `(symbol-overlay-face-1 ((,class :inherit modus-theme-intense-blue)))
+   `(symbol-overlay-face-2 ((,class :inherit modus-theme-refine-magenta)))
+   `(symbol-overlay-face-3 ((,class :inherit modus-theme-intense-yellow)))
+   `(symbol-overlay-face-4 ((,class :inherit modus-theme-intense-magenta)))
+   `(symbol-overlay-face-5 ((,class :inherit modus-theme-intense-red)))
+   `(symbol-overlay-face-6 ((,class :inherit modus-theme-refine-red)))
+   `(symbol-overlay-face-7 ((,class :inherit modus-theme-intense-cyan)))
+   `(symbol-overlay-face-8 ((,class :inherit modus-theme-refine-cyan)))
    ;;;; syslog-mode
-   `(syslog-debug ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(syslog-error ((,class (:foreground ,red :weight bold))))
-   `(syslog-file ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(syslog-hide ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(syslog-hour ((,class (:foreground ,magenta-alt-other :weight bold))))
-   `(syslog-info ((,class (:foreground ,blue-alt-other :weight bold))))
-   `(syslog-ip ((,class (:foreground ,fg-special-mild :weight bold :underline 
t))))
-   `(syslog-su ((,class (:foreground ,red-alt :weight bold))))
-   `(syslog-warn ((,class (:foreground ,yellow :weight bold))))
+   `(syslog-debug ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(syslog-error ((,class :foreground ,red :weight bold)))
+   `(syslog-file ((,class :foreground ,fg-special-cold :weight bold)))
+   `(syslog-hide ((,class :background ,bg-main :foreground ,fg-main)))
+   `(syslog-hour ((,class :foreground ,magenta-alt-other :weight bold)))
+   `(syslog-info ((,class :foreground ,blue-alt-other :weight bold)))
+   `(syslog-ip ((,class :foreground ,fg-special-mild :weight bold :underline 
t)))
+   `(syslog-su ((,class :foreground ,red-alt :weight bold)))
+   `(syslog-warn ((,class :foreground ,yellow :weight bold)))
    ;;;; trashed
-   `(trashed-deleted ((,class (:inherit modus-theme-mark-del))))
-   `(trashed-directory ((,class (:foreground ,blue))))
-   `(trashed-mark ((,class (:inherit modus-theme-mark-symbol))))
-   `(trashed-marked ((,class (:inherit modus-theme-mark-alt))))
-   `(trashed-restored ((,class (:inherit modus-theme-mark-sel))))
-   `(trashed-symlink ((,class (:foreground ,blue-alt :underline t))))
+   `(trashed-deleted ((,class :inherit modus-theme-mark-del)))
+   `(trashed-directory ((,class :foreground ,blue)))
+   `(trashed-mark ((,class :inherit modus-theme-mark-symbol)))
+   `(trashed-marked ((,class :inherit modus-theme-mark-alt)))
+   `(trashed-restored ((,class :inherit modus-theme-mark-sel)))
+   `(trashed-symlink ((,class :foreground ,blue-alt :underline t)))
    ;;;; telephone-line
-   `(telephone-line-accent-active ((,class (:background ,fg-inactive 
:foreground ,bg-inactive))))
-   `(telephone-line-accent-inactive ((,class (:background ,bg-active 
:foreground ,fg-active))))
-   `(telephone-line-error ((,class (:foreground ,red-active :weight bold))))
-   `(telephone-line-evil ((,class (:foreground ,fg-main))))
-   `(telephone-line-evil-emacs ((,class (:inherit telephone-line-evil 
:background ,magenta-intense-bg))))
-   `(telephone-line-evil-insert ((,class (:inherit telephone-line-evil 
:background ,green-intense-bg))))
-   `(telephone-line-evil-motion ((,class (:inherit telephone-line-evil 
:background ,yellow-intense-bg))))
-   `(telephone-line-evil-normal ((,class (:inherit telephone-line-evil 
:background ,bg-alt))))
-   `(telephone-line-evil-operator ((,class (:inherit telephone-line-evil 
:background ,yellow-subtle-bg))))
-   `(telephone-line-evil-replace ((,class (:inherit telephone-line-evil 
:background ,red-intense-bg))))
-   `(telephone-line-evil-visual ((,class (:inherit telephone-line-evil 
:background ,cyan-intense-bg))))
-   `(telephone-line-projectile ((,class (:foreground ,cyan-active))))
-   `(telephone-line-unimportant ((,class (:foreground ,fg-inactive))))
-   `(telephone-line-warning ((,class (:foreground ,yellow-active :weight 
bold))))
+   `(telephone-line-accent-active ((,class :background ,fg-inactive 
:foreground ,bg-inactive)))
+   `(telephone-line-accent-inactive ((,class :background ,bg-active 
:foreground ,fg-active)))
+   `(telephone-line-error ((,class :foreground ,red-active :weight bold)))
+   `(telephone-line-evil ((,class :foreground ,fg-main)))
+   `(telephone-line-evil-emacs ((,class :inherit telephone-line-evil 
:background ,magenta-intense-bg)))
+   `(telephone-line-evil-insert ((,class :inherit telephone-line-evil 
:background ,green-intense-bg)))
+   `(telephone-line-evil-motion ((,class :inherit telephone-line-evil 
:background ,yellow-intense-bg)))
+   `(telephone-line-evil-normal ((,class :inherit telephone-line-evil 
:background ,bg-alt)))
+   `(telephone-line-evil-operator ((,class :inherit telephone-line-evil 
:background ,yellow-subtle-bg)))
+   `(telephone-line-evil-replace ((,class :inherit telephone-line-evil 
:background ,red-intense-bg)))
+   `(telephone-line-evil-visual ((,class :inherit telephone-line-evil 
:background ,cyan-intense-bg)))
+   `(telephone-line-projectile ((,class :foreground ,cyan-active)))
+   `(telephone-line-unimportant ((,class :foreground ,fg-inactive)))
+   `(telephone-line-warning ((,class :foreground ,yellow-active :weight bold)))
    ;;;; term
-   `(term ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(term-bold ((,class (:weight bold))))
-   `(term-color-blue ((,class (:background ,blue :foreground ,blue))))
-   `(term-color-cyan ((,class (:background ,cyan :foreground ,cyan))))
-   `(term-color-green ((,class (:background ,green :foreground ,green))))
-   `(term-color-magenta ((,class (:background ,magenta :foreground ,magenta))))
-   `(term-color-red ((,class (:background ,red :foreground ,red))))
-   `(term-color-yellow ((,class (:background ,yellow :foreground ,yellow))))
-   `(term-underline ((,class (:underline t))))
+   `(term ((,class :background ,bg-main :foreground ,fg-main)))
+   `(term-bold ((,class :weight bold)))
+   `(term-color-blue ((,class :background ,blue :foreground ,blue)))
+   `(term-color-cyan ((,class :background ,cyan :foreground ,cyan)))
+   `(term-color-green ((,class :background ,green :foreground ,green)))
+   `(term-color-magenta ((,class :background ,magenta :foreground ,magenta)))
+   `(term-color-red ((,class :background ,red :foreground ,red)))
+   `(term-color-yellow ((,class :background ,yellow :foreground ,yellow)))
+   `(term-underline ((,class :underline t)))
    ;;;; tomatinho
-   `(tomatinho-ok-face ((,class (:foreground ,blue-intense))))
-   `(tomatinho-pause-face ((,class (:foreground ,yellow-intense))))
-   `(tomatinho-reset-face ((,class (:foreground ,fg-alt))))
+   `(tomatinho-ok-face ((,class :foreground ,blue-intense)))
+   `(tomatinho-pause-face ((,class :foreground ,yellow-intense)))
+   `(tomatinho-reset-face ((,class :foreground ,fg-alt)))
    ;;;; transient
-   `(transient-active-infix ((,class (:inherit modus-theme-special-mild))))
-   `(transient-argument ((,class (:foreground ,green :weight bold))))
-   `(transient-disabled-suffix ((,class (:inherit modus-theme-intense-red))))
-   `(transient-enabled-suffix ((,class (:inherit modus-theme-intense-green))))
-   `(transient-heading ((,class (:foreground ,fg-special-warm :weight bold))))
-   `(transient-inactive-argument ((,class (:foreground ,fg-alt))))
-   `(transient-inactive-value ((,class (:foreground ,fg-alt))))
-   `(transient-key ((,class (:foreground ,magenta-intense))))
-   `(transient-mismatched-key ((,class (:underline t))))
-   `(transient-nonstandard-key ((,class (:underline t))))
-   `(transient-unreachable ((,class (:foreground ,fg-inactive))))
-   `(transient-unreachable-key ((,class (:foreground ,fg-inactive))))
-   `(transient-value ((,class (:foreground ,blue))))
+   `(transient-active-infix ((,class :inherit modus-theme-special-mild)))
+   `(transient-argument ((,class :foreground ,green :weight bold)))
+   `(transient-disabled-suffix ((,class :inherit modus-theme-intense-red)))
+   `(transient-enabled-suffix ((,class :inherit modus-theme-intense-green)))
+   `(transient-heading ((,class :foreground ,fg-special-warm :weight bold)))
+   `(transient-inactive-argument ((,class :foreground ,fg-alt)))
+   `(transient-inactive-value ((,class :foreground ,fg-alt)))
+   `(transient-key ((,class :foreground ,magenta-intense)))
+   `(transient-mismatched-key ((,class :underline t)))
+   `(transient-nonstandard-key ((,class :underline t)))
+   `(transient-unreachable ((,class :foreground ,fg-inactive)))
+   `(transient-unreachable-key ((,class :foreground ,fg-inactive)))
+   `(transient-value ((,class :foreground ,blue)))
    ;;;; treemacs
-   `(treemacs-directory-collapsed-face ((,class (:foreground ,magenta-alt))))
-   `(treemacs-directory-face ((,class (:inherit dired-directory))))
-   `(treemacs-file-face ((,class (:foreground ,fg-main))))
-   `(treemacs-fringe-indicator-face ((,class (:foreground ,fg-main))))
-   `(treemacs-git-added-face ((,class (:foreground ,green-intense))))
-   `(treemacs-git-conflict-face ((,class (:inherit modus-theme-intense-red 
:weight bold))))
-   `(treemacs-git-ignored-face ((,class (:foreground ,fg-alt))))
-   `(treemacs-git-modified-face ((,class (:foreground ,yellow-alt-other))))
-   `(treemacs-git-renamed-face ((,class (:foreground ,cyan-alt-other))))
-   `(treemacs-git-unmodified-face ((,class (:foreground ,fg-main))))
-   `(treemacs-git-untracked-face ((,class (:foreground ,red-alt-other))))
-   `(treemacs-help-column-face ((,class (:foreground ,magenta-alt-other 
:weight ,modus-theme-bold :underline t))))
-   `(treemacs-help-title-face ((,class (:foreground ,blue-alt-other))))
-   `(treemacs-on-failure-pulse-face ((,class (:inherit 
modus-theme-intense-red))))
-   `(treemacs-on-success-pulse-face ((,class (:inherit 
modus-theme-intense-green))))
-   `(treemacs-root-face ((,class (:foreground ,blue-alt-other :height 1.2 
:weight bold :underline t))))
-   `(treemacs-root-remote-disconnected-face ((,class (:inherit 
treemacs-root-remote-face :foreground ,yellow))))
-   `(treemacs-root-remote-face ((,class (:inherit treemacs-root-face 
:foreground ,magenta))))
-   `(treemacs-root-remote-unreadable-face ((,class (:inherit 
treemacs-root-unreadable-face))))
-   `(treemacs-root-unreadable-face ((,class (:inherit treemacs-root-face 
:strike-through t))))
-   `(treemacs-tags-face ((,class (:foreground ,blue-alt))))
-   `(treemacs-tags-face ((,class (:foreground ,magenta-alt))))
+   `(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt)))
+   `(treemacs-directory-face ((,class :inherit dired-directory)))
+   `(treemacs-file-face ((,class :foreground ,fg-main)))
+   `(treemacs-fringe-indicator-face ((,class :foreground ,fg-main)))
+   `(treemacs-git-added-face ((,class :foreground ,green-intense)))
+   `(treemacs-git-conflict-face ((,class :inherit modus-theme-intense-red 
:weight bold)))
+   `(treemacs-git-ignored-face ((,class :foreground ,fg-alt)))
+   `(treemacs-git-modified-face ((,class :foreground ,yellow-alt-other)))
+   `(treemacs-git-renamed-face ((,class :foreground ,cyan-alt-other)))
+   `(treemacs-git-unmodified-face ((,class :foreground ,fg-main)))
+   `(treemacs-git-untracked-face ((,class :foreground ,red-alt-other)))
+   `(treemacs-help-column-face ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold :underline t)))
+   `(treemacs-help-title-face ((,class :foreground ,blue-alt-other)))
+   `(treemacs-on-failure-pulse-face ((,class :inherit 
modus-theme-intense-red)))
+   `(treemacs-on-success-pulse-face ((,class :inherit 
modus-theme-intense-green)))
+   `(treemacs-root-face ((,class :foreground ,blue-alt-other :height 1.2 
:weight bold :underline t)))
+   `(treemacs-root-remote-disconnected-face ((,class :inherit 
treemacs-root-remote-face :foreground ,yellow)))
+   `(treemacs-root-remote-face ((,class :inherit treemacs-root-face 
:foreground ,magenta)))
+   `(treemacs-root-remote-unreadable-face ((,class :inherit 
treemacs-root-unreadable-face)))
+   `(treemacs-root-unreadable-face ((,class :inherit treemacs-root-face 
:strike-through t)))
+   `(treemacs-tags-face ((,class :foreground ,blue-alt)))
+   `(treemacs-tags-face ((,class :foreground ,magenta-alt)))
    ;;;; tuareg
-   `(caml-types-def-face ((,class (:inherit modus-theme-subtle-red))))
-   `(caml-types-expr-face ((,class (:inherit modus-theme-subtle-green))))
-   `(caml-types-occ-face ((,class (:inherit modus-theme-subtle-green))))
-   `(caml-types-scope-face ((,class (:inherit modus-theme-subtle-blue))))
-   `(caml-types-typed-face ((,class (:inherit modus-theme-subtle-magenta))))
-   `(tuareg-font-double-semicolon-face ((,class (:foreground ,red-alt))))
-   `(tuareg-font-lock-attribute-face ((,class (:foreground ,magenta))))
-   `(tuareg-font-lock-constructor-face ((,class (:foreground ,fg-main))))
-   `(tuareg-font-lock-error-face ((,class (:inherit modus-theme-intense-red 
:weight bold))))
-   `(tuareg-font-lock-extension-node-face ((,class (:background ,bg-alt 
:foreground ,magenta))))
-   `(tuareg-font-lock-governing-face ((,class (:foreground ,fg-main :weight 
bold))))
-   `(tuareg-font-lock-infix-extension-node-face ((,class (:foreground 
,magenta))))
-   `(tuareg-font-lock-interactive-directive-face ((,class (:foreground 
,fg-special-cold))))
-   `(tuareg-font-lock-interactive-error-face ((,class (:foreground ,red 
:weight bold))))
-   `(tuareg-font-lock-interactive-output-face ((,class (:foreground 
,blue-alt-other))))
-   `(tuareg-font-lock-label-face ((,class (:foreground ,cyan-alt-other))))
-   `(tuareg-font-lock-line-number-face ((,class (:foreground 
,fg-special-warm))))
-   `(tuareg-font-lock-module-face ((,class (:foreground ,magenta-alt))))
-   `(tuareg-font-lock-multistage-face ((,class (:background ,bg-alt 
:foreground ,blue :weight bold))))
-   `(tuareg-font-lock-operator-face ((,class (:foreground ,red-alt))))
-   `(tuareg-opam-error-face ((,class (:foreground ,red :weight bold))))
-   `(tuareg-opam-pkg-variable-name-face ((,class (:foreground ,cyan :slant 
,modus-theme-slant))))
+   `(caml-types-def-face ((,class :inherit modus-theme-subtle-red)))
+   `(caml-types-expr-face ((,class :inherit modus-theme-subtle-green)))
+   `(caml-types-occ-face ((,class :inherit modus-theme-subtle-green)))
+   `(caml-types-scope-face ((,class :inherit modus-theme-subtle-blue)))
+   `(caml-types-typed-face ((,class :inherit modus-theme-subtle-magenta)))
+   `(tuareg-font-double-semicolon-face ((,class :foreground ,red-alt)))
+   `(tuareg-font-lock-attribute-face ((,class :foreground ,magenta)))
+   `(tuareg-font-lock-constructor-face ((,class :foreground ,fg-main)))
+   `(tuareg-font-lock-error-face ((,class :inherit modus-theme-intense-red 
:weight bold)))
+   `(tuareg-font-lock-extension-node-face ((,class :background ,bg-alt 
:foreground ,magenta)))
+   `(tuareg-font-lock-governing-face ((,class :foreground ,fg-main :weight 
bold)))
+   `(tuareg-font-lock-infix-extension-node-face ((,class :foreground 
,magenta)))
+   `(tuareg-font-lock-interactive-directive-face ((,class :foreground 
,fg-special-cold)))
+   `(tuareg-font-lock-interactive-error-face ((,class :foreground ,red :weight 
bold)))
+   `(tuareg-font-lock-interactive-output-face ((,class :foreground 
,blue-alt-other)))
+   `(tuareg-font-lock-label-face ((,class :foreground ,cyan-alt-other)))
+   `(tuareg-font-lock-line-number-face ((,class :foreground ,fg-special-warm)))
+   `(tuareg-font-lock-module-face ((,class :foreground ,magenta-alt)))
+   `(tuareg-font-lock-multistage-face ((,class :background ,bg-alt :foreground 
,blue :weight bold)))
+   `(tuareg-font-lock-operator-face ((,class :foreground ,red-alt)))
+   `(tuareg-opam-error-face ((,class :foreground ,red :weight bold)))
+   `(tuareg-opam-pkg-variable-name-face ((,class :foreground ,cyan :slant 
,modus-theme-slant)))
    ;;;; undo-tree
-   `(undo-tree-visualizer-active-branch-face ((,class (:foreground ,fg-main 
:weight bold))))
-   `(undo-tree-visualizer-current-face ((,class (:foreground ,blue-intense))))
-   `(undo-tree-visualizer-default-face ((,class (:foreground ,fg-alt))))
-   `(undo-tree-visualizer-register-face ((,class (:foreground 
,magenta-intense))))
-   `(undo-tree-visualizer-unmodified-face ((,class (:foreground 
,green-intense))))
+   `(undo-tree-visualizer-active-branch-face ((,class :foreground ,fg-main 
:weight bold)))
+   `(undo-tree-visualizer-current-face ((,class :foreground ,blue-intense)))
+   `(undo-tree-visualizer-default-face ((,class :foreground ,fg-alt)))
+   `(undo-tree-visualizer-register-face ((,class :foreground 
,magenta-intense)))
+   `(undo-tree-visualizer-unmodified-face ((,class :foreground 
,green-intense)))
    ;;;; vc
-   `(vc-conflict-state ((,class (:foreground ,red-active :weight 
,modus-theme-bold))))
-   `(vc-edited-state ((,class (:foreground ,fg-special-warm))))
-   `(vc-locally-added-state ((,class (:foreground ,cyan-active))))
-   `(vc-locked-state ((,class (:foreground ,magenta-active :weight 
,modus-theme-bold))))
-   `(vc-missing-state ((,class (:foreground ,yellow-active :weight 
,modus-theme-bold))))
-   `(vc-needs-update-state ((,class (:foreground ,fg-special-mild :weight 
,modus-theme-bold))))
-   `(vc-removed-state ((,class (:foreground ,red-active))))
-   `(vc-state-base ((,class (:foreground ,fg-active))))
-   `(vc-up-to-date-state ((,class (:foreground ,fg-special-cold))))
+   `(vc-conflict-state ((,class :foreground ,red-active :weight 
,modus-theme-bold)))
+   `(vc-edited-state ((,class :foreground ,fg-special-warm)))
+   `(vc-locally-added-state ((,class :foreground ,cyan-active)))
+   `(vc-locked-state ((,class :foreground ,magenta-active :weight 
,modus-theme-bold)))
+   `(vc-missing-state ((,class :foreground ,yellow-active :weight 
,modus-theme-bold)))
+   `(vc-needs-update-state ((,class :foreground ,fg-special-mild :weight 
,modus-theme-bold)))
+   `(vc-removed-state ((,class :foreground ,red-active)))
+   `(vc-state-base ((,class :foreground ,fg-active)))
+   `(vc-up-to-date-state ((,class :foreground ,fg-special-cold)))
    ;;;; vdiff
-   `(vdiff-addition-face ((,class ,(modus-operandi-theme-diffs
-                                    bg-main green
-                                    bg-diff-focus-added fg-diff-focus-added))))
-   `(vdiff-change-face ((,class ,(modus-operandi-theme-diffs
-                                  bg-main yellow
-                                  bg-diff-focus-changed 
fg-diff-focus-changed))))
-   `(vdiff-closed-fold-face ((,class (:background ,bg-diff-neutral-1 
:foreground ,fg-diff-neutral-1))))
-   `(vdiff-refine-added ((,class ,(modus-operandi-theme-diffs
-                                   bg-diff-added fg-diff-added
-                                   bg-diff-refine-added 
fg-diff-refine-added))))
-   `(vdiff-refine-changed ((,class ,(modus-operandi-theme-diffs
-                                     bg-diff-changed fg-diff-changed
-                                     bg-diff-refine-changed 
fg-diff-refine-changed))))
-   `(vdiff-subtraction-face ((,class ,(modus-operandi-theme-diffs
-                                       bg-main red
-                                       bg-diff-focus-removed 
fg-diff-focus-removed))))
-   `(vdiff-target-face ((,class (:inherit modus-theme-intense-blue))))
+   `(vdiff-addition-face ((,class ,@(modus-operandi-theme-diffs
+                                     bg-main green
+                                     bg-diff-focus-added 
fg-diff-focus-added))))
+   `(vdiff-change-face ((,class ,@(modus-operandi-theme-diffs
+                                   bg-main yellow
+                                   bg-diff-focus-changed 
fg-diff-focus-changed))))
+   `(vdiff-closed-fold-face ((,class :background ,bg-diff-neutral-1 
:foreground ,fg-diff-neutral-1)))
+   `(vdiff-refine-added ((,class ,@(modus-operandi-theme-diffs
+                                    bg-diff-added fg-diff-added
+                                    bg-diff-refine-added 
fg-diff-refine-added))))
+   `(vdiff-refine-changed ((,class ,@(modus-operandi-theme-diffs
+                                      bg-diff-changed fg-diff-changed
+                                      bg-diff-refine-changed 
fg-diff-refine-changed))))
+   `(vdiff-subtraction-face ((,class ,@(modus-operandi-theme-diffs
+                                        bg-main red
+                                        bg-diff-focus-removed 
fg-diff-focus-removed))))
+   `(vdiff-target-face ((,class :inherit modus-theme-intense-blue)))
    ;;;; vimish-fold
-   `(vimish-fold-fringe ((,class (:foreground ,cyan-active))))
-   `(vimish-fold-mouse-face ((,class (:inherit modus-theme-intense-blue))))
-   `(vimish-fold-overlay ((,class (:background ,bg-alt :foreground 
,fg-special-cold))))
+   `(vimish-fold-fringe ((,class :foreground ,cyan-active)))
+   `(vimish-fold-mouse-face ((,class :inherit modus-theme-intense-blue)))
+   `(vimish-fold-overlay ((,class :background ,bg-alt :foreground 
,fg-special-cold)))
    ;;;; visible-mark
-   `(visible-mark-active ((,class (:background ,blue-intense-bg))))
-   `(visible-mark-face1 ((,class (:background ,cyan-intense-bg))))
-   `(visible-mark-face2 ((,class (:background ,yellow-intense-bg))))
-   `(visible-mark-forward-face1 ((,class (:background ,magenta-intense-bg))))
-   `(visible-mark-forward-face2 ((,class (:background ,green-intense-bg))))
+   `(visible-mark-active ((,class :background ,blue-intense-bg)))
+   `(visible-mark-face1 ((,class :background ,cyan-intense-bg)))
+   `(visible-mark-face2 ((,class :background ,yellow-intense-bg)))
+   `(visible-mark-forward-face1 ((,class :background ,magenta-intense-bg)))
+   `(visible-mark-forward-face2 ((,class :background ,green-intense-bg)))
    ;;;; visual-regexp
-   `(vr/group-0 ((,class (:inherit modus-theme-intense-blue))))
-   `(vr/group-1 ((,class (:inherit modus-theme-intense-magenta))))
-   `(vr/group-2 ((,class (:inherit modus-theme-intense-green))))
-   `(vr/match-0 ((,class (:inherit modus-theme-refine-yellow))))
-   `(vr/match-1 ((,class (:inherit modus-theme-refine-yellow))))
-   `(vr/match-separator-face ((,class (:inherit modus-theme-intense-neutral 
:weight bold))))
+   `(vr/group-0 ((,class :inherit modus-theme-intense-blue)))
+   `(vr/group-1 ((,class :inherit modus-theme-intense-magenta)))
+   `(vr/group-2 ((,class :inherit modus-theme-intense-green)))
+   `(vr/match-0 ((,class :inherit modus-theme-refine-yellow)))
+   `(vr/match-1 ((,class :inherit modus-theme-refine-yellow)))
+   `(vr/match-separator-face ((,class :inherit modus-theme-intense-neutral 
:weight bold)))
    ;;;; volatile-highlights
-   `(vhl/default-face ((,class (,@(and (>= emacs-major-version 27) '(:extend 
t))
-                                :background ,bg-alt :foreground 
,blue-nuanced))))
+   `(vhl/default-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
+                               :background ,bg-alt :foreground ,blue-nuanced)))
    ;;;; vterm
-   `(vterm-color-black ((,class (:background "black" :foreground "black"))))
-   `(vterm-color-blue ((,class (:background ,blue :foreground ,blue))))
-   `(vterm-color-cyan ((,class (:background ,cyan :foreground ,cyan))))
-   `(vterm-color-default ((,class (:background ,bg-main :foreground 
,fg-main))))
-   `(vterm-color-green ((,class (:background ,green :foreground ,green))))
-   `(vterm-color-inverse-video ((,class (:background ,bg-main :inverse-video 
t))))
-   `(vterm-color-magenta ((,class (:background ,magenta :foreground 
,magenta))))
-   `(vterm-color-red ((,class (:background ,red :foreground ,red))))
-   `(vterm-color-underline ((,class (:foreground ,fg-special-warm :underline 
t))))
-   `(vterm-color-white ((,class (:background "white" :foreground "white"))))
-   `(vterm-color-yellow ((,class (:background ,yellow :foreground ,yellow))))
+   `(vterm-color-black ((,class :background "black" :foreground "black")))
+   `(vterm-color-blue ((,class :background ,blue :foreground ,blue)))
+   `(vterm-color-cyan ((,class :background ,cyan :foreground ,cyan)))
+   `(vterm-color-default ((,class :background ,bg-main :foreground ,fg-main)))
+   `(vterm-color-green ((,class :background ,green :foreground ,green)))
+   `(vterm-color-inverse-video ((,class :background ,bg-main :inverse-video 
t)))
+   `(vterm-color-magenta ((,class :background ,magenta :foreground ,magenta)))
+   `(vterm-color-red ((,class :background ,red :foreground ,red)))
+   `(vterm-color-underline ((,class :foreground ,fg-special-warm :underline 
t)))
+   `(vterm-color-white ((,class :background "white" :foreground "white")))
+   `(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow)))
    ;;;; wcheck-mode
-   `(wcheck-default-face ((,class (:foreground ,red :underline t))))
+   `(wcheck-default-face ((,class :foreground ,red :underline t)))
    ;;;; web-mode
-   `(web-mode-annotation-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-annotation-html-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-annotation-tag-face ((,class (:inherit web-mode-comment-face 
:underline t))))
-   `(web-mode-block-attr-name-face ((,class (:foreground ,blue))))
-   `(web-mode-block-attr-value-face ((,class (:foreground ,cyan-alt-other))))
-   `(web-mode-block-comment-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-block-control-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(web-mode-block-delimiter-face ((,class (:foreground ,fg-main))))
-   `(web-mode-block-face ((,class (:background ,bg-dim))))
-   `(web-mode-block-string-face ((,class (:inherit web-mode-string-face))))
-   `(web-mode-bold-face ((,class (:weight bold))))
-   `(web-mode-builtin-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(web-mode-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(web-mode-comment-keyword-face ((,class (:background ,bg-dim :foreground 
,yellow :weight bold))))
-   `(web-mode-constant-face ((,class (:foreground ,blue-alt-other))))
-   `(web-mode-css-at-rule-face ((,class (:foreground ,blue-alt-other))))
-   `(web-mode-css-color-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(web-mode-css-comment-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-css-function-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(web-mode-css-priority-face ((,class (:foreground ,yellow-alt :weight 
,modus-theme-bold))))
-   `(web-mode-css-property-name-face ((,class (:foreground ,cyan))))
-   `(web-mode-css-pseudo-class-face ((,class (:foreground ,cyan-alt-other))))
-   `(web-mode-css-selector-face ((,class (:foreground ,magenta-alt-other 
:weight ,modus-theme-bold))))
-   `(web-mode-css-string-face ((,class (:inherit web-mode-string-face))))
-   `(web-mode-css-variable-face ((,class (:foreground ,fg-special-warm))))
-   `(web-mode-current-column-highlight-face ((,class (:background ,bg-alt))))
-   `(web-mode-current-element-highlight-face ((,class (:inherit 
modus-theme-special-mild))))
-   `(web-mode-doctype-face ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(web-mode-error-face ((,class (:inherit modus-theme-intense-red))))
-   `(web-mode-filter-face ((,class (:foreground ,magenta))))
-   `(web-mode-folded-face ((,class (:underline t))))
-   `(web-mode-function-call-face ((,class (:foreground ,magenta))))
-   `(web-mode-function-name-face ((,class (:foreground ,magenta))))
-   `(web-mode-html-attr-custom-face ((,class (:foreground ,cyan))))
-   `(web-mode-html-attr-engine-face ((,class (:foreground ,fg-main))))
-   `(web-mode-html-attr-equal-face ((,class (:foreground ,fg-main))))
-   `(web-mode-html-attr-name-face ((,class (:foreground ,cyan))))
-   `(web-mode-html-attr-value-face ((,class (:foreground ,blue-alt-other))))
-   `(web-mode-html-entity-face ((,class (:foreground ,yellow-alt-other :slant 
,modus-theme-slant))))
-   `(web-mode-html-tag-bracket-face ((,class (:foreground ,fg-dim))))
-   `(web-mode-html-tag-custom-face ((,class (:foreground ,magenta))))
-   `(web-mode-html-tag-face ((,class (:foreground ,magenta))))
-   `(web-mode-html-tag-namespaced-face ((,class (:foreground ,magenta-alt 
:weight ,modus-theme-bold))))
-   `(web-mode-html-tag-unclosed-face ((,class (:foreground ,red :underline 
t))))
-   `(web-mode-inlay-face ((,class (:background ,bg-alt))))
-   `(web-mode-italic-face ((,class (:slant italic))))
-   `(web-mode-javascript-comment-face ((,class (:inherit 
web-mode-comment-face))))
-   `(web-mode-javascript-string-face ((,class (:inherit 
web-mode-string-face))))
-   `(web-mode-json-comment-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-json-context-face ((,class (:foreground ,magenta-alt))))
-   `(web-mode-json-key-face ((,class (:foreground ,blue-nuanced))))
-   `(web-mode-json-string-face ((,class (:inherit web-mode-string-face))))
-   `(web-mode-jsx-depth-1-face ((,class (:background ,blue-intense-bg 
:foreground ,fg-main))))
-   `(web-mode-jsx-depth-2-face ((,class (:background ,blue-subtle-bg 
:foreground ,fg-main))))
-   `(web-mode-jsx-depth-3-face ((,class (:background ,bg-special-cold 
:foreground ,fg-special-cold))))
-   `(web-mode-jsx-depth-4-face ((,class (:background ,bg-alt :foreground 
,blue-refine-fg))))
-   `(web-mode-jsx-depth-5-face ((,class (:background ,bg-alt :foreground 
,blue-nuanced))))
-   `(web-mode-keyword-face ((,class (:foreground ,magenta-alt-other :weight 
,modus-theme-bold))))
-   `(web-mode-param-name-face ((,class (:foreground ,magenta))))
-   `(web-mode-part-comment-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-part-face ((,class (:inherit web-mode-block-face))))
-   `(web-mode-part-string-face ((,class (:inherit web-mode-string-face))))
-   `(web-mode-preprocessor-face ((,class (:foreground ,magenta))))
-   `(web-mode-script-face ((,class (:inherit web-mode-part-face))))
-   `(web-mode-sql-keyword-face ((,class (:foreground ,yellow :weight bold))))
-   `(web-mode-string-face ((,class (:foreground ,blue-alt))))
-   `(web-mode-style-face ((,class (:inherit web-mode-part-face))))
-   `(web-mode-symbol-face ((,class (:foreground ,blue-alt-other))))
-   `(web-mode-type-face ((,class (:foreground ,magenta-alt))))
-   `(web-mode-underline-face ((,class (:underline t))))
-   `(web-mode-variable-name-face ((,class (:foreground ,cyan))))
-   `(web-mode-warning-face ((,class (:background ,bg-alt :foreground 
,yellow-alt-other :weight bold))))
-   `(web-mode-whitespace-face ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
+   `(web-mode-annotation-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-annotation-html-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-annotation-tag-face ((,class :inherit web-mode-comment-face 
:underline t)))
+   `(web-mode-block-attr-name-face ((,class :foreground ,blue)))
+   `(web-mode-block-attr-value-face ((,class :foreground ,cyan-alt-other)))
+   `(web-mode-block-comment-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-block-control-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(web-mode-block-delimiter-face ((,class :foreground ,fg-main)))
+   `(web-mode-block-face ((,class :background ,bg-dim)))
+   `(web-mode-block-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-bold-face ((,class :weight bold)))
+   `(web-mode-builtin-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(web-mode-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(web-mode-comment-keyword-face ((,class :background ,bg-dim :foreground 
,yellow :weight bold)))
+   `(web-mode-constant-face ((,class :foreground ,blue-alt-other)))
+   `(web-mode-css-at-rule-face ((,class :foreground ,blue-alt-other)))
+   `(web-mode-css-color-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(web-mode-css-comment-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-css-function-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(web-mode-css-priority-face ((,class :foreground ,yellow-alt :weight 
,modus-theme-bold)))
+   `(web-mode-css-property-name-face ((,class :foreground ,cyan)))
+   `(web-mode-css-pseudo-class-face ((,class :foreground ,cyan-alt-other)))
+   `(web-mode-css-selector-face ((,class :foreground ,magenta-alt-other 
:weight ,modus-theme-bold)))
+   `(web-mode-css-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-css-variable-face ((,class :foreground ,fg-special-warm)))
+   `(web-mode-current-column-highlight-face ((,class :background ,bg-alt)))
+   `(web-mode-current-element-highlight-face ((,class :inherit 
modus-theme-special-mild)))
+   `(web-mode-doctype-face ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(web-mode-error-face ((,class :inherit modus-theme-intense-red)))
+   `(web-mode-filter-face ((,class :foreground ,magenta)))
+   `(web-mode-folded-face ((,class :underline t)))
+   `(web-mode-function-call-face ((,class :foreground ,magenta)))
+   `(web-mode-function-name-face ((,class :foreground ,magenta)))
+   `(web-mode-html-attr-custom-face ((,class :foreground ,cyan)))
+   `(web-mode-html-attr-engine-face ((,class :foreground ,fg-main)))
+   `(web-mode-html-attr-equal-face ((,class :foreground ,fg-main)))
+   `(web-mode-html-attr-name-face ((,class :foreground ,cyan)))
+   `(web-mode-html-attr-value-face ((,class :foreground ,blue-alt-other)))
+   `(web-mode-html-entity-face ((,class :foreground ,yellow-alt-other :slant 
,modus-theme-slant)))
+   `(web-mode-html-tag-bracket-face ((,class :foreground ,fg-dim)))
+   `(web-mode-html-tag-custom-face ((,class :foreground ,magenta)))
+   `(web-mode-html-tag-face ((,class :foreground ,magenta)))
+   `(web-mode-html-tag-namespaced-face ((,class :foreground ,magenta-alt 
:weight ,modus-theme-bold)))
+   `(web-mode-html-tag-unclosed-face ((,class :foreground ,red :underline t)))
+   `(web-mode-inlay-face ((,class :background ,bg-alt)))
+   `(web-mode-italic-face ((,class :slant italic)))
+   `(web-mode-javascript-comment-face ((,class :inherit 
web-mode-comment-face)))
+   `(web-mode-javascript-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-json-comment-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-json-context-face ((,class :foreground ,magenta-alt)))
+   `(web-mode-json-key-face ((,class :foreground ,blue-nuanced)))
+   `(web-mode-json-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-jsx-depth-1-face ((,class :background ,blue-intense-bg 
:foreground ,fg-main)))
+   `(web-mode-jsx-depth-2-face ((,class :background ,blue-subtle-bg 
:foreground ,fg-main)))
+   `(web-mode-jsx-depth-3-face ((,class :background ,bg-special-cold 
:foreground ,fg-special-cold)))
+   `(web-mode-jsx-depth-4-face ((,class :background ,bg-alt :foreground 
,blue-refine-fg)))
+   `(web-mode-jsx-depth-5-face ((,class :background ,bg-alt :foreground 
,blue-nuanced)))
+   `(web-mode-keyword-face ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold)))
+   `(web-mode-param-name-face ((,class :foreground ,magenta)))
+   `(web-mode-part-comment-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-part-face ((,class :inherit web-mode-block-face)))
+   `(web-mode-part-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-preprocessor-face ((,class :foreground ,magenta)))
+   `(web-mode-script-face ((,class :inherit web-mode-part-face)))
+   `(web-mode-sql-keyword-face ((,class :foreground ,yellow :weight bold)))
+   `(web-mode-string-face ((,class :foreground ,blue-alt)))
+   `(web-mode-style-face ((,class :inherit web-mode-part-face)))
+   `(web-mode-symbol-face ((,class :foreground ,blue-alt-other)))
+   `(web-mode-type-face ((,class :foreground ,magenta-alt)))
+   `(web-mode-underline-face ((,class :underline t)))
+   `(web-mode-variable-name-face ((,class :foreground ,cyan)))
+   `(web-mode-warning-face ((,class :background ,bg-alt :foreground 
,yellow-alt-other :weight bold)))
+   `(web-mode-whitespace-face ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
    ;;;; wgrep
-   `(wgrep-delete-face ((,class (:inherit modus-theme-refine-yellow))))
-   `(wgrep-done-face ((,class (:inherit modus-theme-refine-blue))))
-   `(wgrep-face ((,class (:inherit modus-theme-refine-green))))
-   `(wgrep-file-face ((,class (:foreground ,fg-special-warm))))
-   `(wgrep-reject-face ((,class (:inherit modus-theme-intense-red :weight 
bold))))
+   `(wgrep-delete-face ((,class :inherit modus-theme-refine-yellow)))
+   `(wgrep-done-face ((,class :inherit modus-theme-refine-blue)))
+   `(wgrep-face ((,class :inherit modus-theme-refine-green)))
+   `(wgrep-file-face ((,class :foreground ,fg-special-warm)))
+   `(wgrep-reject-face ((,class :inherit modus-theme-intense-red :weight 
bold)))
    ;;;; which-function-mode
-   `(which-func ((,class (:foreground ,magenta-active))))
+   `(which-func ((,class :foreground ,magenta-active)))
    ;;;; which-key
-   `(which-key-command-description-face ((,class (:foreground ,cyan))))
-   `(which-key-group-description-face ((,class (:foreground ,magenta-alt))))
-   `(which-key-highlighted-command-face ((,class (:foreground ,cyan-alt 
:underline t))))
-   `(which-key-key-face ((,class (:foreground ,blue-intense :weight bold))))
-   `(which-key-local-map-description-face ((,class (:foreground ,fg-main))))
-   `(which-key-note-face ((,class (:background ,bg-dim :foreground 
,fg-special-mild))))
-   `(which-key-separator-face ((,class (:foreground ,fg-alt))))
-   `(which-key-special-key-face ((,class (:foreground ,yellow-intense :weight 
bold))))
+   `(which-key-command-description-face ((,class :foreground ,cyan)))
+   `(which-key-group-description-face ((,class :foreground ,magenta-alt)))
+   `(which-key-highlighted-command-face ((,class :foreground ,cyan-alt 
:underline t)))
+   `(which-key-key-face ((,class :foreground ,blue-intense :weight bold)))
+   `(which-key-local-map-description-face ((,class :foreground ,fg-main)))
+   `(which-key-note-face ((,class :background ,bg-dim :foreground 
,fg-special-mild)))
+   `(which-key-separator-face ((,class :foreground ,fg-alt)))
+   `(which-key-special-key-face ((,class :foreground ,yellow-intense :weight 
bold)))
    ;;;; whitespace-mode
-   `(whitespace-big-indent ((,class (:inherit modus-theme-subtle-red))))
-   `(whitespace-empty ((,class (:inherit modus-theme-intense-magenta))))
-   `(whitespace-hspace ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-indentation ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-line ((,class (:inherit modus-theme-special-warm))))
-   `(whitespace-newline ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-space ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-space-after-tab ((,class (:inherit 
modus-theme-subtle-magenta))))
-   `(whitespace-space-before-tab ((,class (:inherit modus-theme-subtle-cyan))))
-   `(whitespace-tab ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-trailing ((,class (:inherit modus-theme-intense-red))))
+   `(whitespace-big-indent ((,class :inherit modus-theme-subtle-red)))
+   `(whitespace-empty ((,class :inherit modus-theme-intense-magenta)))
+   `(whitespace-hspace ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-indentation ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-line ((,class :inherit modus-theme-special-warm)))
+   `(whitespace-newline ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-space ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-space-after-tab ((,class :inherit modus-theme-subtle-magenta)))
+   `(whitespace-space-before-tab ((,class :inherit modus-theme-subtle-cyan)))
+   `(whitespace-tab ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-trailing ((,class :inherit modus-theme-intense-red)))
    ;;;; window-divider-mode
-   `(window-divider ((,class (:foreground ,fg-window-divider-inner))))
-   `(window-divider-first-pixel ((,class (:foreground 
,fg-window-divider-outer))))
-   `(window-divider-last-pixel ((,class (:foreground 
,fg-window-divider-outer))))
+   `(window-divider ((,class :foreground ,fg-window-divider-inner)))
+   `(window-divider-first-pixel ((,class :foreground 
,fg-window-divider-outer)))
+   `(window-divider-last-pixel ((,class :foreground ,fg-window-divider-outer)))
    ;;;; winum
-   `(winum-face ((,class (:foreground ,cyan-active :weight 
,modus-theme-bold))))
+   `(winum-face ((,class :foreground ,cyan-active :weight ,modus-theme-bold)))
    ;;;; writegood-mode
-   `(writegood-duplicates-face ((,class (:background ,bg-alt :foreground 
,red-alt :underline t))))
-   `(writegood-passive-voice-face ((,class (:foreground ,yellow-nuanced 
:underline (:color ,fg-lang-warning :style line)))))
-   `(writegood-weasels-face ((,class (:foreground ,red-nuanced :underline 
(:color ,fg-lang-error :style line)))))
+   `(writegood-duplicates-face ((,class :background ,bg-alt :foreground 
,red-alt :underline t)))
+   `(writegood-passive-voice-face ((,class :foreground ,yellow-nuanced 
:underline (:color ,fg-lang-warning :style line))))
+   `(writegood-weasels-face ((,class :foreground ,red-nuanced :underline 
(:color ,fg-lang-error :style line))))
    ;;;; woman
-   `(woman-addition ((,class (:foreground ,magenta-alt-other))))
-   `(woman-bold ((,class (:foreground ,magenta :weight bold))))
-   `(woman-italic ((,class (:foreground ,cyan :slant italic))))
-   `(woman-unknown ((,class (:foreground ,yellow :slant italic))))
+   `(woman-addition ((,class :foreground ,magenta-alt-other)))
+   `(woman-bold ((,class :foreground ,magenta :weight bold)))
+   `(woman-italic ((,class :foreground ,cyan :slant italic)))
+   `(woman-unknown ((,class :foreground ,yellow :slant italic)))
    ;;;; xah-elisp-mode
-   `(xah-elisp-at-symbol ((,class (:foreground ,red-alt :weight bold))))
-   `(xah-elisp-cap-variable ((,class (:foreground ,red-alt-other))))
-   `(xah-elisp-command-face ((,class (:foreground ,cyan-alt-other))))
-   `(xah-elisp-dollar-symbol ((,class (:foreground ,green))))
+   `(xah-elisp-at-symbol ((,class :foreground ,red-alt :weight bold)))
+   `(xah-elisp-cap-variable ((,class :foreground ,red-alt-other)))
+   `(xah-elisp-command-face ((,class :foreground ,cyan-alt-other)))
+   `(xah-elisp-dollar-symbol ((,class :foreground ,green)))
    ;;;; xref
-   `(xref-file-header ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(xref-line-number ((,class (:foreground ,fg-alt))))
-   `(xref-match ((,class (:inherit match))))
+   `(xref-file-header ((,class :foreground ,fg-special-cold :weight bold)))
+   `(xref-line-number ((,class :foreground ,fg-alt)))
+   `(xref-match ((,class :inherit match)))
    ;;;; yaml-mode
-   `(yaml-tab-face ((,class (:inherit modus-theme-intense-red))))
+   `(yaml-tab-face ((,class :inherit modus-theme-intense-red)))
    ;;;; yasnippet
-   `(yas-field-highlight-face ((,class (:background ,bg-alt :foreground 
,fg-main))))
+   `(yas-field-highlight-face ((,class :background ,bg-alt :foreground 
,fg-main)))
    ;;;; ztree
-   `(ztreep-arrow-face ((,class (:foreground ,fg-inactive))))
-   `(ztreep-diff-header-face ((,class (:height 1.2 :foreground 
,fg-special-cold :weight bold))))
-   `(ztreep-diff-header-small-face ((,class (:foreground ,fg-special-mild 
:weight bold))))
-   `(ztreep-diff-model-add-face ((,class (:foreground ,green))))
-   `(ztreep-diff-model-diff-face ((,class (:foreground ,red))))
-   `(ztreep-diff-model-ignored-face ((,class (:foreground ,fg-alt 
:strike-through t))))
-   `(ztreep-diff-model-normal-face ((,class (:foreground ,fg-alt))))
-   `(ztreep-expand-sign-face ((,class (:foreground ,blue))))
-   `(ztreep-header-face ((,class (:height 1.2 :foreground ,fg-special-cold 
:weight bold))))
-   `(ztreep-leaf-face ((,class (:foreground ,cyan))))
-   `(ztreep-node-count-children-face ((,class (:foreground ,fg-special-warm))))
-   `(ztreep-node-face ((,class (:foreground ,fg-main)))))
+   `(ztreep-arrow-face ((,class :foreground ,fg-inactive)))
+   `(ztreep-diff-header-face ((,class :height 1.2 :foreground ,fg-special-cold 
:weight bold)))
+   `(ztreep-diff-header-small-face ((,class :foreground ,fg-special-mild 
:weight bold)))
+   `(ztreep-diff-model-add-face ((,class :foreground ,green)))
+   `(ztreep-diff-model-diff-face ((,class :foreground ,red)))
+   `(ztreep-diff-model-ignored-face ((,class :foreground ,fg-alt 
:strike-through t)))
+   `(ztreep-diff-model-normal-face ((,class :foreground ,fg-alt)))
+   `(ztreep-expand-sign-face ((,class :foreground ,blue)))
+   `(ztreep-header-face ((,class :height 1.2 :foreground ,fg-special-cold 
:weight bold)))
+   `(ztreep-leaf-face ((,class :foreground ,cyan)))
+   `(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm)))
+   `(ztreep-node-face ((,class :foreground ,fg-main))))
   (when (>= emacs-major-version 27) ; EXPERIMENTAL this form is subject to 
review
     (custom-theme-set-faces
      'modus-operandi
      ;;;; tab-bar-mode
-     `(tab-bar ((,class (:background ,bg-tab-bar :foreground ,fg-main))))
-     `(tab-bar-tab ((,class (:box (:line-width 2 :color ,bg-tab-active)
-                                  :background ,bg-tab-active :foreground 
,fg-main :weight bold))))
-     `(tab-bar-tab-inactive ((,class (:box (:line-width 2 :color 
,bg-tab-inactive)
-                                           :background ,bg-tab-inactive 
:foreground ,fg-dim))))
+     `(tab-bar ((,class :background ,bg-tab-bar :foreground ,fg-main)))
+     `(tab-bar-tab ((,class :box (:line-width 2 :color ,bg-tab-active)
+                            :background ,bg-tab-active :foreground ,fg-main 
:weight bold)))
+     `(tab-bar-tab-inactive ((,class :box (:line-width 2 :color 
,bg-tab-inactive)
+                                     :background ,bg-tab-inactive :foreground 
,fg-dim)))
      ;;;; tab-line-mode
-     `(tab-line ((,class (:height 0.95 :background ,bg-tab-bar :foreground 
,fg-main))))
-     `(tab-line-close-highlight ((,class (:foreground ,red))))
-     `(tab-line-highlight ((,class (:background ,blue-subtle-bg :foreground 
,fg-dim))))
-     `(tab-line-tab ((,class (:box (:line-width 2 :color ,bg-tab-active)
-                                   :background ,bg-tab-active :foreground 
,fg-main :weight bold))))
-     `(tab-line-tab-current ((,class (:inherit tab-line-tab))))
-     `(tab-line-tab-inactive ((,class (:box (:line-width 2 :color 
,bg-tab-inactive)
-                                            :background ,bg-tab-inactive 
:foreground ,fg-dim))))))
+     `(tab-line ((,class :height 0.95 :background ,bg-tab-bar :foreground 
,fg-main)))
+     `(tab-line-close-highlight ((,class :foreground ,red)))
+     `(tab-line-highlight ((,class :background ,blue-subtle-bg :foreground 
,fg-dim)))
+     `(tab-line-tab ((,class :box (:line-width 2 :color ,bg-tab-active)
+                             :background ,bg-tab-active :foreground ,fg-main 
:weight bold)))
+     `(tab-line-tab-current ((,class :inherit tab-line-tab)))
+     `(tab-line-tab-inactive ((,class :box (:line-width 2 :color 
,bg-tab-inactive)
+                                      :background ,bg-tab-inactive :foreground 
,fg-dim)))))
   ;;; Theme Variables
   (custom-theme-set-variables
    'modus-operandi
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index aed9ac7..9d05e9b 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -791,2697 +791,2697 @@ Also bind `class' to ((class color) (min-colors 89))."
    ;; custom faces that are inherited by other constructs below ;;
    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    ;;; subtle coloured backgrounds
-   `(modus-theme-subtle-red ((,class (:background ,red-subtle-bg :foreground 
,fg-dim))))
-   `(modus-theme-subtle-green ((,class (:background ,green-subtle-bg 
:foreground ,fg-dim))))
-   `(modus-theme-subtle-yellow ((,class (:background ,yellow-subtle-bg 
:foreground ,fg-dim))))
-   `(modus-theme-subtle-blue ((,class (:background ,blue-subtle-bg :foreground 
,fg-dim))))
-   `(modus-theme-subtle-magenta ((,class (:background ,magenta-subtle-bg 
:foreground ,fg-dim))))
-   `(modus-theme-subtle-cyan ((,class (:background ,cyan-subtle-bg :foreground 
,fg-dim))))
-   `(modus-theme-subtle-neutral ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
+   `(modus-theme-subtle-red ((,class :background ,red-subtle-bg :foreground 
,fg-dim)))
+   `(modus-theme-subtle-green ((,class :background ,green-subtle-bg 
:foreground ,fg-dim)))
+   `(modus-theme-subtle-yellow ((,class :background ,yellow-subtle-bg 
:foreground ,fg-dim)))
+   `(modus-theme-subtle-blue ((,class :background ,blue-subtle-bg :foreground 
,fg-dim)))
+   `(modus-theme-subtle-magenta ((,class :background ,magenta-subtle-bg 
:foreground ,fg-dim)))
+   `(modus-theme-subtle-cyan ((,class :background ,cyan-subtle-bg :foreground 
,fg-dim)))
+   `(modus-theme-subtle-neutral ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
    ;;; intense coloured backgrounds
-   `(modus-theme-intense-red ((,class (:background ,red-intense-bg :foreground 
,fg-main))))
-   `(modus-theme-intense-green ((,class (:background ,green-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-yellow ((,class (:background ,yellow-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-blue ((,class (:background ,blue-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-magenta ((,class (:background ,magenta-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-cyan ((,class (:background ,cyan-intense-bg 
:foreground ,fg-main))))
-   `(modus-theme-intense-neutral ((,class (:background ,bg-active :foreground 
,fg-main))))
+   `(modus-theme-intense-red ((,class :background ,red-intense-bg :foreground 
,fg-main)))
+   `(modus-theme-intense-green ((,class :background ,green-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-yellow ((,class :background ,yellow-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-blue ((,class :background ,blue-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-magenta ((,class :background ,magenta-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-cyan ((,class :background ,cyan-intense-bg 
:foreground ,fg-main)))
+   `(modus-theme-intense-neutral ((,class :background ,bg-active :foreground 
,fg-main)))
    ;;; refined background and foreground combinations
-   `(modus-theme-refine-red ((,class (:background ,red-refine-bg :foreground 
,red-refine-fg))))
-   `(modus-theme-refine-green ((,class (:background ,green-refine-bg 
:foreground ,green-refine-fg))))
-   `(modus-theme-refine-yellow ((,class (:background ,yellow-refine-bg 
:foreground ,yellow-refine-fg))))
-   `(modus-theme-refine-blue ((,class (:background ,blue-refine-bg :foreground 
,blue-refine-fg))))
-   `(modus-theme-refine-magenta ((,class (:background ,magenta-refine-bg 
:foreground ,magenta-refine-fg))))
-   `(modus-theme-refine-cyan ((,class (:background ,cyan-refine-bg :foreground 
,cyan-refine-fg))))
+   `(modus-theme-refine-red ((,class :background ,red-refine-bg :foreground 
,red-refine-fg)))
+   `(modus-theme-refine-green ((,class :background ,green-refine-bg 
:foreground ,green-refine-fg)))
+   `(modus-theme-refine-yellow ((,class :background ,yellow-refine-bg 
:foreground ,yellow-refine-fg)))
+   `(modus-theme-refine-blue ((,class :background ,blue-refine-bg :foreground 
,blue-refine-fg)))
+   `(modus-theme-refine-magenta ((,class :background ,magenta-refine-bg 
:foreground ,magenta-refine-fg)))
+   `(modus-theme-refine-cyan ((,class :background ,cyan-refine-bg :foreground 
,cyan-refine-fg)))
    ;;; invert the colours used on the "active" backgrounds
    ;;; mostly for use on the mode line
-   `(modus-theme-active-red ((,class (:background ,red-active :foreground 
,bg-active))))
-   `(modus-theme-active-green ((,class (:background ,green-active :foreground 
,bg-active))))
-   `(modus-theme-active-yellow ((,class (:background ,yellow-active 
:foreground ,bg-active))))
-   `(modus-theme-active-blue ((,class (:background ,blue-active :foreground 
,bg-active))))
-   `(modus-theme-active-magenta ((,class (:background ,magenta-active 
:foreground ,bg-active))))
-   `(modus-theme-active-cyan ((,class (:background ,cyan-active :foreground 
,bg-active))))
+   `(modus-theme-active-red ((,class :background ,red-active :foreground 
,bg-active)))
+   `(modus-theme-active-green ((,class :background ,green-active :foreground 
,bg-active)))
+   `(modus-theme-active-yellow ((,class :background ,yellow-active :foreground 
,bg-active)))
+   `(modus-theme-active-blue ((,class :background ,blue-active :foreground 
,bg-active)))
+   `(modus-theme-active-magenta ((,class :background ,magenta-active 
:foreground ,bg-active)))
+   `(modus-theme-active-cyan ((,class :background ,cyan-active :foreground 
,bg-active)))
    ;;; for fringe indicators
-   `(modus-theme-fringe-red ((,class (:background ,red-fringe-bg :foreground 
,fg-dim))))
-   `(modus-theme-fringe-green ((,class (:background ,green-fringe-bg 
:foreground ,fg-dim))))
-   `(modus-theme-fringe-yellow ((,class (:background ,yellow-fringe-bg 
:foreground ,fg-dim))))
-   `(modus-theme-fringe-blue ((,class (:background ,blue-fringe-bg :foreground 
,fg-dim))))
-   `(modus-theme-fringe-magenta ((,class (:background ,magenta-fringe-bg 
:foreground ,fg-dim))))
-   `(modus-theme-fringe-cyan ((,class (:background ,cyan-fringe-bg :foreground 
,fg-dim))))
+   `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground 
,fg-dim)))
+   `(modus-theme-fringe-green ((,class :background ,green-fringe-bg 
:foreground ,fg-dim)))
+   `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg 
:foreground ,fg-dim)))
+   `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground 
,fg-dim)))
+   `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg 
:foreground ,fg-dim)))
+   `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground 
,fg-dim)))
    ;;; special base values that are closer to the grayscale than
    ;;; the accents defined above
-   `(modus-theme-special-cold ((,class (:background ,bg-special-cold 
:foreground ,fg-special-cold))))
-   `(modus-theme-special-mild ((,class (:background ,bg-special-mild 
:foreground ,fg-special-mild))))
-   `(modus-theme-special-warm ((,class (:background ,bg-special-warm 
:foreground ,fg-special-warm))))
-   `(modus-theme-special-calm ((,class (:background ,bg-special-calm 
:foreground ,fg-special-calm))))
+   `(modus-theme-special-cold ((,class :background ,bg-special-cold 
:foreground ,fg-special-cold)))
+   `(modus-theme-special-mild ((,class :background ,bg-special-mild 
:foreground ,fg-special-mild)))
+   `(modus-theme-special-warm ((,class :background ,bg-special-warm 
:foreground ,fg-special-warm)))
+   `(modus-theme-special-calm ((,class :background ,bg-special-calm 
:foreground ,fg-special-calm)))
    ;;; colour combinations intended for `diff-mode' or equivalent
-   `(modus-theme-diff-added ((,class (:background ,bg-diff-added :foreground 
,fg-diff-added))))
-   `(modus-theme-diff-changed ((,class (:background ,bg-diff-changed 
:foreground ,fg-diff-changed))))
-   `(modus-theme-diff-removed ((,class (:background ,bg-diff-removed 
:foreground ,fg-diff-removed))))
-   `(modus-theme-diff-refine-added ((,class (:background ,bg-diff-refine-added 
:foreground ,fg-diff-refine-added))))
-   `(modus-theme-diff-refine-changed ((,class (:background 
,bg-diff-refine-changed :foreground ,fg-diff-refine-changed))))
-   `(modus-theme-diff-refine-removed ((,class (:background 
,bg-diff-refine-removed :foreground ,fg-diff-refine-removed))))
-   `(modus-theme-diff-focus-added ((,class (:background ,bg-diff-focus-added 
:foreground ,fg-diff-focus-added))))
-   `(modus-theme-diff-focus-changed ((,class (:background 
,bg-diff-focus-changed :foreground ,fg-diff-focus-changed))))
-   `(modus-theme-diff-focus-removed ((,class (:background 
,bg-diff-focus-removed :foreground ,fg-diff-focus-removed))))
-   `(modus-theme-diff-heading ((,class (:background ,bg-diff-heading 
:foreground ,fg-diff-heading))))
+   `(modus-theme-diff-added ((,class :background ,bg-diff-added :foreground 
,fg-diff-added)))
+   `(modus-theme-diff-changed ((,class :background ,bg-diff-changed 
:foreground ,fg-diff-changed)))
+   `(modus-theme-diff-removed ((,class :background ,bg-diff-removed 
:foreground ,fg-diff-removed)))
+   `(modus-theme-diff-refine-added ((,class :background ,bg-diff-refine-added 
:foreground ,fg-diff-refine-added)))
+   `(modus-theme-diff-refine-changed ((,class :background 
,bg-diff-refine-changed :foreground ,fg-diff-refine-changed)))
+   `(modus-theme-diff-refine-removed ((,class :background 
,bg-diff-refine-removed :foreground ,fg-diff-refine-removed)))
+   `(modus-theme-diff-focus-added ((,class :background ,bg-diff-focus-added 
:foreground ,fg-diff-focus-added)))
+   `(modus-theme-diff-focus-changed ((,class :background 
,bg-diff-focus-changed :foreground ,fg-diff-focus-changed)))
+   `(modus-theme-diff-focus-removed ((,class :background 
,bg-diff-focus-removed :foreground ,fg-diff-focus-removed)))
+   `(modus-theme-diff-heading ((,class :background ,bg-diff-heading 
:foreground ,fg-diff-heading)))
    ;;; colour combinations intended for Dired, Ibuffer, or equivalent
-   `(modus-theme-header ((,class (:foreground ,fg-main :weight bold))))
-   `(modus-theme-mark-alt ((,class (:background ,bg-mark-alt :foreground 
,fg-mark-alt :weight bold))))
-   `(modus-theme-mark-del ((,class (:background ,bg-mark-del :foreground 
,fg-mark-del :weight bold))))
-   `(modus-theme-mark-sel ((,class (:background ,bg-mark-sel :foreground 
,fg-mark-sel :weight bold))))
-   `(modus-theme-mark-symbol ((,class (:foreground ,blue-alt :weight bold))))
+   `(modus-theme-header ((,class :foreground ,fg-main :weight bold)))
+   `(modus-theme-mark-alt ((,class :background ,bg-mark-alt :foreground 
,fg-mark-alt :weight bold)))
+   `(modus-theme-mark-del ((,class :background ,bg-mark-del :foreground 
,fg-mark-del :weight bold)))
+   `(modus-theme-mark-sel ((,class :background ,bg-mark-sel :foreground 
,fg-mark-sel :weight bold)))
+   `(modus-theme-mark-symbol ((,class :foreground ,blue-alt :weight bold)))
    ;;;;;;;;;;;;;;;;;;;
    ;; actual styles ;;
    ;;;;;;;;;;;;;;;;;;;
    ;;; default constructs
    ;;;; absolute essentials
-   `(default ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(cursor ((,class (:background ,fg-main))))
-   `(fringe ((,class (:background
-                      ,(if modus-vivendi-theme-visible-fringes bg-inactive 
bg-main)
-                      :foreground ,fg-main))))
-   `(vertical-border ((,class (:foreground ,fg-window-divider-inner))))
+   `(default ((,class :background ,bg-main :foreground ,fg-main)))
+   `(cursor ((,class :background ,fg-main)))
+   `(fringe ((,class :background
+                     ,(if modus-vivendi-theme-visible-fringes bg-inactive 
bg-main)
+                     :foreground ,fg-main)))
+   `(vertical-border ((,class :foreground ,fg-window-divider-inner)))
    ;;;; basic and/or ungrouped styles
-   `(error ((,class (:foreground ,red :weight bold))))
-   `(escape-glyph ((,class (:foreground ,fg-escape-char-construct))))
-   `(header-line ((,class (:background ,bg-header :foreground ,fg-header))))
-   `(homoglyph ((,class (:foreground ,fg-escape-char-construct))))
-   `(ibuffer-locked-buffer ((,class (:foreground ,yellow-alt-other))))
-   `(italic ((,class (:foreground ,fg-special-cold :slant italic))))
-   `(nobreak-hyphen ((,class (:foreground ,fg-escape-char-construct))))
-   `(nobreak-space ((,class (:foreground ,fg-escape-char-construct :underline 
t))))
-   `(minibuffer-prompt ((,class (:foreground ,cyan-alt-other))))
-   `(mm-command-output ((,class (:foreground ,red-alt-other))))
-   `(mm-uu-extract ((,class (:background ,bg-dim :foreground 
,fg-special-mild))))
-   `(next-error ((,class (:inherit modus-theme-subtle-red))))
-   `(shadow ((,class (:foreground ,fg-alt))))
-   `(success ((,class (:foreground ,green :weight bold))))
-   `(trailing-whitespace ((,class (:background ,red-intense-bg))))
-   `(warning ((,class (:foreground ,yellow :weight bold))))
+   `(error ((,class :foreground ,red :weight bold)))
+   `(escape-glyph ((,class :foreground ,fg-escape-char-construct)))
+   `(header-line ((,class :background ,bg-header :foreground ,fg-header)))
+   `(homoglyph ((,class :foreground ,fg-escape-char-construct)))
+   `(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other)))
+   `(italic ((,class :foreground ,fg-special-cold :slant italic)))
+   `(nobreak-hyphen ((,class :foreground ,fg-escape-char-construct)))
+   `(nobreak-space ((,class :foreground ,fg-escape-char-construct :underline 
t)))
+   `(minibuffer-prompt ((,class :foreground ,cyan-alt-other)))
+   `(mm-command-output ((,class :foreground ,red-alt-other)))
+   `(mm-uu-extract ((,class :background ,bg-dim :foreground ,fg-special-mild)))
+   `(next-error ((,class :inherit modus-theme-subtle-red)))
+   `(shadow ((,class :foreground ,fg-alt)))
+   `(success ((,class :foreground ,green :weight bold)))
+   `(trailing-whitespace ((,class :background ,red-intense-bg)))
+   `(warning ((,class :foreground ,yellow :weight bold)))
    ;;;; ag
-   `(ag-hit-face ((,class (:foreground ,fg-special-cold))))
-   `(ag-match-face ((,class (:inherit modus-theme-special-calm))))
+   `(ag-hit-face ((,class :foreground ,fg-special-cold)))
+   `(ag-match-face ((,class :inherit modus-theme-special-calm)))
    ;;;; alert
-   `(alert-high-face ((,class (:foreground ,red-alt :weight bold))))
-   `(alert-low-face ((,class (:foreground ,fg-special-mild))))
-   `(alert-moderate-face ((,class (:foreground ,yellow :weight bold))))
-   `(alert-trivial-face ((,class (:foreground ,fg-special-calm))))
-   `(alert-urgent-face ((,class (:foreground ,red-intense :weight bold))))
+   `(alert-high-face ((,class :foreground ,red-alt :weight bold)))
+   `(alert-low-face ((,class :foreground ,fg-special-mild)))
+   `(alert-moderate-face ((,class :foreground ,yellow :weight bold)))
+   `(alert-trivial-face ((,class :foreground ,fg-special-calm)))
+   `(alert-urgent-face ((,class :foreground ,red-intense :weight bold)))
    ;;;; all-the-icons
-   `(all-the-icons-blue ((,class (:foreground ,blue))))
-   `(all-the-icons-blue-alt ((,class (:foreground ,blue-alt))))
-   `(all-the-icons-cyan ((,class (:foreground ,cyan))))
-   `(all-the-icons-cyan-alt ((,class (:foreground ,cyan-alt))))
-   `(all-the-icons-dblue ((,class (:foreground ,blue-alt-other))))
-   `(all-the-icons-dcyan ((,class (:foreground ,cyan-alt-other))))
-   `(all-the-icons-dgreen ((,class (:foreground ,green-alt-other))))
-   `(all-the-icons-dired-dir-face ((,class (:foreground ,blue))))
-   `(all-the-icons-dmaroon ((,class (:foreground ,magenta-alt-other))))
-   `(all-the-icons-dorange ((,class (:foreground ,red-alt-other))))
-   `(all-the-icons-dpink ((,class (:foreground ,magenta))))
-   `(all-the-icons-dpurple ((,class (:foreground ,magenta-alt))))
-   `(all-the-icons-dred ((,class (:foreground ,red))))
-   `(all-the-icons-dsilver ((,class (:foreground ,fg-special-cold))))
-   `(all-the-icons-dyellow ((,class (:foreground ,yellow))))
-   `(all-the-icons-green ((,class (:foreground ,green))))
-   `(all-the-icons-lblue ((,class (:foreground ,blue-refine-fg))))
-   `(all-the-icons-lcyan ((,class (:foreground ,cyan-refine-fg))))
-   `(all-the-icons-lgreen ((,class (:foreground ,green-refine-fg))))
-   `(all-the-icons-lmaroon ((,class (:foreground ,magenta-refine-fg))))
-   `(all-the-icons-lorange ((,class (:foreground ,red-refine-fg))))
-   `(all-the-icons-lpink ((,class (:foreground ,magenta-refine-fg))))
-   `(all-the-icons-lpurple ((,class (:foreground ,magenta-refine-fg))))
-   `(all-the-icons-lred ((,class (:foreground ,red-refine-fg))))
-   `(all-the-icons-lsilver ((,class (:foreground ,fg-special-cold))))
-   `(all-the-icons-lyellow ((,class (:foreground ,yellow-refine-fg))))
-   `(all-the-icons-maroon ((,class (:foreground ,magenta))))
-   `(all-the-icons-orange ((,class (:foreground ,red-alt))))
-   `(all-the-icons-pink ((,class (:foreground ,magenta))))
-   `(all-the-icons-purple ((,class (:foreground ,magenta-alt))))
-   `(all-the-icons-purple-alt ((,class (:foreground ,magenta-alt-other))))
-   `(all-the-icons-red ((,class (:foreground ,red))))
-   `(all-the-icons-red-alt ((,class (:foreground ,red-alt))))
-   `(all-the-icons-silver ((,class (:foreground ,fg-special-cold))))
-   `(all-the-icons-yellow ((,class (:foreground ,yellow))))
+   `(all-the-icons-blue ((,class :foreground ,blue)))
+   `(all-the-icons-blue-alt ((,class :foreground ,blue-alt)))
+   `(all-the-icons-cyan ((,class :foreground ,cyan)))
+   `(all-the-icons-cyan-alt ((,class :foreground ,cyan-alt)))
+   `(all-the-icons-dblue ((,class :foreground ,blue-alt-other)))
+   `(all-the-icons-dcyan ((,class :foreground ,cyan-alt-other)))
+   `(all-the-icons-dgreen ((,class :foreground ,green-alt-other)))
+   `(all-the-icons-dired-dir-face ((,class :foreground ,blue)))
+   `(all-the-icons-dmaroon ((,class :foreground ,magenta-alt-other)))
+   `(all-the-icons-dorange ((,class :foreground ,red-alt-other)))
+   `(all-the-icons-dpink ((,class :foreground ,magenta)))
+   `(all-the-icons-dpurple ((,class :foreground ,magenta-alt)))
+   `(all-the-icons-dred ((,class :foreground ,red)))
+   `(all-the-icons-dsilver ((,class :foreground ,fg-special-cold)))
+   `(all-the-icons-dyellow ((,class :foreground ,yellow)))
+   `(all-the-icons-green ((,class :foreground ,green)))
+   `(all-the-icons-lblue ((,class :foreground ,blue-refine-fg)))
+   `(all-the-icons-lcyan ((,class :foreground ,cyan-refine-fg)))
+   `(all-the-icons-lgreen ((,class :foreground ,green-refine-fg)))
+   `(all-the-icons-lmaroon ((,class :foreground ,magenta-refine-fg)))
+   `(all-the-icons-lorange ((,class :foreground ,red-refine-fg)))
+   `(all-the-icons-lpink ((,class :foreground ,magenta-refine-fg)))
+   `(all-the-icons-lpurple ((,class :foreground ,magenta-refine-fg)))
+   `(all-the-icons-lred ((,class :foreground ,red-refine-fg)))
+   `(all-the-icons-lsilver ((,class :foreground ,fg-special-cold)))
+   `(all-the-icons-lyellow ((,class :foreground ,yellow-refine-fg)))
+   `(all-the-icons-maroon ((,class :foreground ,magenta)))
+   `(all-the-icons-orange ((,class :foreground ,red-alt)))
+   `(all-the-icons-pink ((,class :foreground ,magenta)))
+   `(all-the-icons-purple ((,class :foreground ,magenta-alt)))
+   `(all-the-icons-purple-alt ((,class :foreground ,magenta-alt-other)))
+   `(all-the-icons-red ((,class :foreground ,red)))
+   `(all-the-icons-red-alt ((,class :foreground ,red-alt)))
+   `(all-the-icons-silver ((,class :foreground ,fg-special-cold)))
+   `(all-the-icons-yellow ((,class :foreground ,yellow)))
    ;;;; annotate
-   `(annotate-annotation ((,class (:inherit modus-theme-intense-blue))))
-   `(annotate-annotation-secondary ((,class (:inherit 
modus-theme-intense-yellow))))
-   `(annotate-highlight ((,class (:underline (:color ,blue-intense :style 
line)))))
-   `(annotate-highlight-secondary ((,class (:underline (:color ,yellow-intense 
:style line)))))
+   `(annotate-annotation ((,class :inherit modus-theme-intense-blue)))
+   `(annotate-annotation-secondary ((,class :inherit 
modus-theme-intense-yellow)))
+   `(annotate-highlight ((,class :underline (:color ,blue-intense :style 
line))))
+   `(annotate-highlight-secondary ((,class :underline (:color ,yellow-intense 
:style line))))
    ;;;; anzu
-   `(anzu-match-1 ((,class (:inherit modus-theme-subtle-cyan))))
-   `(anzu-match-2 ((,class (:inherit modus-theme-subtle-green))))
-   `(anzu-match-3 ((,class (:inherit modus-theme-subtle-yellow))))
-   `(anzu-mode-line ((,class (:foreground ,green-active :weight bold))))
-   `(anzu-mode-line-no-match ((,class (:foreground ,red-active :weight bold))))
-   `(anzu-replace-highlight ((,class (:inherit modus-theme-refine-yellow 
:underline t))))
-   `(anzu-replace-to ((,class (:inherit modus-theme-intense-green :weight 
bold))))
+   `(anzu-match-1 ((,class :inherit modus-theme-subtle-cyan)))
+   `(anzu-match-2 ((,class :inherit modus-theme-subtle-green)))
+   `(anzu-match-3 ((,class :inherit modus-theme-subtle-yellow)))
+   `(anzu-mode-line ((,class :foreground ,green-active :weight bold)))
+   `(anzu-mode-line-no-match ((,class :foreground ,red-active :weight bold)))
+   `(anzu-replace-highlight ((,class :inherit modus-theme-refine-yellow 
:underline t)))
+   `(anzu-replace-to ((,class :inherit modus-theme-intense-green :weight 
bold)))
    ;;;; apropos
-   `(apropos-function-button ((,class (:foreground ,magenta-alt-other 
:underline t))))
-   `(apropos-keybinding ((,class (:foreground ,cyan :weight bold))))
-   `(apropos-misc-button ((,class (:foreground ,cyan-alt-other :underline t))))
-   `(apropos-property ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(apropos-symbol ((,class (:foreground ,blue-nuanced :weight 
,modus-theme-bold :underline t))))
-   `(apropos-user-option-button ((,class (:foreground ,green-alt-other 
:underline t))))
-   `(apropos-variable-button ((,class (:foreground ,blue :underline t))))
+   `(apropos-function-button ((,class :foreground ,magenta-alt-other 
:underline t)))
+   `(apropos-keybinding ((,class :foreground ,cyan :weight bold)))
+   `(apropos-misc-button ((,class :foreground ,cyan-alt-other :underline t)))
+   `(apropos-property ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(apropos-symbol ((,class :foreground ,blue-nuanced :weight 
,modus-theme-bold :underline t)))
+   `(apropos-user-option-button ((,class :foreground ,green-alt-other 
:underline t)))
+   `(apropos-variable-button ((,class :foreground ,blue :underline t)))
    ;;;; apt-sources-list
-   `(apt-sources-list-components ((,class (:foreground ,cyan))))
-   `(apt-sources-list-options ((,class (:foreground ,yellow))))
-   `(apt-sources-list-suite ((,class (:foreground ,green))))
-   `(apt-sources-list-type ((,class (:foreground ,magenta))))
-   `(apt-sources-list-uri ((,class (:foreground ,blue))))
+   `(apt-sources-list-components ((,class :foreground ,cyan)))
+   `(apt-sources-list-options ((,class :foreground ,yellow)))
+   `(apt-sources-list-suite ((,class :foreground ,green)))
+   `(apt-sources-list-type ((,class :foreground ,magenta)))
+   `(apt-sources-list-uri ((,class :foreground ,blue)))
    ;;;; artbollocks-mode
-   `(artbollocks-face ((,class (:foreground ,cyan-nuanced :underline (:color 
,fg-lang-note :style line)))))
-   `(artbollocks-lexical-illusions-face ((,class (:background ,bg-alt 
:foreground ,red-alt :underline t))))
-   `(artbollocks-passive-voice-face ((,class (:foreground ,yellow-nuanced 
:underline (:color ,fg-lang-warning :style line)))))
-   `(artbollocks-weasel-words-face ((,class (:foreground ,red-nuanced 
:underline (:color ,fg-lang-error :style line)))))
+   `(artbollocks-face ((,class :foreground ,cyan-nuanced :underline (:color 
,fg-lang-note :style line))))
+   `(artbollocks-lexical-illusions-face ((,class :background ,bg-alt 
:foreground ,red-alt :underline t)))
+   `(artbollocks-passive-voice-face ((,class :foreground ,yellow-nuanced 
:underline (:color ,fg-lang-warning :style line))))
+   `(artbollocks-weasel-words-face ((,class :foreground ,red-nuanced 
:underline (:color ,fg-lang-error :style line))))
    ;;;; auctex and Tex
-   `(font-latex-bold-face ((,class (:foreground ,fg-special-calm :weight 
bold))))
-   `(font-latex-doctex-documentation-face ((,class (:foreground 
,fg-special-cold :slant ,modus-theme-slant))))
-   `(font-latex-doctex-preprocessor-face ((,class (:foreground ,magenta-alt 
:weight ,modus-theme-bold))))
-   `(font-latex-italic-face ((,class (:foreground ,fg-special-calm :slant 
italic))))
-   `(font-latex-math-face ((,class (:foreground ,cyan-alt-other))))
-   `(font-latex-script-char-face ((,class (:foreground ,cyan-alt-other))))
-   `(font-latex-sectioning-0-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold
-                                                     
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))))
-   `(font-latex-sectioning-1-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold
-                                                     
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3)))))
-   `(font-latex-sectioning-2-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold
-                                                     
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2)))))
-   `(font-latex-sectioning-3-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold
-                                                     
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-1)))))
-   `(font-latex-sectioning-4-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground ,blue-nuanced 
:weight bold))))
-   `(font-latex-sectioning-5-face ((,class (:inherit 
,modus-theme-variable-pitch
-                                                     :foreground 
,blue-nuanced))))
-   `(font-latex-sedate-face ((,class (:foreground ,magenta-alt-other :weight 
,modus-theme-bold))))
-   `(font-latex-slide-title-face ((,class (:inherit ,modus-theme-variable-pitch
-                                                    :foreground ,cyan-nuanced 
:weight bold
-                                                    
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))))
-   `(font-latex-string-face ((,class (:foreground ,blue-alt))))
-   `(font-latex-subscript-face ((,class (:height 0.95))))
-   `(font-latex-superscript-face ((,class (:height 0.95))))
-   `(font-latex-verbatim-face ((,class (:background ,bg-dim :foreground 
,fg-special-mild))))
-   `(font-latex-warning-face ((,class (:foreground ,yellow-alt-other))))
-   `(tex-match ((,class (:foreground ,blue-alt-other))))
-   `(tex-verbatim ((,class (:background ,bg-dim :foreground 
,fg-special-mild))))
-   `(texinfo-heading ((,class (:foreground ,magenta))))
-   `(TeX-error-description-error ((,class (:foreground ,red :weight bold))))
-   `(TeX-error-description-help ((,class (:foreground ,blue))))
-   `(TeX-error-description-tex-said ((,class (:foreground ,blue))))
-   `(TeX-error-description-warning ((,class (:foreground ,yellow :weight 
bold))))
+   `(font-latex-bold-face ((,class :foreground ,fg-special-calm :weight bold)))
+   `(font-latex-doctex-documentation-face ((,class :foreground 
,fg-special-cold :slant ,modus-theme-slant)))
+   `(font-latex-doctex-preprocessor-face ((,class :foreground ,magenta-alt 
:weight ,modus-theme-bold)))
+   `(font-latex-italic-face ((,class :foreground ,fg-special-calm :slant 
italic)))
+   `(font-latex-math-face ((,class :foreground ,cyan-alt-other)))
+   `(font-latex-script-char-face ((,class :foreground ,cyan-alt-other)))
+   `(font-latex-sectioning-0-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold
+                                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(font-latex-sectioning-1-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold
+                                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3))))
+   `(font-latex-sectioning-2-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold
+                                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2))))
+   `(font-latex-sectioning-3-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold
+                                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-1))))
+   `(font-latex-sectioning-4-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced :weight 
bold)))
+   `(font-latex-sectioning-5-face ((,class :inherit ,modus-theme-variable-pitch
+                                           :foreground ,blue-nuanced)))
+   `(font-latex-sedate-face ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold)))
+   `(font-latex-slide-title-face ((,class :inherit ,modus-theme-variable-pitch
+                                          :foreground ,cyan-nuanced :weight 
bold
+                                          ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(font-latex-string-face ((,class :foreground ,blue-alt)))
+   `(font-latex-subscript-face ((,class :height 0.95)))
+   `(font-latex-superscript-face ((,class :height 0.95)))
+   `(font-latex-verbatim-face ((,class :background ,bg-dim :foreground 
,fg-special-mild)))
+   `(font-latex-warning-face ((,class :foreground ,yellow-alt-other)))
+   `(tex-match ((,class :foreground ,blue-alt-other)))
+   `(tex-verbatim ((,class :background ,bg-dim :foreground ,fg-special-mild)))
+   `(texinfo-heading ((,class :foreground ,magenta)))
+   `(TeX-error-description-error ((,class :foreground ,red :weight bold)))
+   `(TeX-error-description-help ((,class :foreground ,blue)))
+   `(TeX-error-description-tex-said ((,class :foreground ,blue)))
+   `(TeX-error-description-warning ((,class :foreground ,yellow :weight bold)))
    ;;;; auto-dim-other-buffers
-   `(auto-dim-other-buffers-face ((,class (:background ,bg-alt))))
+   `(auto-dim-other-buffers-face ((,class :background ,bg-alt)))
    ;;;; avy
-   `(avy-background-face ((,class (:background ,bg-dim :foreground ,fg-dim))))
-   `(avy-goto-char-timer-face ((,class (:inherit modus-theme-intense-yellow 
:weight bold))))
-   `(avy-lead-face ((,class (:inherit modus-theme-intense-magenta :weight 
bold))))
-   `(avy-lead-face-0 ((,class (:inherit modus-theme-intense-blue :weight 
bold))))
-   `(avy-lead-face-1 ((,class (:inherit modus-theme-intense-red :weight 
bold))))
-   `(avy-lead-face-2 ((,class (:inherit modus-theme-intense-green :weight 
bold))))
+   `(avy-background-face ((,class :background ,bg-dim :foreground ,fg-dim)))
+   `(avy-goto-char-timer-face ((,class :inherit modus-theme-intense-yellow 
:weight bold)))
+   `(avy-lead-face ((,class :inherit modus-theme-intense-magenta :weight 
bold)))
+   `(avy-lead-face-0 ((,class :inherit modus-theme-intense-blue :weight bold)))
+   `(avy-lead-face-1 ((,class :inherit modus-theme-intense-red :weight bold)))
+   `(avy-lead-face-2 ((,class :inherit modus-theme-intense-green :weight 
bold)))
    ;;;; aw (ace-window)
-   `(aw-background-face ((,class (:background ,bg-dim :foreground ,fg-dim))))
-   `(aw-key-face ((,class (:foreground ,blue-intense :weight bold))))
-   `(aw-leading-char-face ((,class (:height 1.5 :background ,bg-main 
:foreground ,red-intense :weight bold))))
-   `(aw-minibuffer-leading-char-face ((,class (:foreground ,magenta-active))))
-   `(aw-mode-line-face ((,class (:weight bold))))
+   `(aw-background-face ((,class :background ,bg-dim :foreground ,fg-dim)))
+   `(aw-key-face ((,class :foreground ,blue-intense :weight bold)))
+   `(aw-leading-char-face ((,class :height 1.5 :background ,bg-main 
:foreground ,red-intense :weight bold)))
+   `(aw-minibuffer-leading-char-face ((,class :foreground ,magenta-active)))
+   `(aw-mode-line-face ((,class :weight bold)))
    ;;;; bm
-   `(bm-face ((,class (:inherit modus-theme-subtle-yellow
-                                ,@(and (>= emacs-major-version 27) '(:extend 
t))))))
-   `(bm-fringe-face ((,class (:inherit modus-theme-fringe-yellow))))
-   `(bm-fringe-persistent-face ((,class (:inherit modus-theme-fringe-blue))))
-   `(bm-persistent-face ((,class (:inherit modus-theme-intense-blue
-                                           ,@(and (>= emacs-major-version 27) 
'(:extend t))))))
+   `(bm-face ((,class :inherit modus-theme-subtle-yellow
+                      ,@(and (>= emacs-major-version 27) '(:extend t)))))
+   `(bm-fringe-face ((,class :inherit modus-theme-fringe-yellow)))
+   `(bm-fringe-persistent-face ((,class :inherit modus-theme-fringe-blue)))
+   `(bm-persistent-face ((,class :inherit modus-theme-intense-blue
+                                 ,@(and (>= emacs-major-version 27) '(:extend 
t)))))
    ;;;; buttons, links, widgets
-   `(button ((,class (:foreground ,blue-alt-other :underline t))))
-   `(link ((,class (:foreground ,blue-alt-other :underline t))))
-   `(link-visited ((,class (:foreground ,magenta-alt-other :underline t))))
-   `(tooltip ((,class (:background ,bg-special-cold :foreground ,fg-main))))
-   `(widget-button ((,class (:inherit button))))
-   `(widget-button-pressed ((,class (:inherit button :foreground ,magenta))))
-   `(widget-documentation ((,class (:foreground ,green))))
-   `(widget-field ((,class (:background ,bg-alt :foreground ,fg-dim))))
-   `(widget-inactive ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(widget-single-line-field ((,class (:inherit widget-field))))
+   `(button ((,class :foreground ,blue-alt-other :underline t)))
+   `(link ((,class :foreground ,blue-alt-other :underline t)))
+   `(link-visited ((,class :foreground ,magenta-alt-other :underline t)))
+   `(tooltip ((,class :background ,bg-special-cold :foreground ,fg-main)))
+   `(widget-button ((,class :inherit button)))
+   `(widget-button-pressed ((,class :inherit button :foreground ,magenta)))
+   `(widget-documentation ((,class :foreground ,green)))
+   `(widget-field ((,class :background ,bg-alt :foreground ,fg-dim)))
+   `(widget-inactive ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(widget-single-line-field ((,class :inherit widget-field)))
    ;;;; breakpoint (built-in gdb-mi.el)
-   `(breakpoint-disabled ((,class (:foreground ,fg-alt))))
-   `(breakpoint-enabled ((,class (:foreground ,red :weight bold))))
+   `(breakpoint-disabled ((,class :foreground ,fg-alt)))
+   `(breakpoint-enabled ((,class :foreground ,red :weight bold)))
    ;;;; buffer-expose
-   `(buffer-expose-ace-char-face ((,class (:foreground ,red-active :weight 
bold))))
-   `(buffer-expose-mode-line-face ((,class (:foreground ,cyan-active))))
-   `(buffer-expose-selected-face ((,class (:inherit 
modus-theme-special-mild))))
+   `(buffer-expose-ace-char-face ((,class :foreground ,red-active :weight 
bold)))
+   `(buffer-expose-mode-line-face ((,class :foreground ,cyan-active)))
+   `(buffer-expose-selected-face ((,class :inherit modus-theme-special-mild)))
    ;;;; calendar and diary
-   `(calendar-month-header ((,class (:foreground ,fg-main :weight bold))))
-   `(calendar-today ((,class (:background ,bg-alt :underline t))))
-   `(calendar-weekday-header ((,class (:foreground ,blue-alt))))
-   `(calendar-weekend-header ((,class (:foreground ,fg-alt))))
-   `(diary ((,class (:foreground ,green-alt-other))))
-   `(diary-anniversary ((,class (:foreground ,yellow-alt-other))))
-   `(diary-time ((,class (:foreground ,red-alt))))
-   `(holiday ((,class (:foreground ,magenta-alt))))
+   `(calendar-month-header ((,class :foreground ,fg-main :weight bold)))
+   `(calendar-today ((,class :background ,bg-alt :underline t)))
+   `(calendar-weekday-header ((,class :foreground ,blue-alt)))
+   `(calendar-weekend-header ((,class :foreground ,fg-alt)))
+   `(diary ((,class :foreground ,green-alt-other)))
+   `(diary-anniversary ((,class :foreground ,yellow-alt-other)))
+   `(diary-time ((,class :foreground ,red-alt)))
+   `(holiday ((,class :foreground ,magenta-alt)))
    ;;;; calfw
-   `(cfw:face-annotation ((,class (:background ,bg-alt :foreground ,fg-alt))))
-   `(cfw:face-day-title ((,class (:background ,bg-alt :foreground ,fg-main))))
-   `(cfw:face-default-content ((,class (:foreground ,green-alt))))
-   `(cfw:face-default-day ((,class (:inherit cfw:face-day-title :weight 
bold))))
-   `(cfw:face-disable ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(cfw:face-grid ((,class (:foreground ,fg-inactive))))
-   `(cfw:face-header ((,class (::foreground ,fg-main :weight bold))))
-   `(cfw:face-holiday ((,class (:background ,bg-alt :foreground ,magenta 
:weight bold))))
-   `(cfw:face-periods ((,class (:foreground ,cyan-alt-other))))
-   `(cfw:face-saturday ((,class (:background ,bg-alt :foreground ,magenta-alt 
:weight bold))))
-   `(cfw:face-select ((,class (:inherit modus-theme-intense-blue))))
-   `(cfw:face-sunday ((,class (:background ,bg-alt :foreground 
,magenta-alt-other :weight bold))))
-   `(cfw:face-title ((,class (:inherit ,modus-theme-variable-pitch
-                                       :foreground ,fg-special-warm :weight 
bold
-                                       ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
-   `(cfw:face-today ((,class (:foreground ,blue :weight bold))))
-   `(cfw:face-today-title ((,class (:inherit modus-theme-special-mild :box 
t))))
-   `(cfw:face-toolbar ((,class (:background ,bg-active :foreground 
,bg-active))))
-   `(cfw:face-toolbar-button-off ((,class (:background ,bg-alt :foreground 
,cyan))))
-   `(cfw:face-toolbar-button-on ((,class (:background ,bg-main :foreground 
,blue-intense :weight bold))))
+   `(cfw:face-annotation ((,class :background ,bg-alt :foreground ,fg-alt)))
+   `(cfw:face-day-title ((,class :background ,bg-alt :foreground ,fg-main)))
+   `(cfw:face-default-content ((,class :foreground ,green-alt)))
+   `(cfw:face-default-day ((,class :inherit cfw:face-day-title :weight bold)))
+   `(cfw:face-disable ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(cfw:face-grid ((,class :foreground ,fg-inactive)))
+   `(cfw:face-header ((,class ::foreground ,fg-main :weight bold)))
+   `(cfw:face-holiday ((,class :background ,bg-alt :foreground ,magenta 
:weight bold)))
+   `(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
+   `(cfw:face-saturday ((,class :background ,bg-alt :foreground ,magenta-alt 
:weight bold)))
+   `(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
+   `(cfw:face-sunday ((,class :background ,bg-alt :foreground 
,magenta-alt-other :weight bold)))
+   `(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch
+                             :foreground ,fg-special-warm :weight bold
+                             ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(cfw:face-today ((,class :foreground ,blue :weight bold)))
+   `(cfw:face-today-title ((,class :inherit modus-theme-special-mild :box t)))
+   `(cfw:face-toolbar ((,class :background ,bg-active :foreground ,bg-active)))
+   `(cfw:face-toolbar-button-off ((,class :background ,bg-alt :foreground 
,cyan)))
+   `(cfw:face-toolbar-button-on ((,class :background ,bg-main :foreground 
,blue-intense :weight bold)))
    ;;;; centaur-tabs
-   `(centaur-tabs-active-bar-face ((,class (:background ,fg-tab-active))))
-   `(centaur-tabs-close-mouse-face ((,class (:foreground ,red-active :weight 
bold :underline t))))
-   `(centaur-tabs-close-selected ((,class (:inherit centaur-tabs-selected))))
-   `(centaur-tabs-close-unselected ((,class (:inherit 
centaur-tabs-unselected))))
-   `(centaur-tabs-modified-marker-selected ((,class (:inherit 
centaur-tabs-selected))))
-   `(centaur-tabs-modified-marker-unselected ((,class (:inherit 
centaur-tabs-unselected))))
-   `(centaur-tabs-default ((,class (:background ,bg-main :foreground 
,bg-main))))
-   `(centaur-tabs-selected ((,class (:background ,bg-tab-active :foreground 
,fg-main :weight bold))))
-   `(centaur-tabs-selected-modified ((,class (:background ,bg-tab-active 
:foreground ,fg-main :slant italic))))
-   `(centaur-tabs-unselected ((,class (:background ,bg-tab-inactive 
:foreground ,fg-dim))))
-   `(centaur-tabs-unselected-modified ((,class (:background ,bg-tab-inactive 
:foreground ,fg-dim :slant italic))))
+   `(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
+   `(centaur-tabs-close-mouse-face ((,class :foreground ,red-active :weight 
bold :underline t)))
+   `(centaur-tabs-close-selected ((,class :inherit centaur-tabs-selected)))
+   `(centaur-tabs-close-unselected ((,class :inherit centaur-tabs-unselected)))
+   `(centaur-tabs-modified-marker-selected ((,class :inherit 
centaur-tabs-selected)))
+   `(centaur-tabs-modified-marker-unselected ((,class :inherit 
centaur-tabs-unselected)))
+   `(centaur-tabs-default ((,class :background ,bg-main :foreground ,bg-main)))
+   `(centaur-tabs-selected ((,class :background ,bg-tab-active :foreground 
,fg-main :weight bold)))
+   `(centaur-tabs-selected-modified ((,class :background ,bg-tab-active 
:foreground ,fg-main :slant italic)))
+   `(centaur-tabs-unselected ((,class :background ,bg-tab-inactive :foreground 
,fg-dim)))
+   `(centaur-tabs-unselected-modified ((,class :background ,bg-tab-inactive 
:foreground ,fg-dim :slant italic)))
    ;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log')
-   `(change-log-acknowledgment ((,class (:foreground ,fg-special-warm))))
-   `(change-log-conditionals ((,class (:foreground ,magenta-alt))))
-   `(change-log-date ((,class (:foreground ,magenta))))
-   `(change-log-email ((,class (:foreground ,cyan))))
-   `(change-log-file ((,class (:foreground ,blue))))
-   `(change-log-function ((,class (:foreground ,green-alt-other))))
-   `(change-log-list ((,class (:foreground ,magenta-alt-other))))
-   `(change-log-name ((,class (:foreground ,cyan))))
-   `(log-edit-header ((,class (:foreground ,green-alt-other :weight bold))))
-   `(log-edit-summary ((,class (:foreground ,magenta-alt-other))))
-   `(log-edit-unknown-header ((,class (:foreground ,fg-alt))))
-   `(log-view-file ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(log-view-message ((,class (:foreground ,fg-special-warm))))
+   `(change-log-acknowledgment ((,class :foreground ,fg-special-warm)))
+   `(change-log-conditionals ((,class :foreground ,magenta-alt)))
+   `(change-log-date ((,class :foreground ,magenta)))
+   `(change-log-email ((,class :foreground ,cyan)))
+   `(change-log-file ((,class :foreground ,blue)))
+   `(change-log-function ((,class :foreground ,green-alt-other)))
+   `(change-log-list ((,class :foreground ,magenta-alt-other)))
+   `(change-log-name ((,class :foreground ,cyan)))
+   `(log-edit-header ((,class :foreground ,green-alt-other :weight bold)))
+   `(log-edit-summary ((,class :foreground ,magenta-alt-other)))
+   `(log-edit-unknown-header ((,class :foreground ,fg-alt)))
+   `(log-view-file ((,class :foreground ,fg-special-cold :weight bold)))
+   `(log-view-message ((,class :foreground ,fg-special-warm)))
    ;;;; cider
-   `(cider-debug-code-overlay-face ((,class (:background ,bg-alt))))
-   `(cider-debug-prompt-face ((,class (:foreground ,magenta-alt :underline 
t))))
-   `(cider-deprecated-face ((,class (:inherit modus-theme-refine-yellow))))
-   `(cider-docview-emphasis-face ((,class (:foreground ,fg-special-cold :slant 
italic))))
-   `(cider-docview-literal-face ((,class (:foreground ,blue-alt))))
-   `(cider-docview-strong-face ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(cider-docview-table-border-face ((,class (:foreground ,fg-alt))))
-   `(cider-enlightened-face ((,class (:box (:line-width -1 :color ,yellow-alt 
:style nil) :background ,bg-dim))))
-   `(cider-enlightened-local-face ((,class (:foreground ,yellow-alt-other 
:weight bold))))
-   `(cider-error-highlight-face ((,class (:foreground ,red :underline t))))
-   `(cider-fragile-button-face ((,class (:box (:line-width 3 :color ,fg-alt 
:style released-button)) :foreground ,yellow)))
-   `(cider-fringe-good-face ((,class (:foreground ,green-active))))
-   `(cider-instrumented-face ((,class (:box (:line-width -1 :color ,red :style 
nil) :background ,bg-dim))))
-   `(cider-reader-conditional-face ((,class (:foreground ,fg-special-warm 
:slant italic))))
-   `(cider-repl-input-face ((,class (:weight bold))))
-   `(cider-repl-prompt-face ((,class (:foreground ,cyan-alt-other))))
-   `(cider-repl-stderr-face ((,class (:foreground ,red :weight bold))))
-   `(cider-repl-stdout-face ((,class (:foreground ,blue))))
-   `(cider-result-overlay-face ((,class (:box (:line-width -1 :color ,blue 
:style nil) :background ,bg-dim))))
-   `(cider-stacktrace-error-class-face ((,class (:foreground ,red :weight 
bold))))
-   `(cider-stacktrace-error-message-face ((,class (:foreground ,red-alt-other 
:slant italic))))
-   `(cider-stacktrace-face ((,class (:foreground ,fg-main))))
-   `(cider-stacktrace-filter-active-face ((,class (:foreground ,cyan-alt 
:underline t))))
-   `(cider-stacktrace-filter-inactive-face ((,class (:foreground ,cyan-alt))))
-   `(cider-stacktrace-fn-face ((,class (:foreground ,fg-main :weight bold))))
-   `(cider-stacktrace-ns-face ((,class (:foreground ,fg-alt :slant italic))))
-   `(cider-stacktrace-promoted-button-face ((,class (:box (:line-width 3 
:color ,fg-alt :style released-button)) :foreground ,red)))
-   `(cider-stacktrace-suppressed-button-face ((,class (:box (:line-width 3 
:color ,fg-alt :style pressed-button))
+   `(cider-debug-code-overlay-face ((,class :background ,bg-alt)))
+   `(cider-debug-prompt-face ((,class :foreground ,magenta-alt :underline t)))
+   `(cider-deprecated-face ((,class :inherit modus-theme-refine-yellow)))
+   `(cider-docview-emphasis-face ((,class :foreground ,fg-special-cold :slant 
italic)))
+   `(cider-docview-literal-face ((,class :foreground ,blue-alt)))
+   `(cider-docview-strong-face ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(cider-docview-table-border-face ((,class :foreground ,fg-alt)))
+   `(cider-enlightened-face ((,class :box (:line-width -1 :color ,yellow-alt 
:style nil) :background ,bg-dim)))
+   `(cider-enlightened-local-face ((,class :foreground ,yellow-alt-other 
:weight bold)))
+   `(cider-error-highlight-face ((,class :foreground ,red :underline t)))
+   `(cider-fragile-button-face ((,class :box (:line-width 3 :color ,fg-alt 
:style released-button) :foreground ,yellow)))
+   `(cider-fringe-good-face ((,class :foreground ,green-active)))
+   `(cider-instrumented-face ((,class :box (:line-width -1 :color ,red :style 
nil) :background ,bg-dim)))
+   `(cider-reader-conditional-face ((,class :foreground ,fg-special-warm 
:slant italic)))
+   `(cider-repl-input-face ((,class :weight bold)))
+   `(cider-repl-prompt-face ((,class :foreground ,cyan-alt-other)))
+   `(cider-repl-stderr-face ((,class :foreground ,red :weight bold)))
+   `(cider-repl-stdout-face ((,class :foreground ,blue)))
+   `(cider-result-overlay-face ((,class :box (:line-width -1 :color ,blue 
:style nil) :background ,bg-dim)))
+   `(cider-stacktrace-error-class-face ((,class :foreground ,red :weight 
bold)))
+   `(cider-stacktrace-error-message-face ((,class :foreground ,red-alt-other 
:slant italic)))
+   `(cider-stacktrace-face ((,class :foreground ,fg-main)))
+   `(cider-stacktrace-filter-active-face ((,class :foreground ,cyan-alt 
:underline t)))
+   `(cider-stacktrace-filter-inactive-face ((,class :foreground ,cyan-alt)))
+   `(cider-stacktrace-fn-face ((,class :foreground ,fg-main :weight bold)))
+   `(cider-stacktrace-ns-face ((,class :foreground ,fg-alt :slant italic)))
+   `(cider-stacktrace-promoted-button-face ((,class :box (:line-width 3 :color 
,fg-alt :style released-button) :foreground ,red)))
+   `(cider-stacktrace-suppressed-button-face ((,class :box (:line-width 3 
:color ,fg-alt :style pressed-button)
                                                       :background ,bg-alt 
:foreground ,fg-alt)))
-   `(cider-test-error-face ((,class (:inherit modus-theme-subtle-red))))
-   `(cider-test-failure-face ((,class (:inherit modus-theme-intense-red 
:weight bold))))
-   `(cider-test-success-face ((,class (:inherit modus-theme-intense-green))))
-   `(cider-traced-face ((,class (:box (:line-width -1 :color ,cyan :style nil) 
:background ,bg-dim))))
-   `(cider-warning-highlight-face ((,class (:foreground ,yellow :underline 
t))))
+   `(cider-test-error-face ((,class :inherit modus-theme-subtle-red)))
+   `(cider-test-failure-face ((,class :inherit modus-theme-intense-red :weight 
bold)))
+   `(cider-test-success-face ((,class :inherit modus-theme-intense-green)))
+   `(cider-traced-face ((,class :box (:line-width -1 :color ,cyan :style nil) 
:background ,bg-dim)))
+   `(cider-warning-highlight-face ((,class :foreground ,yellow :underline t)))
    ;;;; circe (and lui)
-   `(circe-fool-face ((,class (:foreground ,fg-alt))))
-   `(circe-highlight-nick-face ((,class (:foreground ,blue :weight bold))))
-   `(circe-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(circe-server-face ((,class (:foreground ,fg-unfocused))))
-   `(lui-button-face ((,class (:foreground ,blue :underline t))))
-   `(lui-highlight-face ((,class (:foreground ,magenta-alt))))
-   `(lui-time-stamp-face ((,class (:foreground ,blue-nuanced))))
+   `(circe-fool-face ((,class :foreground ,fg-alt)))
+   `(circe-highlight-nick-face ((,class :foreground ,blue :weight bold)))
+   `(circe-prompt-face ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(circe-server-face ((,class :foreground ,fg-unfocused)))
+   `(lui-button-face ((,class :foreground ,blue :underline t)))
+   `(lui-highlight-face ((,class :foreground ,magenta-alt)))
+   `(lui-time-stamp-face ((,class :foreground ,blue-nuanced)))
    ;;;; color-rg
-   `(color-rg-font-lock-column-number ((,class (:foreground 
,magenta-alt-other))))
-   `(color-rg-font-lock-command ((,class (:foreground ,fg-main :weight bold))))
-   `(color-rg-font-lock-file ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(color-rg-font-lock-flash ((,class (:inherit modus-theme-intense-blue))))
-   `(color-rg-font-lock-function-location ((,class (:inherit 
modus-theme-special-calm))))
-   `(color-rg-font-lock-header-line-directory ((,class (:foreground 
,blue-active))))
-   `(color-rg-font-lock-header-line-edit-mode ((,class (:foreground 
,magenta-active))))
-   `(color-rg-font-lock-header-line-keyword ((,class (:foreground 
,green-active))))
-   `(color-rg-font-lock-header-line-text ((,class (:foreground ,fg-active))))
-   `(color-rg-font-lock-line-number ((,class (:foreground ,fg-special-warm))))
-   `(color-rg-font-lock-mark-changed ((,class (:foreground ,blue :weight 
bold))))
-   `(color-rg-font-lock-mark-deleted ((,class (:foreground ,red :weight 
bold))))
-   `(color-rg-font-lock-match ((,class (:inherit modus-theme-special-calm))))
-   `(color-rg-font-lock-position-splitter ((,class (:foreground ,fg-alt))))
+   `(color-rg-font-lock-column-number ((,class :foreground 
,magenta-alt-other)))
+   `(color-rg-font-lock-command ((,class :foreground ,fg-main :weight bold)))
+   `(color-rg-font-lock-file ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(color-rg-font-lock-flash ((,class :inherit modus-theme-intense-blue)))
+   `(color-rg-font-lock-function-location ((,class :inherit 
modus-theme-special-calm)))
+   `(color-rg-font-lock-header-line-directory ((,class :foreground 
,blue-active)))
+   `(color-rg-font-lock-header-line-edit-mode ((,class :foreground 
,magenta-active)))
+   `(color-rg-font-lock-header-line-keyword ((,class :foreground 
,green-active)))
+   `(color-rg-font-lock-header-line-text ((,class :foreground ,fg-active)))
+   `(color-rg-font-lock-line-number ((,class :foreground ,fg-special-warm)))
+   `(color-rg-font-lock-mark-changed ((,class :foreground ,blue :weight bold)))
+   `(color-rg-font-lock-mark-deleted ((,class :foreground ,red :weight bold)))
+   `(color-rg-font-lock-match ((,class :inherit modus-theme-special-calm)))
+   `(color-rg-font-lock-position-splitter ((,class :foreground ,fg-alt)))
    ;;;; column-enforce-mode
-   `(column-enforce-face ((,class (:inherit modus-theme-refine-yellow))))
+   `(column-enforce-face ((,class :inherit modus-theme-refine-yellow)))
    ;;;; company-mode
-   `(company-echo-common ((,class (:foreground ,magenta-alt-other))))
-   `(company-preview ((,class (:background ,bg-dim :foreground ,fg-dim))))
-   `(company-preview-common ((,class (:foreground ,blue-alt))))
-   `(company-preview-search ((,class (:inherit modus-theme-special-calm))))
-   `(company-scrollbar-bg ((,class (:background ,bg-active))))
-   `(company-scrollbar-fg ((,class (:background ,fg-active))))
-   `(company-template-field ((,class (:inherit modus-theme-intense-magenta))))
-   `(company-tooltip ((,class (:background ,bg-alt :foreground ,fg-alt))))
-   `(company-tooltip-annotation ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(company-tooltip-annotation-selection ((,class (:foreground ,fg-main 
:weight bold))))
-   `(company-tooltip-common ((,class (:foreground ,blue-alt :weight bold))))
-   `(company-tooltip-common-selection ((,class (:foreground ,fg-main))))
-   `(company-tooltip-mouse ((,class (:inherit modus-theme-intense-blue))))
-   `(company-tooltip-search ((,class (:inherit modus-theme-refine-cyan :weight 
bold))))
-   `(company-tooltip-search-selection ((,class (:inherit 
modus-theme-intense-green :weight bold :underline t))))
-   `(company-tooltip-selection ((,class (:inherit modus-theme-subtle-cyan 
:weight bold))))
+   `(company-echo-common ((,class :foreground ,magenta-alt-other)))
+   `(company-preview ((,class :background ,bg-dim :foreground ,fg-dim)))
+   `(company-preview-common ((,class :foreground ,blue-alt)))
+   `(company-preview-search ((,class :inherit modus-theme-special-calm)))
+   `(company-scrollbar-bg ((,class :background ,bg-active)))
+   `(company-scrollbar-fg ((,class :background ,fg-active)))
+   `(company-template-field ((,class :inherit modus-theme-intense-magenta)))
+   `(company-tooltip ((,class :background ,bg-alt :foreground ,fg-alt)))
+   `(company-tooltip-annotation ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(company-tooltip-annotation-selection ((,class :foreground ,fg-main 
:weight bold)))
+   `(company-tooltip-common ((,class :foreground ,blue-alt :weight bold)))
+   `(company-tooltip-common-selection ((,class :foreground ,fg-main)))
+   `(company-tooltip-mouse ((,class :inherit modus-theme-intense-blue)))
+   `(company-tooltip-search ((,class :inherit modus-theme-refine-cyan :weight 
bold)))
+   `(company-tooltip-search-selection ((,class :inherit 
modus-theme-intense-green :weight bold :underline t)))
+   `(company-tooltip-selection ((,class :inherit modus-theme-subtle-cyan 
:weight bold)))
    ;;;; company-posframe
-   `(company-posframe-active-backend-name ((,class (:background ,bg-active 
:foreground ,blue-active :weight bold))))
-   `(company-posframe-inactive-backend-name ((,class (:background ,bg-active 
:foreground ,fg-active))))
-   `(company-posframe-metadata ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
+   `(company-posframe-active-backend-name ((,class :background ,bg-active 
:foreground ,blue-active :weight bold)))
+   `(company-posframe-inactive-backend-name ((,class :background ,bg-active 
:foreground ,fg-active)))
+   `(company-posframe-metadata ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
    ;;;; compilation feedback
-   `(compilation-column-number ((,class (:foreground ,magenta-alt-other))))
-   `(compilation-error ((,class (:foreground ,red :weight ,modus-theme-bold))))
-   `(compilation-info ((,class (:foreground ,fg-special-cold))))
-   `(compilation-line-number ((,class (:foreground ,fg-special-warm))))
-   `(compilation-mode-line-exit ((,class (:foreground ,blue-active :weight 
,modus-theme-bold))))
-   `(compilation-mode-line-fail ((,class (:foreground ,red-active :weight 
,modus-theme-bold))))
-   `(compilation-mode-line-run ((,class (:foreground ,magenta-active :weight 
,modus-theme-bold))))
-   `(compilation-warning ((,class (:foreground ,yellow :weight 
,modus-theme-bold))))
+   `(compilation-column-number ((,class :foreground ,magenta-alt-other)))
+   `(compilation-error ((,class :foreground ,red :weight ,modus-theme-bold)))
+   `(compilation-info ((,class :foreground ,fg-special-cold)))
+   `(compilation-line-number ((,class :foreground ,fg-special-warm)))
+   `(compilation-mode-line-exit ((,class :foreground ,blue-active :weight 
,modus-theme-bold)))
+   `(compilation-mode-line-fail ((,class :foreground ,red-active :weight 
,modus-theme-bold)))
+   `(compilation-mode-line-run ((,class :foreground ,magenta-active :weight 
,modus-theme-bold)))
+   `(compilation-warning ((,class :foreground ,yellow :weight 
,modus-theme-bold)))
    ;;;; completions
-   `(completions-annotations ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(completions-common-part ((,class (,@(modus-vivendi-theme-completions
-                                          cyan-alt-other green-refine-bg 
green-refine-fg)))))
-   `(completions-first-difference ((,class (,@(modus-vivendi-theme-completions
-                                               blue-alt-other blue-intense-bg 
fg-main)
-                                            :weight bold))))
+   `(completions-annotations ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(completions-common-part ((,class ,@(modus-vivendi-theme-completions
+                                         cyan-alt-other green-refine-bg 
green-refine-fg))))
+   `(completions-first-difference ((,class ,@(modus-vivendi-theme-completions
+                                              blue-alt-other blue-intense-bg 
fg-main)
+                                           :weight bold)))
    ;;;; counsel
-   `(counsel-active-mode ((,class (:foreground ,magenta-alt-other))))
-   `(counsel-application-name ((,class (:foreground ,red-alt-other))))
-   `(counsel-key-binding ((,class (:foreground ,blue-alt-other :weight bold))))
-   `(counsel-outline-1 ((,class (:inherit outline-1))))
-   `(counsel-outline-2 ((,class (:inherit outline-2))))
-   `(counsel-outline-3 ((,class (:inherit outline-3))))
-   `(counsel-outline-4 ((,class (:inherit outline-4))))
-   `(counsel-outline-5 ((,class (:inherit outline-5))))
-   `(counsel-outline-6 ((,class (:inherit outline-6))))
-   `(counsel-outline-7 ((,class (:inherit outline-7))))
-   `(counsel-outline-8 ((,class (:inherit outline-8))))
-   `(counsel-outline-default ((,class (:foreground ,green-alt-other :weight 
bold))))
-   `(counsel-variable-documentation ((,class (:foreground ,yellow-alt-other 
:slant ,modus-theme-slant))))
+   `(counsel-active-mode ((,class :foreground ,magenta-alt-other)))
+   `(counsel-application-name ((,class :foreground ,red-alt-other)))
+   `(counsel-key-binding ((,class :foreground ,blue-alt-other :weight bold)))
+   `(counsel-outline-1 ((,class :inherit outline-1)))
+   `(counsel-outline-2 ((,class :inherit outline-2)))
+   `(counsel-outline-3 ((,class :inherit outline-3)))
+   `(counsel-outline-4 ((,class :inherit outline-4)))
+   `(counsel-outline-5 ((,class :inherit outline-5)))
+   `(counsel-outline-6 ((,class :inherit outline-6)))
+   `(counsel-outline-7 ((,class :inherit outline-7)))
+   `(counsel-outline-8 ((,class :inherit outline-8)))
+   `(counsel-outline-default ((,class :foreground ,green-alt-other :weight 
bold)))
+   `(counsel-variable-documentation ((,class :foreground ,yellow-alt-other 
:slant ,modus-theme-slant)))
    ;;;; counsel-css
-   `(counsel-css-selector-depth-face-1 ((,class (:foreground ,blue))))
-   `(counsel-css-selector-depth-face-2 ((,class (:foreground ,cyan))))
-   `(counsel-css-selector-depth-face-3 ((,class (:foreground ,green))))
-   `(counsel-css-selector-depth-face-4 ((,class (:foreground ,yellow))))
-   `(counsel-css-selector-depth-face-5 ((,class (:foreground ,magenta))))
-   `(counsel-css-selector-depth-face-6 ((,class (:foreground ,red))))
+   `(counsel-css-selector-depth-face-1 ((,class :foreground ,blue)))
+   `(counsel-css-selector-depth-face-2 ((,class :foreground ,cyan)))
+   `(counsel-css-selector-depth-face-3 ((,class :foreground ,green)))
+   `(counsel-css-selector-depth-face-4 ((,class :foreground ,yellow)))
+   `(counsel-css-selector-depth-face-5 ((,class :foreground ,magenta)))
+   `(counsel-css-selector-depth-face-6 ((,class :foreground ,red)))
    ;;;; counsel-notmuch
-   `(counsel-notmuch-count-face ((,class (:foreground ,cyan))))
-   `(counsel-notmuch-date-face ((,class (:foreground ,blue))))
-   `(counsel-notmuch-people-face ((,class (:foreground ,magenta))))
-   `(counsel-notmuch-subject-face ((,class (:foreground ,magenta-alt-other))))
+   `(counsel-notmuch-count-face ((,class :foreground ,cyan)))
+   `(counsel-notmuch-date-face ((,class :foreground ,blue)))
+   `(counsel-notmuch-people-face ((,class :foreground ,magenta)))
+   `(counsel-notmuch-subject-face ((,class :foreground ,magenta-alt-other)))
    ;;;; counsel-org-capture-string
-   `(counsel-org-capture-string-template-body-face ((,class (:foreground 
,fg-special-cold))))
+   `(counsel-org-capture-string-template-body-face ((,class :foreground 
,fg-special-cold)))
    ;;;; cov
-   `(cov-coverage-not-run-face ((,class (:foreground ,red-intense))))
-   `(cov-coverage-run-face ((,class (:foreground ,green-intense))))
-   `(cov-heavy-face ((,class (:foreground ,magenta-intense))))
-   `(cov-light-face ((,class (:foreground ,blue-intense))))
-   `(cov-med-face ((,class (:foreground ,yellow-intense))))
-   `(cov-none-face ((,class (:foreground ,cyan-intense))))
+   `(cov-coverage-not-run-face ((,class :foreground ,red-intense)))
+   `(cov-coverage-run-face ((,class :foreground ,green-intense)))
+   `(cov-heavy-face ((,class :foreground ,magenta-intense)))
+   `(cov-light-face ((,class :foreground ,blue-intense)))
+   `(cov-med-face ((,class :foreground ,yellow-intense)))
+   `(cov-none-face ((,class :foreground ,cyan-intense)))
    ;;;; csv-mode
-   `(csv-separator-face ((,class (:background ,bg-special-cold :foreground 
,fg-main))))
+   `(csv-separator-face ((,class :background ,bg-special-cold :foreground 
,fg-main)))
    ;;;; ctrlf
-   `(ctrlf-highlight-active ((,class (:inherit modus-theme-intense-green 
:weight bold))))
-   `(ctrlf-highlight-line ((,class (:background ,bg-hl-line))))
-   `(ctrlf-highlight-passive ((,class (:inherit modus-theme-refine-cyan))))
+   `(ctrlf-highlight-active ((,class :inherit modus-theme-intense-green 
:weight bold)))
+   `(ctrlf-highlight-line ((,class :background ,bg-hl-line)))
+   `(ctrlf-highlight-passive ((,class :inherit modus-theme-refine-cyan)))
    ;;;; custom (M-x customize)
-   `(custom-button ((,class (:box (:line-width 2 :color nil :style 
released-button)
-                                  :background ,bg-active :foreground 
,fg-main))))
-   `(custom-button-mouse ((,class (:box (:line-width 2 :color nil :style 
released-button)
-                                        :background ,bg-active :foreground 
,fg-active))))
-   `(custom-button-pressed ((,class (:box (:line-width 2 :color nil :style 
pressed-button)
-                                          :background ,bg-active :foreground 
,fg-main))))
-   `(custom-changed ((,class (:inherit modus-theme-subtle-cyan))))
-   `(custom-comment ((,class (:foreground ,fg-alt))))
-   `(custom-comment-tag ((,class (:background ,bg-alt :foreground 
,yellow-alt-other))))
-   `(custom-face-tag ((,class (:foreground ,blue-intense :weight bold))))
-   `(custom-group-tag ((,class (:foreground ,green-intense :weight bold))))
-   `(custom-group-tag-1 ((,class (:inherit modus-theme-special-warm))))
-   `(custom-invalid ((,class (:inherit modus-theme-intense-red :weight bold))))
-   `(custom-modified ((,class (:inherit modus-theme-subtle-cyan))))
-   `(custom-rogue ((,class (:inherit modus-theme-refine-magenta))))
-   `(custom-set ((,class (:foreground ,blue-alt))))
-   `(custom-state ((,class (:foreground ,cyan-alt-other))))
-   `(custom-themed ((,class (:inherit modus-theme-subtle-blue))))
-   `(custom-variable-tag ((,class (:foreground ,cyan :weight bold))))
+   `(custom-button ((,class :box (:line-width 2 :color nil :style 
released-button)
+                            :background ,bg-active :foreground ,fg-main)))
+   `(custom-button-mouse ((,class :box (:line-width 2 :color nil :style 
released-button)
+                                  :background ,bg-active :foreground 
,fg-active)))
+   `(custom-button-pressed ((,class :box (:line-width 2 :color nil :style 
pressed-button)
+                                    :background ,bg-active :foreground 
,fg-main)))
+   `(custom-changed ((,class :inherit modus-theme-subtle-cyan)))
+   `(custom-comment ((,class :foreground ,fg-alt)))
+   `(custom-comment-tag ((,class :background ,bg-alt :foreground 
,yellow-alt-other)))
+   `(custom-face-tag ((,class :foreground ,blue-intense :weight bold)))
+   `(custom-group-tag ((,class :foreground ,green-intense :weight bold)))
+   `(custom-group-tag-1 ((,class :inherit modus-theme-special-warm)))
+   `(custom-invalid ((,class :inherit modus-theme-intense-red :weight bold)))
+   `(custom-modified ((,class :inherit modus-theme-subtle-cyan)))
+   `(custom-rogue ((,class :inherit modus-theme-refine-magenta)))
+   `(custom-set ((,class :foreground ,blue-alt)))
+   `(custom-state ((,class :foreground ,cyan-alt-other)))
+   `(custom-themed ((,class :inherit modus-theme-subtle-blue)))
+   `(custom-variable-tag ((,class :foreground ,cyan :weight bold)))
    ;;;; dap-mode
-   `(dap-mouse-eval-thing-face ((,class (:box (:line-width -1 :color 
,blue-active :style nil)
-                                              :background ,bg-active 
:foreground ,fg-main))))
-   `(dap-result-overlay-face ((,class (:box (:line-width -1 :color ,bg-active 
:style nil)
-                                            :background ,bg-active :foreground 
,fg-main))))
-   `(dap-ui-breakpoint-verified-fringe ((,class (:foreground ,green-active 
:weight bold))))
-   `(dap-ui-compile-errline ((,class (:foreground ,red-intense :weight bold))))
-   `(dap-ui-locals-scope-face ((,class (:foreground ,magenta :weight bold 
:underline t))))
-   `(dap-ui-locals-variable-face ((,class (:foreground ,cyan :weight bold))))
-   `(dap-ui-locals-variable-leaf-face ((,class (:foreground ,cyan-alt-other 
:slant italic))))
-   `(dap-ui-marker-face ((,class (:inherit modus-theme-subtle-blue))))
-   `(dap-ui-sessions-stack-frame-face ((,class (:foreground ,magenta-alt 
:weight bold))))
-   `(dap-ui-sessions-terminated-active-face ((,class (:foreground ,fg-alt 
:weight bold))))
-   `(dap-ui-sessions-terminated-face ((,class (:foreground ,fg-alt))))
+   `(dap-mouse-eval-thing-face ((,class :box (:line-width -1 :color 
,blue-active :style nil)
+                                        :background ,bg-active :foreground 
,fg-main)))
+   `(dap-result-overlay-face ((,class :box (:line-width -1 :color ,bg-active 
:style nil)
+                                      :background ,bg-active :foreground 
,fg-main)))
+   `(dap-ui-breakpoint-verified-fringe ((,class :foreground ,green-active 
:weight bold)))
+   `(dap-ui-compile-errline ((,class :foreground ,red-intense :weight bold)))
+   `(dap-ui-locals-scope-face ((,class :foreground ,magenta :weight bold 
:underline t)))
+   `(dap-ui-locals-variable-face ((,class :foreground ,cyan :weight bold)))
+   `(dap-ui-locals-variable-leaf-face ((,class :foreground ,cyan-alt-other 
:slant italic)))
+   `(dap-ui-marker-face ((,class :inherit modus-theme-subtle-blue)))
+   `(dap-ui-sessions-stack-frame-face ((,class :foreground ,magenta-alt 
:weight bold)))
+   `(dap-ui-sessions-terminated-active-face ((,class :foreground ,fg-alt 
:weight bold)))
+   `(dap-ui-sessions-terminated-face ((,class :foreground ,fg-alt)))
    ;;;; dashboard (emacs-dashboard)
-   `(dashboard-banner-logo-title ((,class (:foreground ,fg-special-cold 
:weight bold))))
-   `(dashboard-footer ((,class (:foreground ,fg-special-mild :weight bold))))
-   `(dashboard-heading ((,class (:foreground ,fg-special-warm :weight bold))))
-   `(dashboard-navigator ((,class (:foreground ,cyan-alt-other))))
-   `(dashboard-text-banner ((,class (:foreground ,fg-dim))))
+   `(dashboard-banner-logo-title ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(dashboard-footer ((,class :foreground ,fg-special-mild :weight bold)))
+   `(dashboard-heading ((,class :foreground ,fg-special-warm :weight bold)))
+   `(dashboard-navigator ((,class :foreground ,cyan-alt-other)))
+   `(dashboard-text-banner ((,class :foreground ,fg-dim)))
    ;;;; deadgrep
-   `(deadgrep-filename-face ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(deadgrep-match-face ((,class (:inherit modus-theme-special-calm))))
-   `(deadgrep-meta-face ((,class (:foreground ,fg-alt))))
-   `(deadgrep-regexp-metachar-face ((,class (:foreground ,yellow-intense 
:weight bold))))
-   `(deadgrep-search-term-face ((,class (:foreground ,green-intense :weight 
bold))))
+   `(deadgrep-filename-face ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(deadgrep-match-face ((,class :inherit modus-theme-special-calm)))
+   `(deadgrep-meta-face ((,class :foreground ,fg-alt)))
+   `(deadgrep-regexp-metachar-face ((,class :foreground ,yellow-intense 
:weight bold)))
+   `(deadgrep-search-term-face ((,class :foreground ,green-intense :weight 
bold)))
    ;;;; debbugs
-   `(debbugs-gnu-archived ((,class (:inverse-video t))))
-   `(debbugs-gnu-done ((,class (:foreground ,fg-alt))))
-   `(debbugs-gnu-forwarded ((,class (:foreground ,fg-special-warm))))
-   `(debbugs-gnu-handled ((,class (:foreground ,green))))
-   `(debbugs-gnu-new ((,class (:foreground ,red))))
-   `(debbugs-gnu-pending ((,class (:foreground ,cyan))))
-   `(debbugs-gnu-stale-1 ((,class (:foreground ,yellow-nuanced))))
-   `(debbugs-gnu-stale-2 ((,class (:foreground ,yellow))))
-   `(debbugs-gnu-stale-3 ((,class (:foreground ,yellow-alt))))
-   `(debbugs-gnu-stale-4 ((,class (:foreground ,yellow-alt-other))))
-   `(debbugs-gnu-stale-5 ((,class (:foreground ,red-alt))))
-   `(debbugs-gnu-tagged ((,class (:foreground ,magenta-alt))))
+   `(debbugs-gnu-archived ((,class :inverse-video t)))
+   `(debbugs-gnu-done ((,class :foreground ,fg-alt)))
+   `(debbugs-gnu-forwarded ((,class :foreground ,fg-special-warm)))
+   `(debbugs-gnu-handled ((,class :foreground ,green)))
+   `(debbugs-gnu-new ((,class :foreground ,red)))
+   `(debbugs-gnu-pending ((,class :foreground ,cyan)))
+   `(debbugs-gnu-stale-1 ((,class :foreground ,yellow-nuanced)))
+   `(debbugs-gnu-stale-2 ((,class :foreground ,yellow)))
+   `(debbugs-gnu-stale-3 ((,class :foreground ,yellow-alt)))
+   `(debbugs-gnu-stale-4 ((,class :foreground ,yellow-alt-other)))
+   `(debbugs-gnu-stale-5 ((,class :foreground ,red-alt)))
+   `(debbugs-gnu-tagged ((,class :foreground ,magenta-alt)))
    ;;;; define-word
-   `(define-word-face-1 ((,class (:foreground ,yellow))))
-   `(define-word-face-2 ((,class (:foreground ,fg-main))))
+   `(define-word-face-1 ((,class :foreground ,yellow)))
+   `(define-word-face-2 ((,class :foreground ,fg-main)))
    ;;;; deft
-   `(deft-filter-string-error-face ((,class (:inherit 
modus-theme-refine-red))))
-   `(deft-filter-string-face ((,class (:foreground ,green-intense))))
-   `(deft-header-face ((,class (:foreground ,fg-special-warm :weight bold))))
-   `(deft-separator-face ((,class (:foreground ,fg-alt))))
-   `(deft-summary-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(deft-time-face ((,class (:foreground ,fg-special-cold))))
-   `(deft-title-face ((,class (:foreground ,fg-main :weight bold))))
+   `(deft-filter-string-error-face ((,class :inherit modus-theme-refine-red)))
+   `(deft-filter-string-face ((,class :foreground ,green-intense)))
+   `(deft-header-face ((,class :foreground ,fg-special-warm :weight bold)))
+   `(deft-separator-face ((,class :foreground ,fg-alt)))
+   `(deft-summary-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(deft-time-face ((,class :foreground ,fg-special-cold)))
+   `(deft-title-face ((,class :foreground ,fg-main :weight bold)))
    ;;;; diff-hl
-   `(diff-hl-change ((,class (:inherit modus-theme-fringe-blue))))
-   `(diff-hl-delete ((,class (:inherit modus-theme-fringe-red))))
-   `(diff-hl-dired-change ((,class (:inherit diff-hl-change))))
-   `(diff-hl-dired-delete ((,class (:inherit diff-hl-delete))))
-   `(diff-hl-dired-ignored ((,class (:inherit dired-ignored))))
-   `(diff-hl-dired-insert ((,class (:inherit diff-hl-insert))))
-   `(diff-hl-dired-unknown ((,class (:inherit dired-ignored))))
-   `(diff-hl-insert ((,class (:inherit modus-theme-fringe-green))))
-   `(diff-hl-reverted-hunk-highlight ((,class (:inherit 
modus-theme-fringe-magenta :weight bold))))
+   `(diff-hl-change ((,class :inherit modus-theme-fringe-blue)))
+   `(diff-hl-delete ((,class :inherit modus-theme-fringe-red)))
+   `(diff-hl-dired-change ((,class :inherit diff-hl-change)))
+   `(diff-hl-dired-delete ((,class :inherit diff-hl-delete)))
+   `(diff-hl-dired-ignored ((,class :inherit dired-ignored)))
+   `(diff-hl-dired-insert ((,class :inherit diff-hl-insert)))
+   `(diff-hl-dired-unknown ((,class :inherit dired-ignored)))
+   `(diff-hl-insert ((,class :inherit modus-theme-fringe-green)))
+   `(diff-hl-reverted-hunk-highlight ((,class :inherit 
modus-theme-fringe-magenta :weight bold)))
    ;;;; diff-mode
-   `(diff-added ((,class ,(modus-vivendi-theme-diffs
-                           bg-main green
-                           bg-diff-focus-added fg-diff-focus-added))))
-   `(diff-changed ((,class ,(modus-vivendi-theme-diffs
-                             bg-main yellow
-                             bg-diff-focus-changed fg-diff-focus-changed))))
-   `(diff-context ((,class (:foreground ,fg-unfocused))))
-   `(diff-file-header ((,class (:foreground ,blue :weight bold))))
-   `(diff-function ((,class (:foreground ,fg-special-cold))))
-   `(diff-header ((,class (:foreground ,blue-nuanced))))
-   `(diff-hunk-header ((,class ,(modus-vivendi-theme-diffs
-                                 bg-alt blue-alt
-                                 bg-diff-heading fg-diff-heading))))
-   `(diff-index ((,class (:foreground ,blue-alt :weight bold))))
-   `(diff-indicator-added ((,class (:inherit diff-added))))
-   `(diff-indicator-changed ((,class (:inherit diff-changed))))
-   `(diff-indicator-removed ((,class (:inherit diff-removed))))
-   `(diff-nonexistent ((,class (:inherit modus-theme-neutral :weight bold))))
-   `(diff-refine-added ((,class ,(modus-vivendi-theme-diffs
-                                  bg-diff-added fg-diff-added
-                                  bg-diff-refine-added fg-diff-refine-added))))
-   `(diff-refine-changed ((,class ,(modus-vivendi-theme-diffs
-                                    bg-diff-changed fg-diff-changed
-                                    bg-diff-refine-changed 
fg-diff-refine-changed))))
-   `(diff-refine-removed ((,class ,(modus-vivendi-theme-diffs
-                                    bg-diff-removed fg-diff-removed
-                                    bg-diff-refine-removed 
fg-diff-refine-removed))))
-   `(diff-removed ((,class ,(modus-vivendi-theme-diffs
-                             bg-main red
-                             bg-diff-focus-removed fg-diff-focus-removed))))
+   `(diff-added ((,class ,@(modus-vivendi-theme-diffs
+                            bg-main green
+                            bg-diff-focus-added fg-diff-focus-added))))
+   `(diff-changed ((,class ,@(modus-vivendi-theme-diffs
+                              bg-main yellow
+                              bg-diff-focus-changed fg-diff-focus-changed))))
+   `(diff-context ((,class :foreground ,fg-unfocused)))
+   `(diff-file-header ((,class :foreground ,blue :weight bold)))
+   `(diff-function ((,class :foreground ,fg-special-cold)))
+   `(diff-header ((,class :foreground ,blue-nuanced)))
+   `(diff-hunk-header ((,class ,@(modus-vivendi-theme-diffs
+                                  bg-alt blue-alt
+                                  bg-diff-heading fg-diff-heading))))
+   `(diff-index ((,class :foreground ,blue-alt :weight bold)))
+   `(diff-indicator-added ((,class :inherit diff-added)))
+   `(diff-indicator-changed ((,class :inherit diff-changed)))
+   `(diff-indicator-removed ((,class :inherit diff-removed)))
+   `(diff-nonexistent ((,class :inherit modus-theme-neutral :weight bold)))
+   `(diff-refine-added ((,class ,@(modus-vivendi-theme-diffs
+                                   bg-diff-added fg-diff-added
+                                   bg-diff-refine-added 
fg-diff-refine-added))))
+   `(diff-refine-changed ((,class ,@(modus-vivendi-theme-diffs
+                                     bg-diff-changed fg-diff-changed
+                                     bg-diff-refine-changed 
fg-diff-refine-changed))))
+   `(diff-refine-removed ((,class ,@(modus-vivendi-theme-diffs
+                                     bg-diff-removed fg-diff-removed
+                                     bg-diff-refine-removed 
fg-diff-refine-removed))))
+   `(diff-removed ((,class ,@(modus-vivendi-theme-diffs
+                              bg-main red
+                              bg-diff-focus-removed fg-diff-focus-removed))))
    ;;;; dim-autoload
-   `(dim-autoload-cookie-line ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
+   `(dim-autoload-cookie-line ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
    ;;;; dired
-   `(dired-directory ((,class (:foreground ,blue))))
-   `(dired-flagged ((,class (:inherit modus-theme-mark-del))))
-   `(dired-header ((,class (:inherit modus-theme-header))))
-   `(dired-ignored ((,class (:foreground ,fg-alt))))
-   `(dired-mark ((,class (:inherit modus-theme-mark-symbol))))
-   `(dired-marked ((,class (:inherit modus-theme-mark-sel))))
-   `(dired-perm-write ((,class (:foreground ,fg-special-warm))))
-   `(dired-symlink ((,class (:foreground ,blue-alt :underline t))))
-   `(dired-warning ((,class (:foreground ,yellow :weight bold))))
+   `(dired-directory ((,class :foreground ,blue)))
+   `(dired-flagged ((,class :inherit modus-theme-mark-del)))
+   `(dired-header ((,class :inherit modus-theme-header)))
+   `(dired-ignored ((,class :foreground ,fg-alt)))
+   `(dired-mark ((,class :inherit modus-theme-mark-symbol)))
+   `(dired-marked ((,class :inherit modus-theme-mark-sel)))
+   `(dired-perm-write ((,class :foreground ,fg-special-warm)))
+   `(dired-symlink ((,class :foreground ,blue-alt :underline t)))
+   `(dired-warning ((,class :foreground ,yellow :weight bold)))
    ;;;; dired-async
-   `(dired-async-failures ((,class (:foreground ,red-active :weight 
,modus-theme-bold))))
-   `(dired-async-message ((,class (:foreground ,green-active :weight 
,modus-theme-bold))))
-   `(dired-async-mode-message ((,class (:foreground ,cyan-active :weight 
,modus-theme-bold))))
+   `(dired-async-failures ((,class :foreground ,red-active :weight 
,modus-theme-bold)))
+   `(dired-async-message ((,class :foreground ,green-active :weight 
,modus-theme-bold)))
+   `(dired-async-mode-message ((,class :foreground ,cyan-active :weight 
,modus-theme-bold)))
    ;;;; dired-git
-   `(dired-git-branch-else ((,class (:foreground ,magenta-alt :weight bold))))
-   `(dired-git-branch-master ((,class (:foreground ,magenta-alt-other :weight 
bold))))
+   `(dired-git-branch-else ((,class :foreground ,magenta-alt :weight bold)))
+   `(dired-git-branch-master ((,class :foreground ,magenta-alt-other :weight 
bold)))
    ;;;; dired-git-info
-   `(dgi-commit-message-face ((,class (:foreground ,fg-special-mild))))
+   `(dgi-commit-message-face ((,class :foreground ,fg-special-mild)))
    ;;;; dired-narrow
-   `(dired-narrow-blink ((,class (:inherit modus-theme-subtle-cyan :weight 
bold))))
+   `(dired-narrow-blink ((,class :inherit modus-theme-subtle-cyan :weight 
bold)))
    ;;;; dired-subtree
    ;; remove background from dired-subtree, else it breaks
    ;; dired-{flagged,marked} and any other face that sets a background
    ;; such as hl-line
-   `(dired-subtree-depth-1-face ((,class (:background nil))))
-   `(dired-subtree-depth-2-face ((,class (:background nil))))
-   `(dired-subtree-depth-3-face ((,class (:background nil))))
-   `(dired-subtree-depth-4-face ((,class (:background nil))))
-   `(dired-subtree-depth-5-face ((,class (:background nil))))
-   `(dired-subtree-depth-6-face ((,class (:background nil))))
+   `(dired-subtree-depth-1-face ((,class :background nil)))
+   `(dired-subtree-depth-2-face ((,class :background nil)))
+   `(dired-subtree-depth-3-face ((,class :background nil)))
+   `(dired-subtree-depth-4-face ((,class :background nil)))
+   `(dired-subtree-depth-5-face ((,class :background nil)))
+   `(dired-subtree-depth-6-face ((,class :background nil)))
    ;;;; diredfl
-   `(diredfl-autofile-name ((,class (:inherit modus-theme-special-cold))))
-   `(diredfl-compressed-file-name ((,class (:foreground ,green-alt-other))))
-   `(diredfl-compressed-file-suffix ((,class (:foreground ,green-alt))))
-   `(diredfl-date-time ((,class (:foreground ,fg-special-cold))))
-   `(diredfl-deletion ((,class (:inherit modus-theme-mark-del))))
-   `(diredfl-deletion-file-name ((,class (:inherit modus-theme-mark-del))))
-   `(diredfl-dir-heading ((,class (:inherit modus-theme-header))))
-   `(diredfl-dir-name ((,class (:inherit dired-directory))))
-   `(diredfl-dir-priv ((,class (:foreground ,blue))))
-   `(diredfl-exec-priv ((,class (:foreground ,red-alt-other))))
-   `(diredfl-executable-tag ((,class (:foreground ,red-alt))))
-   `(diredfl-file-name ((,class (:foreground ,fg-main))))
-   `(diredfl-file-suffix ((,class (:foreground ,fg-special-warm))))
-   `(diredfl-flag-mark ((,class (:inherit modus-theme-mark-sel))))
-   `(diredfl-flag-mark-line ((,class (:inherit modus-theme-mark-sel))))
-   `(diredfl-ignored-file-name ((,class (:foreground ,fg-inactive))))
-   `(diredfl-link-priv ((,class (:foreground ,blue-alt-other))))
-   `(diredfl-no-priv ((,class (:foreground ,fg-inactive))))
-   `(diredfl-number ((,class (:foreground ,cyan))))
-   `(diredfl-other-priv ((,class (:foreground ,yellow))))
-   `(diredfl-rare-priv ((,class (:foreground ,magenta-alt-other))))
-   `(diredfl-read-priv ((,class (:foreground ,magenta))))
-   `(diredfl-symlink ((,class (:foreground ,blue-alt :underline t))))
-   `(diredfl-tagged-autofile-name ((,class (:inherit 
modus-theme-refine-magenta))))
-   `(diredfl-write-priv ((,class (:foreground ,cyan-alt-other))))
+   `(diredfl-autofile-name ((,class :inherit modus-theme-special-cold)))
+   `(diredfl-compressed-file-name ((,class :foreground ,green-alt-other)))
+   `(diredfl-compressed-file-suffix ((,class :foreground ,green-alt)))
+   `(diredfl-date-time ((,class :foreground ,fg-special-cold)))
+   `(diredfl-deletion ((,class :inherit modus-theme-mark-del)))
+   `(diredfl-deletion-file-name ((,class :inherit modus-theme-mark-del)))
+   `(diredfl-dir-heading ((,class :inherit modus-theme-header)))
+   `(diredfl-dir-name ((,class :inherit dired-directory)))
+   `(diredfl-dir-priv ((,class :foreground ,blue)))
+   `(diredfl-exec-priv ((,class :foreground ,red-alt-other)))
+   `(diredfl-executable-tag ((,class :foreground ,red-alt)))
+   `(diredfl-file-name ((,class :foreground ,fg-main)))
+   `(diredfl-file-suffix ((,class :foreground ,fg-special-warm)))
+   `(diredfl-flag-mark ((,class :inherit modus-theme-mark-sel)))
+   `(diredfl-flag-mark-line ((,class :inherit modus-theme-mark-sel)))
+   `(diredfl-ignored-file-name ((,class :foreground ,fg-inactive)))
+   `(diredfl-link-priv ((,class :foreground ,blue-alt-other)))
+   `(diredfl-no-priv ((,class :foreground ,fg-inactive)))
+   `(diredfl-number ((,class :foreground ,cyan)))
+   `(diredfl-other-priv ((,class :foreground ,yellow)))
+   `(diredfl-rare-priv ((,class :foreground ,magenta-alt-other)))
+   `(diredfl-read-priv ((,class :foreground ,magenta)))
+   `(diredfl-symlink ((,class :foreground ,blue-alt :underline t)))
+   `(diredfl-tagged-autofile-name ((,class :inherit 
modus-theme-refine-magenta)))
+   `(diredfl-write-priv ((,class :foreground ,cyan-alt-other)))
    ;;;; disk-usage
-   `(disk-usage-children ((,class (:foreground ,yellow))))
-   `(disk-usage-inaccessible ((,class (:foreground ,red :weight bold))))
-   `(disk-usage-percent ((,class (:foreground ,green))))
-   `(disk-usage-size ((,class (:foreground ,cyan))))
-   `(disk-usage-symlink ((,class (:foreground ,blue :underline t))))
-   `(disk-usage-symlink-directory ((,class (:foreground ,blue-alt :weight 
bold))))
+   `(disk-usage-children ((,class :foreground ,yellow)))
+   `(disk-usage-inaccessible ((,class :foreground ,red :weight bold)))
+   `(disk-usage-percent ((,class :foreground ,green)))
+   `(disk-usage-size ((,class :foreground ,cyan)))
+   `(disk-usage-symlink ((,class :foreground ,blue :underline t)))
+   `(disk-usage-symlink-directory ((,class :foreground ,blue-alt :weight 
bold)))
    ;;;; doom-modeline
-   `(doom-modeline-bar ((,class (:inherit modus-theme-active-blue))))
-   `(doom-modeline-bar-inactive ((,class (:background ,fg-inactive :foreground 
,bg-main))))
-   `(doom-modeline-battery-charging ((,class (:foreground ,green-active))))
-   `(doom-modeline-battery-critical ((,class (:foreground ,red-active :weight 
bold))))
-   `(doom-modeline-battery-error ((,class (:inherit modus-theme-active-red))))
-   `(doom-modeline-battery-full ((,class (:foreground ,blue-active))))
-   `(doom-modeline-battery-normal ((,class (:foreground ,fg-active))))
-   `(doom-modeline-battery-warning ((,class (:foreground ,yellow-active 
:weight bold))))
-   `(doom-modeline-buffer-file ((,class (:foreground ,fg-active :weight 
bold))))
-   `(doom-modeline-buffer-major-mode ((,class (:foreground ,cyan-active 
:weight bold))))
-   `(doom-modeline-buffer-minor-mode ((,class (:foreground ,fg-inactive))))
-   `(doom-modeline-buffer-modified ((,class (:foreground ,magenta-active 
:weight bold))))
-   `(doom-modeline-buffer-path ((,class (:foreground ,fg-active :weight 
bold))))
-   `(doom-modeline-debug ((,class (:foreground ,yellow-active :weight bold))))
-   `(doom-modeline-evil-emacs-state ((,class (:foreground ,magenta-active 
:weight bold))))
-   `(doom-modeline-evil-insert-state ((,class (:foreground ,green-active 
:weight bold))))
-   `(doom-modeline-evil-motion-state ((,class (:foreground ,fg-inactive 
:weight bold))))
-   `(doom-modeline-evil-normal-state ((,class (:foreground ,fg-active :weight 
bold))))
-   `(doom-modeline-evil-operator-state ((,class (:foreground ,blue-active 
:weight bold))))
-   `(doom-modeline-evil-replace-state ((,class (:foreground ,red-active 
:weight bold))))
-   `(doom-modeline-evil-visual-state ((,class (:foreground ,cyan-active 
:weight bold))))
-   `(doom-modeline-highlight ((,class (:foreground ,blue-active :weight 
bold))))
-   `(doom-modeline-host ((,class (:slant italic))))
-   `(doom-modeline-info ((,class (:foreground ,green-active))))
-   `(doom-modeline-lsp-error ((,class (:foreground ,red-active :weight bold))))
-   `(doom-modeline-lsp-success ((,class (:foreground ,green-active :weight 
bold))))
-   `(doom-modeline-lsp-warning ((,class (:foreground ,yellow-active :weight 
bold))))
-   `(doom-modeline-panel ((,class (:inherit modus-theme-active-blue))))
-   `(doom-modeline-persp-buffer-not-in-persp ((,class (:foreground 
,yellow-active :slant italic))))
-   `(doom-modeline-persp-name ((,class (:foreground ,fg-active))))
-   `(doom-modeline-project-dir ((,class (:foreground ,blue-active :weight 
bold))))
-   `(doom-modeline-project-parent-dir ((,class (:foreground ,blue-active))))
-   `(doom-modeline-project-root-dir ((,class (:foreground ,fg-active))))
-   `(doom-modeline-unread-number ((,class (:foreground ,fg-active :slant 
italic))))
-   `(doom-modeline-urgent ((,class (:foreground ,red-active :weight bold))))
-   `(doom-modeline-warning ((,class (:foreground ,yellow-active :weight 
bold))))
+   `(doom-modeline-bar ((,class :inherit modus-theme-active-blue)))
+   `(doom-modeline-bar-inactive ((,class :background ,fg-inactive :foreground 
,bg-main)))
+   `(doom-modeline-battery-charging ((,class :foreground ,green-active)))
+   `(doom-modeline-battery-critical ((,class :foreground ,red-active :weight 
bold)))
+   `(doom-modeline-battery-error ((,class :inherit modus-theme-active-red)))
+   `(doom-modeline-battery-full ((,class :foreground ,blue-active)))
+   `(doom-modeline-battery-normal ((,class :foreground ,fg-active)))
+   `(doom-modeline-battery-warning ((,class :foreground ,yellow-active :weight 
bold)))
+   `(doom-modeline-buffer-file ((,class :foreground ,fg-active :weight bold)))
+   `(doom-modeline-buffer-major-mode ((,class :foreground ,cyan-active :weight 
bold)))
+   `(doom-modeline-buffer-minor-mode ((,class :foreground ,fg-inactive)))
+   `(doom-modeline-buffer-modified ((,class :foreground ,magenta-active 
:weight bold)))
+   `(doom-modeline-buffer-path ((,class :foreground ,fg-active :weight bold)))
+   `(doom-modeline-debug ((,class :foreground ,yellow-active :weight bold)))
+   `(doom-modeline-evil-emacs-state ((,class :foreground ,magenta-active 
:weight bold)))
+   `(doom-modeline-evil-insert-state ((,class :foreground ,green-active 
:weight bold)))
+   `(doom-modeline-evil-motion-state ((,class :foreground ,fg-inactive :weight 
bold)))
+   `(doom-modeline-evil-normal-state ((,class :foreground ,fg-active :weight 
bold)))
+   `(doom-modeline-evil-operator-state ((,class :foreground ,blue-active 
:weight bold)))
+   `(doom-modeline-evil-replace-state ((,class :foreground ,red-active :weight 
bold)))
+   `(doom-modeline-evil-visual-state ((,class :foreground ,cyan-active :weight 
bold)))
+   `(doom-modeline-highlight ((,class :foreground ,blue-active :weight bold)))
+   `(doom-modeline-host ((,class :slant italic)))
+   `(doom-modeline-info ((,class :foreground ,green-active)))
+   `(doom-modeline-lsp-error ((,class :foreground ,red-active :weight bold)))
+   `(doom-modeline-lsp-success ((,class :foreground ,green-active :weight 
bold)))
+   `(doom-modeline-lsp-warning ((,class :foreground ,yellow-active :weight 
bold)))
+   `(doom-modeline-panel ((,class :inherit modus-theme-active-blue)))
+   `(doom-modeline-persp-buffer-not-in-persp ((,class :foreground 
,yellow-active :slant italic)))
+   `(doom-modeline-persp-name ((,class :foreground ,fg-active)))
+   `(doom-modeline-project-dir ((,class :foreground ,blue-active :weight 
bold)))
+   `(doom-modeline-project-parent-dir ((,class :foreground ,blue-active)))
+   `(doom-modeline-project-root-dir ((,class :foreground ,fg-active)))
+   `(doom-modeline-unread-number ((,class :foreground ,fg-active :slant 
italic)))
+   `(doom-modeline-urgent ((,class :foreground ,red-active :weight bold)))
+   `(doom-modeline-warning ((,class :foreground ,yellow-active :weight bold)))
    ;;;; dynamic-ruler
-   `(dynamic-ruler-negative-face ((,class (:inherit 
modus-theme-intense-neutral))))
-   `(dynamic-ruler-positive-face ((,class (:inherit 
modus-theme-intense-yellow))))
+   `(dynamic-ruler-negative-face ((,class :inherit 
modus-theme-intense-neutral)))
+   `(dynamic-ruler-positive-face ((,class :inherit 
modus-theme-intense-yellow)))
    ;;;; easy-jekyll
-   `(easy-jekyll-help-face ((,class (:background ,bg-dim :foreground 
,cyan-alt-other))))
+   `(easy-jekyll-help-face ((,class :background ,bg-dim :foreground 
,cyan-alt-other)))
    ;;;; easy-kill
-   `(easy-kill-origin ((,class (:inherit modus-theme-subtle-red))))
-   `(easy-kill-selection ((,class (:inherit modus-theme-subtle-yellow))))
+   `(easy-kill-origin ((,class :inherit modus-theme-subtle-red)))
+   `(easy-kill-selection ((,class :inherit modus-theme-subtle-yellow)))
    ;;;; ebdb
-   `(ebdb-address-default ((,class (:foreground ,fg-main))))
-   `(ebdb-db-char ((,class (:foreground ,fg-special-cold))))
-   `(ebdb-defunct ((,class (:foreground ,fg-alt))))
-   `(ebdb-field-hidden ((,class (:foreground ,magenta))))
-   `(ebdb-field-url ((,class (:foreground ,blue))))
-   `(ebdb-label ((,class (:foreground ,cyan-alt-other))))
-   `(ebdb-mail-default ((,class (:foreground ,fg-main))))
-   `(ebdb-mail-primary ((,class (:foreground ,blue-alt))))
-   `(ebdb-marked ((,class (:background ,cyan-intense-bg))))
-   `(ebdb-organization-name ((,class (:foreground ,fg-special-calm))))
-   `(ebdb-person-name ((,class (:foreground ,magenta-alt-other))))
-   `(ebdb-phone-default ((,class (:foreground ,fg-special-warm))))
-   `(ebdb-role-defunct ((,class (:foreground ,fg-alt))))
-   `(eieio-custom-slot-tag-face ((,class (:foreground ,red-alt))))
+   `(ebdb-address-default ((,class :foreground ,fg-main)))
+   `(ebdb-db-char ((,class :foreground ,fg-special-cold)))
+   `(ebdb-defunct ((,class :foreground ,fg-alt)))
+   `(ebdb-field-hidden ((,class :foreground ,magenta)))
+   `(ebdb-field-url ((,class :foreground ,blue)))
+   `(ebdb-label ((,class :foreground ,cyan-alt-other)))
+   `(ebdb-mail-default ((,class :foreground ,fg-main)))
+   `(ebdb-mail-primary ((,class :foreground ,blue-alt)))
+   `(ebdb-marked ((,class :background ,cyan-intense-bg)))
+   `(ebdb-organization-name ((,class :foreground ,fg-special-calm)))
+   `(ebdb-person-name ((,class :foreground ,magenta-alt-other)))
+   `(ebdb-phone-default ((,class :foreground ,fg-special-warm)))
+   `(ebdb-role-defunct ((,class :foreground ,fg-alt)))
+   `(eieio-custom-slot-tag-face ((,class :foreground ,red-alt)))
    ;;;; ediff
-   `(ediff-current-diff-A ((,class ,(modus-vivendi-theme-diffs
-                                     bg-alt red
-                                     bg-diff-removed fg-diff-removed))))
-   `(ediff-current-diff-Ancestor ((,class ,(modus-vivendi-theme-diffs
-                                            bg-alt fg-special-cold
-                                            bg-special-cold fg-special-cold))))
-   `(ediff-current-diff-B ((,class ,(modus-vivendi-theme-diffs
-                                     bg-alt green
-                                     bg-diff-added fg-diff-added))))
-   `(ediff-current-diff-C ((,class ,(modus-vivendi-theme-diffs
-                                     bg-alt yellow
-                                     bg-diff-changed fg-diff-changed))))
-   `(ediff-even-diff-A ((,class (:background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1))))
-   `(ediff-even-diff-Ancestor ((,class (:background ,bg-diff-neutral-2 
:foreground ,fg-diff-neutral-1))))
-   `(ediff-even-diff-B ((,class (:background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1))))
-   `(ediff-even-diff-C ((,class (:background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2))))
-   `(ediff-fine-diff-A ((,class (:background ,bg-diff-focus-removed 
:foreground ,fg-diff-focus-removed))))
-   `(ediff-fine-diff-Ancestor ((,class (:inherit modus-theme-refine-cyan))))
-   `(ediff-fine-diff-B ((,class (:background ,bg-diff-focus-added :foreground 
,fg-diff-focus-added))))
-   `(ediff-fine-diff-C ((,class (:background ,bg-diff-focus-changed 
:foreground ,fg-diff-focus-changed))))
-   `(ediff-odd-diff-A ((,class (:background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2))))
-   `(ediff-odd-diff-Ancestor ((,class (:background ,bg-diff-neutral-0 
:foreground ,fg-diff-neutral-0))))
-   `(ediff-odd-diff-B ((,class (:background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2))))
-   `(ediff-odd-diff-C ((,class (:background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1))))
+   `(ediff-current-diff-A ((,class ,@(modus-vivendi-theme-diffs
+                                      bg-alt red
+                                      bg-diff-removed fg-diff-removed))))
+   `(ediff-current-diff-Ancestor ((,class ,@(modus-vivendi-theme-diffs
+                                             bg-alt fg-special-cold
+                                             bg-special-cold 
fg-special-cold))))
+   `(ediff-current-diff-B ((,class ,@(modus-vivendi-theme-diffs
+                                      bg-alt green
+                                      bg-diff-added fg-diff-added))))
+   `(ediff-current-diff-C ((,class ,@(modus-vivendi-theme-diffs
+                                      bg-alt yellow
+                                      bg-diff-changed fg-diff-changed))))
+   `(ediff-even-diff-A ((,class :background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1)))
+   `(ediff-even-diff-Ancestor ((,class :background ,bg-diff-neutral-2 
:foreground ,fg-diff-neutral-1)))
+   `(ediff-even-diff-B ((,class :background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1)))
+   `(ediff-even-diff-C ((,class :background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2)))
+   `(ediff-fine-diff-A ((,class :background ,bg-diff-focus-removed :foreground 
,fg-diff-focus-removed)))
+   `(ediff-fine-diff-Ancestor ((,class :inherit modus-theme-refine-cyan)))
+   `(ediff-fine-diff-B ((,class :background ,bg-diff-focus-added :foreground 
,fg-diff-focus-added)))
+   `(ediff-fine-diff-C ((,class :background ,bg-diff-focus-changed :foreground 
,fg-diff-focus-changed)))
+   `(ediff-odd-diff-A ((,class :background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2)))
+   `(ediff-odd-diff-Ancestor ((,class :background ,bg-diff-neutral-0 
:foreground ,fg-diff-neutral-0)))
+   `(ediff-odd-diff-B ((,class :background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2)))
+   `(ediff-odd-diff-C ((,class :background ,bg-diff-neutral-1 :foreground 
,fg-diff-neutral-1)))
    ;;;; eglot
-   `(eglot-mode-line ((,class (:foreground ,magenta-active :weight 
,modus-theme-bold))))
+   `(eglot-mode-line ((,class :foreground ,magenta-active :weight 
,modus-theme-bold)))
    ;;;; el-search
-   `(el-search-highlight-in-prompt-face ((,class (:foreground ,magenta-alt 
:weight bold))))
-   `(el-search-match ((,class (:inherit modus-theme-intense-green))))
-   `(el-search-other-match ((,class (:inherit modus-theme-special-mild))))
-   `(el-search-occur-match ((,class (:inherit modus-theme-special-calm))))
+   `(el-search-highlight-in-prompt-face ((,class :foreground ,magenta-alt 
:weight bold)))
+   `(el-search-match ((,class :inherit modus-theme-intense-green)))
+   `(el-search-other-match ((,class :inherit modus-theme-special-mild)))
+   `(el-search-occur-match ((,class :inherit modus-theme-special-calm)))
    ;;;; eldoc-box
-   `(eldoc-box-body ((,class (:background ,bg-alt :foreground ,fg-main))))
-   `(eldoc-box-border ((,class (:background ,fg-alt))))
+   `(eldoc-box-body ((,class :background ,bg-alt :foreground ,fg-main)))
+   `(eldoc-box-border ((,class :background ,fg-alt)))
    ;;;; elfeed
-   `(elfeed-log-date-face ((,class (:foreground ,cyan-alt))))
-   `(elfeed-log-debug-level-face ((,class (:foreground ,magenta))))
-   `(elfeed-log-error-level-face ((,class (:foreground ,red))))
-   `(elfeed-log-info-level-face ((,class (:foreground ,green))))
-   `(elfeed-log-warn-level-face ((,class (:foreground ,yellow))))
-   `(elfeed-search-date-face ((,class (:foreground ,cyan))))
-   `(elfeed-search-feed-face ((,class (:foreground ,blue))))
-   `(elfeed-search-filter-face ((,class (:foreground ,magenta-active))))
-   `(elfeed-search-last-update-face ((,class (:foreground ,green-active))))
-   `(elfeed-search-tag-face ((,class (:foreground ,cyan-alt-other))))
-   `(elfeed-search-title-face ((,class (:foreground ,fg-main))))
-   `(elfeed-search-unread-count-face ((,class (:foreground ,blue-active))))
-   `(elfeed-search-unread-title-face ((,class (:weight bold))))
+   `(elfeed-log-date-face ((,class :foreground ,cyan-alt)))
+   `(elfeed-log-debug-level-face ((,class :foreground ,magenta)))
+   `(elfeed-log-error-level-face ((,class :foreground ,red)))
+   `(elfeed-log-info-level-face ((,class :foreground ,green)))
+   `(elfeed-log-warn-level-face ((,class :foreground ,yellow)))
+   `(elfeed-search-date-face ((,class :foreground ,cyan)))
+   `(elfeed-search-feed-face ((,class :foreground ,blue)))
+   `(elfeed-search-filter-face ((,class :foreground ,magenta-active)))
+   `(elfeed-search-last-update-face ((,class :foreground ,green-active)))
+   `(elfeed-search-tag-face ((,class :foreground ,cyan-alt-other)))
+   `(elfeed-search-title-face ((,class :foreground ,fg-main)))
+   `(elfeed-search-unread-count-face ((,class :foreground ,blue-active)))
+   `(elfeed-search-unread-title-face ((,class :weight bold)))
    ;;;; elfeed-score
-   `(elfeed-score-date-face ((,class (:foreground ,blue))))
-   `(elfeed-score-debug-level-face ((,class (:foreground ,magenta-alt-other))))
-   `(elfeed-score-error-level-face ((,class (:foreground ,red))))
-   `(elfeed-score-info-level-face ((,class (:foreground ,cyan))))
-   `(elfeed-score-warn-level-face ((,class (:foreground ,yellow))))
+   `(elfeed-score-date-face ((,class :foreground ,blue)))
+   `(elfeed-score-debug-level-face ((,class :foreground ,magenta-alt-other)))
+   `(elfeed-score-error-level-face ((,class :foreground ,red)))
+   `(elfeed-score-info-level-face ((,class :foreground ,cyan)))
+   `(elfeed-score-warn-level-face ((,class :foreground ,yellow)))
    ;;;; emms
-   `(emms-playlist-track-face ((,class (:foreground ,blue))))
-   `(emms-playlist-selected-face ((,class (:foreground ,magenta :weight 
bold))))
+   `(emms-playlist-track-face ((,class :foreground ,blue)))
+   `(emms-playlist-selected-face ((,class :foreground ,magenta :weight bold)))
    ;;;; enhanced-ruby-mode
-   `(enh-ruby-heredoc-delimiter-face ((,class (:foreground ,blue-alt-other))))
-   `(enh-ruby-op-face ((,class (:foreground ,fg-main))))
-   `(enh-ruby-regexp-delimiter-face ((,class (:foreground ,green))))
-   `(enh-ruby-regexp-face ((,class (:foreground ,magenta))))
-   `(enh-ruby-string-delimiter-face ((,class (:foreground ,blue-alt))))
-   `(erm-syn-errline ((,class (:foreground ,red :underline t))))
-   `(erm-syn-warnline ((,class (:foreground ,yellow :underline t))))
+   `(enh-ruby-heredoc-delimiter-face ((,class :foreground ,blue-alt-other)))
+   `(enh-ruby-op-face ((,class :foreground ,fg-main)))
+   `(enh-ruby-regexp-delimiter-face ((,class :foreground ,green)))
+   `(enh-ruby-regexp-face ((,class :foreground ,magenta)))
+   `(enh-ruby-string-delimiter-face ((,class :foreground ,blue-alt)))
+   `(erm-syn-errline ((,class :foreground ,red :underline t)))
+   `(erm-syn-warnline ((,class :foreground ,yellow :underline t)))
    ;;;; epa
-   `(epa-field-body ((,class (:foreground ,fg-main))))
-   `(epa-field-name ((,class (:foreground ,fg-dim :weight bold))))
-   `(epa-mark ((,class (:foreground ,magenta :weight bold))))
-   `(epa-string ((,class (:foreground ,blue-alt))))
-   `(epa-validity-disabled ((,class (:inherit modus-theme-refine-red))))
-   `(epa-validity-high ((,class (:foreground ,green-alt-other :weight bold))))
-   `(epa-validity-low ((,class (:foreground ,fg-alt))))
-   `(epa-validity-medium ((,class (:foreground ,green-alt))))
+   `(epa-field-body ((,class :foreground ,fg-main)))
+   `(epa-field-name ((,class :foreground ,fg-dim :weight bold)))
+   `(epa-mark ((,class :foreground ,magenta :weight bold)))
+   `(epa-string ((,class :foreground ,blue-alt)))
+   `(epa-validity-disabled ((,class :inherit modus-theme-refine-red)))
+   `(epa-validity-high ((,class :foreground ,green-alt-other :weight bold)))
+   `(epa-validity-low ((,class :foreground ,fg-alt)))
+   `(epa-validity-medium ((,class :foreground ,green-alt)))
    ;;;; equake
-   `(equake-buffer-face ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(equake-shell-type-eshell ((,class (:background ,bg-inactive :foreground 
,green-active))))
-   `(equake-shell-type-rash ((,class (:background ,bg-inactive :foreground 
,red-active))))
-   `(equake-shell-type-shell ((,class (:background ,bg-inactive :foreground 
,cyan-active))))
-   `(equake-shell-type-term ((,class (:background ,bg-inactive :foreground 
,yellow-active))))
-   `(equake-shell-type-vterm ((,class (:background ,bg-inactive :foreground 
,magenta-active))))
-   `(equake-tab-active ((,class (:background ,fg-alt :foreground ,bg-alt))))
-   `(equake-tab-inactive ((,class (:foreground ,fg-inactive))))
+   `(equake-buffer-face ((,class :background ,bg-main :foreground ,fg-main)))
+   `(equake-shell-type-eshell ((,class :background ,bg-inactive :foreground 
,green-active)))
+   `(equake-shell-type-rash ((,class :background ,bg-inactive :foreground 
,red-active)))
+   `(equake-shell-type-shell ((,class :background ,bg-inactive :foreground 
,cyan-active)))
+   `(equake-shell-type-term ((,class :background ,bg-inactive :foreground 
,yellow-active)))
+   `(equake-shell-type-vterm ((,class :background ,bg-inactive :foreground 
,magenta-active)))
+   `(equake-tab-active ((,class :background ,fg-alt :foreground ,bg-alt)))
+   `(equake-tab-inactive ((,class :foreground ,fg-inactive)))
    ;;;; erc
-   `(erc-action-face ((,class (:foreground ,cyan :weight bold))))
-   `(erc-bold-face ((,class (:weight bold))))
-   `(erc-button ((,class (:inherit button))))
-   `(erc-command-indicator-face ((,class (:foreground ,cyan-alt :weight 
bold))))
-   `(erc-current-nick-face ((,class (:foreground ,magenta-alt-other))))
-   `(erc-dangerous-host-face ((,class (:inherit modus-theme-intense-red))))
-   `(erc-direct-msg-face ((,class (:foreground ,magenta))))
-   `(erc-error-face ((,class (:foreground ,red :weight bold))))
-   `(erc-fool-face ((,class (:foreground ,fg-inactive))))
-   `(erc-header-line ((,class (:background ,bg-header :foreground 
,fg-header))))
-   `(erc-input-face ((,class (:foreground ,fg-special-calm))))
-   `(erc-inverse-face ((,class (:inherit erc-default-face :inverse-video t))))
-   `(erc-keyword-face ((,class (:foreground ,magenta-alt :weight bold))))
-   `(erc-my-nick-face ((,class (:foreground ,magenta :weight bold))))
-   `(erc-my-nick-prefix-face ((,class (:inherit erc-my-nick-face))))
-   `(erc-nick-default-face ((,class (:foreground ,blue :weight bold))))
-   `(erc-nick-msg-face ((,class (:foreground ,green :weight bold))))
-   `(erc-nick-prefix-face ((,class (:inherit erc-nick-default-face))))
-   `(erc-notice-face ((,class (:foreground ,fg-unfocused))))
-   `(erc-pal-face ((,class (:foreground ,red-alt :weight bold))))
-   `(erc-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(erc-timestamp-face ((,class (:foreground ,blue-nuanced))))
-   `(erc-underline-face ((,class (:underline t))))
+   `(erc-action-face ((,class :foreground ,cyan :weight bold)))
+   `(erc-bold-face ((,class :weight bold)))
+   `(erc-button ((,class :inherit button)))
+   `(erc-command-indicator-face ((,class :foreground ,cyan-alt :weight bold)))
+   `(erc-current-nick-face ((,class :foreground ,magenta-alt-other)))
+   `(erc-dangerous-host-face ((,class :inherit modus-theme-intense-red)))
+   `(erc-direct-msg-face ((,class :foreground ,magenta)))
+   `(erc-error-face ((,class :foreground ,red :weight bold)))
+   `(erc-fool-face ((,class :foreground ,fg-inactive)))
+   `(erc-header-line ((,class :background ,bg-header :foreground ,fg-header)))
+   `(erc-input-face ((,class :foreground ,fg-special-calm)))
+   `(erc-inverse-face ((,class :inherit erc-default-face :inverse-video t)))
+   `(erc-keyword-face ((,class :foreground ,magenta-alt :weight bold)))
+   `(erc-my-nick-face ((,class :foreground ,magenta :weight bold)))
+   `(erc-my-nick-prefix-face ((,class :inherit erc-my-nick-face)))
+   `(erc-nick-default-face ((,class :foreground ,blue :weight bold)))
+   `(erc-nick-msg-face ((,class :foreground ,green :weight bold)))
+   `(erc-nick-prefix-face ((,class :inherit erc-nick-default-face)))
+   `(erc-notice-face ((,class :foreground ,fg-unfocused)))
+   `(erc-pal-face ((,class :foreground ,red-alt :weight bold)))
+   `(erc-prompt-face ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(erc-timestamp-face ((,class :foreground ,blue-nuanced)))
+   `(erc-underline-face ((,class :underline t)))
    ;;;; eros
-   `(eros-result-overlay-face ((,class (:box (:line-width -1 :color ,blue)
-                                             :background ,bg-dim :foreground 
,fg-dim))))
+   `(eros-result-overlay-face ((,class :box (:line-width -1 :color ,blue)
+                                       :background ,bg-dim :foreground 
,fg-dim)))
    ;;;; ert
-   `(ert-test-result-expected ((,class (:inherit modus-theme-intense-green))))
-   `(ert-test-result-unexpected ((,class (:inherit modus-theme-intense-red))))
+   `(ert-test-result-expected ((,class :inherit modus-theme-intense-green)))
+   `(ert-test-result-unexpected ((,class :inherit modus-theme-intense-red)))
    ;;;; eshell
-   `(eshell-ls-archive ((,class (:foreground ,cyan-alt :weight bold))))
-   `(eshell-ls-backup ((,class (:foreground ,yellow-alt))))
-   `(eshell-ls-clutter ((,class (:foreground ,red-alt))))
-   `(eshell-ls-directory ((,class (:foreground ,blue-alt :weight bold))))
-   `(eshell-ls-executable ((,class (:foreground ,magenta-alt))))
-   `(eshell-ls-missing ((,class (:inherit modus-theme-intense-red))))
-   `(eshell-ls-product ((,class (:foreground ,fg-special-warm))))
-   `(eshell-ls-readonly ((,class (:foreground ,fg-special-cold))))
-   `(eshell-ls-special ((,class (:foreground ,magenta :weight bold))))
-   `(eshell-ls-symlink ((,class (:foreground ,cyan :underline t))))
-   `(eshell-ls-unreadable ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(eshell-prompt ((,class (:foreground ,green-alt-other :weight 
,modus-theme-bold))))
+   `(eshell-ls-archive ((,class :foreground ,cyan-alt :weight bold)))
+   `(eshell-ls-backup ((,class :foreground ,yellow-alt)))
+   `(eshell-ls-clutter ((,class :foreground ,red-alt)))
+   `(eshell-ls-directory ((,class :foreground ,blue-alt :weight bold)))
+   `(eshell-ls-executable ((,class :foreground ,magenta-alt)))
+   `(eshell-ls-missing ((,class :inherit modus-theme-intense-red)))
+   `(eshell-ls-product ((,class :foreground ,fg-special-warm)))
+   `(eshell-ls-readonly ((,class :foreground ,fg-special-cold)))
+   `(eshell-ls-special ((,class :foreground ,magenta :weight bold)))
+   `(eshell-ls-symlink ((,class :foreground ,cyan :underline t)))
+   `(eshell-ls-unreadable ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(eshell-prompt ((,class :foreground ,green-alt-other :weight 
,modus-theme-bold)))
    ;;;; evil-mode
-   `(evil-ex-commands ((,class (:foreground ,magenta-alt-other))))
-   `(evil-ex-info ((,class (:foreground ,cyan-alt-other))))
-   `(evil-ex-lazy-highlight ((,class (:inherit modus-theme-refine-cyan))))
-   `(evil-ex-search ((,class (:inherit modus-theme-intense-green))))
-   `(evil-ex-substitute-matches ((,class (:inherit modus-theme-refine-yellow 
:underline t))))
-   `(evil-ex-substitute-replacement ((,class (:inherit 
modus-theme-intense-green :weight bold))))
+   `(evil-ex-commands ((,class :foreground ,magenta-alt-other)))
+   `(evil-ex-info ((,class :foreground ,cyan-alt-other)))
+   `(evil-ex-lazy-highlight ((,class :inherit modus-theme-refine-cyan)))
+   `(evil-ex-search ((,class :inherit modus-theme-intense-green)))
+   `(evil-ex-substitute-matches ((,class :inherit modus-theme-refine-yellow 
:underline t)))
+   `(evil-ex-substitute-replacement ((,class :inherit 
modus-theme-intense-green :weight bold)))
    ;;;; evil-goggles
-   `(evil-goggles-change-face ((,class (:inherit modus-theme-refine-yellow))))
-   `(evil-goggles-commentary-face ((,class (:inherit 
modus-theme-subtle-neutral :slant ,modus-theme-slant))))
-   `(evil-goggles-default-face ((,class (:inherit 
modus-theme-subtle-neutral))))
-   `(evil-goggles-delete-face ((,class (:inherit modus-theme-refine-red))))
-   `(evil-goggles-fill-and-move-face ((,class (:inherit 
evil-goggles-default-face))))
-   `(evil-goggles-indent-face ((,class (:inherit evil-goggles-default-face))))
-   `(evil-goggles-join-face ((,class (:inherit modus-theme-subtle-green))))
-   `(evil-goggles-nerd-commenter-face ((,class (:inherit 
evil-goggles-commentary-face))))
-   `(evil-goggles-paste-face ((,class (:inherit modus-theme-subtle-cyan))))
-   `(evil-goggles-record-macro-face ((,class (:inherit 
modus-theme-special-cold))))
-   `(evil-goggles-replace-with-register-face ((,class (:inherit 
modus-theme-refine-magenta))))
-   `(evil-goggles-set-marker-face ((,class (:inherit 
modus-theme-intense-magenta))))
-   `(evil-goggles-shift-face ((,class (:inherit evil-goggles-default-face))))
-   `(evil-goggles-surround-face ((,class (:inherit 
evil-goggles-default-face))))
-   `(evil-goggles-yank-face ((,class (:inherit modus-theme-subtle-blue))))
+   `(evil-goggles-change-face ((,class :inherit modus-theme-refine-yellow)))
+   `(evil-goggles-commentary-face ((,class :inherit modus-theme-subtle-neutral 
:slant ,modus-theme-slant)))
+   `(evil-goggles-default-face ((,class :inherit modus-theme-subtle-neutral)))
+   `(evil-goggles-delete-face ((,class :inherit modus-theme-refine-red)))
+   `(evil-goggles-fill-and-move-face ((,class :inherit 
evil-goggles-default-face)))
+   `(evil-goggles-indent-face ((,class :inherit evil-goggles-default-face)))
+   `(evil-goggles-join-face ((,class :inherit modus-theme-subtle-green)))
+   `(evil-goggles-nerd-commenter-face ((,class :inherit 
evil-goggles-commentary-face)))
+   `(evil-goggles-paste-face ((,class :inherit modus-theme-subtle-cyan)))
+   `(evil-goggles-record-macro-face ((,class :inherit 
modus-theme-special-cold)))
+   `(evil-goggles-replace-with-register-face ((,class :inherit 
modus-theme-refine-magenta)))
+   `(evil-goggles-set-marker-face ((,class :inherit 
modus-theme-intense-magenta)))
+   `(evil-goggles-shift-face ((,class :inherit evil-goggles-default-face)))
+   `(evil-goggles-surround-face ((,class :inherit evil-goggles-default-face)))
+   `(evil-goggles-yank-face ((,class :inherit modus-theme-subtle-blue)))
    ;;;; evil-visual-mark-mode
-   `(evil-visual-mark-face ((,class (:inherit modus-theme-intense-magenta))))
+   `(evil-visual-mark-face ((,class :inherit modus-theme-intense-magenta)))
    ;;;; eww
-   `(eww-invalid-certificate ((,class (:foreground ,red-active))))
-   `(eww-valid-certificate ((,class (:foreground ,green-active))))
-   `(eww-form-checkbox ((,class (:box (:line-width 1 :color ,fg-inactive 
:style released-button) :background ,bg-inactive :foreground ,fg-main))))
-   `(eww-form-file ((,class (:box (:line-width 1 :color ,fg-inactive :style 
released-button) :background ,bg-active :foreground ,fg-main))))
-   `(eww-form-select ((,class (:inherit eww-form-checkbox))))
-   `(eww-form-submit ((,class (:inherit eww-form-file))))
-   `(eww-form-text ((,class (:box (:line-width 1 :color ,fg-inactive :style 
none) :background ,bg-active :foreground ,fg-active))))
-   `(eww-form-textarea ((,class (:background ,bg-alt :foreground ,fg-main))))
+   `(eww-invalid-certificate ((,class :foreground ,red-active)))
+   `(eww-valid-certificate ((,class :foreground ,green-active)))
+   `(eww-form-checkbox ((,class :box (:line-width 1 :color ,fg-inactive :style 
released-button) :background ,bg-inactive :foreground ,fg-main)))
+   `(eww-form-file ((,class :box (:line-width 1 :color ,fg-inactive :style 
released-button) :background ,bg-active :foreground ,fg-main)))
+   `(eww-form-select ((,class :inherit eww-form-checkbox)))
+   `(eww-form-submit ((,class :inherit eww-form-file)))
+   `(eww-form-text ((,class :box (:line-width 1 :color ,fg-inactive :style 
none) :background ,bg-active :foreground ,fg-active)))
+   `(eww-form-textarea ((,class :background ,bg-alt :foreground ,fg-main)))
    ;;;; eyebrowse
-   `(eyebrowse-mode-line-active ((,class (:foreground ,blue-active :weight 
bold))))
+   `(eyebrowse-mode-line-active ((,class :foreground ,blue-active :weight 
bold)))
    ;;;; fancy-dabbrev
-   `(fancy-dabbrev-menu-face ((,class (:background ,bg-alt :foreground 
,fg-alt))))
-   `(fancy-dabbrev-preview-face ((,class (:foreground ,fg-alt :underline t))))
-   `(fancy-dabbrev-selection-face ((,class (:inherit modus-theme-intense-cyan 
:weight bold))))
+   `(fancy-dabbrev-menu-face ((,class :background ,bg-alt :foreground 
,fg-alt)))
+   `(fancy-dabbrev-preview-face ((,class :foreground ,fg-alt :underline t)))
+   `(fancy-dabbrev-selection-face ((,class :inherit modus-theme-intense-cyan 
:weight bold)))
    ;;;; flycheck
    `(flycheck-error
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-error :style wave)))
-      (,class (:foreground ,fg-lang-error :underline t))))
-   `(flycheck-error-list-checker-name ((,class (:foreground ,magenta-active))))
-   `(flycheck-error-list-column-number ((,class (:foreground 
,fg-special-cold))))
-   `(flycheck-error-list-error ((,class (:foreground ,red :weight 
,modus-theme-bold))))
-   `(flycheck-error-list-filename ((,class (:foreground ,blue))))
-   `(flycheck-error-list-highlight ((,class (:inherit 
modus-theme-special-warm))))
-   `(flycheck-error-list-id ((,class (:foreground ,magenta-alt-other))))
-   `(flycheck-error-list-id-with-explainer ((,class (:inherit 
flycheck-error-list-id :box t))))
-   `(flycheck-error-list-info ((,class (:foreground ,cyan))))
-   `(flycheck-error-list-line-number ((,class (:foreground ,fg-special-warm))))
-   `(flycheck-error-list-warning ((,class (:foreground ,yellow))))
-   `(flycheck-fringe-error ((,class (:inherit modus-theme-fringe-red))))
-   `(flycheck-fringe-info ((,class (:inherit modus-theme-fringe-cyan))))
-   `(flycheck-fringe-warning ((,class (:inherit modus-theme-fringe-yellow))))
+       :underline (:color ,fg-lang-error :style wave))
+      (,class :foreground ,fg-lang-error :underline t)))
+   `(flycheck-error-list-checker-name ((,class :foreground ,magenta-active)))
+   `(flycheck-error-list-column-number ((,class :foreground ,fg-special-cold)))
+   `(flycheck-error-list-error ((,class :foreground ,red :weight 
,modus-theme-bold)))
+   `(flycheck-error-list-filename ((,class :foreground ,blue)))
+   `(flycheck-error-list-highlight ((,class :inherit 
modus-theme-special-warm)))
+   `(flycheck-error-list-id ((,class :foreground ,magenta-alt-other)))
+   `(flycheck-error-list-id-with-explainer ((,class :inherit 
flycheck-error-list-id :box t)))
+   `(flycheck-error-list-info ((,class :foreground ,cyan)))
+   `(flycheck-error-list-line-number ((,class :foreground ,fg-special-warm)))
+   `(flycheck-error-list-warning ((,class :foreground ,yellow)))
+   `(flycheck-fringe-error ((,class :inherit modus-theme-fringe-red)))
+   `(flycheck-fringe-info ((,class :inherit modus-theme-fringe-cyan)))
+   `(flycheck-fringe-warning ((,class :inherit modus-theme-fringe-yellow)))
    `(flycheck-info
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-note :style wave)))
-      (,class (:foreground ,fg-lang-note :underline t))))
-   `(flycheck-verify-select-checker ((,class (:box (:line-width 1 :color nil 
:style released-button)))))
+       :underline (:color ,fg-lang-note :style wave))
+      (,class :foreground ,fg-lang-note :underline t)))
+   `(flycheck-verify-select-checker ((,class :box (:line-width 1 :color nil 
:style released-button))))
    `(flycheck-warning
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-warning :style wave)))
-      (,class (:foreground ,fg-lang-warning :underline t))))
+       :underline (:color ,fg-lang-warning :style wave))
+      (,class :foreground ,fg-lang-warning :underline t)))
    ;;;; flycheck-indicator
-   `(flycheck-indicator-disabled ((,class (:foreground ,fg-inactive :slant 
,modus-theme-slant))))
-   `(flycheck-indicator-error ((,class (:foreground ,red-active :weight 
,modus-theme-bold))))
-   `(flycheck-indicator-info ((,class (:foreground ,blue-active :weight 
,modus-theme-bold))))
-   `(flycheck-indicator-running ((,class (:foreground ,magenta-active :weight 
,modus-theme-bold))))
-   `(flycheck-indicator-success ((,class (:foreground ,green-active :weight 
,modus-theme-bold))))
-   `(flycheck-indicator-warning ((,class (:foreground ,yellow-active :weight 
,modus-theme-bold))))
+   `(flycheck-indicator-disabled ((,class :foreground ,fg-inactive :slant 
,modus-theme-slant)))
+   `(flycheck-indicator-error ((,class :foreground ,red-active :weight 
,modus-theme-bold)))
+   `(flycheck-indicator-info ((,class :foreground ,blue-active :weight 
,modus-theme-bold)))
+   `(flycheck-indicator-running ((,class :foreground ,magenta-active :weight 
,modus-theme-bold)))
+   `(flycheck-indicator-success ((,class :foreground ,green-active :weight 
,modus-theme-bold)))
+   `(flycheck-indicator-warning ((,class :foreground ,yellow-active :weight 
,modus-theme-bold)))
    ;;;; flycheck-posframe
-   `(flycheck-posframe-background-face ((,class (:background ,bg-alt))))
-   `(flycheck-posframe-border-face ((,class (:foreground ,fg-alt))))
-   `(flycheck-posframe-error-face ((,class (:foreground ,red :weight bold))))
-   `(flycheck-posframe-face ((,class (:foreground ,fg-main :slant 
,modus-theme-slant))))
-   `(flycheck-posframe-info-face ((,class (:foreground ,cyan :weight bold))))
-   `(flycheck-posframe-warning-face ((,class (:foreground ,yellow :weight 
bold))))
+   `(flycheck-posframe-background-face ((,class :background ,bg-alt)))
+   `(flycheck-posframe-border-face ((,class :foreground ,fg-alt)))
+   `(flycheck-posframe-error-face ((,class :foreground ,red :weight bold)))
+   `(flycheck-posframe-face ((,class :foreground ,fg-main :slant 
,modus-theme-slant)))
+   `(flycheck-posframe-info-face ((,class :foreground ,cyan :weight bold)))
+   `(flycheck-posframe-warning-face ((,class :foreground ,yellow :weight 
bold)))
    ;;;; flymake
    `(flymake-error
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-error :style wave)))
-      (,class (:foreground ,fg-lang-error :underline t))))
+       :underline (:color ,fg-lang-error :style wave))
+      (,class :foreground ,fg-lang-error :underline t)))
    `(flymake-note
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-note :style wave)))
-      (,class (:foreground ,fg-lang-note :underline t))))
+       :underline (:color ,fg-lang-note :style wave))
+      (,class :foreground ,fg-lang-note :underline t)))
    `(flymake-warning
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-warning :style wave)))
-      (,class (:foreground ,fg-lang-warning :underline t))))
+       :underline (:color ,fg-lang-warning :style wave))
+      (,class :foreground ,fg-lang-warning :underline t)))
    ;;;; flyspell
    `(flyspell-duplicate
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-warning :style wave)))
-      (,class (:foreground ,fg-lang-warning :underline t))))
+       :underline (:color ,fg-lang-warning :style wave))
+      (,class :foreground ,fg-lang-warning :underline t)))
    `(flyspell-incorrect
      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:color ,fg-lang-error :style wave)))
-      (,class (:foreground ,fg-lang-error :underline t))))
+       :underline (:color ,fg-lang-error :style wave))
+      (,class :foreground ,fg-lang-error :underline t)))
    ;;;; flyspell-correct
-   `(flyspell-correct-highlight-face ((,class (:inherit 
modus-theme-refine-green))))
+   `(flyspell-correct-highlight-face ((,class :inherit 
modus-theme-refine-green)))
    ;;;; flx
-   `(flx-highlight-face ((,class (:inherit modus-theme-intense-magenta))))
+   `(flx-highlight-face ((,class :inherit modus-theme-intense-magenta)))
    ;;;; freeze-it
-   `(freeze-it-show ((,class (:background ,bg-dim :foreground 
,fg-special-warm))))
+   `(freeze-it-show ((,class :background ,bg-dim :foreground 
,fg-special-warm)))
    ;;;; frog-menu
-   `(frog-menu-action-keybinding-face ((,class (:foreground ,blue-alt-other))))
-   `(frog-menu-actions-face ((,class (:foreground ,magenta))))
-   `(frog-menu-border ((,class (:background ,bg-active))))
-   `(frog-menu-candidates-face ((,class (:foreground ,fg-main))))
-   `(frog-menu-posframe-background-face ((,class (:background ,bg-dim))))
-   `(frog-menu-prompt-face ((,class (:foreground ,cyan))))
+   `(frog-menu-action-keybinding-face ((,class :foreground ,blue-alt-other)))
+   `(frog-menu-actions-face ((,class :foreground ,magenta)))
+   `(frog-menu-border ((,class :background ,bg-active)))
+   `(frog-menu-candidates-face ((,class :foreground ,fg-main)))
+   `(frog-menu-posframe-background-face ((,class :background ,bg-dim)))
+   `(frog-menu-prompt-face ((,class :foreground ,cyan)))
    ;;;; focus
-   `(focus-unfocused ((,class (:foreground ,fg-unfocused))))
+   `(focus-unfocused ((,class :foreground ,fg-unfocused)))
    ;;;; fold-this
-   `(fold-this-overlay ((,class (:inherit modus-theme-special-mild))))
+   `(fold-this-overlay ((,class :inherit modus-theme-special-mild)))
    ;;;; font-lock
-   `(font-lock-builtin-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(font-lock-comment-delimiter-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(font-lock-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(font-lock-constant-face ((,class (:foreground ,blue-alt-other))))
-   `(font-lock-doc-face ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(font-lock-function-name-face ((,class (:foreground ,magenta))))
-   `(font-lock-keyword-face ((,class (:foreground ,magenta-alt-other :weight 
,modus-theme-bold))))
-   `(font-lock-negation-char-face ((,class (:foreground ,yellow :weight 
,modus-theme-bold))))
-   `(font-lock-preprocessor-face ((,class (:foreground ,magenta))))
-   `(font-lock-regexp-grouping-backslash ((,class (:foreground 
,fg-escape-char-backslash :weight bold))))
-   `(font-lock-regexp-grouping-construct ((,class (:foreground 
,fg-escape-char-construct :weight bold))))
-   `(font-lock-string-face ((,class (:foreground ,blue-alt))))
-   `(font-lock-type-face ((,class (:foreground ,magenta-alt))))
-   `(font-lock-variable-name-face ((,class (:foreground ,cyan))))
-   `(font-lock-warning-face ((,class (:foreground ,yellow-active :weight 
bold))))
+   `(font-lock-builtin-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(font-lock-comment-delimiter-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(font-lock-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(font-lock-constant-face ((,class :foreground ,blue-alt-other)))
+   `(font-lock-doc-face ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(font-lock-function-name-face ((,class :foreground ,magenta)))
+   `(font-lock-keyword-face ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold)))
+   `(font-lock-negation-char-face ((,class :foreground ,yellow :weight 
,modus-theme-bold)))
+   `(font-lock-preprocessor-face ((,class :foreground ,magenta)))
+   `(font-lock-regexp-grouping-backslash ((,class :foreground 
,fg-escape-char-backslash :weight bold)))
+   `(font-lock-regexp-grouping-construct ((,class :foreground 
,fg-escape-char-construct :weight bold)))
+   `(font-lock-string-face ((,class :foreground ,blue-alt)))
+   `(font-lock-type-face ((,class :foreground ,magenta-alt)))
+   `(font-lock-variable-name-face ((,class :foreground ,cyan)))
+   `(font-lock-warning-face ((,class :foreground ,yellow-active :weight bold)))
    ;;;; forge
-   `(forge-post-author ((,class (:foreground ,fg-main :weight bold))))
-   `(forge-post-date ((,class (:foreground ,fg-special-cold))))
-   `(forge-topic-closed ((,class (:foreground ,fg-alt))))
-   `(forge-topic-merged ((,class (:foreground ,fg-alt))))
-   `(forge-topic-open ((,class (:foreground ,fg-special-mild))))
-   `(forge-topic-unmerged ((,class (:foreground ,magenta :slant 
,modus-theme-slant))))
-   `(forge-topic-unread ((,class (:foreground ,fg-main :weight bold))))
+   `(forge-post-author ((,class :foreground ,fg-main :weight bold)))
+   `(forge-post-date ((,class :foreground ,fg-special-cold)))
+   `(forge-topic-closed ((,class :foreground ,fg-alt)))
+   `(forge-topic-merged ((,class :foreground ,fg-alt)))
+   `(forge-topic-open ((,class :foreground ,fg-special-mild)))
+   `(forge-topic-unmerged ((,class :foreground ,magenta :slant 
,modus-theme-slant)))
+   `(forge-topic-unread ((,class :foreground ,fg-main :weight bold)))
    ;;;; fountain-mode
-   `(fountain-character ((,class (:foreground ,magenta-alt-other))))
-   `(fountain-comment ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(fountain-dialog ((,class (:foreground ,blue))))
-   `(fountain-metadata-key ((,class (:foreground ,blue-alt-other))))
-   `(fountain-metadata-value ((,class (:foreground ,cyan-alt-other))))
-   `(fountain-non-printing ((,class (:inherit fountain-comment))))
-   `(fountain-note ((,class (:foreground ,fg-special-warm :slant 
,modus-theme-slant))))
-   `(fountain-page-break ((,class (:foreground ,yellow :weight bold))))
-   `(fountain-page-number ((,class (:foreground ,yellow-alt :weight bold))))
-   `(fountain-paren ((,class (:foreground ,cyan))))
-   `(fountain-scene-heading ((,class (:foreground ,fg-special-calm :weight 
bold))))
-   `(fountain-section-heading ((,class (:inherit ,modus-theme-variable-pitch
-                                                 :foreground ,fg-main :weight 
bold
-                                                 ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
-   `(fountain-section-heading-1 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground ,fg-main 
:weight bold
-                                                   
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))))
-   `(fountain-section-heading-2 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground 
,fg-special-warm :weight bold
-                                                   
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3)))))
-   `(fountain-section-heading-3 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground 
,fg-special-cold :weight bold
-                                                   
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2)))))
-   `(fountain-section-heading-4 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground 
,fg-special-mild :weight bold
-                                                   
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-1)))))
-   `(fountain-section-heading-5 ((,class (:inherit ,modus-theme-variable-pitch
-                                                   :foreground 
,fg-special-calm :weight bold))))
-   `(fountain-synopsis ((,class (:foreground ,green))))
-   `(fountain-template ((,class (:foreground ,magenta-alt))))
-   `(fountain-trans ((,class (:foreground ,magenta :weight bold))))
+   `(fountain-character ((,class :foreground ,magenta-alt-other)))
+   `(fountain-comment ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+   `(fountain-dialog ((,class :foreground ,blue)))
+   `(fountain-metadata-key ((,class :foreground ,blue-alt-other)))
+   `(fountain-metadata-value ((,class :foreground ,cyan-alt-other)))
+   `(fountain-non-printing ((,class :inherit fountain-comment)))
+   `(fountain-note ((,class :foreground ,fg-special-warm :slant 
,modus-theme-slant)))
+   `(fountain-page-break ((,class :foreground ,yellow :weight bold)))
+   `(fountain-page-number ((,class :foreground ,yellow-alt :weight bold)))
+   `(fountain-paren ((,class :foreground ,cyan)))
+   `(fountain-scene-heading ((,class :foreground ,fg-special-calm :weight 
bold)))
+   `(fountain-section-heading ((,class :inherit ,modus-theme-variable-pitch
+                                       :foreground ,fg-main :weight bold
+                                       ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(fountain-section-heading-1 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-main :weight bold
+                                         ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(fountain-section-heading-2 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-special-warm :weight 
bold
+                                         ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3))))
+   `(fountain-section-heading-3 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-special-cold :weight 
bold
+                                         ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2))))
+   `(fountain-section-heading-4 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-special-mild :weight 
bold
+                                         ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-1))))
+   `(fountain-section-heading-5 ((,class :inherit ,modus-theme-variable-pitch
+                                         :foreground ,fg-special-calm :weight 
bold)))
+   `(fountain-synopsis ((,class :foreground ,green)))
+   `(fountain-template ((,class :foreground ,magenta-alt)))
+   `(fountain-trans ((,class :foreground ,magenta :weight bold)))
    ;;;; geiser
-   `(geiser-font-lock-autodoc-current-arg ((,class (:foreground ,magenta))))
-   `(geiser-font-lock-autodoc-identifier ((,class (:foreground ,blue))))
-   `(geiser-font-lock-doc-button ((,class (:foreground ,cyan-alt :underline 
t))))
-   `(geiser-font-lock-doc-link ((,class (:inherit link))))
-   `(geiser-font-lock-error-link ((,class (:foreground ,red-alt :underline 
t))))
-   `(geiser-font-lock-image-button ((,class (:foreground ,green-alt :underline 
t))))
-   `(geiser-font-lock-repl-input ((,class (:weight bold))))
-   `(geiser-font-lock-repl-output ((,class (:foreground ,magenta-alt-other))))
-   `(geiser-font-lock-repl-prompt ((,class (:foreground ,cyan-alt-other))))
-   `(geiser-font-lock-xref-header ((,class (:weight bold))))
-   `(geiser-font-lock-xref-link ((,class (:inherit link))))
+   `(geiser-font-lock-autodoc-current-arg ((,class :foreground ,magenta)))
+   `(geiser-font-lock-autodoc-identifier ((,class :foreground ,blue)))
+   `(geiser-font-lock-doc-button ((,class :foreground ,cyan-alt :underline t)))
+   `(geiser-font-lock-doc-link ((,class :inherit link)))
+   `(geiser-font-lock-error-link ((,class :foreground ,red-alt :underline t)))
+   `(geiser-font-lock-image-button ((,class :foreground ,green-alt :underline 
t)))
+   `(geiser-font-lock-repl-input ((,class :weight bold)))
+   `(geiser-font-lock-repl-output ((,class :foreground ,magenta-alt-other)))
+   `(geiser-font-lock-repl-prompt ((,class :foreground ,cyan-alt-other)))
+   `(geiser-font-lock-xref-header ((,class :weight bold)))
+   `(geiser-font-lock-xref-link ((,class :inherit link)))
    ;;;; git-commit
-   `(git-commit-comment-action ((,class (:foreground ,fg-special-calm :slant 
,modus-theme-slant))))
-   `(git-commit-comment-branch-local ((,class (:foreground ,cyan :slant 
,modus-theme-slant))))
-   `(git-commit-comment-branch-remote ((,class (:foreground ,blue :slant 
,modus-theme-slant))))
-   `(git-commit-comment-detached ((,class (:foreground ,yellow :slant 
,modus-theme-slant))))
-   `(git-commit-comment-file ((,class (:foreground ,blue :slant 
,modus-theme-slant))))
-   `(git-commit-comment-heading ((,class (:foreground ,fg-main :weight bold 
:slant ,modus-theme-slant))))
-   `(git-commit-keyword ((,class (:foreground ,magenta))))
-   `(git-commit-known-pseudo-header ((,class (:foreground ,fg-special-warm 
:weight bold))))
-   `(git-commit-nonempty-second-line ((,class (:inherit 
modus-theme-refine-yellow :weight bold))))
-   `(git-commit-overlong-summary ((,class (:inherit 
modus-theme-subtle-yellow))))
-   `(git-commit-pseudo-header ((,class (:foreground ,fg-alt :weight bold))))
-   `(git-commit-summary ((,class (:foreground ,magenta-alt-other))))
+   `(git-commit-comment-action ((,class :foreground ,fg-special-calm :slant 
,modus-theme-slant)))
+   `(git-commit-comment-branch-local ((,class :foreground ,cyan :slant 
,modus-theme-slant)))
+   `(git-commit-comment-branch-remote ((,class :foreground ,blue :slant 
,modus-theme-slant)))
+   `(git-commit-comment-detached ((,class :foreground ,yellow :slant 
,modus-theme-slant)))
+   `(git-commit-comment-file ((,class :foreground ,blue :slant 
,modus-theme-slant)))
+   `(git-commit-comment-heading ((,class :foreground ,fg-main :weight bold 
:slant ,modus-theme-slant)))
+   `(git-commit-keyword ((,class :foreground ,magenta)))
+   `(git-commit-known-pseudo-header ((,class :foreground ,fg-special-warm 
:weight bold)))
+   `(git-commit-nonempty-second-line ((,class :inherit 
modus-theme-refine-yellow :weight bold)))
+   `(git-commit-overlong-summary ((,class :inherit modus-theme-subtle-yellow)))
+   `(git-commit-pseudo-header ((,class :foreground ,fg-alt :weight bold)))
+   `(git-commit-summary ((,class :foreground ,magenta-alt-other)))
    ;;;; git-gutter
-   `(git-gutter:added ((,class (:inherit modus-theme-fringe-green))))
-   `(git-gutter:deleted ((,class (:inherit modus-theme-fringe-red))))
-   `(git-gutter:modified ((,class (:inherit modus-theme-fringe-yellow))))
-   `(git-gutter:separator ((,class (:inherit modus-theme-fringe-cyan))))
-   `(git-gutter:unchanged ((,class (:inherit modus-theme-fringe-magenta))))
+   `(git-gutter:added ((,class :inherit modus-theme-fringe-green)))
+   `(git-gutter:deleted ((,class :inherit modus-theme-fringe-red)))
+   `(git-gutter:modified ((,class :inherit modus-theme-fringe-yellow)))
+   `(git-gutter:separator ((,class :inherit modus-theme-fringe-cyan)))
+   `(git-gutter:unchanged ((,class :inherit modus-theme-fringe-magenta)))
    ;;;; git-gutter-fr
-   `(git-gutter-fr:added ((,class (:inherit modus-theme-fringe-green))))
-   `(git-gutter-fr:deleted ((,class (:inherit modus-theme-fringe-red))))
-   `(git-gutter-fr:modified ((,class (:inherit modus-theme-fringe-yellow))))
+   `(git-gutter-fr:added ((,class :inherit modus-theme-fringe-green)))
+   `(git-gutter-fr:deleted ((,class :inherit modus-theme-fringe-red)))
+   `(git-gutter-fr:modified ((,class :inherit modus-theme-fringe-yellow)))
    ;;;; git-{gutter,fringe}+
-   `(git-gutter+-added ((,class (:inherit modus-theme-fringe-green))))
-   `(git-gutter+-deleted ((,class (:inherit modus-theme-fringe-red))))
-   `(git-gutter+-modified ((,class (:inherit modus-theme-fringe-yellow))))
-   `(git-gutter+-separator ((,class (:inherit modus-theme-fringe-cyan))))
-   `(git-gutter+-unchanged ((,class (:inherit modus-theme-fringe-magenta))))
-   `(git-gutter-fr+-added ((,class (:inherit modus-theme-fringe-green))))
-   `(git-gutter-fr+-deleted ((,class (:inherit modus-theme-fringe-red))))
-   `(git-gutter-fr+-modified ((,class (:inherit modus-theme-fringe-yellow))))
+   `(git-gutter+-added ((,class :inherit modus-theme-fringe-green)))
+   `(git-gutter+-deleted ((,class :inherit modus-theme-fringe-red)))
+   `(git-gutter+-modified ((,class :inherit modus-theme-fringe-yellow)))
+   `(git-gutter+-separator ((,class :inherit modus-theme-fringe-cyan)))
+   `(git-gutter+-unchanged ((,class :inherit modus-theme-fringe-magenta)))
+   `(git-gutter-fr+-added ((,class :inherit modus-theme-fringe-green)))
+   `(git-gutter-fr+-deleted ((,class :inherit modus-theme-fringe-red)))
+   `(git-gutter-fr+-modified ((,class :inherit modus-theme-fringe-yellow)))
    ;;;; git-lens
-   `(git-lens-added ((,class (:foreground ,green :weight bold))))
-   `(git-lens-deleted ((,class (:foreground ,red :weight bold))))
-   `(git-lens-header ((,class (:height 1.1 :foreground ,cyan :weight bold))))
-   `(git-lens-modified ((,class (:foreground ,yellow :weight bold))))
-   `(git-lens-renamed ((,class (:foreground ,magenta :weight bold))))
+   `(git-lens-added ((,class :foreground ,green :weight bold)))
+   `(git-lens-deleted ((,class :foreground ,red :weight bold)))
+   `(git-lens-header ((,class :height 1.1 :foreground ,cyan :weight bold)))
+   `(git-lens-modified ((,class :foreground ,yellow :weight bold)))
+   `(git-lens-renamed ((,class :foreground ,magenta :weight bold)))
    ;;;; git-timemachine
-   `(git-timemachine-commit ((,class (:foreground ,yellow-active :weight 
bold))))
-   `(git-timemachine-minibuffer-author-face ((,class (:foreground 
,fg-special-warm))))
-   `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,red-alt))))
+   `(git-timemachine-commit ((,class :foreground ,yellow-active :weight bold)))
+   `(git-timemachine-minibuffer-author-face ((,class :foreground 
,fg-special-warm)))
+   `(git-timemachine-minibuffer-detail-face ((,class :foreground ,red-alt)))
    ;;;; git-walktree
-   `(git-walktree-commit-face ((,class (:foreground ,yellow))))
-   `(git-walktree-symlink-face ((,class (:foreground ,cyan :underline t))))
-   `(git-walktree-tree-face ((,class (:foreground ,magenta))))
+   `(git-walktree-commit-face ((,class :foreground ,yellow)))
+   `(git-walktree-symlink-face ((,class :foreground ,cyan :underline t)))
+   `(git-walktree-tree-face ((,class :foreground ,magenta)))
    ;;;; gnus
-   `(gnus-button ((,class (:inherit button))))
-   `(gnus-cite-1 ((,class (:foreground ,blue-alt))))
-   `(gnus-cite-10 ((,class (:foreground ,magenta-alt-other))))
-   `(gnus-cite-11 ((,class (:foreground ,yellow-alt-other))))
-   `(gnus-cite-2 ((,class (:foreground ,red-alt))))
-   `(gnus-cite-3 ((,class (:foreground ,green-alt))))
-   `(gnus-cite-4 ((,class (:foreground ,magenta-alt))))
-   `(gnus-cite-5 ((,class (:foreground ,yellow-alt))))
-   `(gnus-cite-6 ((,class (:foreground ,cyan-alt))))
-   `(gnus-cite-7 ((,class (:foreground ,blue-alt-other))))
-   `(gnus-cite-8 ((,class (:foreground ,red-alt-other))))
-   `(gnus-cite-9 ((,class (:foreground ,green-alt-other))))
-   `(gnus-cite-attribution ((,class (:foreground ,fg-main :slant italic))))
-   `(gnus-emphasis-highlight-words ((,class (:inherit 
modus-theme-refine-yellow))))
-   `(gnus-group-mail-1 ((,class (:foreground ,magenta :weight bold))))
-   `(gnus-group-mail-1-empty ((,class (:foreground ,magenta))))
-   `(gnus-group-mail-2 ((,class (:foreground ,magenta-alt :weight bold))))
-   `(gnus-group-mail-2-empty ((,class (:foreground ,magenta-alt))))
-   `(gnus-group-mail-3 ((,class (:foreground ,magenta-alt-other :weight 
bold))))
-   `(gnus-group-mail-3-empty ((,class (:foreground ,magenta-alt-other))))
-   `(gnus-group-mail-low ((,class (:foreground ,fg-special-calm :weight 
bold))))
-   `(gnus-group-mail-low-empty ((,class (:foreground ,fg-special-calm))))
-   `(gnus-group-news-1 ((,class (:foreground ,blue-alt-other :weight bold))))
-   `(gnus-group-news-1-empty ((,class (:foreground ,blue-alt))))
-   `(gnus-group-news-2 ((,class (:foreground ,green-alt-other :weight bold))))
-   `(gnus-group-news-2-empty ((,class (:foreground ,green-alt))))
-   `(gnus-group-news-3 ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(gnus-group-news-3-empty ((,class (:foreground ,cyan))))
-   `(gnus-group-news-4 ((,class (:foreground ,yellow-nuanced :weight bold))))
-   `(gnus-group-news-4-empty ((,class (:foreground ,green-nuanced))))
-   `(gnus-group-news-5 ((,class (:foreground ,magenta-nuanced :weight bold))))
-   `(gnus-group-news-5-empty ((,class (:foreground ,magenta-nuanced))))
-   `(gnus-group-news-6 ((,class (:foreground ,red-nuanced :weight bold))))
-   `(gnus-group-news-6-empty ((,class (:foreground ,red-nuanced))))
-   `(gnus-group-news-low ((,class (:foreground ,fg-alt :weight bold))))
-   `(gnus-group-news-low-empty ((,class (:foreground ,fg-alt))))
-   `(gnus-header-content ((,class (:foreground ,fg-special-calm))))
-   `(gnus-header-from ((,class (:foreground ,cyan-alt :weight bold :underline 
nil))))
-   `(gnus-header-name ((,class (:foreground ,cyan-alt-other))))
-   `(gnus-header-newsgroups ((,class (:foreground ,blue-alt :weight bold))))
-   `(gnus-header-subject ((,class (:foreground ,magenta-alt-other :weight 
bold))))
-   `(gnus-server-agent ((,class (:foreground ,cyan :weight bold))))
-   `(gnus-server-closed ((,class (:foreground ,magenta :weight bold))))
-   `(gnus-server-cloud ((,class (:foreground ,cyan-alt :weight bold))))
-   `(gnus-server-cloud-host ((,class (:inherit modus-theme-refine-cyan))))
-   `(gnus-server-denied ((,class (:foreground ,red :weight bold))))
-   `(gnus-server-offline ((,class (:foreground ,yellow :weight bold))))
-   `(gnus-server-opened ((,class (:foreground ,green :weight bold))))
-   `(gnus-signature ((,class (:foreground ,fg-special-cold :slant italic))))
-   `(gnus-splash ((,class (:foreground ,fg-alt))))
-   `(gnus-summary-cancelled ((,class (:inherit modus-theme-mark-alt))))
-   `(gnus-summary-high-ancient ((,class (:foreground ,fg-alt :weight bold))))
-   `(gnus-summary-high-read ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(gnus-summary-high-ticked ((,class (:foreground ,red-alt-other :weight 
bold))))
-   `(gnus-summary-high-undownloaded ((,class (:foreground ,yellow :weight 
bold))))
-   `(gnus-summary-high-unread ((,class (:foreground ,fg-main :weight bold))))
-   `(gnus-summary-low-ancient ((,class (:foreground ,fg-alt :slant italic))))
-   `(gnus-summary-low-read ((,class (:foreground ,fg-special-cold :slant 
italic))))
-   `(gnus-summary-low-ticked ((,class (:foreground ,red-refine-fg :slant 
italic))))
-   `(gnus-summary-low-undownloaded ((,class (:foreground ,yellow-refine-fg 
:slant italic))))
-   `(gnus-summary-low-unread ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(gnus-summary-normal-ancient ((,class (:foreground ,fg-special-calm))))
-   `(gnus-summary-normal-read ((,class (:foreground ,fg-special-cold))))
-   `(gnus-summary-normal-ticked ((,class (:foreground ,red-alt-other))))
-   `(gnus-summary-normal-undownloaded ((,class (:foreground ,yellow))))
-   `(gnus-summary-normal-unread ((,class (:foreground ,fg-main))))
-   `(gnus-summary-selected ((,class (:inherit modus-theme-subtle-blue))))
+   `(gnus-button ((,class :inherit button)))
+   `(gnus-cite-1 ((,class :foreground ,blue-alt)))
+   `(gnus-cite-10 ((,class :foreground ,magenta-alt-other)))
+   `(gnus-cite-11 ((,class :foreground ,yellow-alt-other)))
+   `(gnus-cite-2 ((,class :foreground ,red-alt)))
+   `(gnus-cite-3 ((,class :foreground ,green-alt)))
+   `(gnus-cite-4 ((,class :foreground ,magenta-alt)))
+   `(gnus-cite-5 ((,class :foreground ,yellow-alt)))
+   `(gnus-cite-6 ((,class :foreground ,cyan-alt)))
+   `(gnus-cite-7 ((,class :foreground ,blue-alt-other)))
+   `(gnus-cite-8 ((,class :foreground ,red-alt-other)))
+   `(gnus-cite-9 ((,class :foreground ,green-alt-other)))
+   `(gnus-cite-attribution ((,class :foreground ,fg-main :slant italic)))
+   `(gnus-emphasis-highlight-words ((,class :inherit 
modus-theme-refine-yellow)))
+   `(gnus-group-mail-1 ((,class :foreground ,magenta :weight bold)))
+   `(gnus-group-mail-1-empty ((,class :foreground ,magenta)))
+   `(gnus-group-mail-2 ((,class :foreground ,magenta-alt :weight bold)))
+   `(gnus-group-mail-2-empty ((,class :foreground ,magenta-alt)))
+   `(gnus-group-mail-3 ((,class :foreground ,magenta-alt-other :weight bold)))
+   `(gnus-group-mail-3-empty ((,class :foreground ,magenta-alt-other)))
+   `(gnus-group-mail-low ((,class :foreground ,fg-special-calm :weight bold)))
+   `(gnus-group-mail-low-empty ((,class :foreground ,fg-special-calm)))
+   `(gnus-group-news-1 ((,class :foreground ,blue-alt-other :weight bold)))
+   `(gnus-group-news-1-empty ((,class :foreground ,blue-alt)))
+   `(gnus-group-news-2 ((,class :foreground ,green-alt-other :weight bold)))
+   `(gnus-group-news-2-empty ((,class :foreground ,green-alt)))
+   `(gnus-group-news-3 ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(gnus-group-news-3-empty ((,class :foreground ,cyan)))
+   `(gnus-group-news-4 ((,class :foreground ,yellow-nuanced :weight bold)))
+   `(gnus-group-news-4-empty ((,class :foreground ,green-nuanced)))
+   `(gnus-group-news-5 ((,class :foreground ,magenta-nuanced :weight bold)))
+   `(gnus-group-news-5-empty ((,class :foreground ,magenta-nuanced)))
+   `(gnus-group-news-6 ((,class :foreground ,red-nuanced :weight bold)))
+   `(gnus-group-news-6-empty ((,class :foreground ,red-nuanced)))
+   `(gnus-group-news-low ((,class :foreground ,fg-alt :weight bold)))
+   `(gnus-group-news-low-empty ((,class :foreground ,fg-alt)))
+   `(gnus-header-content ((,class :foreground ,fg-special-calm)))
+   `(gnus-header-from ((,class :foreground ,cyan-alt :weight bold :underline 
nil)))
+   `(gnus-header-name ((,class :foreground ,cyan-alt-other)))
+   `(gnus-header-newsgroups ((,class :foreground ,blue-alt :weight bold)))
+   `(gnus-header-subject ((,class :foreground ,magenta-alt-other :weight 
bold)))
+   `(gnus-server-agent ((,class :foreground ,cyan :weight bold)))
+   `(gnus-server-closed ((,class :foreground ,magenta :weight bold)))
+   `(gnus-server-cloud ((,class :foreground ,cyan-alt :weight bold)))
+   `(gnus-server-cloud-host ((,class :inherit modus-theme-refine-cyan)))
+   `(gnus-server-denied ((,class :foreground ,red :weight bold)))
+   `(gnus-server-offline ((,class :foreground ,yellow :weight bold)))
+   `(gnus-server-opened ((,class :foreground ,green :weight bold)))
+   `(gnus-signature ((,class :foreground ,fg-special-cold :slant italic)))
+   `(gnus-splash ((,class :foreground ,fg-alt)))
+   `(gnus-summary-cancelled ((,class :inherit modus-theme-mark-alt)))
+   `(gnus-summary-high-ancient ((,class :foreground ,fg-alt :weight bold)))
+   `(gnus-summary-high-read ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(gnus-summary-high-ticked ((,class :foreground ,red-alt-other :weight 
bold)))
+   `(gnus-summary-high-undownloaded ((,class :foreground ,yellow :weight 
bold)))
+   `(gnus-summary-high-unread ((,class :foreground ,fg-main :weight bold)))
+   `(gnus-summary-low-ancient ((,class :foreground ,fg-alt :slant italic)))
+   `(gnus-summary-low-read ((,class :foreground ,fg-special-cold :slant 
italic)))
+   `(gnus-summary-low-ticked ((,class :foreground ,red-refine-fg :slant 
italic)))
+   `(gnus-summary-low-undownloaded ((,class :foreground ,yellow-refine-fg 
:slant italic)))
+   `(gnus-summary-low-unread ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(gnus-summary-normal-ancient ((,class :foreground ,fg-special-calm)))
+   `(gnus-summary-normal-read ((,class :foreground ,fg-special-cold)))
+   `(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other)))
+   `(gnus-summary-normal-undownloaded ((,class :foreground ,yellow)))
+   `(gnus-summary-normal-unread ((,class :foreground ,fg-main)))
+   `(gnus-summary-selected ((,class :inherit modus-theme-subtle-blue)))
    ;;;; golden-ratio-scroll-screen
-   `(golden-ratio-scroll-highlight-line-face ((,class (:background 
,cyan-subtle-bg :foreground ,fg-main))))
+   `(golden-ratio-scroll-highlight-line-face ((,class :background 
,cyan-subtle-bg :foreground ,fg-main)))
    ;;;; helm
-   `(helm-M-x-key ((,class (:foreground ,magenta-alt-other :weight bold))))
-   `(helm-action ((,class (:underline t))))
-   `(helm-bookmark-addressbook ((,class (:foreground ,green-alt))))
-   `(helm-bookmark-directory ((,class (:foreground ,blue :weight bold))))
-   `(helm-bookmark-file ((,class (:foreground ,fg-main))))
-   `(helm-bookmark-file-not-found ((,class (:background ,bg-alt :foreground 
,fg-alt))))
-   `(helm-bookmark-gnus ((,class (:foreground ,magenta))))
-   `(helm-bookmark-info ((,class (:foreground ,cyan-alt))))
-   `(helm-bookmark-man ((,class (:foreground ,yellow-alt))))
-   `(helm-bookmark-w3m ((,class (:foreground ,blue-alt))))
-   `(helm-buffer-archive ((,class (:foreground ,cyan :weight bold))))
-   `(helm-buffer-directory ((,class (:foreground ,blue :weight bold))))
-   `(helm-buffer-file ((,class (:foreground ,fg-main))))
-   `(helm-buffer-modified ((,class (:foreground ,yellow-alt))))
-   `(helm-buffer-not-saved ((,class (:foreground ,red-alt))))
-   `(helm-buffer-process ((,class (:foreground ,magenta))))
-   `(helm-buffer-saved-out ((,class (:background ,bg-alt :foreground ,red 
:weight bold))))
-   `(helm-buffer-size ((,class (:foreground ,fg-alt))))
-   `(helm-candidate-number ((,class (:foreground ,cyan-active))))
-   `(helm-candidate-number-suspended ((,class (:foreground ,yellow-active))))
-   `(helm-comint-prompts-buffer-name ((,class (:foreground ,green-active))))
-   `(helm-comint-prompts-promptidx ((,class (:foreground ,cyan-active))))
-   `(helm-delete-async-message ((,class (:foreground ,magenta-active :weight 
bold))))
-   `(helm-eob-line ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(helm-eshell-prompts-buffer-name ((,class (:foreground ,green-active))))
-   `(helm-eshell-prompts-promptidx ((,class (:foreground ,cyan-active))))
-   `(helm-etags-file ((,class (:foreground ,fg-dim :underline t))))
-   `(helm-ff-denied ((,class (:inherit modus-theme-intense-red))))
-   `(helm-ff-directory ((,class (:inherit helm-buffer-directory))))
-   `(helm-ff-dirs ((,class (:foreground ,blue-alt-other :weight bold))))
-   `(helm-ff-dotted-directory ((,class (:background ,bg-alt :foreground 
,fg-alt :weight bold))))
-   `(helm-ff-dotted-symlink-directory ((,class (:inherit 
helm-ff-dotted-directory :underline t))))
-   `(helm-ff-executable ((,class (:foreground ,magenta-alt))))
-   `(helm-ff-file ((,class (:foreground ,fg-main))))
-   `(helm-ff-invalid-symlink ((,class (:foreground ,red :underline t))))
-   `(helm-ff-pipe ((,class (:inherit modus-theme-subtle-magenta))))
-   `(helm-ff-prefix ((,class (:inherit modus-theme-subtle-yellow))))
-   `(helm-ff-socket ((,class (:foreground ,red-alt-other))))
-   `(helm-ff-suid ((,class (:inherit modus-theme-refine-red))))
-   `(helm-ff-symlink ((,class (:foreground ,cyan :underline t))))
-   `(helm-ff-truename ((,class (:foreground ,blue-alt-other))))
-   `(helm-grep-cmd-line ((,class (:foreground ,yellow-alt-other))))
-   `(helm-grep-file ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(helm-grep-finish ((,class (:foreground ,green-active))))
-   `(helm-grep-lineno ((,class (:foreground ,fg-special-warm))))
-   `(helm-grep-match ((,class (:inherit modus-theme-special-calm))))
-   `(helm-header ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(helm-header-line-left-margin ((,class (:foreground ,yellow-intense 
:weight bold))))
-   `(helm-history-deleted ((,class (:inherit modus-theme-intense-red :weight 
bold))))
-   `(helm-history-remote ((,class (:foreground ,red-alt-other))))
-   `(helm-lisp-completion-info ((,class (:foreground ,fg-special-warm))))
-   `(helm-lisp-show-completion ((,class (:inherit modus-theme-refine-yellow))))
-   `(helm-locate-finish ((,class (:foreground ,green-active))))
-   `(helm-match ((,class (:inherit modus-theme-refine-cyan :weight bold))))
-   `(helm-match-item ((,class (:inherit modus-theme-subtle-cyan))))
-   `(helm-minibuffer-prompt ((,class (:inherit minibuffer-prompt))))
-   `(helm-moccur-buffer ((,class (:foreground ,cyan-alt-other :underline t))))
-   `(helm-mode-prefix ((,class (:inherit modus-theme-intense-magenta))))
-   `(helm-non-file-buffer ((,class (:foreground ,fg-alt))))
-   `(helm-prefarg ((,class (:foreground ,red-active))))
-   `(helm-resume-need-update ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                       :inherit modus-theme-refine-magenta))))
-   `(helm-selection ((,class (,@(and (>= emacs-major-version 27) '(:extend t))
-                              :inherit modus-theme-refine-blue :weight bold))))
-   `(helm-selection-line ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                   :inherit modus-theme-special-cold))))
-   `(helm-separator ((,class (:foreground ,fg-special-mild))))
-   `(helm-time-zone-current ((,class (:foreground ,green))))
-   `(helm-time-zone-home ((,class (:foreground ,magenta))))
-   `(helm-source-header ((,class (:foreground ,red-alt :weight bold
-                                              ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
-   `(helm-top-columns ((,class (:inherit helm-header))))
-   `(helm-ucs-char ((,class (:foreground ,yellow-alt-other))))
-   `(helm-visible-mark ((,class (:inherit modus-theme-subtle-cyan))))
+   `(helm-M-x-key ((,class :foreground ,magenta-alt-other :weight bold)))
+   `(helm-action ((,class :underline t)))
+   `(helm-bookmark-addressbook ((,class :foreground ,green-alt)))
+   `(helm-bookmark-directory ((,class :foreground ,blue :weight bold)))
+   `(helm-bookmark-file ((,class :foreground ,fg-main)))
+   `(helm-bookmark-file-not-found ((,class :background ,bg-alt :foreground 
,fg-alt)))
+   `(helm-bookmark-gnus ((,class :foreground ,magenta)))
+   `(helm-bookmark-info ((,class :foreground ,cyan-alt)))
+   `(helm-bookmark-man ((,class :foreground ,yellow-alt)))
+   `(helm-bookmark-w3m ((,class :foreground ,blue-alt)))
+   `(helm-buffer-archive ((,class :foreground ,cyan :weight bold)))
+   `(helm-buffer-directory ((,class :foreground ,blue :weight bold)))
+   `(helm-buffer-file ((,class :foreground ,fg-main)))
+   `(helm-buffer-modified ((,class :foreground ,yellow-alt)))
+   `(helm-buffer-not-saved ((,class :foreground ,red-alt)))
+   `(helm-buffer-process ((,class :foreground ,magenta)))
+   `(helm-buffer-saved-out ((,class :background ,bg-alt :foreground ,red 
:weight bold)))
+   `(helm-buffer-size ((,class :foreground ,fg-alt)))
+   `(helm-candidate-number ((,class :foreground ,cyan-active)))
+   `(helm-candidate-number-suspended ((,class :foreground ,yellow-active)))
+   `(helm-comint-prompts-buffer-name ((,class :foreground ,green-active)))
+   `(helm-comint-prompts-promptidx ((,class :foreground ,cyan-active)))
+   `(helm-delete-async-message ((,class :foreground ,magenta-active :weight 
bold)))
+   `(helm-eob-line ((,class :background ,bg-main :foreground ,fg-main)))
+   `(helm-eshell-prompts-buffer-name ((,class :foreground ,green-active)))
+   `(helm-eshell-prompts-promptidx ((,class :foreground ,cyan-active)))
+   `(helm-etags-file ((,class :foreground ,fg-dim :underline t)))
+   `(helm-ff-denied ((,class :inherit modus-theme-intense-red)))
+   `(helm-ff-directory ((,class :inherit helm-buffer-directory)))
+   `(helm-ff-dirs ((,class :foreground ,blue-alt-other :weight bold)))
+   `(helm-ff-dotted-directory ((,class :background ,bg-alt :foreground ,fg-alt 
:weight bold)))
+   `(helm-ff-dotted-symlink-directory ((,class :inherit 
helm-ff-dotted-directory :underline t)))
+   `(helm-ff-executable ((,class :foreground ,magenta-alt)))
+   `(helm-ff-file ((,class :foreground ,fg-main)))
+   `(helm-ff-invalid-symlink ((,class :foreground ,red :underline t)))
+   `(helm-ff-pipe ((,class :inherit modus-theme-subtle-magenta)))
+   `(helm-ff-prefix ((,class :inherit modus-theme-subtle-yellow)))
+   `(helm-ff-socket ((,class :foreground ,red-alt-other)))
+   `(helm-ff-suid ((,class :inherit modus-theme-refine-red)))
+   `(helm-ff-symlink ((,class :foreground ,cyan :underline t)))
+   `(helm-ff-truename ((,class :foreground ,blue-alt-other)))
+   `(helm-grep-cmd-line ((,class :foreground ,yellow-alt-other)))
+   `(helm-grep-file ((,class :foreground ,fg-special-cold :weight bold)))
+   `(helm-grep-finish ((,class :foreground ,green-active)))
+   `(helm-grep-lineno ((,class :foreground ,fg-special-warm)))
+   `(helm-grep-match ((,class :inherit modus-theme-special-calm)))
+   `(helm-header ((,class :foreground ,fg-special-cold :weight bold)))
+   `(helm-header-line-left-margin ((,class :foreground ,yellow-intense :weight 
bold)))
+   `(helm-history-deleted ((,class :inherit modus-theme-intense-red :weight 
bold)))
+   `(helm-history-remote ((,class :foreground ,red-alt-other)))
+   `(helm-lisp-completion-info ((,class :foreground ,fg-special-warm)))
+   `(helm-lisp-show-completion ((,class :inherit modus-theme-refine-yellow)))
+   `(helm-locate-finish ((,class :foreground ,green-active)))
+   `(helm-match ((,class :inherit modus-theme-refine-cyan :weight bold)))
+   `(helm-match-item ((,class :inherit modus-theme-subtle-cyan)))
+   `(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt)))
+   `(helm-moccur-buffer ((,class :foreground ,cyan-alt-other :underline t)))
+   `(helm-mode-prefix ((,class :inherit modus-theme-intense-magenta)))
+   `(helm-non-file-buffer ((,class :foreground ,fg-alt)))
+   `(helm-prefarg ((,class :foreground ,red-active)))
+   `(helm-resume-need-update ((,class ,@(and (>= emacs-major-version 27) 
'(:extend t))
+                                      :inherit modus-theme-refine-magenta)))
+   `(helm-selection ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
+                             :inherit modus-theme-refine-blue :weight bold)))
+   `(helm-selection-line ((,class ,@(and (>= emacs-major-version 27) '(:extend 
t))
+                                  :inherit modus-theme-special-cold)))
+   `(helm-separator ((,class :foreground ,fg-special-mild)))
+   `(helm-time-zone-current ((,class :foreground ,green)))
+   `(helm-time-zone-home ((,class :foreground ,magenta)))
+   `(helm-source-header ((,class :foreground ,red-alt :weight bold
+                                 ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(helm-top-columns ((,class :inherit helm-header)))
+   `(helm-ucs-char ((,class :foreground ,yellow-alt-other)))
+   `(helm-visible-mark ((,class :inherit modus-theme-subtle-cyan)))
    ;;;; helm-ls-git
-   `(helm-ls-git-added-copied-face ((,class (:foreground ,green-intense))))
-   `(helm-ls-git-added-modified-face ((,class (:foreground ,yellow-intense))))
-   `(helm-ls-git-conflict-face ((,class (:foreground ,red-intense :weight 
bold))))
-   `(helm-ls-git-deleted-and-staged-face ((,class (:foreground ,red-nuanced))))
-   `(helm-ls-git-deleted-not-staged-face ((,class (:foreground ,red))))
-   `(helm-ls-git-modified-and-staged-face ((,class (:foreground 
,yellow-nuanced))))
-   `(helm-ls-git-modified-not-staged-face ((,class (:foreground ,yellow))))
-   `(helm-ls-git-renamed-modified-face ((,class (:foreground ,magenta))))
-   `(helm-ls-git-untracked-face ((,class (:foreground ,fg-special-cold))))
+   `(helm-ls-git-added-copied-face ((,class :foreground ,green-intense)))
+   `(helm-ls-git-added-modified-face ((,class :foreground ,yellow-intense)))
+   `(helm-ls-git-conflict-face ((,class :foreground ,red-intense :weight 
bold)))
+   `(helm-ls-git-deleted-and-staged-face ((,class :foreground ,red-nuanced)))
+   `(helm-ls-git-deleted-not-staged-face ((,class :foreground ,red)))
+   `(helm-ls-git-modified-and-staged-face ((,class :foreground 
,yellow-nuanced)))
+   `(helm-ls-git-modified-not-staged-face ((,class :foreground ,yellow)))
+   `(helm-ls-git-renamed-modified-face ((,class :foreground ,magenta)))
+   `(helm-ls-git-untracked-face ((,class :foreground ,fg-special-cold)))
    ;;;; helm-switch-shell
-   `(helm-switch-shell-new-shell-face ((,class (:inherit 
modus-theme-refine-magenta :weight bold))))
+   `(helm-switch-shell-new-shell-face ((,class :inherit 
modus-theme-refine-magenta :weight bold)))
    ;;;; helm-xref
-   `(helm-xref-file-name ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(helm-xref-file-name ((,class (:foreground ,fg-special-warm))))
+   `(helm-xref-file-name ((,class :foreground ,fg-special-cold :weight bold)))
+   `(helm-xref-file-name ((,class :foreground ,fg-special-warm)))
    ;;;; helpful
-   `(helpful-heading  ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,fg-main :weight bold
-                                         ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
+   `(helpful-heading  ((,class :inherit ,modus-theme-variable-pitch 
:foreground ,fg-main :weight bold
+                               ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
    ;;;; highlight region or ad-hoc regexp
-   `(hi-black-b ((,class (:background ,fg-main :foreground ,bg-main))))
-   `(hi-blue ((,class (:background ,bg-alt :foreground ,blue :underline t))))
-   `(hi-blue-b ((,class (:inherit modus-theme-intense-blue))))
-   `(hi-green ((,class (:background ,bg-alt :foreground ,green :underline t))))
-   `(hi-green-b ((,class (:inherit modus-theme-intense-green))))
-   `(hi-pink ((,class (:background ,bg-alt :foreground ,magenta :underline 
t))))
-   `(hi-red-b ((,class (:inherit modus-theme-intense-red))))
-   `(hi-yellow ((,class (:background ,bg-alt :foreground ,yellow :underline 
t))))
-   `(highlight ((,class (:inherit modus-theme-subtle-blue))))
-   `(highlight-changes ((,class (:foreground ,yellow-alt-other))))
-   `(highlight-changes-delete ((,class (:foreground ,red-alt-other :underline 
t))))
-   `(hl-line ((,class (:background ,bg-hl-line))))
-   `(region ((,class (:background ,bg-region :foreground ,fg-main))))
-   `(secondary-selection ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
+   `(hi-black-b ((,class :background ,fg-main :foreground ,bg-main)))
+   `(hi-blue ((,class :background ,bg-alt :foreground ,blue :underline t)))
+   `(hi-blue-b ((,class :inherit modus-theme-intense-blue)))
+   `(hi-green ((,class :background ,bg-alt :foreground ,green :underline t)))
+   `(hi-green-b ((,class :inherit modus-theme-intense-green)))
+   `(hi-pink ((,class :background ,bg-alt :foreground ,magenta :underline t)))
+   `(hi-red-b ((,class :inherit modus-theme-intense-red)))
+   `(hi-yellow ((,class :background ,bg-alt :foreground ,yellow :underline t)))
+   `(highlight ((,class :inherit modus-theme-subtle-blue)))
+   `(highlight-changes ((,class :foreground ,yellow-alt-other)))
+   `(highlight-changes-delete ((,class :foreground ,red-alt-other :underline 
t)))
+   `(hl-line ((,class :background ,bg-hl-line)))
+   `(region ((,class :background ,bg-region :foreground ,fg-main)))
+   `(secondary-selection ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
    ;;;; highlight-blocks
-   `(highlight-blocks-depth-1-face ((,class (:background ,bg-dim :foreground 
,fg-main))))
-   `(highlight-blocks-depth-2-face ((,class (:background ,bg-alt :foreground 
,fg-main))))
-   `(highlight-blocks-depth-3-face ((,class (:background ,bg-special-cold 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-4-face ((,class (:background ,bg-special-calm 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-5-face ((,class (:background ,bg-special-warm 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-6-face ((,class (:background ,bg-special-mild 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-7-face ((,class (:background ,bg-inactive 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-8-face ((,class (:background ,bg-active 
:foreground ,fg-main))))
-   `(highlight-blocks-depth-9-face ((,class (:background ,cyan-subtle-bg 
:foreground ,fg-main))))
+   `(highlight-blocks-depth-1-face ((,class :background ,bg-dim :foreground 
,fg-main)))
+   `(highlight-blocks-depth-2-face ((,class :background ,bg-alt :foreground 
,fg-main)))
+   `(highlight-blocks-depth-3-face ((,class :background ,bg-special-cold 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-4-face ((,class :background ,bg-special-calm 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-5-face ((,class :background ,bg-special-warm 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-6-face ((,class :background ,bg-special-mild 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-7-face ((,class :background ,bg-inactive 
:foreground ,fg-main)))
+   `(highlight-blocks-depth-8-face ((,class :background ,bg-active :foreground 
,fg-main)))
+   `(highlight-blocks-depth-9-face ((,class :background ,cyan-subtle-bg 
:foreground ,fg-main)))
    ;;;; highlight-defined
-   `(highlight-defined-builtin-function-name-face ((,class (:foreground 
,magenta))))
-   `(highlight-defined-face-name-face ((,class (:foreground ,fg-main))))
-   `(highlight-defined-function-name-face ((,class (:foreground ,magenta))))
-   `(highlight-defined-macro-name-face ((,class (:foreground ,magenta-alt))))
-   `(highlight-defined-special-form-name-face ((,class (:foreground 
,magenta-alt-other))))
-   `(highlight-defined-variable-name-face ((,class (:foreground ,cyan))))
+   `(highlight-defined-builtin-function-name-face ((,class :foreground 
,magenta)))
+   `(highlight-defined-face-name-face ((,class :foreground ,fg-main)))
+   `(highlight-defined-function-name-face ((,class :foreground ,magenta)))
+   `(highlight-defined-macro-name-face ((,class :foreground ,magenta-alt)))
+   `(highlight-defined-special-form-name-face ((,class :foreground 
,magenta-alt-other)))
+   `(highlight-defined-variable-name-face ((,class :foreground ,cyan)))
    ;;;; highlight-escape-sequences (`hes-mode')
-   `(hes-escape-backslash-face ((,class (:foreground ,fg-escape-char-construct 
:weight bold))))
-   `(hes-escape-sequence-face ((,class (:foreground ,fg-escape-char-backslash 
:weight bold))))
+   `(hes-escape-backslash-face ((,class :foreground ,fg-escape-char-construct 
:weight bold)))
+   `(hes-escape-sequence-face ((,class :foreground ,fg-escape-char-backslash 
:weight bold)))
    ;;;; highlight-indentation
-   `(highlight-indentation-face ((,class (:background ,bg-hl-line))))
-   `(highlight-indentation-current-column-face ((,class (:background 
,bg-active))))
+   `(highlight-indentation-face ((,class :background ,bg-hl-line)))
+   `(highlight-indentation-current-column-face ((,class :background 
,bg-active)))
    ;;;; highlight-numbers
-   `(highlight-numbers-number ((,class (:foreground ,blue-alt-other))))
+   `(highlight-numbers-number ((,class :foreground ,blue-alt-other)))
    ;;;; highlight-symbol
-   `(highlight-symbol-face ((,class (:inherit modus-theme-special-mild))))
+   `(highlight-symbol-face ((,class :inherit modus-theme-special-mild)))
    ;;;; highlight-thing
-   `(highlight-thing ((,class (:background ,bg-alt :foreground ,cyan))))
+   `(highlight-thing ((,class :background ,bg-alt :foreground ,cyan)))
    ;;;; hl-fill-column
-   `(hl-fill-column-face ((,class (:background ,bg-active :foreground 
,fg-active))))
+   `(hl-fill-column-face ((,class :background ,bg-active :foreground 
,fg-active)))
    ;;;; hl-todo
-   `(hl-todo ((,class (:foreground ,red-alt-other :weight bold))))
+   `(hl-todo ((,class :foreground ,red-alt-other :weight bold)))
    ;;;; hydra
-   `(hydra-face-amaranth ((,class (:foreground ,yellow :weight bold))))
-   `(hydra-face-blue ((,class (:foreground ,blue-alt :weight bold))))
-   `(hydra-face-pink ((,class (:foreground ,magenta-alt :weight bold))))
-   `(hydra-face-red ((,class (:foreground ,red :weight bold))))
-   `(hydra-face-teal ((,class (:foreground ,cyan :weight bold))))
+   `(hydra-face-amaranth ((,class :foreground ,yellow :weight bold)))
+   `(hydra-face-blue ((,class :foreground ,blue-alt :weight bold)))
+   `(hydra-face-pink ((,class :foreground ,magenta-alt :weight bold)))
+   `(hydra-face-red ((,class :foreground ,red :weight bold)))
+   `(hydra-face-teal ((,class :foreground ,cyan :weight bold)))
    ;;;; hyperlist
-   `(hyperlist-condition ((,class (:foreground ,green))))
-   `(hyperlist-hashtag ((,class (:foreground ,yellow))))
-   `(hyperlist-operator ((,class (:foreground ,blue-alt))))
-   `(hyperlist-paren ((,class (:foreground ,cyan-alt-other))))
-   `(hyperlist-quote ((,class (:foreground ,cyan-alt))))
-   `(hyperlist-ref ((,class (:foreground ,magenta-alt-other))))
-   `(hyperlist-stars ((,class (:foreground ,fg-alt))))
-   `(hyperlist-tag ((,class (:foreground ,red))))
-   `(hyperlist-toplevel ((,class (:foreground ,fg-main :weight bold))))
+   `(hyperlist-condition ((,class :foreground ,green)))
+   `(hyperlist-hashtag ((,class :foreground ,yellow)))
+   `(hyperlist-operator ((,class :foreground ,blue-alt)))
+   `(hyperlist-paren ((,class :foreground ,cyan-alt-other)))
+   `(hyperlist-quote ((,class :foreground ,cyan-alt)))
+   `(hyperlist-ref ((,class :foreground ,magenta-alt-other)))
+   `(hyperlist-stars ((,class :foreground ,fg-alt)))
+   `(hyperlist-tag ((,class :foreground ,red)))
+   `(hyperlist-toplevel ((,class :foreground ,fg-main :weight bold)))
    ;;;; icomplete
-   `(icomplete-first-match ((,class (,@(modus-vivendi-theme-completions
-                                        magenta magenta-intense-bg fg-main)
-                                     :weight bold))))
+   `(icomplete-first-match ((,class ,@(modus-vivendi-theme-completions
+                                       magenta magenta-intense-bg fg-main)
+                                    :weight bold)))
    ;;;; icomplete-vertical
-   `(icomplete-vertical-separator ((,class (:foreground ,fg-alt))))
+   `(icomplete-vertical-separator ((,class :foreground ,fg-alt)))
    ;;;; ido-mode
-   `(ido-first-match ((,class (,@(modus-vivendi-theme-completions
-                                  magenta magenta-subtle-bg fg-main)
-                               :weight bold))))
-   `(ido-incomplete-regexp ((,class (:inherit error))))
-   `(ido-indicator ((,class (:inherit modus-theme-subtle-yellow))))
-   `(ido-only-match ((,class (,@(modus-vivendi-theme-completions
-                                 magenta-intense magenta-intense-bg fg-main)
-                              :weight bold))))
-   `(ido-subdir ((,class (:foreground ,blue-alt-other))))
-   `(ido-virtual ((,class (:foreground ,yellow-alt-other))))
+   `(ido-first-match ((,class ,@(modus-vivendi-theme-completions
+                                 magenta magenta-subtle-bg fg-main)
+                              :weight bold)))
+   `(ido-incomplete-regexp ((,class :inherit error)))
+   `(ido-indicator ((,class :inherit modus-theme-subtle-yellow)))
+   `(ido-only-match ((,class ,@(modus-vivendi-theme-completions
+                                magenta-intense magenta-intense-bg fg-main)
+                             :weight bold)))
+   `(ido-subdir ((,class :foreground ,blue-alt-other)))
+   `(ido-virtual ((,class :foreground ,yellow-alt-other)))
    ;;;; iedit
-   `(iedit-occurrence ((,class (:inherit modus-theme-refine-blue))))
-   `(iedit-read-only-occurrence ((,class (:inherit 
modus-theme-intense-yellow))))
+   `(iedit-occurrence ((,class :inherit modus-theme-refine-blue)))
+   `(iedit-read-only-occurrence ((,class :inherit modus-theme-intense-yellow)))
    ;;;; iflipb
-   `(iflipb-current-buffer-face ((,class (:foreground ,cyan-alt :weight 
bold))))
-   `(iflipb-other-buffer-face ((,class (:foreground ,fg-alt))))
+   `(iflipb-current-buffer-face ((,class :foreground ,cyan-alt :weight bold)))
+   `(iflipb-other-buffer-face ((,class :foreground ,fg-alt)))
    ;;;; imenu-list
-   `(imenu-list-entry-face-0 ((,class (:foreground ,cyan))))
-   `(imenu-list-entry-face-1 ((,class (:foreground ,blue))))
-   `(imenu-list-entry-face-2 ((,class (:foreground ,cyan-alt-other))))
-   `(imenu-list-entry-face-3 ((,class (:foreground ,blue-alt))))
-   `(imenu-list-entry-subalist-face-0 ((,class (:foreground ,magenta-alt-other 
:weight bold :underline t))))
-   `(imenu-list-entry-subalist-face-1 ((,class (:foreground ,magenta :weight 
bold :underline t))))
-   `(imenu-list-entry-subalist-face-2 ((,class (:foreground ,green-alt-other 
:weight bold :underline t))))
-   `(imenu-list-entry-subalist-face-3 ((,class (:foreground ,red-alt-other 
:weight bold :underline t))))
+   `(imenu-list-entry-face-0 ((,class :foreground ,cyan)))
+   `(imenu-list-entry-face-1 ((,class :foreground ,blue)))
+   `(imenu-list-entry-face-2 ((,class :foreground ,cyan-alt-other)))
+   `(imenu-list-entry-face-3 ((,class :foreground ,blue-alt)))
+   `(imenu-list-entry-subalist-face-0 ((,class :foreground ,magenta-alt-other 
:weight bold :underline t)))
+   `(imenu-list-entry-subalist-face-1 ((,class :foreground ,magenta :weight 
bold :underline t)))
+   `(imenu-list-entry-subalist-face-2 ((,class :foreground ,green-alt-other 
:weight bold :underline t)))
+   `(imenu-list-entry-subalist-face-3 ((,class :foreground ,red-alt-other 
:weight bold :underline t)))
    ;;;; indium
-   `(indium-breakpoint-face ((,class (:foreground ,red-active))))
-   `(indium-frame-url-face ((,class (:foreground ,fg-alt :underline t))))
-   `(indium-keyword-face ((,class (:foreground ,magenta-alt-other))))
-   `(indium-litable-face ((,class (:foreground ,fg-special-warm :slant 
,modus-theme-slant))))
-   `(indium-repl-error-face ((,class (:foreground ,red :weight bold))))
-   `(indium-repl-prompt-face ((,class (:foreground ,cyan-alt-other))))
-   `(indium-repl-stdout-face ((,class (:foreground ,fg-main))))
+   `(indium-breakpoint-face ((,class :foreground ,red-active)))
+   `(indium-frame-url-face ((,class :foreground ,fg-alt :underline t)))
+   `(indium-keyword-face ((,class :foreground ,magenta-alt-other)))
+   `(indium-litable-face ((,class :foreground ,fg-special-warm :slant 
,modus-theme-slant)))
+   `(indium-repl-error-face ((,class :foreground ,red :weight bold)))
+   `(indium-repl-prompt-face ((,class :foreground ,cyan-alt-other)))
+   `(indium-repl-stdout-face ((,class :foreground ,fg-main)))
    ;;;; info
-   `(Info-quoted ((,class (:foreground ,magenta)))) ; the capitalisation is 
canonical
-   `(info-header-node ((,class (:foreground ,fg-alt :weight bold))))
-   `(info-header-xref ((,class (:foreground ,blue-active))))
-   `(info-index-match ((,class (:inherit match))))
-   `(info-menu-header ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,fg-main :weight bold
-                                         ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2)))))
-   `(info-menu-star ((,class (:foreground ,fg-main))))
-   `(info-node ((,class (:weight bold))))
-   `(info-title-1 ((,class (:inherit ,modus-theme-variable-pitch :foreground 
,fg-main :weight bold
-                                     ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
-   `(info-title-2 ((,class (:inherit ,modus-theme-variable-pitch :foreground 
,fg-special-warm :weight bold
-                                     ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3)))))
-   `(info-title-3 ((,class (:inherit ,modus-theme-variable-pitch :foreground 
,fg-special-cold :weight bold
-                                     ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2)))))
-   `(info-title-4 ((,class (:inherit ,modus-theme-variable-pitch :foreground 
,fg-special-mild :weight bold
-                                     ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-1)))))
+   `(Info-quoted ((,class :foreground ,magenta))) ; the capitalisation is 
canonical
+   `(info-header-node ((,class :foreground ,fg-alt :weight bold)))
+   `(info-header-xref ((,class :foreground ,blue-active)))
+   `(info-index-match ((,class :inherit match)))
+   `(info-menu-header ((,class :inherit ,modus-theme-variable-pitch 
:foreground ,fg-main :weight bold
+                               ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2))))
+   `(info-menu-star ((,class :foreground ,fg-main)))
+   `(info-node ((,class :weight bold)))
+   `(info-title-1 ((,class :inherit ,modus-theme-variable-pitch :foreground 
,fg-main :weight bold
+                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(info-title-2 ((,class :inherit ,modus-theme-variable-pitch :foreground 
,fg-special-warm :weight bold
+                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3))))
+   `(info-title-3 ((,class :inherit ,modus-theme-variable-pitch :foreground 
,fg-special-cold :weight bold
+                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2))))
+   `(info-title-4 ((,class :inherit ,modus-theme-variable-pitch :foreground 
,fg-special-mild :weight bold
+                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-1))))
    ;;;; info-colors
-   `(info-colors-lisp-code-block ((,class (:inherit fixed-pitch))))
-   `(info-colors-ref-item-command ((,class (:foreground ,magenta))))
-   `(info-colors-ref-item-constant ((,class (:foreground ,blue-alt-other))))
-   `(info-colors-ref-item-function ((,class (:foreground ,magenta))))
-   `(info-colors-ref-item-macro ((,class (:foreground ,magenta-alt-other 
:weight ,modus-theme-bold))))
-   `(info-colors-ref-item-other ((,class (:foreground ,cyan))))
-   `(info-colors-ref-item-special-form ((,class (:foreground 
,magenta-alt-other :weight ,modus-theme-bold))))
-   `(info-colors-ref-item-syntax-class ((,class (:foreground ,magenta))))
-   `(info-colors-ref-item-type ((,class (:foreground ,magenta-alt))))
-   `(info-colors-ref-item-user-option ((,class (:foreground ,cyan))))
-   `(info-colors-ref-item-variable ((,class (:foreground ,cyan))))
+   `(info-colors-lisp-code-block ((,class :inherit fixed-pitch)))
+   `(info-colors-ref-item-command ((,class :foreground ,magenta)))
+   `(info-colors-ref-item-constant ((,class :foreground ,blue-alt-other)))
+   `(info-colors-ref-item-function ((,class :foreground ,magenta)))
+   `(info-colors-ref-item-macro ((,class :foreground ,magenta-alt-other 
:weight ,modus-theme-bold)))
+   `(info-colors-ref-item-other ((,class :foreground ,cyan)))
+   `(info-colors-ref-item-special-form ((,class :foreground ,magenta-alt-other 
:weight ,modus-theme-bold)))
+   `(info-colors-ref-item-syntax-class ((,class :foreground ,magenta)))
+   `(info-colors-ref-item-type ((,class :foreground ,magenta-alt)))
+   `(info-colors-ref-item-user-option ((,class :foreground ,cyan)))
+   `(info-colors-ref-item-variable ((,class :foreground ,cyan)))
    ;;;; interaction-log
-   `(ilog-buffer-face ((,class (:foreground ,magenta-alt-other))))
-   `(ilog-change-face ((,class (:foreground ,magenta-alt))))
-   `(ilog-echo-face ((,class (:foreground ,yellow-alt-other))))
-   `(ilog-load-face ((,class (:foreground ,green))))
-   `(ilog-message-face ((,class (:foreground ,fg-alt))))
-   `(ilog-non-change-face ((,class (:foreground ,blue))))
+   `(ilog-buffer-face ((,class :foreground ,magenta-alt-other)))
+   `(ilog-change-face ((,class :foreground ,magenta-alt)))
+   `(ilog-echo-face ((,class :foreground ,yellow-alt-other)))
+   `(ilog-load-face ((,class :foreground ,green)))
+   `(ilog-message-face ((,class :foreground ,fg-alt)))
+   `(ilog-non-change-face ((,class :foreground ,blue)))
    ;;;; ioccur
-   `(ioccur-cursor ((,class (:foreground ,fg-main))))
-   `(ioccur-invalid-regexp ((,class (:foreground ,red))))
-   `(ioccur-match-face ((,class (:inherit modus-theme-special-calm))))
-   `(ioccur-match-overlay-face ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                         :inherit modus-theme-special-cold))))
-   `(ioccur-num-line-face ((,class (:foreground ,fg-special-warm))))
-   `(ioccur-overlay-face ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                   :inherit modus-theme-refine-blue))))
-   `(ioccur-regexp-face ((,class (:inherit modus-theme-intense-magenta :weight 
bold))))
-   `(ioccur-title-face ((,class (:foreground ,red-alt :weight bold
-                                             ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
+   `(ioccur-cursor ((,class :foreground ,fg-main)))
+   `(ioccur-invalid-regexp ((,class :foreground ,red)))
+   `(ioccur-match-face ((,class :inherit modus-theme-special-calm)))
+   `(ioccur-match-overlay-face ((,class ,@(and (>= emacs-major-version 27) 
'(:extend t))
+                                        :inherit modus-theme-special-cold)))
+   `(ioccur-num-line-face ((,class :foreground ,fg-special-warm)))
+   `(ioccur-overlay-face ((,class ,@(and (>= emacs-major-version 27) '(:extend 
t))
+                                  :inherit modus-theme-refine-blue)))
+   `(ioccur-regexp-face ((,class :inherit modus-theme-intense-magenta :weight 
bold)))
+   `(ioccur-title-face ((,class :foreground ,red-alt :weight bold
+                                ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
    ;;;; isearch, occur, and the like
-   `(isearch ((,class (:inherit modus-theme-intense-green :weight bold))))
-   `(isearch-fail ((,class (:inherit modus-theme-refine-red))))
-   `(lazy-highlight ((,class (:inherit modus-theme-refine-cyan))))
-   `(match ((,class (:inherit modus-theme-special-calm))))
-   `(query-replace ((,class (:inherit modus-theme-intense-yellow :weight 
bold))))
+   `(isearch ((,class :inherit modus-theme-intense-green :weight bold)))
+   `(isearch-fail ((,class :inherit modus-theme-refine-red)))
+   `(lazy-highlight ((,class :inherit modus-theme-refine-cyan)))
+   `(match ((,class :inherit modus-theme-special-calm)))
+   `(query-replace ((,class :inherit modus-theme-intense-yellow :weight bold)))
    ;;;; ivy
-   `(ivy-action ((,class (:foreground ,red-alt :weight bold))))
-   `(ivy-completions-annotations ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(ivy-confirm-face ((,class (:foreground ,cyan))))
-   `(ivy-current-match ((,class (,@(and (>= emacs-major-version 27) '(:extend 
t))
-                                 :inherit modus-theme-intense-cyan :weight 
bold))))
-   `(ivy-cursor ((,class (:background ,fg-main :foreground ,bg-main))))
-   `(ivy-grep-info ((,class (:foreground ,cyan-alt))))
-   `(ivy-grep-line-number ((,class (:foreground ,fg-special-warm))))
-   `(ivy-highlight-face ((,class (:foreground ,magenta))))
-   `(ivy-match-required-face ((,class (:inherit error))))
-   `(ivy-minibuffer-match-face-1 ((,class (:inherit 
modus-theme-intense-neutral))))
-   `(ivy-minibuffer-match-face-2 ((,class (:inherit modus-theme-refine-green 
:weight bold))))
-   `(ivy-minibuffer-match-face-3 ((,class (:inherit modus-theme-refine-cyan 
:weight bold))))
-   `(ivy-minibuffer-match-face-4 ((,class (:inherit modus-theme-refine-magenta 
:weight bold))))
-   `(ivy-minibuffer-match-highlight ((,class (:inherit modus-theme-subtle-blue 
:weight bold))))
-   `(ivy-modified-buffer ((,class (:foreground ,yellow :slant 
,modus-theme-slant))))
-   `(ivy-modified-outside-buffer ((,class (:foreground ,yellow-alt :slant 
,modus-theme-slant))))
-   `(ivy-org ((,class (:foreground ,cyan-alt-other))))
-   `(ivy-prompt-match ((,class (:inherit ivy-current-match))))
-   `(ivy-remote ((,class (:foreground ,magenta))))
-   `(ivy-separator ((,class (:foreground ,fg-alt))))
-   `(ivy-subdir ((,class (:foreground ,blue-alt-other))))
-   `(ivy-virtual ((,class (:foreground ,magenta-alt-other))))
-   `(ivy-yanked-word ((,class (:inherit modus-theme-refine-blue))))
+   `(ivy-action ((,class :foreground ,red-alt :weight bold)))
+   `(ivy-completions-annotations ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(ivy-confirm-face ((,class :foreground ,cyan)))
+   `(ivy-current-match ((,class ,@(and (>= emacs-major-version 27) '(:extend 
t))
+                                :inherit modus-theme-intense-cyan :weight 
bold)))
+   `(ivy-cursor ((,class :background ,fg-main :foreground ,bg-main)))
+   `(ivy-grep-info ((,class :foreground ,cyan-alt)))
+   `(ivy-grep-line-number ((,class :foreground ,fg-special-warm)))
+   `(ivy-highlight-face ((,class :foreground ,magenta)))
+   `(ivy-match-required-face ((,class :inherit error)))
+   `(ivy-minibuffer-match-face-1 ((,class :inherit 
modus-theme-intense-neutral)))
+   `(ivy-minibuffer-match-face-2 ((,class :inherit modus-theme-refine-green 
:weight bold)))
+   `(ivy-minibuffer-match-face-3 ((,class :inherit modus-theme-refine-cyan 
:weight bold)))
+   `(ivy-minibuffer-match-face-4 ((,class :inherit modus-theme-refine-magenta 
:weight bold)))
+   `(ivy-minibuffer-match-highlight ((,class :inherit modus-theme-subtle-blue 
:weight bold)))
+   `(ivy-modified-buffer ((,class :foreground ,yellow :slant 
,modus-theme-slant)))
+   `(ivy-modified-outside-buffer ((,class :foreground ,yellow-alt :slant 
,modus-theme-slant)))
+   `(ivy-org ((,class :foreground ,cyan-alt-other)))
+   `(ivy-prompt-match ((,class :inherit ivy-current-match)))
+   `(ivy-remote ((,class :foreground ,magenta)))
+   `(ivy-separator ((,class :foreground ,fg-alt)))
+   `(ivy-subdir ((,class :foreground ,blue-alt-other)))
+   `(ivy-virtual ((,class :foreground ,magenta-alt-other)))
+   `(ivy-yanked-word ((,class :inherit modus-theme-refine-blue)))
    ;;;; ivy-posframe
-   `(ivy-posframe ((,class (:background ,bg-dim :foreground ,fg-main))))
-   `(ivy-posframe-border ((,class (:background ,bg-active))))
-   `(ivy-posframe-cursor ((,class (:background ,fg-main :foreground 
,bg-main))))
+   `(ivy-posframe ((,class :background ,bg-dim :foreground ,fg-main)))
+   `(ivy-posframe-border ((,class :background ,bg-active)))
+   `(ivy-posframe-cursor ((,class :background ,fg-main :foreground ,bg-main)))
    ;;;; jira (org-jira)
-   `(jiralib-comment-face ((,class (:background ,bg-alt))))
-   `(jiralib-comment-header-face ((,class (:weight bold))))
-   `(jiralib-issue-info-face ((,class (:inherit modus-theme-special-warm))))
-   `(jiralib-issue-info-header-face ((,class (:inherit 
modus-theme-special-warm :weight bold))))
-   `(jiralib-issue-summary-face ((,class (:weight bold))))
-   `(jiralib-link-filter-face ((,class (:underline t))))
-   `(jiralib-link-issue-face ((,class (:underline t))))
-   `(jiralib-link-project-face ((,class (:underline t))))
+   `(jiralib-comment-face ((,class :background ,bg-alt)))
+   `(jiralib-comment-header-face ((,class :weight bold)))
+   `(jiralib-issue-info-face ((,class :inherit modus-theme-special-warm)))
+   `(jiralib-issue-info-header-face ((,class :inherit modus-theme-special-warm 
:weight bold)))
+   `(jiralib-issue-summary-face ((,class :weight bold)))
+   `(jiralib-link-filter-face ((,class :underline t)))
+   `(jiralib-link-issue-face ((,class :underline t)))
+   `(jiralib-link-project-face ((,class :underline t)))
    ;;;; journalctl-mode
-   `(journalctl-error-face ((,class (:foreground ,red :weight bold))))
-   `(journalctl-finished-face ((,class (:foreground ,green :weight bold))))
-   `(journalctl-host-face ((,class (:foreground ,blue))))
-   `(journalctl-process-face ((,class (:foreground ,cyan-alt-other))))
-   `(journalctl-starting-face ((,class (:foreground ,green))))
-   `(journalctl-timestamp-face ((,class (:foreground ,fg-special-cold))))
-   `(journalctl-warning-face ((,class (:foreground ,yellow :weight bold))))
+   `(journalctl-error-face ((,class :foreground ,red :weight bold)))
+   `(journalctl-finished-face ((,class :foreground ,green :weight bold)))
+   `(journalctl-host-face ((,class :foreground ,blue)))
+   `(journalctl-process-face ((,class :foreground ,cyan-alt-other)))
+   `(journalctl-starting-face ((,class :foreground ,green)))
+   `(journalctl-timestamp-face ((,class :foreground ,fg-special-cold)))
+   `(journalctl-warning-face ((,class :foreground ,yellow :weight bold)))
    ;;;; js2-mode
-   `(js2-error ((,class (:foreground ,red))))
-   `(js2-external-variable ((,class (:foreground ,cyan-alt-other))))
-   `(js2-function-call ((,class (:foreground ,magenta))))
-   `(js2-function-param ((,class (:foreground ,blue))))
-   `(js2-instance-member ((,class (:foreground ,magenta-alt-other))))
-   `(js2-jsdoc-html-tag-delimiter ((,class (:foreground ,fg-main))))
-   `(js2-jsdoc-html-tag-name ((,class (:foreground ,cyan))))
-   `(js2-jsdoc-tag ((,class (:foreground ,fg-special-calm))))
-   `(js2-jsdoc-type ((,class (:foreground ,fg-special-cold))))
-   `(js2-jsdoc-value ((,class (:foreground ,fg-special-warm))))
-   `(js2-object-property ((,class (:foreground ,fg-main))))
-   `(js2-object-property-access ((,class (:foreground ,fg-main))))
-   `(js2-private-function-call ((,class (:foreground ,green-alt-other))))
-   `(js2-private-member ((,class (:foreground ,fg-special-mild))))
-   `(js2-warning ((,class (:foreground ,yellow-alt :underline t))))
+   `(js2-error ((,class :foreground ,red)))
+   `(js2-external-variable ((,class :foreground ,cyan-alt-other)))
+   `(js2-function-call ((,class :foreground ,magenta)))
+   `(js2-function-param ((,class :foreground ,blue)))
+   `(js2-instance-member ((,class :foreground ,magenta-alt-other)))
+   `(js2-jsdoc-html-tag-delimiter ((,class :foreground ,fg-main)))
+   `(js2-jsdoc-html-tag-name ((,class :foreground ,cyan)))
+   `(js2-jsdoc-tag ((,class :foreground ,fg-special-calm)))
+   `(js2-jsdoc-type ((,class :foreground ,fg-special-cold)))
+   `(js2-jsdoc-value ((,class :foreground ,fg-special-warm)))
+   `(js2-object-property ((,class :foreground ,fg-main)))
+   `(js2-object-property-access ((,class :foreground ,fg-main)))
+   `(js2-private-function-call ((,class :foreground ,green-alt-other)))
+   `(js2-private-member ((,class :foreground ,fg-special-mild)))
+   `(js2-warning ((,class :foreground ,yellow-alt :underline t)))
    ;;;; julia
-   `(julia-macro-face ((,class (:foreground ,magenta :weight 
,modus-theme-bold))))
-   `(julia-quoted-symbol-face ((,class (:foreground ,blue-alt-other))))
+   `(julia-macro-face ((,class :foreground ,magenta :weight 
,modus-theme-bold)))
+   `(julia-quoted-symbol-face ((,class :foreground ,blue-alt-other)))
    ;;;; jupyter
-   `(jupyter-eval-overlay ((,class (:foreground ,blue :weight bold))))
-   `(jupyter-repl-input-prompt ((,class (:foreground ,cyan-alt-other))))
-   `(jupyter-repl-output-prompt ((,class (:foreground ,magenta-alt-other))))
-   `(jupyter-repl-traceback ((,class (:inherit modus-theme-intense-red))))
+   `(jupyter-eval-overlay ((,class :foreground ,blue :weight bold)))
+   `(jupyter-repl-input-prompt ((,class :foreground ,cyan-alt-other)))
+   `(jupyter-repl-output-prompt ((,class :foreground ,magenta-alt-other)))
+   `(jupyter-repl-traceback ((,class :inherit modus-theme-intense-red)))
    ;;;; kaocha-runner
-   `(kaocha-runner-error-face ((,class (:foreground ,red))))
-   `(kaocha-runner-success-face ((,class (:foreground ,green))))
-   `(kaocha-runner-warning-face ((,class (:foreground ,yellow))))
+   `(kaocha-runner-error-face ((,class :foreground ,red)))
+   `(kaocha-runner-success-face ((,class :foreground ,green)))
+   `(kaocha-runner-warning-face ((,class :foreground ,yellow)))
    ;;;; keycast
-   `(keycast-command ((,class (:foreground ,blue-active :weight bold))))
-   `(keycast-key ((,class (:box ,(modus-vivendi-theme-modeline-box 
blue-intense blue-active t -3)
-                                ,@(modus-vivendi-theme-modeline-props
-                                   blue-active bg-main
-                                   blue-active bg-active)))))
+   `(keycast-command ((,class :foreground ,blue-active :weight bold)))
+   `(keycast-key ((,class :box ,(modus-vivendi-theme-modeline-box blue-intense 
blue-active t -3)
+                          ,@(modus-vivendi-theme-modeline-props
+                             blue-active bg-main
+                             blue-active bg-active))))
    ;;;; line numbers (display-line-numbers-mode and global variant)
-   `(line-number ((,class (:background ,bg-dim :foreground ,fg-alt))))
-   `(line-number-current-line ((,class (:background ,bg-active :foreground 
,fg-active :weight bold))))
+   `(line-number ((,class :background ,bg-dim :foreground ,fg-alt)))
+   `(line-number-current-line ((,class :background ,bg-active :foreground 
,fg-active :weight bold)))
    ;;;; lsp-mode
-   `(lsp-face-highlight-read ((,class (:inherit modus-theme-subtle-blue 
:underline t))))
-   `(lsp-face-highlight-textual ((,class (:inherit modus-theme-subtle-blue))))
-   `(lsp-face-highlight-write ((,class (:inherit modus-theme-refine-blue 
:weight bold))))
-   `(lsp-face-semhl-constant ((,class (:foreground ,blue-alt-other))))
+   `(lsp-face-highlight-read ((,class :inherit modus-theme-subtle-blue 
:underline t)))
+   `(lsp-face-highlight-textual ((,class :inherit modus-theme-subtle-blue)))
+   `(lsp-face-highlight-write ((,class :inherit modus-theme-refine-blue 
:weight bold)))
+   `(lsp-face-semhl-constant ((,class :foreground ,blue-alt-other)))
    `(lsp-face-semhl-deprecated
      ((,(append '((supports :underline (:style wave))) class)
-       (:foreground ,yellow :underline (:style wave)))
-      (,class (:foreground ,yellow :underline t))))
-   `(lsp-face-semhl-enummember ((,class (:foreground ,blue-alt-other))))
-   `(lsp-face-semhl-field ((,class (:foreground ,cyan-alt))))
-   `(lsp-face-semhl-field-static ((,class (:foreground ,cyan-alt :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-function ((,class (:foreground ,magenta))))
-   `(lsp-face-semhl-method ((,class (:foreground ,magenta))))
-   `(lsp-face-semhl-namespace ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(lsp-face-semhl-preprocessor ((,class (:foreground ,magenta))))
-   `(lsp-face-semhl-static-method ((,class (:foreground ,magenta :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-type-class ((,class (:foreground ,magenta-alt))))
-   `(lsp-face-semhl-type-enum ((,class (:foreground ,magenta-alt))))
-   `(lsp-face-semhl-type-primitive ((,class (:foreground ,magenta-alt :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-type-template ((,class (:foreground ,magenta-alt :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-type-typedef ((,class (:foreground ,magenta-alt :slant 
,modus-theme-slant))))
-   `(lsp-face-semhl-variable ((,class (:foreground ,cyan))))
-   `(lsp-face-semhl-variable-local ((,class (:foreground ,cyan))))
-   `(lsp-face-semhl-variable-parameter ((,class (:foreground 
,cyan-alt-other))))
-   `(lsp-lens-face ((,class (:height 0.8 :foreground ,fg-alt))))
-   `(lsp-lens-mouse-face ((,class (:height 0.8 :foreground ,blue-alt-other 
:underline t))))
-   `(lsp-ui-doc-background ((,class (:background ,bg-alt))))
-   `(lsp-ui-doc-header ((,class (:background ,bg-header :foreground 
,fg-header))))
-   `(lsp-ui-doc-url ((,class (:foreground ,blue-alt-other :underline t))))
-   `(lsp-ui-peek-filename ((,class (:foreground ,fg-special-warm))))
-   `(lsp-ui-peek-footer ((,class (:background ,bg-header :foreground 
,fg-header))))
-   `(lsp-ui-peek-header ((,class (:background ,bg-header :foreground 
,fg-header))))
-   `(lsp-ui-peek-highlight ((,class (:inherit modus-theme-subtle-blue))))
-   `(lsp-ui-peek-line-number ((,class (:foreground ,fg-alt))))
-   `(lsp-ui-peek-list ((,class (:background ,bg-dim))))
-   `(lsp-ui-peek-peek ((,class (:background ,bg-alt))))
-   `(lsp-ui-peek-selection ((,class (:inherit modus-theme-subtle-cyan))))
-   `(lsp-ui-sideline-code-action ((,class (:foreground ,yellow))))
-   `(lsp-ui-sideline-current-symbol ((,class (:height 0.99 :box (:line-width 
-1 :style nil) :foreground ,fg-main :weight bold))))
-   `(lsp-ui-sideline-symbol ((,class (:height 0.99 :box (:line-width -1 :style 
nil) :foreground ,fg-alt :weight bold))))
-   `(lsp-ui-sideline-symbol-info ((,class (:height 0.99 :slant italic))))
+       :foreground ,yellow :underline (:style wave))
+      (,class :foreground ,yellow :underline t)))
+   `(lsp-face-semhl-enummember ((,class :foreground ,blue-alt-other)))
+   `(lsp-face-semhl-field ((,class :foreground ,cyan-alt)))
+   `(lsp-face-semhl-field-static ((,class :foreground ,cyan-alt :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-function ((,class :foreground ,magenta)))
+   `(lsp-face-semhl-method ((,class :foreground ,magenta)))
+   `(lsp-face-semhl-namespace ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(lsp-face-semhl-preprocessor ((,class :foreground ,magenta)))
+   `(lsp-face-semhl-static-method ((,class :foreground ,magenta :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-type-class ((,class :foreground ,magenta-alt)))
+   `(lsp-face-semhl-type-enum ((,class :foreground ,magenta-alt)))
+   `(lsp-face-semhl-type-primitive ((,class :foreground ,magenta-alt :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-type-template ((,class :foreground ,magenta-alt :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-type-typedef ((,class :foreground ,magenta-alt :slant 
,modus-theme-slant)))
+   `(lsp-face-semhl-variable ((,class :foreground ,cyan)))
+   `(lsp-face-semhl-variable-local ((,class :foreground ,cyan)))
+   `(lsp-face-semhl-variable-parameter ((,class :foreground ,cyan-alt-other)))
+   `(lsp-lens-face ((,class :height 0.8 :foreground ,fg-alt)))
+   `(lsp-lens-mouse-face ((,class :height 0.8 :foreground ,blue-alt-other 
:underline t)))
+   `(lsp-ui-doc-background ((,class :background ,bg-alt)))
+   `(lsp-ui-doc-header ((,class :background ,bg-header :foreground 
,fg-header)))
+   `(lsp-ui-doc-url ((,class :foreground ,blue-alt-other :underline t)))
+   `(lsp-ui-peek-filename ((,class :foreground ,fg-special-warm)))
+   `(lsp-ui-peek-footer ((,class :background ,bg-header :foreground 
,fg-header)))
+   `(lsp-ui-peek-header ((,class :background ,bg-header :foreground 
,fg-header)))
+   `(lsp-ui-peek-highlight ((,class :inherit modus-theme-subtle-blue)))
+   `(lsp-ui-peek-line-number ((,class :foreground ,fg-alt)))
+   `(lsp-ui-peek-list ((,class :background ,bg-dim)))
+   `(lsp-ui-peek-peek ((,class :background ,bg-alt)))
+   `(lsp-ui-peek-selection ((,class :inherit modus-theme-subtle-cyan)))
+   `(lsp-ui-sideline-code-action ((,class :foreground ,yellow)))
+   `(lsp-ui-sideline-current-symbol ((,class :height 0.99 :box (:line-width -1 
:style nil) :foreground ,fg-main :weight bold)))
+   `(lsp-ui-sideline-symbol ((,class :height 0.99 :box (:line-width -1 :style 
nil) :foreground ,fg-alt :weight bold)))
+   `(lsp-ui-sideline-symbol-info ((,class :height 0.99 :slant italic)))
    ;;;; magit
-   `(magit-bisect-bad ((,class (:foreground ,red-alt-other))))
-   `(magit-bisect-good ((,class (:foreground ,green-alt-other))))
-   `(magit-bisect-skip ((,class (:foreground ,yellow-alt-other))))
-   `(magit-blame-date ((,class (:foreground ,fg-dim))))
-   `(magit-blame-dimmed ((,class (:foreground ,fg-inactive))))
-   `(magit-blame-hash ((,class (:foreground ,fg-special-warm))))
-   `(magit-blame-heading ((,class (:background ,bg-main :foreground 
,fg-special-cold :weight bold))))
-   `(magit-blame-highlight ((,class (:inherit modus-theme-special-cold :weight 
bold))))
-   `(magit-blame-margin ((,class (:inherit magit-blame-highlight))))
-   `(magit-blame-name ((,class (:foreground ,fg-main))))
-   `(magit-blame-summary ((,class (:foreground ,fg-main))))
-   `(magit-branch-current ((,class (:foreground ,blue-alt-other :box t))))
-   `(magit-branch-local ((,class (:foreground ,blue-alt))))
-   `(magit-branch-remote ((,class (:foreground ,magenta-alt))))
-   `(magit-branch-remote-head ((,class (:foreground ,magenta-alt-other :box 
t))))
-   `(magit-branch-upstream ((,class (:slant italic))))
-   `(magit-cherry-equivalent ((,class (:background ,bg-main :foreground 
,magenta-intense))))
-   `(magit-cherry-unmatched ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-diff-added ((,class ,(modus-vivendi-theme-diffs
-                                 bg-main green
-                                 bg-diff-added fg-diff-added))))
-   `(magit-diff-added-highlight ((,class ,(modus-vivendi-theme-diffs
-                                           bg-dim green
-                                           bg-diff-focus-added 
fg-diff-focus-added))))
-   `(magit-diff-base ((,class ,(modus-vivendi-theme-diffs
-                                bg-main yellow
-                                bg-diff-changed fg-diff-changed))))
-   `(magit-diff-base-highlight ((,class ,(modus-vivendi-theme-diffs
-                                          bg-dim yellow
-                                          bg-diff-focus-changed 
fg-diff-focus-changed))))
-   `(magit-diff-context ((,class (:foreground ,fg-unfocused))))
-   `(magit-diff-context-highlight ((,class ,(modus-vivendi-theme-diffs
-                                             bg-dim fg-dim
-                                             bg-inactive fg-inactive))))
-   `(magit-diff-file-heading ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(magit-diff-file-heading-highlight ((,class (:inherit 
modus-theme-special-cold :weight bold))))
-   `(magit-diff-file-heading-selection ((,class (:background ,bg-alt 
:foreground ,cyan))))
-   `(magit-diff-hunk-heading ((,class (:background ,bg-active :foreground 
,fg-inactive :weight bold))))
-   `(magit-diff-hunk-heading-highlight ((,class (:inherit 
modus-theme-diff-heading :weight bold))))
-   `(magit-diff-hunk-heading-selection ((,class (:inherit 
modus-theme-intense-cyan))))
-   `(magit-diff-hunk-region ((,class (:weight bold))))
-   `(magit-diff-lines-boundary ((,class (:background ,fg-main))))
-   `(magit-diff-lines-heading ((,class (:inherit modus-theme-refine-magenta))))
-   `(magit-diff-removed ((,class ,(modus-vivendi-theme-diffs
-                                   bg-main red
-                                   bg-diff-removed fg-diff-removed))))
-   `(magit-diff-removed-highlight ((,class ,(modus-vivendi-theme-diffs
-                                             bg-dim red
-                                             bg-diff-focus-removed 
fg-diff-focus-removed))))
-   `(magit-diffstat-added ((,class (:foreground ,green))))
-   `(magit-diffstat-removed ((,class (:foreground ,red))))
-   `(magit-dimmed ((,class (:foreground ,fg-alt))))
-   `(magit-filename ((,class (:foreground ,fg-special-cold))))
-   `(magit-hash ((,class (:foreground ,fg-special-warm))))
-   `(magit-head ((,class (:inherit magit-branch-local))))
-   `(magit-header-line ((,class (:foreground ,cyan-active :weight bold))))
-   `(magit-header-line-key ((,class (:foreground ,red-active :weight bold))))
-   `(magit-header-line-log-select ((,class (:foreground ,fg-main :weight 
bold))))
-   `(magit-keyword ((,class (:foreground ,magenta))))
-   `(magit-keyword-squash ((,class (:foreground ,yellow-alt-other :weight 
bold))))
-   `(magit-log-author ((,class (:foreground ,cyan))))
-   `(magit-log-date ((,class (:foreground ,magenta))))
-   `(magit-log-graph ((,class (:foreground ,fg-dim))))
-   `(magit-mode-line-process ((,class (:foreground ,blue-active :weight 
bold))))
-   `(magit-mode-line-process-error ((,class (:foreground ,red-active :weight 
bold))))
-   `(magit-process-ng ((,class (:inherit error))))
-   `(magit-process-ok ((,class (:inherit success))))
-   `(magit-reflog-amend ((,class (:background ,bg-main :foreground 
,magenta-intense))))
-   `(magit-reflog-checkout ((,class (:background ,bg-main :foreground 
,blue-intense))))
-   `(magit-reflog-cherry-pick ((,class (:background ,bg-main :foreground 
,green-intense))))
-   `(magit-reflog-commit ((,class (:background ,bg-main :foreground 
,green-intense))))
-   `(magit-reflog-merge ((,class (:background ,bg-main :foreground 
,green-intense))))
-   `(magit-reflog-other ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-reflog-rebase ((,class (:background ,bg-main :foreground 
,magenta-intense))))
-   `(magit-reflog-remote ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-reflog-reset ((,class (:background ,bg-main :foreground 
,red-intense))))
-   `(magit-refname ((,class (:foreground ,fg-alt))))
-   `(magit-refname-pullreq ((,class (:foreground ,fg-alt))))
-   `(magit-refname-stash ((,class (:foreground ,fg-alt))))
-   `(magit-refname-wip ((,class (:foreground ,fg-alt))))
-   `(magit-section ((,class (:background ,bg-dim :foreground ,fg-main))))
-   `(magit-section-heading ((,class (:foreground ,cyan-alt-other :weight 
bold))))
-   `(magit-section-heading-selection ((,class (:inherit 
modus-theme-refine-cyan :weight bold))))
-   `(magit-section-highlight ((,class (:background ,bg-alt))))
-   `(magit-sequence-done ((,class (:foreground ,green-alt))))
-   `(magit-sequence-drop ((,class (:foreground ,red-alt))))
-   `(magit-sequence-exec ((,class (:foreground ,magenta-alt))))
-   `(magit-sequence-head ((,class (:foreground ,cyan-alt))))
-   `(magit-sequence-onto ((,class (:foreground ,fg-alt))))
-   `(magit-sequence-part ((,class (:foreground ,yellow-alt))))
-   `(magit-sequence-pick ((,class (:foreground ,blue-alt))))
-   `(magit-sequence-stop ((,class (:foreground ,red))))
-   `(magit-signature-bad ((,class (:background ,bg-main :foreground 
,red-intense :weight bold))))
-   `(magit-signature-error ((,class (:background ,bg-main :foreground 
,red-intense))))
-   `(magit-signature-expired ((,class (:background ,bg-main :foreground 
,yellow-intense))))
-   `(magit-signature-expired-key ((,class (:background ,bg-main :foreground 
,yellow-intense))))
-   `(magit-signature-good ((,class (:background ,bg-main :foreground 
,green-intense))))
-   `(magit-signature-revoked ((,class (:background ,bg-main :foreground 
,magenta-intense))))
-   `(magit-signature-untrusted ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-tag ((,class (:foreground ,green-alt))))
+   `(magit-bisect-bad ((,class :foreground ,red-alt-other)))
+   `(magit-bisect-good ((,class :foreground ,green-alt-other)))
+   `(magit-bisect-skip ((,class :foreground ,yellow-alt-other)))
+   `(magit-blame-date ((,class :foreground ,fg-dim)))
+   `(magit-blame-dimmed ((,class :foreground ,fg-inactive)))
+   `(magit-blame-hash ((,class :foreground ,fg-special-warm)))
+   `(magit-blame-heading ((,class :background ,bg-main :foreground 
,fg-special-cold :weight bold)))
+   `(magit-blame-highlight ((,class :inherit modus-theme-special-cold :weight 
bold)))
+   `(magit-blame-margin ((,class :inherit magit-blame-highlight)))
+   `(magit-blame-name ((,class :foreground ,fg-main)))
+   `(magit-blame-summary ((,class :foreground ,fg-main)))
+   `(magit-branch-current ((,class :foreground ,blue-alt-other :box t)))
+   `(magit-branch-local ((,class :foreground ,blue-alt)))
+   `(magit-branch-remote ((,class :foreground ,magenta-alt)))
+   `(magit-branch-remote-head ((,class :foreground ,magenta-alt-other :box t)))
+   `(magit-branch-upstream ((,class :slant italic)))
+   `(magit-cherry-equivalent ((,class :background ,bg-main :foreground 
,magenta-intense)))
+   `(magit-cherry-unmatched ((,class :background ,bg-main :foreground 
,cyan-intense)))
+   `(magit-diff-added ((,class ,@(modus-vivendi-theme-diffs
+                                  bg-main green
+                                  bg-diff-added fg-diff-added))))
+   `(magit-diff-added-highlight ((,class ,@(modus-vivendi-theme-diffs
+                                            bg-dim green
+                                            bg-diff-focus-added 
fg-diff-focus-added))))
+   `(magit-diff-base ((,class ,@(modus-vivendi-theme-diffs
+                                 bg-main yellow
+                                 bg-diff-changed fg-diff-changed))))
+   `(magit-diff-base-highlight ((,class ,@(modus-vivendi-theme-diffs
+                                           bg-dim yellow
+                                           bg-diff-focus-changed 
fg-diff-focus-changed))))
+   `(magit-diff-context ((,class :foreground ,fg-unfocused)))
+   `(magit-diff-context-highlight ((,class ,@(modus-vivendi-theme-diffs
+                                              bg-dim fg-dim
+                                              bg-inactive fg-inactive))))
+   `(magit-diff-file-heading ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(magit-diff-file-heading-highlight ((,class :inherit 
modus-theme-special-cold :weight bold)))
+   `(magit-diff-file-heading-selection ((,class :background ,bg-alt 
:foreground ,cyan)))
+   `(magit-diff-hunk-heading ((,class :background ,bg-active :foreground 
,fg-inactive :weight bold)))
+   `(magit-diff-hunk-heading-highlight ((,class :inherit 
modus-theme-diff-heading :weight bold)))
+   `(magit-diff-hunk-heading-selection ((,class :inherit 
modus-theme-intense-cyan)))
+   `(magit-diff-hunk-region ((,class :weight bold)))
+   `(magit-diff-lines-boundary ((,class :background ,fg-main)))
+   `(magit-diff-lines-heading ((,class :inherit modus-theme-refine-magenta)))
+   `(magit-diff-removed ((,class ,@(modus-vivendi-theme-diffs
+                                    bg-main red
+                                    bg-diff-removed fg-diff-removed))))
+   `(magit-diff-removed-highlight ((,class ,@(modus-vivendi-theme-diffs
+                                              bg-dim red
+                                              bg-diff-focus-removed 
fg-diff-focus-removed))))
+   `(magit-diffstat-added ((,class :foreground ,green)))
+   `(magit-diffstat-removed ((,class :foreground ,red)))
+   `(magit-dimmed ((,class :foreground ,fg-alt)))
+   `(magit-filename ((,class :foreground ,fg-special-cold)))
+   `(magit-hash ((,class :foreground ,fg-special-warm)))
+   `(magit-head ((,class :inherit magit-branch-local)))
+   `(magit-header-line ((,class :foreground ,cyan-active :weight bold)))
+   `(magit-header-line-key ((,class :foreground ,red-active :weight bold)))
+   `(magit-header-line-log-select ((,class :foreground ,fg-main :weight bold)))
+   `(magit-keyword ((,class :foreground ,magenta)))
+   `(magit-keyword-squash ((,class :foreground ,yellow-alt-other :weight 
bold)))
+   `(magit-log-author ((,class :foreground ,cyan)))
+   `(magit-log-date ((,class :foreground ,magenta)))
+   `(magit-log-graph ((,class :foreground ,fg-dim)))
+   `(magit-mode-line-process ((,class :foreground ,blue-active :weight bold)))
+   `(magit-mode-line-process-error ((,class :foreground ,red-active :weight 
bold)))
+   `(magit-process-ng ((,class :inherit error)))
+   `(magit-process-ok ((,class :inherit success)))
+   `(magit-reflog-amend ((,class :background ,bg-main :foreground 
,magenta-intense)))
+   `(magit-reflog-checkout ((,class :background ,bg-main :foreground 
,blue-intense)))
+   `(magit-reflog-cherry-pick ((,class :background ,bg-main :foreground 
,green-intense)))
+   `(magit-reflog-commit ((,class :background ,bg-main :foreground 
,green-intense)))
+   `(magit-reflog-merge ((,class :background ,bg-main :foreground 
,green-intense)))
+   `(magit-reflog-other ((,class :background ,bg-main :foreground 
,cyan-intense)))
+   `(magit-reflog-rebase ((,class :background ,bg-main :foreground 
,magenta-intense)))
+   `(magit-reflog-remote ((,class :background ,bg-main :foreground 
,cyan-intense)))
+   `(magit-reflog-reset ((,class :background ,bg-main :foreground 
,red-intense)))
+   `(magit-refname ((,class :foreground ,fg-alt)))
+   `(magit-refname-pullreq ((,class :foreground ,fg-alt)))
+   `(magit-refname-stash ((,class :foreground ,fg-alt)))
+   `(magit-refname-wip ((,class :foreground ,fg-alt)))
+   `(magit-section ((,class :background ,bg-dim :foreground ,fg-main)))
+   `(magit-section-heading ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(magit-section-heading-selection ((,class :inherit modus-theme-refine-cyan 
:weight bold)))
+   `(magit-section-highlight ((,class :background ,bg-alt)))
+   `(magit-sequence-done ((,class :foreground ,green-alt)))
+   `(magit-sequence-drop ((,class :foreground ,red-alt)))
+   `(magit-sequence-exec ((,class :foreground ,magenta-alt)))
+   `(magit-sequence-head ((,class :foreground ,cyan-alt)))
+   `(magit-sequence-onto ((,class :foreground ,fg-alt)))
+   `(magit-sequence-part ((,class :foreground ,yellow-alt)))
+   `(magit-sequence-pick ((,class :foreground ,blue-alt)))
+   `(magit-sequence-stop ((,class :foreground ,red)))
+   `(magit-signature-bad ((,class :background ,bg-main :foreground 
,red-intense :weight bold)))
+   `(magit-signature-error ((,class :background ,bg-main :foreground 
,red-intense)))
+   `(magit-signature-expired ((,class :background ,bg-main :foreground 
,yellow-intense)))
+   `(magit-signature-expired-key ((,class :background ,bg-main :foreground 
,yellow-intense)))
+   `(magit-signature-good ((,class :background ,bg-main :foreground 
,green-intense)))
+   `(magit-signature-revoked ((,class :background ,bg-main :foreground 
,magenta-intense)))
+   `(magit-signature-untrusted ((,class :background ,bg-main :foreground 
,cyan-intense)))
+   `(magit-tag ((,class :foreground ,green-alt)))
    ;;;; magit-imerge
-   `(magit-imerge-overriding-value ((,class (:foreground ,red-alt :weight 
bold))))
+   `(magit-imerge-overriding-value ((,class :foreground ,red-alt :weight 
bold)))
    ;;;; man
-   `(Man-overstrike ((,class (:foreground ,magenta :weight bold))))
-   `(Man-reverse ((,class (:inherit modus-theme-subtle-magenta))))
-   `(Man-underline ((,class (:foreground ,cyan :underline t))))
+   `(Man-overstrike ((,class :foreground ,magenta :weight bold)))
+   `(Man-reverse ((,class :inherit modus-theme-subtle-magenta)))
+   `(Man-underline ((,class :foreground ,cyan :underline t)))
    ;;;; markdown-mode
-   `(markdown-blockquote-face ((,class (:background ,bg-dim :foreground 
,fg-special-warm :slant ,modus-theme-slant))))
-   `(markdown-bold-face ((,class (:weight bold))))
-   `(markdown-code-face ((,class (:inherit fixed-pitch))))
-   `(markdown-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(markdown-footnote-marker-face ((,class (:foreground ,cyan-alt :weight 
bold))))
-   `(markdown-footnote-text-face ((,class (:foreground ,fg-main :slant 
,modus-theme-slant))))
-   `(markdown-gfm-checkbox-face ((,class (:foreground ,cyan-alt-other))))
-   `(markdown-header-delimiter-face ((,class (:foreground ,fg-dim :weight 
normal))))
-   `(markdown-header-face ((,class (:weight bold))))
-   `(markdown-header-rule-face ((,class (:foreground ,fg-special-warm :weight 
bold))))
-   `(markdown-hr-face ((,class (:foreground ,fg-special-warm :weight bold))))
-   `(markdown-html-attr-name-face ((,class (:foreground ,cyan))))
-   `(markdown-html-attr-value-face ((,class (:foreground ,blue))))
-   `(markdown-html-entity-face ((,class (:foreground ,cyan))))
-   `(markdown-html-tag-delimiter-face ((,class (:foreground 
,fg-special-mild))))
-   `(markdown-html-tag-name-face ((,class (:foreground ,magenta-alt))))
-   `(markdown-inline-code-face ((,class (:foreground ,magenta))))
-   `(markdown-italic-face ((,class (:slant italic))))
-   `(markdown-language-info-face ((,class (:foreground ,fg-special-cold))))
-   `(markdown-language-keyword-face ((,class (:foreground ,green-alt-other))))
-   `(markdown-line-break-face ((,class (:inherit modus-theme-refine-cyan 
:underline t))))
-   `(markdown-link-face ((,class (:inherit link))))
-   `(markdown-link-title-face ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(markdown-list-face ((,class (:foreground ,fg-dim))))
-   `(markdown-markup-face ((,class (:foreground ,fg-alt))))
-   `(markdown-math-face ((,class (:foreground ,magenta-alt-other))))
-   `(markdown-metadata-key-face ((,class (:foreground ,cyan-alt-other))))
-   `(markdown-metadata-value-face ((,class (:foreground ,blue-alt))))
-   `(markdown-missing-link-face ((,class (:foreground ,yellow :weight bold))))
-   `(markdown-plain-url-face ((,class (:inherit markdown-link-face))))
-   `(markdown-pre-face ((,class (:foreground ,fg-special-mild))))
-   `(markdown-reference-face ((,class (:inherit markdown-markup-face))))
-   `(markdown-strike-through-face ((,class (:strike-through t))))
-   `(markdown-table-face ((,class (:foreground ,fg-special-cold))))
-   `(markdown-url-face ((,class (:foreground ,blue))))
+   `(markdown-blockquote-face ((,class :background ,bg-dim :foreground 
,fg-special-warm :slant ,modus-theme-slant)))
+   `(markdown-bold-face ((,class :weight bold)))
+   `(markdown-code-face ((,class :inherit fixed-pitch)))
+   `(markdown-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(markdown-footnote-marker-face ((,class :foreground ,cyan-alt :weight 
bold)))
+   `(markdown-footnote-text-face ((,class :foreground ,fg-main :slant 
,modus-theme-slant)))
+   `(markdown-gfm-checkbox-face ((,class :foreground ,cyan-alt-other)))
+   `(markdown-header-delimiter-face ((,class :foreground ,fg-dim :weight 
normal)))
+   `(markdown-header-face ((,class :weight bold)))
+   `(markdown-header-rule-face ((,class :foreground ,fg-special-warm :weight 
bold)))
+   `(markdown-hr-face ((,class :foreground ,fg-special-warm :weight bold)))
+   `(markdown-html-attr-name-face ((,class :foreground ,cyan)))
+   `(markdown-html-attr-value-face ((,class :foreground ,blue)))
+   `(markdown-html-entity-face ((,class :foreground ,cyan)))
+   `(markdown-html-tag-delimiter-face ((,class :foreground ,fg-special-mild)))
+   `(markdown-html-tag-name-face ((,class :foreground ,magenta-alt)))
+   `(markdown-inline-code-face ((,class :foreground ,magenta)))
+   `(markdown-italic-face ((,class :slant italic)))
+   `(markdown-language-info-face ((,class :foreground ,fg-special-cold)))
+   `(markdown-language-keyword-face ((,class :foreground ,green-alt-other)))
+   `(markdown-line-break-face ((,class :inherit modus-theme-refine-cyan 
:underline t)))
+   `(markdown-link-face ((,class :inherit link)))
+   `(markdown-link-title-face ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(markdown-list-face ((,class :foreground ,fg-dim)))
+   `(markdown-markup-face ((,class :foreground ,fg-alt)))
+   `(markdown-math-face ((,class :foreground ,magenta-alt-other)))
+   `(markdown-metadata-key-face ((,class :foreground ,cyan-alt-other)))
+   `(markdown-metadata-value-face ((,class :foreground ,blue-alt)))
+   `(markdown-missing-link-face ((,class :foreground ,yellow :weight bold)))
+   `(markdown-plain-url-face ((,class :inherit markdown-link-face)))
+   `(markdown-pre-face ((,class :foreground ,fg-special-mild)))
+   `(markdown-reference-face ((,class :inherit markdown-markup-face)))
+   `(markdown-strike-through-face ((,class :strike-through t)))
+   `(markdown-table-face ((,class :foreground ,fg-special-cold)))
+   `(markdown-url-face ((,class :foreground ,blue)))
    ;;;; markup-faces (`adoc-mode')
-   `(markup-anchor-face ((,class (:foreground ,fg-inactive))))
-   `(markup-attribute-face ((,class (:foreground ,fg-inactive :slant italic))))
-   `(markup-big-face ((,class (:height 1.3 :foreground ,blue-nuanced))))
-   `(markup-bold-face ((,class (:foreground ,red-nuanced :weight bold))))
-   `(markup-code-face ((,class (:inherit fixed-pitch :foreground ,magenta))))
-   `(markup-command-face ((,class (:foreground ,fg-inactive))))
-   `(markup-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(markup-complex-replacement-face ((,class (:box (:line-width 2 :color nil 
:style released-button)
-                                                    :inherit 
modus-theme-refine-magenta))))
-   `(markup-emphasis-face ((,class (:foreground ,fg-special-cold :slant 
italic))))
-   `(markup-error-face ((,class (:foreground ,red :weight bold))))
-   `(markup-gen-face ((,class (:foreground ,magenta-alt))))
-   `(markup-internal-reference-face ((,class (:foreground ,fg-inactive 
:underline t))))
-   `(markup-italic-face ((,class (:foreground ,fg-special-cold :slant 
italic))))
-   `(markup-list-face ((,class (:inherit modus-theme-special-calm))))
-   `(markup-meta-face ((,class (:foreground ,fg-inactive))))
-   `(markup-meta-hide-face ((,class (:foreground ,fg-alt))))
-   `(markup-passthrough-face ((,class (:inherit fixed-pitch :foreground 
,cyan))))
-   `(markup-preprocessor-face ((,class (:foreground ,magenta))))
-   `(markup-replacement-face ((,class (:foreground ,yellow-alt-other))))
-   `(markup-secondary-text-face ((,class (:height 0.8 :foreground 
,magenta-nuanced))))
-   `(markup-small-face ((,class (:height 0.8 :foreground ,fg-main))))
-   `(markup-strong-face ((,class (:foreground ,red-nuanced :weight bold))))
-   `(markup-subscript-face ((,class (:height 0.8 :foreground 
,fg-special-cold))))
-   `(markup-superscript-face ((,class (:height 0.8 :foreground 
,fg-special-cold))))
-   `(markup-table-cell-face ((,class (:inherit modus-theme-special-cold))))
-   `(markup-table-face ((,class (:inherit modus-theme-subtle-cyan))))
-   `(markup-table-row-face ((,class (:inherit modus-theme-subtle-cyan))))
-   `(markup-title-0-face ((,class (:height 3.0 :foreground ,blue-nuanced))))
-   `(markup-title-1-face ((,class (:height 2.4 :foreground ,blue-nuanced))))
-   `(markup-title-2-face ((,class (:height 1.8 :foreground ,blue-nuanced))))
-   `(markup-title-3-face ((,class (:height 1.4 :foreground ,blue-nuanced))))
-   `(markup-title-4-face ((,class (:height 1.2 :foreground ,blue-nuanced))))
-   `(markup-title-5-face ((,class (:height 1.2 :foreground ,blue-nuanced 
:underline t))))
-   `(markup-value-face ((,class (:foreground ,fg-inactive))))
-   `(markup-verbatim-face ((,class (:inherit modus-theme-special-mild))))
+   `(markup-anchor-face ((,class :foreground ,fg-inactive)))
+   `(markup-attribute-face ((,class :foreground ,fg-inactive :slant italic)))
+   `(markup-big-face ((,class :height 1.3 :foreground ,blue-nuanced)))
+   `(markup-bold-face ((,class :foreground ,red-nuanced :weight bold)))
+   `(markup-code-face ((,class :inherit fixed-pitch :foreground ,magenta)))
+   `(markup-command-face ((,class :foreground ,fg-inactive)))
+   `(markup-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(markup-complex-replacement-face ((,class :box (:line-width 2 :color nil 
:style released-button)
+                                              :inherit 
modus-theme-refine-magenta)))
+   `(markup-emphasis-face ((,class :foreground ,fg-special-cold :slant 
italic)))
+   `(markup-error-face ((,class :foreground ,red :weight bold)))
+   `(markup-gen-face ((,class :foreground ,magenta-alt)))
+   `(markup-internal-reference-face ((,class :foreground ,fg-inactive 
:underline t)))
+   `(markup-italic-face ((,class :foreground ,fg-special-cold :slant italic)))
+   `(markup-list-face ((,class :inherit modus-theme-special-calm)))
+   `(markup-meta-face ((,class :foreground ,fg-inactive)))
+   `(markup-meta-hide-face ((,class :foreground ,fg-alt)))
+   `(markup-passthrough-face ((,class :inherit fixed-pitch :foreground ,cyan)))
+   `(markup-preprocessor-face ((,class :foreground ,magenta)))
+   `(markup-replacement-face ((,class :foreground ,yellow-alt-other)))
+   `(markup-secondary-text-face ((,class :height 0.8 :foreground 
,magenta-nuanced)))
+   `(markup-small-face ((,class :height 0.8 :foreground ,fg-main)))
+   `(markup-strong-face ((,class :foreground ,red-nuanced :weight bold)))
+   `(markup-subscript-face ((,class :height 0.8 :foreground ,fg-special-cold)))
+   `(markup-superscript-face ((,class :height 0.8 :foreground 
,fg-special-cold)))
+   `(markup-table-cell-face ((,class :inherit modus-theme-special-cold)))
+   `(markup-table-face ((,class :inherit modus-theme-subtle-cyan)))
+   `(markup-table-row-face ((,class :inherit modus-theme-subtle-cyan)))
+   `(markup-title-0-face ((,class :height 3.0 :foreground ,blue-nuanced)))
+   `(markup-title-1-face ((,class :height 2.4 :foreground ,blue-nuanced)))
+   `(markup-title-2-face ((,class :height 1.8 :foreground ,blue-nuanced)))
+   `(markup-title-3-face ((,class :height 1.4 :foreground ,blue-nuanced)))
+   `(markup-title-4-face ((,class :height 1.2 :foreground ,blue-nuanced)))
+   `(markup-title-5-face ((,class :height 1.2 :foreground ,blue-nuanced 
:underline t)))
+   `(markup-value-face ((,class :foreground ,fg-inactive)))
+   `(markup-verbatim-face ((,class :inherit modus-theme-special-mild)))
    ;;;; mentor
-   `(mentor-download-message ((,class (:foreground ,fg-special-warm))))
-   `(mentor-download-name ((,class (:foreground ,fg-special-cold))))
-   `(mentor-download-progress ((,class (:foreground ,blue-alt-other))))
-   `(mentor-download-size ((,class (:foreground ,magenta-alt-other))))
-   `(mentor-download-speed-down ((,class (:foreground ,cyan-alt))))
-   `(mentor-download-speed-up ((,class (:foreground ,red-alt))))
-   `(mentor-download-state ((,class (:foreground ,yellow-alt))))
-   `(mentor-highlight-face ((,class (:inherit modus-theme-subtle-blue))))
-   `(mentor-tracker-name ((,class (:foreground ,magenta-alt))))
+   `(mentor-download-message ((,class :foreground ,fg-special-warm)))
+   `(mentor-download-name ((,class :foreground ,fg-special-cold)))
+   `(mentor-download-progress ((,class :foreground ,blue-alt-other)))
+   `(mentor-download-size ((,class :foreground ,magenta-alt-other)))
+   `(mentor-download-speed-down ((,class :foreground ,cyan-alt)))
+   `(mentor-download-speed-up ((,class :foreground ,red-alt)))
+   `(mentor-download-state ((,class :foreground ,yellow-alt)))
+   `(mentor-highlight-face ((,class :inherit modus-theme-subtle-blue)))
+   `(mentor-tracker-name ((,class :foreground ,magenta-alt)))
    ;;;; messages
-   `(message-cited-text-1 ((,class (:foreground ,cyan))))
-   `(message-cited-text-2 ((,class (:foreground ,green))))
-   `(message-cited-text-3 ((,class (:foreground ,yellow))))
-   `(message-cited-text-4 ((,class (:foreground ,red))))
-   `(message-header-cc ((,class (:foreground ,blue-alt))))
-   `(message-header-name ((,class (:foreground ,green-alt-other))))
-   `(message-header-newsgroups ((,class (:foreground ,blue :weight bold))))
-   `(message-header-other ((,class (:foreground ,cyan-alt-other :weight 
bold))))
-   `(message-header-subject ((,class (:foreground ,magenta-alt-other :weight 
bold))))
-   `(message-header-to ((,class (:foreground ,magenta-alt :weight bold))))
-   `(message-header-xheader ((,class (:foreground ,blue-alt-other))))
-   `(message-mml ((,class (:foreground ,green-alt))))
-   `(message-separator ((,class (:background ,bg-active :foreground 
,fg-special-warm))))
+   `(message-cited-text-1 ((,class :foreground ,cyan)))
+   `(message-cited-text-2 ((,class :foreground ,green)))
+   `(message-cited-text-3 ((,class :foreground ,yellow)))
+   `(message-cited-text-4 ((,class :foreground ,red)))
+   `(message-header-cc ((,class :foreground ,blue-alt)))
+   `(message-header-name ((,class :foreground ,green-alt-other)))
+   `(message-header-newsgroups ((,class :foreground ,blue :weight bold)))
+   `(message-header-other ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(message-header-subject ((,class :foreground ,magenta-alt-other :weight 
bold)))
+   `(message-header-to ((,class :foreground ,magenta-alt :weight bold)))
+   `(message-header-xheader ((,class :foreground ,blue-alt-other)))
+   `(message-mml ((,class :foreground ,green-alt)))
+   `(message-separator ((,class :background ,bg-active :foreground 
,fg-special-warm)))
    ;;;; minibuffer-line
-   `(minibuffer-line ((,class (:foreground ,fg-main))))
+   `(minibuffer-line ((,class :foreground ,fg-main)))
    ;;;; minimap
-   `(minimap-active-region-background ((,class (:background ,bg-active))))
-   `(minimap-current-line-face ((,class (:background ,cyan-intense-bg 
:foreground ,fg-main))))
+   `(minimap-active-region-background ((,class :background ,bg-active)))
+   `(minimap-current-line-face ((,class :background ,cyan-intense-bg 
:foreground ,fg-main)))
    ;;;; modeline
-   `(mode-line ((,class (:box ,(modus-vivendi-theme-modeline-box bg-inactive 
fg-inactive t)
-                              ,@(modus-vivendi-theme-modeline-props
-                                 bg-active fg-dim
-                                 bg-active fg-active)))))
-   `(mode-line-buffer-id ((,class (:weight bold))))
-   `(mode-line-emphasis ((,class (:foreground ,blue-active :weight bold))))
-   `(mode-line-highlight ((,class (:inherit modus-theme-active-blue :box 
(:line-width -1 :style pressed-button)))))
-   `(mode-line-inactive ((,class (:box ,(modus-vivendi-theme-modeline-box 
bg-active bg-active)
-                                       ,@(modus-vivendi-theme-modeline-props
-                                          bg-dim fg-inactive
-                                          bg-inactive fg-inactive)))))
+   `(mode-line ((,class :box ,(modus-vivendi-theme-modeline-box bg-inactive 
fg-inactive t)
+                        ,@(modus-vivendi-theme-modeline-props
+                           bg-active fg-dim
+                           bg-active fg-active))))
+   `(mode-line-buffer-id ((,class :weight bold)))
+   `(mode-line-emphasis ((,class :foreground ,blue-active :weight bold)))
+   `(mode-line-highlight ((,class :inherit modus-theme-active-blue :box 
(:line-width -1 :style pressed-button))))
+   `(mode-line-inactive ((,class :box ,(modus-vivendi-theme-modeline-box 
bg-active bg-active)
+                                 ,@(modus-vivendi-theme-modeline-props
+                                    bg-dim fg-inactive
+                                    bg-inactive fg-inactive))))
    ;;;; mood-line
-   `(mood-line-modified ((,class (:foreground ,magenta-active))))
-   `(mood-line-status-error ((,class (:foreground ,red-active :weight bold))))
-   `(mood-line-status-info ((,class (:foreground ,cyan-active))))
-   `(mood-line-status-neutral ((,class (:foreground ,blue-active))))
-   `(mood-line-status-success ((,class (:foreground ,green-active))))
-   `(mood-line-status-warning ((,class (:foreground ,yellow-active :weight 
bold))))
-   `(mood-line-unimportant ((,class (:foreground ,fg-inactive))))
+   `(mood-line-modified ((,class :foreground ,magenta-active)))
+   `(mood-line-status-error ((,class :foreground ,red-active :weight bold)))
+   `(mood-line-status-info ((,class :foreground ,cyan-active)))
+   `(mood-line-status-neutral ((,class :foreground ,blue-active)))
+   `(mood-line-status-success ((,class :foreground ,green-active)))
+   `(mood-line-status-warning ((,class :foreground ,yellow-active :weight 
bold)))
+   `(mood-line-unimportant ((,class :foreground ,fg-inactive)))
    ;;;; mu4e
-   `(mu4e-attach-number-face ((,class (:foreground ,cyan-alt :weight bold))))
-   `(mu4e-cited-1-face ((,class (:foreground ,blue-alt))))
-   `(mu4e-cited-2-face ((,class (:foreground ,red-alt))))
-   `(mu4e-cited-3-face ((,class (:foreground ,green-alt))))
-   `(mu4e-cited-4-face ((,class (:foreground ,magenta-alt))))
-   `(mu4e-cited-5-face ((,class (:foreground ,cyan-alt))))
-   `(mu4e-cited-6-face ((,class (:foreground ,blue-alt-other))))
-   `(mu4e-cited-7-face ((,class (:foreground ,red-alt-other))))
-   `(mu4e-compose-header-face ((,class (:foreground ,green-alt))))
-   `(mu4e-compose-separator-face ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(mu4e-contact-face ((,class (:foreground ,cyan))))
-   `(mu4e-context-face ((,class (:foreground ,blue-active))))
-   `(mu4e-draft-face ((,class (:foreground ,magenta-refine-fg))))
-   `(mu4e-flagged-face ((,class (:foreground ,red-alt-other))))
-   `(mu4e-footer-face ((,class (:foreground ,fg-alt))))
-   `(mu4e-forwarded-face ((,class (:foreground ,green-alt-other))))
-   `(mu4e-header-face ((,class (:foreground ,fg-main))))
-   `(mu4e-header-highlight-face ((,class (,@(and (>= emacs-major-version 27) 
'(:extend t))
-                                          :background ,bg-hl-line))))
-   `(mu4e-header-key-face ((,class (:foreground ,fg-dim :weight bold))))
-   `(mu4e-header-marks-face ((,class (:foreground ,magenta-alt :weight bold))))
-   `(mu4e-header-title-face ((,class (:foreground ,fg-special-warm))))
-   `(mu4e-header-value-face ((,class (:foreground ,magenta-alt-other))))
-   `(mu4e-highlight-face ((,class (:foreground ,blue-intense :weight bold))))
-   `(mu4e-link-face ((,class (:inherit link))))
-   `(mu4e-modeline-face ((,class (:foreground ,magenta-active))))
-   `(mu4e-moved-face ((,class (:foreground ,blue-refine-fg))))
-   `(mu4e-ok-face ((,class (:foreground ,green-intense :weight bold))))
-   `(mu4e-region-code ((,class (:inherit modus-theme-special-calm))))
-   `(mu4e-replied-face ((,class (:foreground ,cyan-refine-fg))))
-   `(mu4e-special-header-value-face ((,class (:foreground ,magenta :weight 
bold))))
-   `(mu4e-system-face ((,class (:foreground ,fg-alt))))
-   `(mu4e-title-face ((,class (:foreground ,fg-main))))
-   `(mu4e-unread-face ((,class (:foreground ,fg-main :weight bold))))
-   `(mu4e-url-number-face ((,class (:foreground ,blue-alt-other :weight 
bold))))
-   `(mu4e-view-body-face ((,class (:background ,bg-main :foreground 
,fg-main))))
-   `(mu4e-warning-face ((,class (:inherit warning))))
+   `(mu4e-attach-number-face ((,class :foreground ,cyan-alt :weight bold)))
+   `(mu4e-cited-1-face ((,class :foreground ,blue-alt)))
+   `(mu4e-cited-2-face ((,class :foreground ,red-alt)))
+   `(mu4e-cited-3-face ((,class :foreground ,green-alt)))
+   `(mu4e-cited-4-face ((,class :foreground ,magenta-alt)))
+   `(mu4e-cited-5-face ((,class :foreground ,cyan-alt)))
+   `(mu4e-cited-6-face ((,class :foreground ,blue-alt-other)))
+   `(mu4e-cited-7-face ((,class :foreground ,red-alt-other)))
+   `(mu4e-compose-header-face ((,class :foreground ,green-alt)))
+   `(mu4e-compose-separator-face ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(mu4e-contact-face ((,class :foreground ,cyan)))
+   `(mu4e-context-face ((,class :foreground ,blue-active)))
+   `(mu4e-draft-face ((,class :foreground ,magenta-refine-fg)))
+   `(mu4e-flagged-face ((,class :foreground ,red-alt-other)))
+   `(mu4e-footer-face ((,class :foreground ,fg-alt)))
+   `(mu4e-forwarded-face ((,class :foreground ,green-alt-other)))
+   `(mu4e-header-face ((,class :foreground ,fg-main)))
+   `(mu4e-header-highlight-face ((,class ,@(and (>= emacs-major-version 27) 
'(:extend t))
+                                         :background ,bg-hl-line)))
+   `(mu4e-header-key-face ((,class :foreground ,fg-dim :weight bold)))
+   `(mu4e-header-marks-face ((,class :foreground ,magenta-alt :weight bold)))
+   `(mu4e-header-title-face ((,class :foreground ,fg-special-warm)))
+   `(mu4e-header-value-face ((,class :foreground ,magenta-alt-other)))
+   `(mu4e-highlight-face ((,class :foreground ,blue-intense :weight bold)))
+   `(mu4e-link-face ((,class :inherit link)))
+   `(mu4e-modeline-face ((,class :foreground ,magenta-active)))
+   `(mu4e-moved-face ((,class :foreground ,blue-refine-fg)))
+   `(mu4e-ok-face ((,class :foreground ,green-intense :weight bold)))
+   `(mu4e-region-code ((,class :inherit modus-theme-special-calm)))
+   `(mu4e-replied-face ((,class :foreground ,cyan-refine-fg)))
+   `(mu4e-special-header-value-face ((,class :foreground ,magenta :weight 
bold)))
+   `(mu4e-system-face ((,class :foreground ,fg-alt)))
+   `(mu4e-title-face ((,class :foreground ,fg-main)))
+   `(mu4e-unread-face ((,class :foreground ,fg-main :weight bold)))
+   `(mu4e-url-number-face ((,class :foreground ,blue-alt-other :weight bold)))
+   `(mu4e-view-body-face ((,class :background ,bg-main :foreground ,fg-main)))
+   `(mu4e-warning-face ((,class :inherit warning)))
    ;;;; mu4e-conversation
-   `(mu4e-conversation-header ((,class (:inherit modus-theme-special-cold))))
-   `(mu4e-conversation-sender-1 ((,class (:foreground ,fg-special-warm))))
-   `(mu4e-conversation-sender-2 ((,class (:foreground ,fg-special-cold))))
-   `(mu4e-conversation-sender-3 ((,class (:foreground ,fg-special-mild))))
-   `(mu4e-conversation-sender-4 ((,class (:foreground ,fg-alt))))
-   `(mu4e-conversation-sender-5 ((,class (:foreground ,yellow-refine-fg))))
-   `(mu4e-conversation-sender-6 ((,class (:foreground ,cyan-refine-fg))))
-   `(mu4e-conversation-sender-7 ((,class (:foreground ,green-refine-fg))))
-   `(mu4e-conversation-sender-8 ((,class (:foreground ,blue-refine-fg))))
-   `(mu4e-conversation-sender-me ((,class (:foreground ,fg-main))))
-   `(mu4e-conversation-unread ((,class (:weight bold))))
+   `(mu4e-conversation-header ((,class :inherit modus-theme-special-cold)))
+   `(mu4e-conversation-sender-1 ((,class :foreground ,fg-special-warm)))
+   `(mu4e-conversation-sender-2 ((,class :foreground ,fg-special-cold)))
+   `(mu4e-conversation-sender-3 ((,class :foreground ,fg-special-mild)))
+   `(mu4e-conversation-sender-4 ((,class :foreground ,fg-alt)))
+   `(mu4e-conversation-sender-5 ((,class :foreground ,yellow-refine-fg)))
+   `(mu4e-conversation-sender-6 ((,class :foreground ,cyan-refine-fg)))
+   `(mu4e-conversation-sender-7 ((,class :foreground ,green-refine-fg)))
+   `(mu4e-conversation-sender-8 ((,class :foreground ,blue-refine-fg)))
+   `(mu4e-conversation-sender-me ((,class :foreground ,fg-main)))
+   `(mu4e-conversation-unread ((,class :weight bold)))
    ;;;; multiple-cursors
-   `(mc/cursor-bar-face ((,class (:height 1 :background ,fg-main))))
-   `(mc/cursor-face ((,class (:inverse-video t))))
-   `(mc/region-face ((,class (:inherit region))))
+   `(mc/cursor-bar-face ((,class :height 1 :background ,fg-main)))
+   `(mc/cursor-face ((,class :inverse-video t)))
+   `(mc/region-face ((,class :inherit region)))
    ;;;; neotree
-   `(neo-banner-face ((,class (:foreground ,magenta))))
-   `(neo-button-face ((,class (:inherit button))))
-   `(neo-dir-link-face ((,class (:foreground ,blue :weight bold))))
-   `(neo-expand-btn-face ((,class (:foreground ,cyan))))
-   `(neo-file-link-face ((,class (:foreground ,fg-main))))
-   `(neo-header-face ((,class (:foreground ,fg-main :weight bold))))
-   `(neo-root-dir-face ((,class (:foreground ,cyan-alt :weight bold))))
-   `(neo-vc-added-face ((,class (:foreground ,green))))
-   `(neo-vc-conflict-face ((,class (:foreground ,red :Weight bold))))
-   `(neo-vc-default-face ((,class (:foreground ,fg-main))))
-   `(neo-vc-edited-face ((,class (:foreground ,yellow))))
-   `(neo-vc-ignored-face ((,class (:foreground ,fg-inactive))))
-   `(neo-vc-missing-face ((,class (:foreground ,red-alt))))
-   `(neo-vc-needs-merge-face ((,class (:foreground ,magenta-alt))))
-   `(neo-vc-needs-update-face ((,class (:underline t))))
-   `(neo-vc-removed-face ((,class (:strike-through t))))
-   `(neo-vc-unlocked-changes-face ((,class (:inherit 
modus-theme-refine-blue))))
-   `(neo-vc-up-to-date-face ((,class (:foreground ,fg-alt))))
-   `(neo-vc-user-face ((,class (:foreground ,magenta))))
+   `(neo-banner-face ((,class :foreground ,magenta)))
+   `(neo-button-face ((,class :inherit button)))
+   `(neo-dir-link-face ((,class :foreground ,blue :weight bold)))
+   `(neo-expand-btn-face ((,class :foreground ,cyan)))
+   `(neo-file-link-face ((,class :foreground ,fg-main)))
+   `(neo-header-face ((,class :foreground ,fg-main :weight bold)))
+   `(neo-root-dir-face ((,class :foreground ,cyan-alt :weight bold)))
+   `(neo-vc-added-face ((,class :foreground ,green)))
+   `(neo-vc-conflict-face ((,class :foreground ,red :Weight bold)))
+   `(neo-vc-default-face ((,class :foreground ,fg-main)))
+   `(neo-vc-edited-face ((,class :foreground ,yellow)))
+   `(neo-vc-ignored-face ((,class :foreground ,fg-inactive)))
+   `(neo-vc-missing-face ((,class :foreground ,red-alt)))
+   `(neo-vc-needs-merge-face ((,class :foreground ,magenta-alt)))
+   `(neo-vc-needs-update-face ((,class :underline t)))
+   `(neo-vc-removed-face ((,class :strike-through t)))
+   `(neo-vc-unlocked-changes-face ((,class :inherit modus-theme-refine-blue)))
+   `(neo-vc-up-to-date-face ((,class :foreground ,fg-alt)))
+   `(neo-vc-user-face ((,class :foreground ,magenta)))
    ;;;; no-emoji
-   `(no-emoji ((,class (:foreground ,cyan))))
+   `(no-emoji ((,class :foreground ,cyan)))
    ;;;; num3-mode
-   `(num3-face-even ((,class (:background ,bg-alt :weight bold))))
+   `(num3-face-even ((,class :background ,bg-alt :weight bold)))
    ;;;; nxml-mode
-   `(nxml-attribute-colon ((,class (:foreground ,fg-main))))
-   `(nxml-attribute-local-name ((,class (:foreground ,cyan-alt))))
-   `(nxml-attribute-prefix ((,class (:foreground ,cyan-alt-other :weight 
,modus-theme-bold))))
-   `(nxml-attribute-value ((,class (:foreground ,blue))))
-   `(nxml-cdata-section-CDATA ((,class (:foreground ,red-alt :weight 
,modus-theme-bold))))
-   `(nxml-cdata-section-delimiter ((,class (:foreground ,red-alt))))
-   `(nxml-char-ref-delimiter ((,class (:foreground ,green-alt-other))))
-   `(nxml-char-ref-number ((,class (:foreground ,green-alt-other :weight 
,modus-theme-bold))))
-   `(nxml-delimited-data ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(nxml-delimiter ((,class (:foreground ,fg-dim))))
-   `(nxml-element-colon ((,class (:foreground ,fg-main))))
-   `(nxml-element-local-name ((,class (:foreground ,magenta))))
-   `(nxml-element-prefix ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(nxml-entity-ref-delimiter ((,class (:foreground ,green-alt-other))))
-   `(nxml-entity-ref-name ((,class (:foreground ,green-alt-other :weight 
,modus-theme-bold))))
-   `(nxml-glyph ((,class (:inherit modus-theme-intense-neutral))))
-   `(nxml-hash ((,class (:foreground ,blue-alt :weight ,modus-theme-bold))))
-   `(nxml-heading ((,class (:weight bold))))
-   `(nxml-name ((,class (:foreground ,magenta-alt :weight ,modus-theme-bold))))
-   `(nxml-namespace-attribute-colon ((,class (:foreground ,fg-main))))
-   `(nxml-namespace-attribute-prefix ((,class (:foreground ,cyan))))
-   `(nxml-processing-instruction-target ((,class (:foreground 
,magenta-alt-other :weight ,modus-theme-bold))))
-   `(nxml-prolog-keyword ((,class (:foreground ,magenta-alt-other :weight 
,modus-theme-bold))))
-   `(nxml-ref ((,class (:foreground ,green-alt-other :weight 
,modus-theme-bold))))
+   `(nxml-attribute-colon ((,class :foreground ,fg-main)))
+   `(nxml-attribute-local-name ((,class :foreground ,cyan-alt)))
+   `(nxml-attribute-prefix ((,class :foreground ,cyan-alt-other :weight 
,modus-theme-bold)))
+   `(nxml-attribute-value ((,class :foreground ,blue)))
+   `(nxml-cdata-section-CDATA ((,class :foreground ,red-alt :weight 
,modus-theme-bold)))
+   `(nxml-cdata-section-delimiter ((,class :foreground ,red-alt)))
+   `(nxml-char-ref-delimiter ((,class :foreground ,green-alt-other)))
+   `(nxml-char-ref-number ((,class :foreground ,green-alt-other :weight 
,modus-theme-bold)))
+   `(nxml-delimited-data ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(nxml-delimiter ((,class :foreground ,fg-dim)))
+   `(nxml-element-colon ((,class :foreground ,fg-main)))
+   `(nxml-element-local-name ((,class :foreground ,magenta)))
+   `(nxml-element-prefix ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(nxml-entity-ref-delimiter ((,class :foreground ,green-alt-other)))
+   `(nxml-entity-ref-name ((,class :foreground ,green-alt-other :weight 
,modus-theme-bold)))
+   `(nxml-glyph ((,class :inherit modus-theme-intense-neutral)))
+   `(nxml-hash ((,class :foreground ,blue-alt :weight ,modus-theme-bold)))
+   `(nxml-heading ((,class :weight bold)))
+   `(nxml-name ((,class :foreground ,magenta-alt :weight ,modus-theme-bold)))
+   `(nxml-namespace-attribute-colon ((,class :foreground ,fg-main)))
+   `(nxml-namespace-attribute-prefix ((,class :foreground ,cyan)))
+   `(nxml-processing-instruction-target ((,class :foreground 
,magenta-alt-other :weight ,modus-theme-bold)))
+   `(nxml-prolog-keyword ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold)))
+   `(nxml-ref ((,class :foreground ,green-alt-other :weight 
,modus-theme-bold)))
    ;;;; orderless
-   `(orderless-match-face-0 ((,class (,@(modus-vivendi-theme-completions
-                                         blue-alt blue-refine-bg 
blue-refine-fg)
-                                      :weight bold))))
-   `(orderless-match-face-1 ((,class (,@(modus-vivendi-theme-completions
-                                         magenta-alt magenta-refine-bg 
magenta-refine-fg)
-                                      :weight bold))))
-   `(orderless-match-face-2 ((,class (,@(modus-vivendi-theme-completions
-                                         green-alt-other green-refine-bg 
green-refine-fg)
-                                      :weight bold))))
-   `(orderless-match-face-3 ((,class (,@(modus-vivendi-theme-completions
-                                         yellow-alt-other yellow-refine-bg 
yellow-refine-fg)
-                                      :weight bold))))
+   `(orderless-match-face-0 ((,class ,@(modus-vivendi-theme-completions
+                                        blue-alt blue-refine-bg blue-refine-fg)
+                                     :weight bold)))
+   `(orderless-match-face-1 ((,class ,@(modus-vivendi-theme-completions
+                                        magenta-alt magenta-refine-bg 
magenta-refine-fg)
+                                     :weight bold)))
+   `(orderless-match-face-2 ((,class ,@(modus-vivendi-theme-completions
+                                        green-alt-other green-refine-bg 
green-refine-fg)
+                                     :weight bold)))
+   `(orderless-match-face-3 ((,class ,@(modus-vivendi-theme-completions
+                                        yellow-alt-other yellow-refine-bg 
yellow-refine-fg)
+                                     :weight bold)))
    ;;;; org
-   `(org-agenda-calendar-event ((,class (:foreground ,fg-main))))
-   `(org-agenda-calendar-sexp ((,class (:foreground ,cyan-alt))))
-   `(org-agenda-clocking ((,class (:inherit modus-theme-special-cold))))
-   `(org-agenda-column-dateline ((,class (:inherit 
modus-theme-subtle-neutral))))
-   `(org-agenda-current-time ((,class (:inherit modus-theme-intense-cyan))))
-   `(org-agenda-date ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,cyan-alt-other
-                                        ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)
-                                        ,@(modus-vivendi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced)))))
-   `(org-agenda-date-today ((,class (:inherit ,modus-theme-variable-pitch 
:background ,cyan-subtle-bg
-                                              :foreground ,fg-main :weight bold
-                                              ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
-   `(org-agenda-date-weekend ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,cyan
-                                                ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)
-                                                
,@(modus-vivendi-theme-heading-block blue-nuanced-bg cyan-nuanced)))))
-   `(org-agenda-diary ((,class (:foreground ,fg-main))))
-   `(org-agenda-dimmed-todo-face ((,class (:inherit 
modus-theme-subtle-neutral))))
-   `(org-agenda-done ((,class (,@(modus-vivendi-theme-org-todo-block 
green-nuanced-bg green-nuanced green)))))
-   `(org-agenda-filter-category ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(org-agenda-filter-effort ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(org-agenda-filter-regexp ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(org-agenda-filter-tags ((,class (:background ,bg-active :foreground 
,fg-main :box t))))
-   `(org-agenda-restriction-lock ((,class (:background ,bg-dim :foreground 
,fg-dim))))
-   `(org-agenda-structure ((,class (:inherit ,modus-theme-variable-pitch
-                                             :foreground ,fg-special-mild
-                                             ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3)))))
-   `(org-archived ((,class (:background ,bg-alt :foreground ,fg-alt))))
-   `(org-block ((,class (,@(modus-vivendi-theme-org-src-block bg-dim bg-main)
-                         :inherit fixed-pitch :foreground ,fg-main))))
-   `(org-block-begin-line ((,class (,@(and (>= emacs-major-version 27)
-                                           
modus-vivendi-theme-distinct-org-blocks
-                                           '(:extend t))
-                                    :inherit fixed-pitch :background ,bg-alt 
:foreground ,fg-special-mild))))
-   `(org-block-end-line ((,class (:inherit org-block-begin-line))))
-   `(org-checkbox ((,class (:box (:line-width 1 :color ,bg-active)
-                                 :background ,bg-inactive :foreground 
,fg-active))))
-   `(org-checkbox-statistics-done ((,class (:foreground ,green
-                                                        
,@(modus-vivendi-theme-heading-block
-                                                           green-nuanced-bg 
green-nuanced)))))
-   `(org-checkbox-statistics-todo ((,class (:foreground ,red-alt
-                                                        
,@(modus-vivendi-theme-heading-block
-                                                           red-nuanced-bg 
red-nuanced)))))
-   `(org-clock-overlay ((,class (:inherit modus-theme-special-cold))))
-   `(org-code ((,class (:inherit fixed-pitch :foreground ,magenta))))
-   `(org-column ((,class (:background ,bg-alt))))
-   `(org-column-title ((,class (:underline t :background ,bg-alt :weight 
bold))))
-   `(org-date ((,class (:foreground ,cyan-alt-other :underline t))))
-   `(org-date-selected ((,class (:inherit modus-theme-intense-cyan :weight 
bold))))
-   `(org-default ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(org-document-info ((,class (:foreground ,fg-special-cold))))
-   `(org-document-info-keyword ((,class (:inherit fixed-pitch :foreground 
,fg-alt))))
-   `(org-document-title ((,class (:inherit ,modus-theme-variable-pitch 
:foreground ,fg-special-cold :weight bold
-                                           ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-5)))))
-   `(org-done ((,class (,@(modus-vivendi-theme-org-todo-block green-nuanced-bg 
green-nuanced green)))))
-   `(org-drawer ((,class (:foreground ,cyan-alt))))
-   `(org-ellipsis ((,class (:foreground nil)))) ; inherits from the heading's 
colour
-   `(org-footnote ((,class (:foreground ,blue-alt :underline t))))
-   `(org-formula ((,class (:foreground ,red-alt))))
-   `(org-habit-alert-face ((,class (:inherit modus-theme-intense-yellow))))
-   `(org-habit-alert-future-face ((,class (:inherit 
modus-theme-refine-yellow))))
-   `(org-habit-clear-face ((,class (:inherit modus-theme-intense-magenta))))
-   `(org-habit-clear-future-face ((,class (:inherit 
modus-theme-refine-magenta))))
-   `(org-habit-overdue-face ((,class (:inherit modus-theme-intense-red))))
-   `(org-habit-overdue-future-face ((,class (:inherit 
modus-theme-refine-red))))
-   `(org-habit-ready-face ((,class (:inherit modus-theme-intense-blue))))
-   `(org-habit-ready-future-face ((,class (:inherit modus-theme-refine-blue))))
-   `(org-headline-done ((,class (:foreground ,green-nuanced
-                                             
,@(modus-vivendi-theme-heading-block
-                                                green-nuanced-bg 
green-nuanced)))))
-   `(org-hide ((,class (:foreground ,bg-main))))
-   `(org-indent ((,class (:inherit (fixed-pitch org-hide)))))
-   `(org-latex-and-related ((,class (:foreground ,magenta-refine-fg))))
-   `(org-level-1 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-vivendi-theme-heading-foreground 
fg-main magenta-alt-other)
-                                    ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)
-                                    ,@(modus-vivendi-theme-heading-block 
magenta-nuanced-bg magenta-nuanced)))))
-   `(org-level-2 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-vivendi-theme-heading-foreground 
fg-special-warm magenta-alt)
-                                    ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3)
-                                    ,@(modus-vivendi-theme-heading-block 
red-nuanced-bg red-nuanced)))))
-   `(org-level-3 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-vivendi-theme-heading-foreground 
fg-special-cold blue)
-                                    ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2)
-                                    ,@(modus-vivendi-theme-heading-block 
blue-nuanced-bg blue-nuanced)))))
-   `(org-level-4 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-vivendi-theme-heading-foreground 
fg-special-mild cyan-alt-other)
-                                    ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-1)
-                                    ,@(modus-vivendi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced)))))
-   `(org-level-5 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-vivendi-theme-heading-foreground 
fg-special-calm green-alt)
-                                    ,@(modus-vivendi-theme-heading-block 
green-nuanced-bg green-nuanced)))))
-   `(org-level-6 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-vivendi-theme-heading-foreground 
yellow-nuanced yellow-alt-other)
-                                    ,@(modus-vivendi-theme-heading-block 
yellow-nuanced-bg yellow-nuanced)))))
-   `(org-level-7 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-vivendi-theme-heading-foreground 
red-nuanced red-alt)
-                                    ,@(modus-vivendi-theme-heading-block 
red-nuanced-bg red-nuanced)))))
-   `(org-level-8 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                    ,@(modus-vivendi-theme-heading-foreground 
fg-dim magenta)
-                                    ,@(modus-vivendi-theme-heading-block 
bg-alt fg-alt)))))
-   `(org-link ((,class (:inherit link))))
-   `(org-list-dt ((,class (:weight bold))))
-   `(org-macro ((,class (:inherit org-latex-and-related))))
-   `(org-meta-line ((,class (:inherit fixed-pitch :foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(org-mode-line-clock ((,class (:foreground ,fg-main))))
-   `(org-mode-line-clock-overrun ((,class (:inherit modus-theme-active-red))))
-   `(org-priority ((,class (,@(modus-vivendi-theme-org-todo-block 
blue-nuanced-bg blue-nuanced magenta)
-                            ,@(modus-vivendi-theme-heading-foreground magenta 
blue-alt)))))
-   `(org-quote ((,class (,@(modus-vivendi-theme-org-src-block bg-dim bg-main)
-                         :foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(org-scheduled ((,class (:foreground ,fg-special-cold))))
-   `(org-scheduled-previously ((,class (:foreground ,fg-special-warm))))
-   `(org-scheduled-today ((,class (:foreground ,yellow-alt-other))))
-   `(org-sexp-date ((,class (:inherit org-date))))
-   `(org-special-keyword ((,class (,@(modus-vivendi-theme-org-todo-block 
cyan-nuanced-bg cyan-nuanced cyan-alt)))))
-   `(org-table ((,class (:inherit fixed-pitch :foreground ,fg-special-cold))))
-   `(org-tag ((,class (:foreground ,magenta-nuanced :weight normal))))
-   `(org-tag-group ((,class (:foreground ,cyan-nuanced :weight bold))))
-   `(org-target ((,class (:underline t))))
-   `(org-time-grid ((,class (:foreground ,fg-unfocused))))
-   `(org-todo ((,class (,@(modus-vivendi-theme-org-todo-block red-nuanced-bg 
red-nuanced red-alt)
-                        ,@(modus-vivendi-theme-heading-foreground red-alt 
red-alt-other)))))
-   `(org-upcoming-deadline ((,class (:foreground ,red-alt-other))))
-   `(org-upcoming-distant-deadline ((,class (:foreground ,red-nuanced))))
-   `(org-verbatim ((,class (:inherit fixed-pitch :background ,bg-alt 
:foreground ,fg-special-calm))))
-   `(org-verse ((,class (:inherit org-quote))))
-   `(org-warning ((,class (:foreground ,blue-intense))))
+   `(org-agenda-calendar-event ((,class :foreground ,fg-main)))
+   `(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
+   `(org-agenda-clocking ((,class :inherit modus-theme-special-cold)))
+   `(org-agenda-column-dateline ((,class :inherit modus-theme-subtle-neutral)))
+   `(org-agenda-current-time ((,class :inherit modus-theme-intense-cyan)))
+   `(org-agenda-date ((,class :inherit ,modus-theme-variable-pitch :foreground 
,cyan-alt-other
+                              ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)
+                              ,@(modus-vivendi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced))))
+   `(org-agenda-date-today ((,class :inherit ,modus-theme-variable-pitch 
:background ,cyan-subtle-bg
+                                    :foreground ,fg-main :weight bold
+                                    ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(org-agenda-date-weekend ((,class :inherit ,modus-theme-variable-pitch 
:foreground ,cyan
+                                      ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)
+                                      ,@(modus-vivendi-theme-heading-block 
blue-nuanced-bg cyan-nuanced))))
+   `(org-agenda-diary ((,class :foreground ,fg-main)))
+   `(org-agenda-dimmed-todo-face ((,class :inherit 
modus-theme-subtle-neutral)))
+   `(org-agenda-done ((,class ,@(modus-vivendi-theme-org-todo-block 
green-nuanced-bg green-nuanced green))))
+   `(org-agenda-filter-category ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(org-agenda-filter-effort ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(org-agenda-filter-regexp ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(org-agenda-filter-tags ((,class :background ,bg-active :foreground 
,fg-main :box t)))
+   `(org-agenda-restriction-lock ((,class :background ,bg-dim :foreground 
,fg-dim)))
+   `(org-agenda-structure ((,class :inherit ,modus-theme-variable-pitch
+                                   :foreground ,fg-special-mild
+                                   ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3))))
+   `(org-archived ((,class :background ,bg-alt :foreground ,fg-alt)))
+   `(org-block ((,class ,@(modus-vivendi-theme-org-src-block bg-dim bg-main)
+                        :inherit fixed-pitch :foreground ,fg-main)))
+   `(org-block-begin-line ((,class ,@(and (>= emacs-major-version 27)
+                                          
modus-vivendi-theme-distinct-org-blocks
+                                          '(:extend t))
+                                   :inherit fixed-pitch :background ,bg-alt 
:foreground ,fg-special-mild)))
+   `(org-block-end-line ((,class :inherit org-block-begin-line)))
+   `(org-checkbox ((,class :box (:line-width 1 :color ,bg-active)
+                           :background ,bg-inactive :foreground ,fg-active)))
+   `(org-checkbox-statistics-done ((,class :foreground ,green
+                                           ,@(modus-vivendi-theme-heading-block
+                                              green-nuanced-bg 
green-nuanced))))
+   `(org-checkbox-statistics-todo ((,class :foreground ,red-alt
+                                           ,@(modus-vivendi-theme-heading-block
+                                              red-nuanced-bg red-nuanced))))
+   `(org-clock-overlay ((,class :inherit modus-theme-special-cold)))
+   `(org-code ((,class :inherit fixed-pitch :foreground ,magenta)))
+   `(org-column ((,class :background ,bg-alt)))
+   `(org-column-title ((,class :underline t :background ,bg-alt :weight bold)))
+   `(org-date ((,class :foreground ,cyan-alt-other :underline t)))
+   `(org-date-selected ((,class :inherit modus-theme-intense-cyan :weight 
bold)))
+   `(org-default ((,class :background ,bg-main :foreground ,fg-main)))
+   `(org-document-info ((,class :foreground ,fg-special-cold)))
+   `(org-document-info-keyword ((,class :inherit fixed-pitch :foreground 
,fg-alt)))
+   `(org-document-title ((,class :inherit ,modus-theme-variable-pitch 
:foreground ,fg-special-cold :weight bold
+                                 ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-5))))
+   `(org-done ((,class ,@(modus-vivendi-theme-org-todo-block green-nuanced-bg 
green-nuanced green))))
+   `(org-drawer ((,class :foreground ,cyan-alt)))
+   `(org-ellipsis ((,class :foreground nil))) ; inherits from the heading's 
colour
+   `(org-footnote ((,class :foreground ,blue-alt :underline t)))
+   `(org-formula ((,class :foreground ,red-alt)))
+   `(org-habit-alert-face ((,class :inherit modus-theme-intense-yellow)))
+   `(org-habit-alert-future-face ((,class :inherit modus-theme-refine-yellow)))
+   `(org-habit-clear-face ((,class :inherit modus-theme-intense-magenta)))
+   `(org-habit-clear-future-face ((,class :inherit 
modus-theme-refine-magenta)))
+   `(org-habit-overdue-face ((,class :inherit modus-theme-intense-red)))
+   `(org-habit-overdue-future-face ((,class :inherit modus-theme-refine-red)))
+   `(org-habit-ready-face ((,class :inherit modus-theme-intense-blue)))
+   `(org-habit-ready-future-face ((,class :inherit modus-theme-refine-blue)))
+   `(org-headline-done ((,class :foreground ,green-nuanced
+                                ,@(modus-vivendi-theme-heading-block
+                                   green-nuanced-bg green-nuanced))))
+   `(org-hide ((,class :foreground ,bg-main)))
+   `(org-indent ((,class :inherit (fixed-pitch org-hide))))
+   `(org-latex-and-related ((,class :foreground ,magenta-refine-fg)))
+   `(org-level-1 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-vivendi-theme-heading-foreground fg-main 
magenta-alt-other)
+                          ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)
+                          ,@(modus-vivendi-theme-heading-block 
magenta-nuanced-bg magenta-nuanced))))
+   `(org-level-2 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-vivendi-theme-heading-foreground 
fg-special-warm magenta-alt)
+                          ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3)
+                          ,@(modus-vivendi-theme-heading-block red-nuanced-bg 
red-nuanced))))
+   `(org-level-3 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-vivendi-theme-heading-foreground 
fg-special-cold blue)
+                          ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2)
+                          ,@(modus-vivendi-theme-heading-block blue-nuanced-bg 
blue-nuanced))))
+   `(org-level-4 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-vivendi-theme-heading-foreground 
fg-special-mild cyan-alt-other)
+                          ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-1)
+                          ,@(modus-vivendi-theme-heading-block cyan-nuanced-bg 
cyan-nuanced))))
+   `(org-level-5 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-vivendi-theme-heading-foreground 
fg-special-calm green-alt)
+                          ,@(modus-vivendi-theme-heading-block 
green-nuanced-bg green-nuanced))))
+   `(org-level-6 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-vivendi-theme-heading-foreground 
yellow-nuanced yellow-alt-other)
+                          ,@(modus-vivendi-theme-heading-block 
yellow-nuanced-bg yellow-nuanced))))
+   `(org-level-7 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-vivendi-theme-heading-foreground 
red-nuanced red-alt)
+                          ,@(modus-vivendi-theme-heading-block red-nuanced-bg 
red-nuanced))))
+   `(org-level-8 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                          ,@(modus-vivendi-theme-heading-foreground fg-dim 
magenta)
+                          ,@(modus-vivendi-theme-heading-block bg-alt 
fg-alt))))
+   `(org-link ((,class :inherit link)))
+   `(org-list-dt ((,class :weight bold)))
+   `(org-macro ((,class :inherit org-latex-and-related)))
+   `(org-meta-line ((,class :inherit fixed-pitch :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(org-mode-line-clock ((,class :foreground ,fg-main)))
+   `(org-mode-line-clock-overrun ((,class :inherit modus-theme-active-red)))
+   `(org-priority ((,class ,@(modus-vivendi-theme-org-todo-block 
blue-nuanced-bg blue-nuanced magenta)
+                           ,@(modus-vivendi-theme-heading-foreground magenta 
blue-alt))))
+   `(org-quote ((,class ,@(modus-vivendi-theme-org-src-block bg-dim bg-main)
+                        :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(org-scheduled ((,class :foreground ,fg-special-cold)))
+   `(org-scheduled-previously ((,class :foreground ,fg-special-warm)))
+   `(org-scheduled-today ((,class :foreground ,yellow-alt-other)))
+   `(org-sexp-date ((,class :inherit org-date)))
+   `(org-special-keyword ((,class ,@(modus-vivendi-theme-org-todo-block 
cyan-nuanced-bg cyan-nuanced cyan-alt))))
+   `(org-table ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
+   `(org-tag ((,class :foreground ,magenta-nuanced :weight normal)))
+   `(org-tag-group ((,class :foreground ,cyan-nuanced :weight bold)))
+   `(org-target ((,class :underline t)))
+   `(org-time-grid ((,class :foreground ,fg-unfocused)))
+   `(org-todo ((,class ,@(modus-vivendi-theme-org-todo-block red-nuanced-bg 
red-nuanced red-alt)
+                       ,@(modus-vivendi-theme-heading-foreground red-alt 
red-alt-other))))
+   `(org-upcoming-deadline ((,class :foreground ,red-alt-other)))
+   `(org-upcoming-distant-deadline ((,class :foreground ,red-nuanced)))
+   `(org-verbatim ((,class :inherit fixed-pitch :background ,bg-alt 
:foreground ,fg-special-calm)))
+   `(org-verse ((,class :inherit org-quote)))
+   `(org-warning ((,class :foreground ,blue-intense)))
    ;;;; org-journal
-   `(org-journal-calendar-entry-face ((,class (:foreground ,yellow-alt-other 
:slant ,modus-theme-slant))))
-   `(org-journal-calendar-scheduled-face ((,class (:foreground ,red-alt-other 
:slant ,modus-theme-slant))))
-   `(org-journal-highlight ((,class (:foreground ,magenta-alt))))
+   `(org-journal-calendar-entry-face ((,class :foreground ,yellow-alt-other 
:slant ,modus-theme-slant)))
+   `(org-journal-calendar-scheduled-face ((,class :foreground ,red-alt-other 
:slant ,modus-theme-slant)))
+   `(org-journal-highlight ((,class :foreground ,magenta-alt)))
    ;;;; org-noter
-   `(org-noter-no-notes-exist-face ((,class (:foreground ,red-active :weight 
bold))))
-   `(org-noter-notes-exist-face ((,class (:foreground ,green-active :weight 
bold))))
+   `(org-noter-no-notes-exist-face ((,class :foreground ,red-active :weight 
bold)))
+   `(org-noter-notes-exist-face ((,class :foreground ,green-active :weight 
bold)))
    ;;;; org-pomodoro
-   `(org-pomodoro-mode-line ((,class (:foreground ,red-active))))
-   `(org-pomodoro-mode-line-break ((,class (:foreground ,cyan-active))))
-   `(org-pomodoro-mode-line-overtime ((,class (:foreground ,red-active :weight 
bold))))
+   `(org-pomodoro-mode-line ((,class :foreground ,red-active)))
+   `(org-pomodoro-mode-line-break ((,class :foreground ,cyan-active)))
+   `(org-pomodoro-mode-line-overtime ((,class :foreground ,red-active :weight 
bold)))
    ;;;; org-recur
-   `(org-recur ((,class (:foreground ,magenta-active))))
+   `(org-recur ((,class :foreground ,magenta-active)))
    ;;;; org-roam
-   `(org-roam-link ((,class (:foreground ,blue-alt-other :underline t))))
-   `(org-roam-backlink ((,class (:foreground ,green-alt-other :underline t))))
+   `(org-roam-link ((,class :foreground ,blue-alt-other :underline t)))
+   `(org-roam-backlink ((,class :foreground ,green-alt-other :underline t)))
    ;;;; org-superstar
-   `(org-superstar-item ((,class (:foreground ,fg-main))))
-   `(org-superstar-leading ((,class (:foreground ,fg-whitespace))))
+   `(org-superstar-item ((,class :foreground ,fg-main)))
+   `(org-superstar-leading ((,class :foreground ,fg-whitespace)))
    ;;;; org-treescope
-   `(org-treescope-faces--markerinternal-midday ((,class (:inherit 
modus-theme-intense-blue))))
-   `(org-treescope-faces--markerinternal-range ((,class (:inherit 
modus-theme-special-mild))))
+   `(org-treescope-faces--markerinternal-midday ((,class :inherit 
modus-theme-intense-blue)))
+   `(org-treescope-faces--markerinternal-range ((,class :inherit 
modus-theme-special-mild)))
    ;;;; origami
-   `(origami-fold-header-face ((,class (:background ,bg-dim :foreground 
,fg-dim :box t))))
-   `(origami-fold-replacement-face ((,class (:background ,bg-alt :foreground 
,fg-alt))))
+   `(origami-fold-header-face ((,class :background ,bg-dim :foreground ,fg-dim 
:box t)))
+   `(origami-fold-replacement-face ((,class :background ,bg-alt :foreground 
,fg-alt)))
    ;;;; outline-mode
-   `(outline-1 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-vivendi-theme-heading-foreground 
fg-main magenta-alt-other)
-                                  ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)
-                                  ,@(modus-vivendi-theme-heading-block 
magenta-nuanced-bg magenta-nuanced)))))
-   `(outline-2 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-vivendi-theme-heading-foreground 
fg-special-warm magenta-alt)
-                                  ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3)
-                                  ,@(modus-vivendi-theme-heading-block 
red-nuanced-bg red-nuanced)))))
-   `(outline-3 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-vivendi-theme-heading-foreground 
fg-special-cold blue)
-                                  ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2)
-                                  ,@(modus-vivendi-theme-heading-block 
blue-nuanced-bg blue-nuanced)))))
-   `(outline-4 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-vivendi-theme-heading-foreground 
fg-special-mild cyan-alt-other)
-                                  ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-1)
-                                  ,@(modus-vivendi-theme-heading-block 
cyan-nuanced-bg cyan-nuanced)))))
-   `(outline-5 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-vivendi-theme-heading-foreground 
fg-special-calm green-alt)
-                                  ,@(modus-vivendi-theme-heading-block 
green-nuanced-bg green-nuanced)))))
-   `(outline-6 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-vivendi-theme-heading-foreground 
yellow-nuanced yellow-alt-other)
-                                  ,@(modus-vivendi-theme-heading-block 
yellow-nuanced-bg yellow-nuanced)))))
-   `(outline-7 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-vivendi-theme-heading-foreground 
red-nuanced red-alt)
-                                  ,@(modus-vivendi-theme-heading-block 
red-nuanced-bg red-nuanced)))))
-   `(outline-8 ((,class (:inherit ,modus-theme-variable-pitch :weight bold
-                                  ,@(modus-vivendi-theme-heading-foreground 
fg-dim magenta)
-                                  ,@(modus-vivendi-theme-heading-block bg-alt 
fg-alt)))))
+   `(outline-1 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-vivendi-theme-heading-foreground fg-main 
magenta-alt-other)
+                        ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)
+                        ,@(modus-vivendi-theme-heading-block 
magenta-nuanced-bg magenta-nuanced))))
+   `(outline-2 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-vivendi-theme-heading-foreground 
fg-special-warm magenta-alt)
+                        ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3)
+                        ,@(modus-vivendi-theme-heading-block red-nuanced-bg 
red-nuanced))))
+   `(outline-3 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-vivendi-theme-heading-foreground 
fg-special-cold blue)
+                        ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-2)
+                        ,@(modus-vivendi-theme-heading-block blue-nuanced-bg 
blue-nuanced))))
+   `(outline-4 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-vivendi-theme-heading-foreground 
fg-special-mild cyan-alt-other)
+                        ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-1)
+                        ,@(modus-vivendi-theme-heading-block cyan-nuanced-bg 
cyan-nuanced))))
+   `(outline-5 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-vivendi-theme-heading-foreground 
fg-special-calm green-alt)
+                        ,@(modus-vivendi-theme-heading-block green-nuanced-bg 
green-nuanced))))
+   `(outline-6 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-vivendi-theme-heading-foreground 
yellow-nuanced yellow-alt-other)
+                        ,@(modus-vivendi-theme-heading-block yellow-nuanced-bg 
yellow-nuanced))))
+   `(outline-7 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-vivendi-theme-heading-foreground red-nuanced 
red-alt)
+                        ,@(modus-vivendi-theme-heading-block red-nuanced-bg 
red-nuanced))))
+   `(outline-8 ((,class :inherit ,modus-theme-variable-pitch :weight bold
+                        ,@(modus-vivendi-theme-heading-foreground fg-dim 
magenta)
+                        ,@(modus-vivendi-theme-heading-block bg-alt fg-alt))))
    ;;;; outline-minor-faces
-   `(outline-minor-0 ((,class (:background ,bg-alt))))
+   `(outline-minor-0 ((,class :background ,bg-alt)))
    ;;;; package (M-x list-packages)
-   `(package-description ((,class (:foreground ,fg-special-cold))))
-   `(package-help-section-name ((,class (:foreground ,magenta-alt-other 
:weight bold))))
-   `(package-name ((,class (:inherit link))))
-   `(package-status-avail-obso ((,class (:foreground ,red :weight bold))))
-   `(package-status-available ((,class (:foreground ,fg-special-mild))))
-   `(package-status-built-in ((,class (:foreground ,magenta))))
-   `(package-status-dependency ((,class (:foreground ,magenta-alt-other))))
-   `(package-status-disabled ((,class (:inherit modus-theme-subtle-red))))
-   `(package-status-external ((,class (:foreground ,cyan-alt-other))))
-   `(package-status-held ((,class (:foreground ,yellow-alt))))
-   `(package-status-incompat ((,class (:foreground ,yellow :weight bold))))
-   `(package-status-installed ((,class (:foreground ,fg-special-warm))))
-   `(package-status-new ((,class (:foreground ,green :weight bold))))
-   `(package-status-unsigned ((,class (:foreground ,red-alt :weight bold))))
+   `(package-description ((,class :foreground ,fg-special-cold)))
+   `(package-help-section-name ((,class :foreground ,magenta-alt-other :weight 
bold)))
+   `(package-name ((,class :inherit link)))
+   `(package-status-avail-obso ((,class :foreground ,red :weight bold)))
+   `(package-status-available ((,class :foreground ,fg-special-mild)))
+   `(package-status-built-in ((,class :foreground ,magenta)))
+   `(package-status-dependency ((,class :foreground ,magenta-alt-other)))
+   `(package-status-disabled ((,class :inherit modus-theme-subtle-red)))
+   `(package-status-external ((,class :foreground ,cyan-alt-other)))
+   `(package-status-held ((,class :foreground ,yellow-alt)))
+   `(package-status-incompat ((,class :foreground ,yellow :weight bold)))
+   `(package-status-installed ((,class :foreground ,fg-special-warm)))
+   `(package-status-new ((,class :foreground ,green :weight bold)))
+   `(package-status-unsigned ((,class :foreground ,red-alt :weight bold)))
    ;;;; page-break-lines
-   `(page-break-lines ((,class (:inherit default :foreground 
,fg-window-divider-outer))))
+   `(page-break-lines ((,class :inherit default :foreground 
,fg-window-divider-outer)))
    ;;;; paradox
-   `(paradox-archive-face ((,class (:foreground ,fg-special-mild))))
-   `(paradox-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(paradox-commit-tag-face ((,class (:inherit modus-theme-refine-magenta 
:box t))))
-   `(paradox-description-face ((,class (:foreground ,fg-special-cold))))
-   `(paradox-description-face-multiline ((,class (:foreground 
,fg-special-cold))))
-   `(paradox-download-face ((,class (:foreground ,blue-alt-other :weight 
,modus-theme-bold))))
-   `(paradox-highlight-face ((,class (:foreground ,cyan-alt-other :weight 
,modus-theme-bold))))
-   `(paradox-homepage-button-face ((,class (:foreground ,magenta-alt-other 
:underline t))))
-   `(paradox-mode-line-face ((,class (:foreground ,cyan-active :weight bold))))
-   `(paradox-name-face ((,class (:foreground ,blue :underline t))))
-   `(paradox-star-face ((,class (:foreground ,magenta))))
-   `(paradox-starred-face ((,class (:foreground ,magenta-alt))))
+   `(paradox-archive-face ((,class :foreground ,fg-special-mild)))
+   `(paradox-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(paradox-commit-tag-face ((,class :inherit modus-theme-refine-magenta :box 
t)))
+   `(paradox-description-face ((,class :foreground ,fg-special-cold)))
+   `(paradox-description-face-multiline ((,class :foreground 
,fg-special-cold)))
+   `(paradox-download-face ((,class :foreground ,blue-alt-other :weight 
,modus-theme-bold)))
+   `(paradox-highlight-face ((,class :foreground ,cyan-alt-other :weight 
,modus-theme-bold)))
+   `(paradox-homepage-button-face ((,class :foreground ,magenta-alt-other 
:underline t)))
+   `(paradox-mode-line-face ((,class :foreground ,cyan-active :weight bold)))
+   `(paradox-name-face ((,class :foreground ,blue :underline t)))
+   `(paradox-star-face ((,class :foreground ,magenta)))
+   `(paradox-starred-face ((,class :foreground ,magenta-alt)))
    ;;;; paren-face
-   `(parenthesis ((,class (:foreground ,fg-alt))))
+   `(parenthesis ((,class :foreground ,fg-alt)))
    ;;;; parrot
-   `(parrot-rotate-rotation-highlight-face ((,class (:inherit 
modus-theme-refine-magenta))))
+   `(parrot-rotate-rotation-highlight-face ((,class :inherit 
modus-theme-refine-magenta)))
    ;;;; pass
-   `(pass-mode-directory-face ((,class (:foreground ,fg-special-cold :weight 
bold))))
-   `(pass-mode-entry-face ((,class (:background ,bg-main :foreground 
,fg-main))))
-   `(pass-mode-header-face ((,class (:foreground ,fg-special-warm))))
+   `(pass-mode-directory-face ((,class :foreground ,fg-special-cold :weight 
bold)))
+   `(pass-mode-entry-face ((,class :background ,bg-main :foreground ,fg-main)))
+   `(pass-mode-header-face ((,class :foreground ,fg-special-warm)))
    ;;;; persp-mode
-   `(persp-face-lighter-buffer-not-in-persp ((,class (:inherit 
modus-theme-intense-red))))
-   `(persp-face-lighter-default ((,class (:foreground ,blue-active :weight 
bold))))
-   `(persp-face-lighter-nil-persp ((,class (:foreground ,fg-active :weight 
bold))))
+   `(persp-face-lighter-buffer-not-in-persp ((,class :inherit 
modus-theme-intense-red)))
+   `(persp-face-lighter-default ((,class :foreground ,blue-active :weight 
bold)))
+   `(persp-face-lighter-nil-persp ((,class :foreground ,fg-active :weight 
bold)))
    ;;;; perspective
-   `(persp-selected-face ((,class (:foreground ,blue-active :weight bold))))
+   `(persp-selected-face ((,class :foreground ,blue-active :weight bold)))
    ;;;; phi-grep
-   `(phi-grep-heading-face  ((,class (:foreground ,red-alt :weight bold
-                                                  ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
-   `(phi-grep-line-number-face ((,class (:foreground ,fg-special-warm))))
-   `(phi-grep-match-face ((,class (:inherit modus-theme-special-calm))))
-   `(phi-grep-modified-face ((,class (:inherit modus-theme-refine-yellow))))
-   `(phi-grep-overlay-face ((,class (:inherit modus-theme-refine-blue))))
+   `(phi-grep-heading-face  ((,class :foreground ,red-alt :weight bold
+                                     ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(phi-grep-line-number-face ((,class :foreground ,fg-special-warm)))
+   `(phi-grep-match-face ((,class :inherit modus-theme-special-calm)))
+   `(phi-grep-modified-face ((,class :inherit modus-theme-refine-yellow)))
+   `(phi-grep-overlay-face ((,class :inherit modus-theme-refine-blue)))
    ;;;; phi-search
-   `(phi-replace-preview-face ((,class (:inherit 
modus-theme-intense-magenta))))
-   `(phi-search-failpart-face ((,class (:inherit modus-theme-refine-red))))
-   `(phi-search-match-face ((,class (:inherit modus-theme-refine-cyan))))
-   `(phi-search-selection-face ((,class (:inherit modus-theme-intense-green 
:weight bold))))
+   `(phi-replace-preview-face ((,class :inherit modus-theme-intense-magenta)))
+   `(phi-search-failpart-face ((,class :inherit modus-theme-refine-red)))
+   `(phi-search-match-face ((,class :inherit modus-theme-refine-cyan)))
+   `(phi-search-selection-face ((,class :inherit modus-theme-intense-green 
:weight bold)))
    ;;;; pomidor
-   `(pomidor-break-face ((,class (:foreground ,blue-alt-other))))
-   `(pomidor-overwork-face ((,class (:foreground ,red-alt-other))))
-   `(pomidor-skip-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(pomidor-work-face ((,class (:foreground ,green-alt-other))))
+   `(pomidor-break-face ((,class :foreground ,blue-alt-other)))
+   `(pomidor-overwork-face ((,class :foreground ,red-alt-other)))
+   `(pomidor-skip-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(pomidor-work-face ((,class :foreground ,green-alt-other)))
    ;;;; powerline
-   `(powerline-active0 ((,class (:background ,fg-inactive :foreground 
,bg-inactive))))
-   `(powerline-active1 ((,class (:background ,bg-active :foreground 
,fg-active))))
-   `(powerline-active2 ((,class (:background ,bg-alt :foreground ,fg-active))))
-   `(powerline-inactive0 ((,class (:background ,bg-active :foreground 
,fg-inactive))))
-   `(powerline-inactive1 ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(powerline-inactive2 ((,class (:background ,bg-main :foreground ,fg-alt))))
+   `(powerline-active0 ((,class :background ,fg-inactive :foreground 
,bg-inactive)))
+   `(powerline-active1 ((,class :background ,bg-active :foreground 
,fg-active)))
+   `(powerline-active2 ((,class :background ,bg-alt :foreground ,fg-active)))
+   `(powerline-inactive0 ((,class :background ,bg-active :foreground 
,fg-inactive)))
+   `(powerline-inactive1 ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(powerline-inactive2 ((,class :background ,bg-main :foreground ,fg-alt)))
    ;;;; powerline-evil
-   `(powerline-evil-base-face ((,class (:background ,fg-main :foreground 
,bg-main))))
-   `(powerline-evil-emacs-face ((,class (:inherit 
modus-theme-active-magenta))))
-   `(powerline-evil-insert-face ((,class (:inherit modus-theme-active-green))))
-   `(powerline-evil-motion-face ((,class (:inherit modus-theme-active-blue))))
-   `(powerline-evil-normal-face ((,class (:background ,fg-alt :foreground 
,bg-main))))
-   `(powerline-evil-operator-face ((,class (:inherit 
modus-theme-active-yellow))))
-   `(powerline-evil-replace-face ((,class (:inherit modus-theme-active-red))))
-   `(powerline-evil-visual-face ((,class (:inherit modus-theme-active-cyan))))
+   `(powerline-evil-base-face ((,class :background ,fg-main :foreground 
,bg-main)))
+   `(powerline-evil-emacs-face ((,class :inherit modus-theme-active-magenta)))
+   `(powerline-evil-insert-face ((,class :inherit modus-theme-active-green)))
+   `(powerline-evil-motion-face ((,class :inherit modus-theme-active-blue)))
+   `(powerline-evil-normal-face ((,class :background ,fg-alt :foreground 
,bg-main)))
+   `(powerline-evil-operator-face ((,class :inherit 
modus-theme-active-yellow)))
+   `(powerline-evil-replace-face ((,class :inherit modus-theme-active-red)))
+   `(powerline-evil-visual-face ((,class :inherit modus-theme-active-cyan)))
    ;;;; proced
-   `(proced-mark ((,class (:inherit modus-theme-mark-symbol))))
-   `(proced-marked ((,class (:inherit modus-theme-mark-alt))))
-   `(proced-sort-header ((,class (:foreground ,fg-special-calm :weight bold 
:underline t))))
+   `(proced-mark ((,class :inherit modus-theme-mark-symbol)))
+   `(proced-marked ((,class :inherit modus-theme-mark-alt)))
+   `(proced-sort-header ((,class :foreground ,fg-special-calm :weight bold 
:underline t)))
    ;;;; prodigy
-   `(prodigy-green-face ((,class (:foreground ,green))))
-   `(prodigy-red-face ((,class (:foreground ,red))))
-   `(prodigy-yellow-face ((,class (:foreground ,yellow))))
+   `(prodigy-green-face ((,class :foreground ,green)))
+   `(prodigy-red-face ((,class :foreground ,red)))
+   `(prodigy-yellow-face ((,class :foreground ,yellow)))
    ;;;; rainbow-blocks
-   `(rainbow-blocks-depth-1-face ((,class (:foreground ,magenta-alt-other))))
-   `(rainbow-blocks-depth-2-face ((,class (:foreground ,blue))))
-   `(rainbow-blocks-depth-3-face ((,class (:foreground ,magenta-alt))))
-   `(rainbow-blocks-depth-4-face ((,class (:foreground ,green))))
-   `(rainbow-blocks-depth-5-face ((,class (:foreground ,magenta))))
-   `(rainbow-blocks-depth-6-face ((,class (:foreground ,cyan))))
-   `(rainbow-blocks-depth-7-face ((,class (:foreground ,yellow))))
-   `(rainbow-blocks-depth-8-face ((,class (:foreground ,cyan-alt))))
-   `(rainbow-blocks-depth-9-face ((,class (:foreground ,red-alt))))
-   `(rainbow-blocks-unmatched-face ((,class (:foreground ,red))))
+   `(rainbow-blocks-depth-1-face ((,class :foreground ,magenta-alt-other)))
+   `(rainbow-blocks-depth-2-face ((,class :foreground ,blue)))
+   `(rainbow-blocks-depth-3-face ((,class :foreground ,magenta-alt)))
+   `(rainbow-blocks-depth-4-face ((,class :foreground ,green)))
+   `(rainbow-blocks-depth-5-face ((,class :foreground ,magenta)))
+   `(rainbow-blocks-depth-6-face ((,class :foreground ,cyan)))
+   `(rainbow-blocks-depth-7-face ((,class :foreground ,yellow)))
+   `(rainbow-blocks-depth-8-face ((,class :foreground ,cyan-alt)))
+   `(rainbow-blocks-depth-9-face ((,class :foreground ,red-alt)))
+   `(rainbow-blocks-unmatched-face ((,class :foreground ,red)))
    ;;;; rainbow-identifiers
-   `(rainbow-identifiers-identifier-1 ((,class (:foreground 
,green-alt-other))))
-   `(rainbow-identifiers-identifier-2 ((,class (:foreground 
,magenta-alt-other))))
-   `(rainbow-identifiers-identifier-3 ((,class (:foreground ,cyan-alt-other))))
-   `(rainbow-identifiers-identifier-4 ((,class (:foreground 
,yellow-alt-other))))
-   `(rainbow-identifiers-identifier-5 ((,class (:foreground ,blue-alt-other))))
-   `(rainbow-identifiers-identifier-6 ((,class (:foreground ,green-alt))))
-   `(rainbow-identifiers-identifier-7 ((,class (:foreground ,magenta-alt))))
-   `(rainbow-identifiers-identifier-8 ((,class (:foreground ,cyan-alt))))
-   `(rainbow-identifiers-identifier-9 ((,class (:foreground ,yellow-alt))))
-   `(rainbow-identifiers-identifier-10 ((,class (:foreground ,green))))
-   `(rainbow-identifiers-identifier-11 ((,class (:foreground ,magenta))))
-   `(rainbow-identifiers-identifier-12 ((,class (:foreground ,cyan))))
-   `(rainbow-identifiers-identifier-13 ((,class (:foreground ,yellow))))
-   `(rainbow-identifiers-identifier-14 ((,class (:foreground ,blue-alt))))
-   `(rainbow-identifiers-identifier-15 ((,class (:foreground ,red-alt))))
+   `(rainbow-identifiers-identifier-1 ((,class :foreground ,green-alt-other)))
+   `(rainbow-identifiers-identifier-2 ((,class :foreground 
,magenta-alt-other)))
+   `(rainbow-identifiers-identifier-3 ((,class :foreground ,cyan-alt-other)))
+   `(rainbow-identifiers-identifier-4 ((,class :foreground ,yellow-alt-other)))
+   `(rainbow-identifiers-identifier-5 ((,class :foreground ,blue-alt-other)))
+   `(rainbow-identifiers-identifier-6 ((,class :foreground ,green-alt)))
+   `(rainbow-identifiers-identifier-7 ((,class :foreground ,magenta-alt)))
+   `(rainbow-identifiers-identifier-8 ((,class :foreground ,cyan-alt)))
+   `(rainbow-identifiers-identifier-9 ((,class :foreground ,yellow-alt)))
+   `(rainbow-identifiers-identifier-10 ((,class :foreground ,green)))
+   `(rainbow-identifiers-identifier-11 ((,class :foreground ,magenta)))
+   `(rainbow-identifiers-identifier-12 ((,class :foreground ,cyan)))
+   `(rainbow-identifiers-identifier-13 ((,class :foreground ,yellow)))
+   `(rainbow-identifiers-identifier-14 ((,class :foreground ,blue-alt)))
+   `(rainbow-identifiers-identifier-15 ((,class :foreground ,red-alt)))
    ;;;; rainbow-delimiters
-   `(rainbow-delimiters-base-face-error ((,class (:foreground ,red))))
-   `(rainbow-delimiters-base-face ((,class (:foreground ,fg-main))))
-   `(rainbow-delimiters-depth-1-face ((,class (:foreground ,green-alt-other))))
-   `(rainbow-delimiters-depth-2-face ((,class (:foreground 
,magenta-alt-other))))
-   `(rainbow-delimiters-depth-3-face ((,class (:foreground ,cyan-alt-other))))
-   `(rainbow-delimiters-depth-4-face ((,class (:foreground 
,yellow-alt-other))))
-   `(rainbow-delimiters-depth-5-face ((,class (:foreground ,blue-alt-other))))
-   `(rainbow-delimiters-depth-6-face ((,class (:foreground ,green-alt))))
-   `(rainbow-delimiters-depth-7-face ((,class (:foreground ,magenta-alt))))
-   `(rainbow-delimiters-depth-8-face ((,class (:foreground ,cyan-alt))))
-   `(rainbow-delimiters-depth-9-face ((,class (:foreground ,yellow-alt))))
-   `(rainbow-delimiters-mismatched-face ((,class (:foreground ,red-alt :weight 
bold))))
-   `(rainbow-delimiters-unmatched-face ((,class (:foreground ,red :weight 
bold))))
+   `(rainbow-delimiters-base-face-error ((,class :foreground ,red)))
+   `(rainbow-delimiters-base-face ((,class :foreground ,fg-main)))
+   `(rainbow-delimiters-depth-1-face ((,class :foreground ,green-alt-other)))
+   `(rainbow-delimiters-depth-2-face ((,class :foreground ,magenta-alt-other)))
+   `(rainbow-delimiters-depth-3-face ((,class :foreground ,cyan-alt-other)))
+   `(rainbow-delimiters-depth-4-face ((,class :foreground ,yellow-alt-other)))
+   `(rainbow-delimiters-depth-5-face ((,class :foreground ,blue-alt-other)))
+   `(rainbow-delimiters-depth-6-face ((,class :foreground ,green-alt)))
+   `(rainbow-delimiters-depth-7-face ((,class :foreground ,magenta-alt)))
+   `(rainbow-delimiters-depth-8-face ((,class :foreground ,cyan-alt)))
+   `(rainbow-delimiters-depth-9-face ((,class :foreground ,yellow-alt)))
+   `(rainbow-delimiters-mismatched-face ((,class :foreground ,red-alt :weight 
bold)))
+   `(rainbow-delimiters-unmatched-face ((,class :foreground ,red :weight 
bold)))
    ;;;; rcirc
-   `(rcirc-bright-nick ((,class (:foreground ,magenta-alt :weight bold))))
-   `(rcirc-dim-nick ((,class (:foreground ,fg-alt))))
-   `(rcirc-my-nick ((,class (:foreground ,magenta :weight bold))))
-   `(rcirc-nick-in-message ((,class (:foreground ,magenta-alt-other))))
-   `(rcirc-nick-in-message-full-line ((,class (:foreground ,fg-special-mild 
:weight bold))))
-   `(rcirc-other-nick ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(rcirc-prompt ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(rcirc-server ((,class (:foreground ,fg-unfocused))))
-   `(rcirc-timestamp ((,class (:foreground ,blue-nuanced))))
-   `(rcirc-url ((,class (:foreground ,blue :underline t))))
+   `(rcirc-bright-nick ((,class :foreground ,magenta-alt :weight bold)))
+   `(rcirc-dim-nick ((,class :foreground ,fg-alt)))
+   `(rcirc-my-nick ((,class :foreground ,magenta :weight bold)))
+   `(rcirc-nick-in-message ((,class :foreground ,magenta-alt-other)))
+   `(rcirc-nick-in-message-full-line ((,class :foreground ,fg-special-mild 
:weight bold)))
+   `(rcirc-other-nick ((,class :foreground ,fg-special-cold :weight bold)))
+   `(rcirc-prompt ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(rcirc-server ((,class :foreground ,fg-unfocused)))
+   `(rcirc-timestamp ((,class :foreground ,blue-nuanced)))
+   `(rcirc-url ((,class :foreground ,blue :underline t)))
    ;;;; regexp-builder (re-builder)
-   `(reb-match-0 ((,class (:inherit modus-theme-intense-blue))))
-   `(reb-match-1 ((,class (:inherit modus-theme-intense-magenta))))
-   `(reb-match-2 ((,class (:inherit modus-theme-intense-green))))
-   `(reb-match-3 ((,class (:inherit modus-theme-intense-red))))
-   `(reb-regexp-grouping-backslash ((,class (:foreground 
,fg-escape-char-backslash :weight bold))))
-   `(reb-regexp-grouping-construct ((,class (:foreground 
,fg-escape-char-construct :weight bold))))
+   `(reb-match-0 ((,class :inherit modus-theme-intense-blue)))
+   `(reb-match-1 ((,class :inherit modus-theme-intense-magenta)))
+   `(reb-match-2 ((,class :inherit modus-theme-intense-green)))
+   `(reb-match-3 ((,class :inherit modus-theme-intense-red)))
+   `(reb-regexp-grouping-backslash ((,class :foreground 
,fg-escape-char-backslash :weight bold)))
+   `(reb-regexp-grouping-construct ((,class :foreground 
,fg-escape-char-construct :weight bold)))
    ;;;; rg (rg.el)
-   `(rg-column-number-face ((,class (:foreground ,magenta-alt-other))))
-   `(rg-context-face ((,class (:foreground ,fg-unfocused))))
-   `(rg-error-face ((,class (:foreground ,red :weight bold))))
-   `(rg-file-tag-face ((,class (:foreground ,fg-special-cold))))
-   `(rg-filename-face ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(rg-line-number-face ((,class (:foreground ,fg-special-warm))))
-   `(rg-literal-face ((,class (:foreground ,blue-alt))))
-   `(rg-match-face ((,class (:inherit modus-theme-special-calm))))
-   `(rg-regexp-face ((,class (:foreground ,magenta-active))))
-   `(rg-toggle-off-face ((,class (:foreground ,fg-inactive :weight bold))))
-   `(rg-toggle-on-face ((,class (:foreground ,cyan-active :weight bold))))
-   `(rg-warning-face ((,class (:foreground ,yellow :weight bold))))
+   `(rg-column-number-face ((,class :foreground ,magenta-alt-other)))
+   `(rg-context-face ((,class :foreground ,fg-unfocused)))
+   `(rg-error-face ((,class :foreground ,red :weight bold)))
+   `(rg-file-tag-face ((,class :foreground ,fg-special-cold)))
+   `(rg-filename-face ((,class :foreground ,fg-special-cold :weight bold)))
+   `(rg-line-number-face ((,class :foreground ,fg-special-warm)))
+   `(rg-literal-face ((,class :foreground ,blue-alt)))
+   `(rg-match-face ((,class :inherit modus-theme-special-calm)))
+   `(rg-regexp-face ((,class :foreground ,magenta-active)))
+   `(rg-toggle-off-face ((,class :foreground ,fg-inactive :weight bold)))
+   `(rg-toggle-on-face ((,class :foreground ,cyan-active :weight bold)))
+   `(rg-warning-face ((,class :foreground ,yellow :weight bold)))
    ;;;; ripgrep
-   `(ripgrep-context-face ((,class (:foreground ,fg-unfocused))))
-   `(ripgrep-error-face ((,class (:foreground ,red :weight bold))))
-   `(ripgrep-hit-face ((,class (:foreground ,cyan))))
-   `(ripgrep-match-face ((,class (:inherit modus-theme-special-calm))))
+   `(ripgrep-context-face ((,class :foreground ,fg-unfocused)))
+   `(ripgrep-error-face ((,class :foreground ,red :weight bold)))
+   `(ripgrep-hit-face ((,class :foreground ,cyan)))
+   `(ripgrep-match-face ((,class :inherit modus-theme-special-calm)))
    ;;;; rmail
-   `(rmail-header-name ((,class (:foreground ,cyan-alt-other))))
-   `(rmail-highlight ((,class (:foreground ,magenta-alt :weight bold))))
+   `(rmail-header-name ((,class :foreground ,cyan-alt-other)))
+   `(rmail-highlight ((,class :foreground ,magenta-alt :weight bold)))
    ;;;; ruler-mode
-   `(ruler-mode-column-number ((,class (:inherit ruler-mode-default 
:foreground ,fg-main :weight bold))))
-   `(ruler-mode-comment-column ((,class (:inherit ruler-mode-default 
:foreground ,red-active))))
-   `(ruler-mode-current-column ((,class (:inherit ruler-mode-default 
:foreground ,cyan-active :box t))))
-   `(ruler-mode-default ((,class (:background ,bg-inactive :foreground 
,fg-inactive))))
-   `(ruler-mode-fill-column ((,class (:inherit ruler-mode-default :foreground 
,green-active))))
-   `(ruler-mode-fringes ((,class (:inherit ruler-mode-default :foreground 
,blue-active))))
-   `(ruler-mode-goal-column ((,class (:inherit ruler-mode-default :foreground 
,magenta-active))))
-   `(ruler-mode-margins ((,class (:inherit ruler-mode-default :foreground 
,bg-main))))
-   `(ruler-mode-pad ((,class (:background ,bg-active :foreground 
,fg-inactive))))
-   `(ruler-mode-tab-stop ((,class (:inherit ruler-mode-default :foreground 
,yellow-active))))
+   `(ruler-mode-column-number ((,class :inherit ruler-mode-default :foreground 
,fg-main :weight bold)))
+   `(ruler-mode-comment-column ((,class :inherit ruler-mode-default 
:foreground ,red-active)))
+   `(ruler-mode-current-column ((,class :inherit ruler-mode-default 
:foreground ,cyan-active :box t)))
+   `(ruler-mode-default ((,class :background ,bg-inactive :foreground 
,fg-inactive)))
+   `(ruler-mode-fill-column ((,class :inherit ruler-mode-default :foreground 
,green-active)))
+   `(ruler-mode-fringes ((,class :inherit ruler-mode-default :foreground 
,blue-active)))
+   `(ruler-mode-goal-column ((,class :inherit ruler-mode-default :foreground 
,magenta-active)))
+   `(ruler-mode-margins ((,class :inherit ruler-mode-default :foreground 
,bg-main)))
+   `(ruler-mode-pad ((,class :background ,bg-active :foreground ,fg-inactive)))
+   `(ruler-mode-tab-stop ((,class :inherit ruler-mode-default :foreground 
,yellow-active)))
    ;;;; sallet
-   `(sallet-buffer-compressed ((,class (:foreground ,yellow-nuanced :slant 
italic))))
-   `(sallet-buffer-default-directory ((,class (:foreground ,cyan-nuanced))))
-   `(sallet-buffer-directory ((,class (:foreground ,blue-nuanced))))
-   `(sallet-buffer-help ((,class (:foreground ,fg-special-cold))))
-   `(sallet-buffer-modified ((,class (:foreground ,yellow-alt-other :slant 
italic))))
-   `(sallet-buffer-ordinary ((,class (:foreground ,fg-main))))
-   `(sallet-buffer-read-only ((,class (:foreground ,yellow-alt))))
-   `(sallet-buffer-size ((,class (:foreground ,fg-special-calm))))
-   `(sallet-buffer-special ((,class (:foreground ,magenta-alt-other))))
-   `(sallet-flx-match ((,class (:inherit modus-theme-refine-cyan))))
-   `(sallet-recentf-buffer-name ((,class (:foreground ,blue-nuanced))))
-   `(sallet-recentf-file-path ((,class (:foreground ,fg-special-mild))))
-   `(sallet-regexp-match ((,class (:inherit modus-theme-refine-magenta))))
-   `(sallet-source-header ((,class (:foreground ,red-alt :weight bold
-                                                ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4)))))
-   `(sallet-substring-match ((,class (:inherit modus-theme-refine-blue))))
+   `(sallet-buffer-compressed ((,class :foreground ,yellow-nuanced :slant 
italic)))
+   `(sallet-buffer-default-directory ((,class :foreground ,cyan-nuanced)))
+   `(sallet-buffer-directory ((,class :foreground ,blue-nuanced)))
+   `(sallet-buffer-help ((,class :foreground ,fg-special-cold)))
+   `(sallet-buffer-modified ((,class :foreground ,yellow-alt-other :slant 
italic)))
+   `(sallet-buffer-ordinary ((,class :foreground ,fg-main)))
+   `(sallet-buffer-read-only ((,class :foreground ,yellow-alt)))
+   `(sallet-buffer-size ((,class :foreground ,fg-special-calm)))
+   `(sallet-buffer-special ((,class :foreground ,magenta-alt-other)))
+   `(sallet-flx-match ((,class :inherit modus-theme-refine-cyan)))
+   `(sallet-recentf-buffer-name ((,class :foreground ,blue-nuanced)))
+   `(sallet-recentf-file-path ((,class :foreground ,fg-special-mild)))
+   `(sallet-regexp-match ((,class :inherit modus-theme-refine-magenta)))
+   `(sallet-source-header ((,class :foreground ,red-alt :weight bold
+                                   ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(sallet-substring-match ((,class :inherit modus-theme-refine-blue)))
    ;;;; selectrum
-   `(selectrum-current-candidate ((,class (:inherit 
modus-theme-intense-magenta))))
-   `(selectrum-primary-highlight ((,class (:inherit modus-theme-refine-blue 
:weight bold))))
-   `(selectrum-secondary-highlight ((,class (:inherit modus-theme-refine-cyan 
:weight bold))))
+   `(selectrum-current-candidate ((,class :inherit 
modus-theme-intense-magenta)))
+   `(selectrum-primary-highlight ((,class :inherit modus-theme-refine-blue 
:weight bold)))
+   `(selectrum-secondary-highlight ((,class :inherit modus-theme-refine-cyan 
:weight bold)))
    ;;;; sesman
-   `(sesman-browser-button-face ((,class (:foreground ,blue-alt-other 
:underline t))))
-   `(sesman-browser-highligh-face ((,class (:inherit 
modus-theme-subtle-blue))))
-   `(sesman-buffer-face ((,class (:foreground ,magenta))))
-   `(sesman-directory-face ((,class (:foreground ,blue :weight bold))))
-   `(sesman-project-face ((,class (:foreground ,magenta-alt-other :weight 
bold))))
+   `(sesman-browser-button-face ((,class :foreground ,blue-alt-other 
:underline t)))
+   `(sesman-browser-highligh-face ((,class :inherit modus-theme-subtle-blue)))
+   `(sesman-buffer-face ((,class :foreground ,magenta)))
+   `(sesman-directory-face ((,class :foreground ,blue :weight bold)))
+   `(sesman-project-face ((,class :foreground ,magenta-alt-other :weight 
bold)))
    ;;;; shell-script-mode
-   `(sh-heredoc ((,class (:foreground ,blue-alt))))
-   `(sh-quoted-exec ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
+   `(sh-heredoc ((,class :foreground ,blue-alt)))
+   `(sh-quoted-exec ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
    ;;;; show-paren-mode
-   `(show-paren-match ((,class (:background ,bg-paren-match :foreground 
,fg-main))))
-   `(show-paren-match-expression ((,class (:inherit 
modus-theme-special-calm))))
-   `(show-paren-mismatch ((,class (:inherit modus-theme-intense-red))))
+   `(show-paren-match ((,class :background ,bg-paren-match :foreground 
,fg-main)))
+   `(show-paren-match-expression ((,class :inherit modus-theme-special-calm)))
+   `(show-paren-mismatch ((,class :inherit modus-theme-intense-red)))
    ;;;; side-notes
-   `(side-notes ((,class (:background ,bg-dim :foreground ,fg-dim))))
+   `(side-notes ((,class :background ,bg-dim :foreground ,fg-dim)))
    ;;;; skewer-mode
-   `(skewer-error-face ((,class (:foreground ,red :underline t))))
+   `(skewer-error-face ((,class :foreground ,red :underline t)))
    ;;;; smart-mode-line
-   `(sml/charging ((,class (:foreground ,green-active))))
-   `(sml/discharging ((,class (:foreground ,red-active))))
-   `(sml/filename ((,class (:foreground ,blue-active :weight bold))))
-   `(sml/folder ((,class (:foreground ,fg-active))))
-   `(sml/git ((,class (:foreground ,green-active :weight bold))))
-   `(sml/global ((,class (:foreground ,fg-active))))
-   `(sml/line-number ((,class (:inherit sml/global))))
-   `(sml/minor-modes ((,class (:inherit sml/global))))
-   `(sml/modes ((,class (:foreground ,fg-active :weight bold))))
-   `(sml/modified ((,class (:foreground ,magenta-active :weight bold))))
-   `(sml/mule-info ((,class (:inherit sml/global))))
-   `(sml/name-filling ((,class (:foreground ,yellow-active))))
-   `(sml/not-modified ((,class (:inherit sml/global))))
-   `(sml/numbers-separator ((,class (:inherit sml/global))))
-   `(sml/outside-modified ((,class (:inherit modus-theme-intense-red))))
-   `(sml/position-percentage ((,class (:inherit sml/global))))
-   `(sml/prefix ((,class (:foreground ,green-active))))
-   `(sml/process ((,class (:inherit sml/prefix))))
-   `(sml/projectile ((,class (:inherit sml/git))))
-   `(sml/read-only ((,class (:foreground ,cyan-active :weight bold))))
-   `(sml/remote ((,class (:inherit sml/global))))
-   `(sml/sudo ((,class (:inherit modus-theme-subtle-red))))
-   `(sml/time ((,class (:inherit sml/global))))
-   `(sml/vc ((,class (:inherit sml/git))))
-   `(sml/vc-edited ((,class (:foreground ,yellow-active :weight bold))))
+   `(sml/charging ((,class :foreground ,green-active)))
+   `(sml/discharging ((,class :foreground ,red-active)))
+   `(sml/filename ((,class :foreground ,blue-active :weight bold)))
+   `(sml/folder ((,class :foreground ,fg-active)))
+   `(sml/git ((,class :foreground ,green-active :weight bold)))
+   `(sml/global ((,class :foreground ,fg-active)))
+   `(sml/line-number ((,class :inherit sml/global)))
+   `(sml/minor-modes ((,class :inherit sml/global)))
+   `(sml/modes ((,class :foreground ,fg-active :weight bold)))
+   `(sml/modified ((,class :foreground ,magenta-active :weight bold)))
+   `(sml/mule-info ((,class :inherit sml/global)))
+   `(sml/name-filling ((,class :foreground ,yellow-active)))
+   `(sml/not-modified ((,class :inherit sml/global)))
+   `(sml/numbers-separator ((,class :inherit sml/global)))
+   `(sml/outside-modified ((,class :inherit modus-theme-intense-red)))
+   `(sml/position-percentage ((,class :inherit sml/global)))
+   `(sml/prefix ((,class :foreground ,green-active)))
+   `(sml/process ((,class :inherit sml/prefix)))
+   `(sml/projectile ((,class :inherit sml/git)))
+   `(sml/read-only ((,class :foreground ,cyan-active :weight bold)))
+   `(sml/remote ((,class :inherit sml/global)))
+   `(sml/sudo ((,class :inherit modus-theme-subtle-red)))
+   `(sml/time ((,class :inherit sml/global)))
+   `(sml/vc ((,class :inherit sml/git)))
+   `(sml/vc-edited ((,class :foreground ,yellow-active :weight bold)))
    ;;;; smartparens
-   `(sp-pair-overlay-face ((,class (:inherit modus-theme-special-warm))))
-   `(sp-show-pair-enclosing ((,class (:inherit modus-theme-special-mild))))
-   `(sp-show-pair-match-face ((,class (:background ,bg-paren-match :foreground 
,fg-main))))
-   `(sp-show-pair-mismatch-face ((,class (:inherit modus-theme-intense-red))))
-   `(sp-wrap-overlay-closing-pair ((,class (:inherit sp-pair-overlay-face))))
-   `(sp-wrap-overlay-face ((,class (:inherit sp-pair-overlay-face))))
-   `(sp-wrap-overlay-opening-pair ((,class (:inherit sp-pair-overlay-face))))
-   `(sp-wrap-tag-overlay-face ((,class (:inherit sp-pair-overlay-face))))
+   `(sp-pair-overlay-face ((,class :inherit modus-theme-special-warm)))
+   `(sp-show-pair-enclosing ((,class :inherit modus-theme-special-mild)))
+   `(sp-show-pair-match-face ((,class :background ,bg-paren-match :foreground 
,fg-main)))
+   `(sp-show-pair-mismatch-face ((,class :inherit modus-theme-intense-red)))
+   `(sp-wrap-overlay-closing-pair ((,class :inherit sp-pair-overlay-face)))
+   `(sp-wrap-overlay-face ((,class :inherit sp-pair-overlay-face)))
+   `(sp-wrap-overlay-opening-pair ((,class :inherit sp-pair-overlay-face)))
+   `(sp-wrap-tag-overlay-face ((,class :inherit sp-pair-overlay-face)))
    ;;;; smerge
-   `(smerge-base ((,class ,(modus-vivendi-theme-diffs
-                            bg-main yellow
-                            bg-diff-focus-changed fg-diff-focus-changed))))
-   `(smerge-lower ((,class ,(modus-vivendi-theme-diffs
-                             bg-main green
-                             bg-diff-focus-added fg-diff-focus-added))))
-   `(smerge-markers ((,class (:background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2))))
-   `(smerge-refined-added ((,class ,(modus-vivendi-theme-diffs
-                                     bg-diff-added fg-diff-added
-                                     bg-diff-refine-added 
fg-diff-refine-added))))
-   `(smerge-refined-changed ((,class nil)))
-   `(smerge-refined-removed ((,class ,(modus-vivendi-theme-diffs
-                                       bg-diff-removed fg-diff-removed
-                                       bg-diff-refine-removed 
fg-diff-refine-removed))))
-   `(smerge-upper ((,class ,(modus-vivendi-theme-diffs
-                             bg-main red
-                             bg-diff-focus-removed fg-diff-focus-removed))))
+   `(smerge-base ((,class ,@(modus-vivendi-theme-diffs
+                             bg-main yellow
+                             bg-diff-focus-changed fg-diff-focus-changed))))
+   `(smerge-lower ((,class ,@(modus-vivendi-theme-diffs
+                              bg-main green
+                              bg-diff-focus-added fg-diff-focus-added))))
+   `(smerge-markers ((,class :background ,bg-diff-neutral-2 :foreground 
,fg-diff-neutral-2)))
+   `(smerge-refined-added ((,class ,@(modus-vivendi-theme-diffs
+                                      bg-diff-added fg-diff-added
+                                      bg-diff-refine-added 
fg-diff-refine-added))))
+   `(smerge-refined-changed ((,class)))
+   `(smerge-refined-removed ((,class ,@(modus-vivendi-theme-diffs
+                                        bg-diff-removed fg-diff-removed
+                                        bg-diff-refine-removed 
fg-diff-refine-removed))))
+   `(smerge-upper ((,class ,@(modus-vivendi-theme-diffs
+                              bg-main red
+                              bg-diff-focus-removed fg-diff-focus-removed))))
    ;;;; speedbar
-   `(speedbar-button-face ((,class (:inherit link))))
-   `(speedbar-directory-face ((,class (:foreground ,blue :weight bold))))
-   `(speedbar-file-face ((,class (:foreground ,fg-main))))
-   `(speedbar-highlight-face ((,class (:inherit modus-theme-subtle-blue))))
-   `(speedbar-selected-face ((,class (:foreground ,cyan :weight bold))))
-   `(speedbar-separator-face ((,class (:inherit modus-theme-intense-neutral))))
-   `(speedbar-tag-face ((,class (:foreground ,yellow-alt-other))))
+   `(speedbar-button-face ((,class :inherit link)))
+   `(speedbar-directory-face ((,class :foreground ,blue :weight bold)))
+   `(speedbar-file-face ((,class :foreground ,fg-main)))
+   `(speedbar-highlight-face ((,class :inherit modus-theme-subtle-blue)))
+   `(speedbar-selected-face ((,class :foreground ,cyan :weight bold)))
+   `(speedbar-separator-face ((,class :inherit modus-theme-intense-neutral)))
+   `(speedbar-tag-face ((,class :foreground ,yellow-alt-other)))
    ;;;; spell-fu
    `(spell-fu-incorrect-face
      ((,(append '((supports :underline (:style wave))) class)
-       (:foreground ,fg-lang-error :underline (:style wave)))
-      (,class (:foreground ,fg-lang-error :underline t))))
+       :foreground ,fg-lang-error :underline (:style wave))
+      (,class :foreground ,fg-lang-error :underline t)))
    ;;;; stripes
-   `(stripes ((,class (:background ,bg-hl-line))))
+   `(stripes ((,class :background ,bg-hl-line)))
    ;;;; success
-   `(suggest-heading ((,class (:foreground ,yellow-alt-other :weight bold))))
+   `(suggest-heading ((,class :foreground ,yellow-alt-other :weight bold)))
    ;;;; switch-window
-   `(switch-window-background ((,class (:background ,bg-dim))))
-   `(switch-window-label ((,class (:height 3.0 :foreground ,blue-intense))))
+   `(switch-window-background ((,class :background ,bg-dim)))
+   `(switch-window-label ((,class :height 3.0 :foreground ,blue-intense)))
    ;;;; swiper
-   `(swiper-background-match-face-1 ((,class (:inherit 
modus-theme-subtle-neutral))))
-   `(swiper-background-match-face-2 ((,class (:inherit 
modus-theme-subtle-cyan))))
-   `(swiper-background-match-face-3 ((,class (:inherit 
modus-theme-subtle-magenta))))
-   `(swiper-background-match-face-4 ((,class (:inherit 
modus-theme-subtle-green))))
-   `(swiper-line-face ((,class (,@(and (>= emacs-major-version 27) '(:extend 
t))
-                                :inherit modus-theme-special-cold))))
-   `(swiper-match-face-1 ((,class (:inherit swiper-line-face))))
-   `(swiper-match-face-2 ((,class (:inherit swiper-line-face))))
-   `(swiper-match-face-3 ((,class (:inherit swiper-line-face))))
-   `(swiper-match-face-4 ((,class (:inherit swiper-line-face))))
+   `(swiper-background-match-face-1 ((,class :inherit 
modus-theme-subtle-neutral)))
+   `(swiper-background-match-face-2 ((,class :inherit 
modus-theme-subtle-cyan)))
+   `(swiper-background-match-face-3 ((,class :inherit 
modus-theme-subtle-magenta)))
+   `(swiper-background-match-face-4 ((,class :inherit 
modus-theme-subtle-green)))
+   `(swiper-line-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
+                               :inherit modus-theme-special-cold)))
+   `(swiper-match-face-1 ((,class :inherit swiper-line-face)))
+   `(swiper-match-face-2 ((,class :inherit swiper-line-face)))
+   `(swiper-match-face-3 ((,class :inherit swiper-line-face)))
+   `(swiper-match-face-4 ((,class :inherit swiper-line-face)))
    ;;;; swoop
-   `(swoop-face-header-format-line ((,class (:foreground ,red-alt :weight bold
-                                                         
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3)))))
-   `(swoop-face-line-buffer-name ((,class (:foreground ,blue-alt :weight bold
-                                                       
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))))
-   `(swoop-face-line-number ((,class (:foreground ,fg-special-warm))))
-   `(swoop-face-target-line ((,class (:inherit modus-theme-intense-blue
-                                               ,@(and (>= emacs-major-version 
27) '(:extend t))))))
-   `(swoop-face-target-words ((,class (:inherit modus-theme-refine-cyan))))
+   `(swoop-face-header-format-line ((,class :foreground ,red-alt :weight bold
+                                            ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-3))))
+   `(swoop-face-line-buffer-name ((,class :foreground ,blue-alt :weight bold
+                                          ,@(modus-vivendi-theme-scale 
modus-vivendi-theme-scale-4))))
+   `(swoop-face-line-number ((,class :foreground ,fg-special-warm)))
+   `(swoop-face-target-line ((,class :inherit modus-theme-intense-blue
+                                     ,@(and (>= emacs-major-version 27) 
'(:extend t)))))
+   `(swoop-face-target-words ((,class :inherit modus-theme-refine-cyan)))
    ;;;; sx
-   `(sx-inbox-item-type ((,class (:foreground ,magenta-alt-other))))
-   `(sx-inbox-item-type-unread ((,class (:inherit sx-inbox-item-type :weight 
bold))))
-   `(sx-question-list-answers ((,class (:foreground ,green))))
-   `(sx-question-list-answers-accepted ((,class (:box t :foreground ,green))))
-   `(sx-question-list-bounty ((,class (:background ,bg-alt :foreground ,yellow 
:weight bold))))
-   `(sx-question-list-date ((,class (:foreground ,fg-special-cold))))
-   `(sx-question-list-favorite ((,class (:foreground ,fg-special-warm :weight 
bold))))
-   `(sx-question-list-parent ((,class (:foreground ,fg-main))))
-   `(sx-question-list-read-question ((,class (:foreground ,fg-alt))))
-   `(sx-question-list-score ((,class (:foreground ,fg-special-mild))))
-   `(sx-question-list-score-upvoted ((,class (:inherit sx-question-list-score 
:weight bold))))
-   `(sx-question-list-unread-question ((,class (:foreground ,fg-main :weight 
bold))))
-   `(sx-question-mode-accepted ((,class (:height 1.3 :foreground ,green 
:weight bold))))
-   `(sx-question-mode-closed ((,class (:box (:line-width 2 :color nil) 
:inherit modus-theme-active-yellow))))
-   `(sx-question-mode-closed-reason ((,class (:box (:line-width 2 :color nil) 
:foreground ,fg-main))))
-   `(sx-question-mode-content-face ((,class (:background ,bg-dim))))
-   `(sx-question-mode-date ((,class (:foreground ,blue))))
-   `(sx-question-mode-header ((,class (:foreground ,cyan :weight bold))))
-   `(sx-question-mode-kbd-tag ((,class (:height 0.9 :box (:line-width 3 :color 
,fg-main :style released-button) :foreground ,fg-main :weight bold))))
-   `(sx-question-mode-score ((,class (:foreground ,fg-dim))))
-   `(sx-question-mode-score-downvoted ((,class (:foreground ,yellow))))
-   `(sx-question-mode-score-upvoted ((,class (:foreground ,magenta :weight 
bold))))
-   `(sx-question-mode-title ((,class (:foreground ,fg-main :weight bold))))
-   `(sx-question-mode-title-comments ((,class (:foreground ,fg-alt :weight 
bold))))
-   `(sx-tag ((,class (:foreground ,magenta-alt))))
-   `(sx-user-name ((,class (:foreground ,blue-alt))))
-   `(sx-user-reputation ((,class (:foreground ,fg-alt))))
+   `(sx-inbox-item-type ((,class :foreground ,magenta-alt-other)))
+   `(sx-inbox-item-type-unread ((,class :inherit sx-inbox-item-type :weight 
bold)))
+   `(sx-question-list-answers ((,class :foreground ,green)))
+   `(sx-question-list-answers-accepted ((,class :box t :foreground ,green)))
+   `(sx-question-list-bounty ((,class :background ,bg-alt :foreground ,yellow 
:weight bold)))
+   `(sx-question-list-date ((,class :foreground ,fg-special-cold)))
+   `(sx-question-list-favorite ((,class :foreground ,fg-special-warm :weight 
bold)))
+   `(sx-question-list-parent ((,class :foreground ,fg-main)))
+   `(sx-question-list-read-question ((,class :foreground ,fg-alt)))
+   `(sx-question-list-score ((,class :foreground ,fg-special-mild)))
+   `(sx-question-list-score-upvoted ((,class :inherit sx-question-list-score 
:weight bold)))
+   `(sx-question-list-unread-question ((,class :foreground ,fg-main :weight 
bold)))
+   `(sx-question-mode-accepted ((,class :height 1.3 :foreground ,green :weight 
bold)))
+   `(sx-question-mode-closed ((,class :box (:line-width 2 :color nil) :inherit 
modus-theme-active-yellow)))
+   `(sx-question-mode-closed-reason ((,class :box (:line-width 2 :color nil) 
:foreground ,fg-main)))
+   `(sx-question-mode-content-face ((,class :background ,bg-dim)))
+   `(sx-question-mode-date ((,class :foreground ,blue)))
+   `(sx-question-mode-header ((,class :foreground ,cyan :weight bold)))
+   `(sx-question-mode-kbd-tag ((,class :height 0.9 :box (:line-width 3 :color 
,fg-main :style released-button) :foreground ,fg-main :weight bold)))
+   `(sx-question-mode-score ((,class :foreground ,fg-dim)))
+   `(sx-question-mode-score-downvoted ((,class :foreground ,yellow)))
+   `(sx-question-mode-score-upvoted ((,class :foreground ,magenta :weight 
bold)))
+   `(sx-question-mode-title ((,class :foreground ,fg-main :weight bold)))
+   `(sx-question-mode-title-comments ((,class :foreground ,fg-alt :weight 
bold)))
+   `(sx-tag ((,class :foreground ,magenta-alt)))
+   `(sx-user-name ((,class :foreground ,blue-alt)))
+   `(sx-user-reputation ((,class :foreground ,fg-alt)))
    ;;;; symbol-overlay
-   `(symbol-overlay-default-face ((,class (:inherit modus-theme-refine-blue))))
-   `(symbol-overlay-face-1 ((,class (:inherit modus-theme-intense-blue))))
-   `(symbol-overlay-face-2 ((,class (:inherit modus-theme-refine-magenta))))
-   `(symbol-overlay-face-3 ((,class (:inherit modus-theme-intense-yellow))))
-   `(symbol-overlay-face-4 ((,class (:inherit modus-theme-intense-magenta))))
-   `(symbol-overlay-face-5 ((,class (:inherit modus-theme-intense-red))))
-   `(symbol-overlay-face-6 ((,class (:inherit modus-theme-refine-red))))
-   `(symbol-overlay-face-7 ((,class (:inherit modus-theme-intense-cyan))))
-   `(symbol-overlay-face-8 ((,class (:inherit modus-theme-refine-cyan))))
+   `(symbol-overlay-default-face ((,class :inherit modus-theme-refine-blue)))
+   `(symbol-overlay-face-1 ((,class :inherit modus-theme-intense-blue)))
+   `(symbol-overlay-face-2 ((,class :inherit modus-theme-refine-magenta)))
+   `(symbol-overlay-face-3 ((,class :inherit modus-theme-intense-yellow)))
+   `(symbol-overlay-face-4 ((,class :inherit modus-theme-intense-magenta)))
+   `(symbol-overlay-face-5 ((,class :inherit modus-theme-intense-red)))
+   `(symbol-overlay-face-6 ((,class :inherit modus-theme-refine-red)))
+   `(symbol-overlay-face-7 ((,class :inherit modus-theme-intense-cyan)))
+   `(symbol-overlay-face-8 ((,class :inherit modus-theme-refine-cyan)))
    ;;;; syslog-mode
-   `(syslog-debug ((,class (:foreground ,cyan-alt-other :weight bold))))
-   `(syslog-error ((,class (:foreground ,red :weight bold))))
-   `(syslog-file ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(syslog-hide ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(syslog-hour ((,class (:foreground ,magenta-alt-other :weight bold))))
-   `(syslog-info ((,class (:foreground ,blue-alt-other :weight bold))))
-   `(syslog-ip ((,class (:foreground ,fg-special-mild :weight bold :underline 
t))))
-   `(syslog-su ((,class (:foreground ,red-alt :weight bold))))
-   `(syslog-warn ((,class (:foreground ,yellow :weight bold))))
+   `(syslog-debug ((,class :foreground ,cyan-alt-other :weight bold)))
+   `(syslog-error ((,class :foreground ,red :weight bold)))
+   `(syslog-file ((,class :foreground ,fg-special-cold :weight bold)))
+   `(syslog-hide ((,class :background ,bg-main :foreground ,fg-main)))
+   `(syslog-hour ((,class :foreground ,magenta-alt-other :weight bold)))
+   `(syslog-info ((,class :foreground ,blue-alt-other :weight bold)))
+   `(syslog-ip ((,class :foreground ,fg-special-mild :weight bold :underline 
t)))
+   `(syslog-su ((,class :foreground ,red-alt :weight bold)))
+   `(syslog-warn ((,class :foreground ,yellow :weight bold)))
    ;;;; trashed
-   `(trashed-deleted ((,class (:inherit modus-theme-mark-del))))
-   `(trashed-directory ((,class (:foreground ,blue))))
-   `(trashed-mark ((,class (:inherit modus-theme-mark-symbol))))
-   `(trashed-marked ((,class (:inherit modus-theme-mark-alt))))
-   `(trashed-restored ((,class (:inherit modus-theme-mark-sel))))
-   `(trashed-symlink ((,class (:foreground ,blue-alt :underline t))))
+   `(trashed-deleted ((,class :inherit modus-theme-mark-del)))
+   `(trashed-directory ((,class :foreground ,blue)))
+   `(trashed-mark ((,class :inherit modus-theme-mark-symbol)))
+   `(trashed-marked ((,class :inherit modus-theme-mark-alt)))
+   `(trashed-restored ((,class :inherit modus-theme-mark-sel)))
+   `(trashed-symlink ((,class :foreground ,blue-alt :underline t)))
    ;;;; telephone-line
-   `(telephone-line-accent-active ((,class (:background ,fg-inactive 
:foreground ,bg-inactive))))
-   `(telephone-line-accent-inactive ((,class (:background ,bg-active 
:foreground ,fg-active))))
-   `(telephone-line-error ((,class (:foreground ,red-active :weight bold))))
-   `(telephone-line-evil ((,class (:foreground ,fg-main))))
-   `(telephone-line-evil-emacs ((,class (:inherit telephone-line-evil 
:background ,magenta-intense-bg))))
-   `(telephone-line-evil-insert ((,class (:inherit telephone-line-evil 
:background ,green-intense-bg))))
-   `(telephone-line-evil-motion ((,class (:inherit telephone-line-evil 
:background ,yellow-intense-bg))))
-   `(telephone-line-evil-normal ((,class (:inherit telephone-line-evil 
:background ,bg-alt))))
-   `(telephone-line-evil-operator ((,class (:inherit telephone-line-evil 
:background ,yellow-subtle-bg))))
-   `(telephone-line-evil-replace ((,class (:inherit telephone-line-evil 
:background ,red-intense-bg))))
-   `(telephone-line-evil-visual ((,class (:inherit telephone-line-evil 
:background ,cyan-intense-bg))))
-   `(telephone-line-projectile ((,class (:foreground ,cyan-active))))
-   `(telephone-line-unimportant ((,class (:foreground ,fg-inactive))))
-   `(telephone-line-warning ((,class (:foreground ,yellow-active :weight 
bold))))
+   `(telephone-line-accent-active ((,class :background ,fg-inactive 
:foreground ,bg-inactive)))
+   `(telephone-line-accent-inactive ((,class :background ,bg-active 
:foreground ,fg-active)))
+   `(telephone-line-error ((,class :foreground ,red-active :weight bold)))
+   `(telephone-line-evil ((,class :foreground ,fg-main)))
+   `(telephone-line-evil-emacs ((,class :inherit telephone-line-evil 
:background ,magenta-intense-bg)))
+   `(telephone-line-evil-insert ((,class :inherit telephone-line-evil 
:background ,green-intense-bg)))
+   `(telephone-line-evil-motion ((,class :inherit telephone-line-evil 
:background ,yellow-intense-bg)))
+   `(telephone-line-evil-normal ((,class :inherit telephone-line-evil 
:background ,bg-alt)))
+   `(telephone-line-evil-operator ((,class :inherit telephone-line-evil 
:background ,yellow-subtle-bg)))
+   `(telephone-line-evil-replace ((,class :inherit telephone-line-evil 
:background ,red-intense-bg)))
+   `(telephone-line-evil-visual ((,class :inherit telephone-line-evil 
:background ,cyan-intense-bg)))
+   `(telephone-line-projectile ((,class :foreground ,cyan-active)))
+   `(telephone-line-unimportant ((,class :foreground ,fg-inactive)))
+   `(telephone-line-warning ((,class :foreground ,yellow-active :weight bold)))
    ;;;; term
-   `(term ((,class (:background ,bg-main :foreground ,fg-main))))
-   `(term-bold ((,class (:weight bold))))
-   `(term-color-blue ((,class (:background ,blue :foreground ,blue))))
-   `(term-color-cyan ((,class (:background ,cyan :foreground ,cyan))))
-   `(term-color-green ((,class (:background ,green :foreground ,green))))
-   `(term-color-magenta ((,class (:background ,magenta :foreground ,magenta))))
-   `(term-color-red ((,class (:background ,red :foreground ,red))))
-   `(term-color-yellow ((,class (:background ,yellow :foreground ,yellow))))
-   `(term-underline ((,class (:underline t))))
+   `(term ((,class :background ,bg-main :foreground ,fg-main)))
+   `(term-bold ((,class :weight bold)))
+   `(term-color-blue ((,class :background ,blue :foreground ,blue)))
+   `(term-color-cyan ((,class :background ,cyan :foreground ,cyan)))
+   `(term-color-green ((,class :background ,green :foreground ,green)))
+   `(term-color-magenta ((,class :background ,magenta :foreground ,magenta)))
+   `(term-color-red ((,class :background ,red :foreground ,red)))
+   `(term-color-yellow ((,class :background ,yellow :foreground ,yellow)))
+   `(term-underline ((,class :underline t)))
    ;;;; tomatinho
-   `(tomatinho-ok-face ((,class (:foreground ,blue-intense))))
-   `(tomatinho-pause-face ((,class (:foreground ,yellow-intense))))
-   `(tomatinho-reset-face ((,class (:foreground ,fg-alt))))
+   `(tomatinho-ok-face ((,class :foreground ,blue-intense)))
+   `(tomatinho-pause-face ((,class :foreground ,yellow-intense)))
+   `(tomatinho-reset-face ((,class :foreground ,fg-alt)))
    ;;;; transient
-   `(transient-active-infix ((,class (:inherit modus-theme-special-mild))))
-   `(transient-argument ((,class (:foreground ,green :weight bold))))
-   `(transient-disabled-suffix ((,class (:inherit modus-theme-intense-red))))
-   `(transient-enabled-suffix ((,class (:inherit modus-theme-intense-green))))
-   `(transient-heading ((,class (:foreground ,fg-special-warm :weight bold))))
-   `(transient-inactive-argument ((,class (:foreground ,fg-alt))))
-   `(transient-inactive-value ((,class (:foreground ,fg-alt))))
-   `(transient-key ((,class (:foreground ,magenta-intense))))
-   `(transient-mismatched-key ((,class (:underline t))))
-   `(transient-nonstandard-key ((,class (:underline t))))
-   `(transient-unreachable ((,class (:foreground ,fg-inactive))))
-   `(transient-unreachable-key ((,class (:foreground ,fg-inactive))))
-   `(transient-value ((,class (:foreground ,blue))))
+   `(transient-active-infix ((,class :inherit modus-theme-special-mild)))
+   `(transient-argument ((,class :foreground ,green :weight bold)))
+   `(transient-disabled-suffix ((,class :inherit modus-theme-intense-red)))
+   `(transient-enabled-suffix ((,class :inherit modus-theme-intense-green)))
+   `(transient-heading ((,class :foreground ,fg-special-warm :weight bold)))
+   `(transient-inactive-argument ((,class :foreground ,fg-alt)))
+   `(transient-inactive-value ((,class :foreground ,fg-alt)))
+   `(transient-key ((,class :foreground ,magenta-intense)))
+   `(transient-mismatched-key ((,class :underline t)))
+   `(transient-nonstandard-key ((,class :underline t)))
+   `(transient-unreachable ((,class :foreground ,fg-inactive)))
+   `(transient-unreachable-key ((,class :foreground ,fg-inactive)))
+   `(transient-value ((,class :foreground ,blue)))
    ;;;; treemacs
-   `(treemacs-directory-collapsed-face ((,class (:foreground ,magenta-alt))))
-   `(treemacs-directory-face ((,class (:inherit dired-directory))))
-   `(treemacs-file-face ((,class (:foreground ,fg-main))))
-   `(treemacs-fringe-indicator-face ((,class (:foreground ,fg-main))))
-   `(treemacs-git-added-face ((,class (:foreground ,green-intense))))
-   `(treemacs-git-conflict-face ((,class (:inherit modus-theme-intense-red 
:weight bold))))
-   `(treemacs-git-ignored-face ((,class (:foreground ,fg-alt))))
-   `(treemacs-git-modified-face ((,class (:foreground ,yellow-alt-other))))
-   `(treemacs-git-renamed-face ((,class (:foreground ,cyan-alt-other))))
-   `(treemacs-git-unmodified-face ((,class (:foreground ,fg-main))))
-   `(treemacs-git-untracked-face ((,class (:foreground ,red-alt-other))))
-   `(treemacs-help-column-face ((,class (:foreground ,magenta-alt-other 
:weight ,modus-theme-bold :underline t))))
-   `(treemacs-help-title-face ((,class (:foreground ,blue-alt-other))))
-   `(treemacs-on-failure-pulse-face ((,class (:inherit 
modus-theme-intense-red))))
-   `(treemacs-on-success-pulse-face ((,class (:inherit 
modus-theme-intense-green))))
-   `(treemacs-root-face ((,class (:foreground ,blue-alt-other :height 1.2 
:weight bold :underline t))))
-   `(treemacs-root-remote-disconnected-face ((,class (:inherit 
treemacs-root-remote-face :foreground ,yellow))))
-   `(treemacs-root-remote-face ((,class (:inherit treemacs-root-face 
:foreground ,magenta))))
-   `(treemacs-root-remote-unreadable-face ((,class (:inherit 
treemacs-root-unreadable-face))))
-   `(treemacs-root-unreadable-face ((,class (:inherit treemacs-root-face 
:strike-through t))))
-   `(treemacs-tags-face ((,class (:foreground ,blue-alt))))
-   `(treemacs-tags-face ((,class (:foreground ,magenta-alt))))
+   `(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt)))
+   `(treemacs-directory-face ((,class :inherit dired-directory)))
+   `(treemacs-file-face ((,class :foreground ,fg-main)))
+   `(treemacs-fringe-indicator-face ((,class :foreground ,fg-main)))
+   `(treemacs-git-added-face ((,class :foreground ,green-intense)))
+   `(treemacs-git-conflict-face ((,class :inherit modus-theme-intense-red 
:weight bold)))
+   `(treemacs-git-ignored-face ((,class :foreground ,fg-alt)))
+   `(treemacs-git-modified-face ((,class :foreground ,yellow-alt-other)))
+   `(treemacs-git-renamed-face ((,class :foreground ,cyan-alt-other)))
+   `(treemacs-git-unmodified-face ((,class :foreground ,fg-main)))
+   `(treemacs-git-untracked-face ((,class :foreground ,red-alt-other)))
+   `(treemacs-help-column-face ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold :underline t)))
+   `(treemacs-help-title-face ((,class :foreground ,blue-alt-other)))
+   `(treemacs-on-failure-pulse-face ((,class :inherit 
modus-theme-intense-red)))
+   `(treemacs-on-success-pulse-face ((,class :inherit 
modus-theme-intense-green)))
+   `(treemacs-root-face ((,class :foreground ,blue-alt-other :height 1.2 
:weight bold :underline t)))
+   `(treemacs-root-remote-disconnected-face ((,class :inherit 
treemacs-root-remote-face :foreground ,yellow)))
+   `(treemacs-root-remote-face ((,class :inherit treemacs-root-face 
:foreground ,magenta)))
+   `(treemacs-root-remote-unreadable-face ((,class :inherit 
treemacs-root-unreadable-face)))
+   `(treemacs-root-unreadable-face ((,class :inherit treemacs-root-face 
:strike-through t)))
+   `(treemacs-tags-face ((,class :foreground ,blue-alt)))
+   `(treemacs-tags-face ((,class :foreground ,magenta-alt)))
    ;;;; tuareg
-   `(caml-types-def-face ((,class (:inherit modus-theme-subtle-red))))
-   `(caml-types-expr-face ((,class (:inherit modus-theme-subtle-green))))
-   `(caml-types-occ-face ((,class (:inherit modus-theme-subtle-green))))
-   `(caml-types-scope-face ((,class (:inherit modus-theme-subtle-blue))))
-   `(caml-types-typed-face ((,class (:inherit modus-theme-subtle-magenta))))
-   `(tuareg-font-double-semicolon-face ((,class (:foreground ,red-alt))))
-   `(tuareg-font-lock-attribute-face ((,class (:foreground ,magenta))))
-   `(tuareg-font-lock-constructor-face ((,class (:foreground ,fg-main))))
-   `(tuareg-font-lock-error-face ((,class (:inherit modus-theme-intense-red 
:weight bold))))
-   `(tuareg-font-lock-extension-node-face ((,class (:background ,bg-alt 
:foreground ,magenta))))
-   `(tuareg-font-lock-governing-face ((,class (:foreground ,fg-main :weight 
bold))))
-   `(tuareg-font-lock-infix-extension-node-face ((,class (:foreground 
,magenta))))
-   `(tuareg-font-lock-interactive-directive-face ((,class (:foreground 
,fg-special-cold))))
-   `(tuareg-font-lock-interactive-error-face ((,class (:foreground ,red 
:weight bold))))
-   `(tuareg-font-lock-interactive-output-face ((,class (:foreground 
,blue-alt-other))))
-   `(tuareg-font-lock-label-face ((,class (:foreground ,cyan-alt-other))))
-   `(tuareg-font-lock-line-number-face ((,class (:foreground 
,fg-special-warm))))
-   `(tuareg-font-lock-module-face ((,class (:foreground ,magenta-alt))))
-   `(tuareg-font-lock-multistage-face ((,class (:background ,bg-alt 
:foreground ,blue :weight bold))))
-   `(tuareg-font-lock-operator-face ((,class (:foreground ,red-alt))))
-   `(tuareg-opam-error-face ((,class (:foreground ,red :weight bold))))
-   `(tuareg-opam-pkg-variable-name-face ((,class (:foreground ,cyan :slant 
,modus-theme-slant))))
+   `(caml-types-def-face ((,class :inherit modus-theme-subtle-red)))
+   `(caml-types-expr-face ((,class :inherit modus-theme-subtle-green)))
+   `(caml-types-occ-face ((,class :inherit modus-theme-subtle-green)))
+   `(caml-types-scope-face ((,class :inherit modus-theme-subtle-blue)))
+   `(caml-types-typed-face ((,class :inherit modus-theme-subtle-magenta)))
+   `(tuareg-font-double-semicolon-face ((,class :foreground ,red-alt)))
+   `(tuareg-font-lock-attribute-face ((,class :foreground ,magenta)))
+   `(tuareg-font-lock-constructor-face ((,class :foreground ,fg-main)))
+   `(tuareg-font-lock-error-face ((,class :inherit modus-theme-intense-red 
:weight bold)))
+   `(tuareg-font-lock-extension-node-face ((,class :background ,bg-alt 
:foreground ,magenta)))
+   `(tuareg-font-lock-governing-face ((,class :foreground ,fg-main :weight 
bold)))
+   `(tuareg-font-lock-infix-extension-node-face ((,class :foreground 
,magenta)))
+   `(tuareg-font-lock-interactive-directive-face ((,class :foreground 
,fg-special-cold)))
+   `(tuareg-font-lock-interactive-error-face ((,class :foreground ,red :weight 
bold)))
+   `(tuareg-font-lock-interactive-output-face ((,class :foreground 
,blue-alt-other)))
+   `(tuareg-font-lock-label-face ((,class :foreground ,cyan-alt-other)))
+   `(tuareg-font-lock-line-number-face ((,class :foreground ,fg-special-warm)))
+   `(tuareg-font-lock-module-face ((,class :foreground ,magenta-alt)))
+   `(tuareg-font-lock-multistage-face ((,class :background ,bg-alt :foreground 
,blue :weight bold)))
+   `(tuareg-font-lock-operator-face ((,class :foreground ,red-alt)))
+   `(tuareg-opam-error-face ((,class :foreground ,red :weight bold)))
+   `(tuareg-opam-pkg-variable-name-face ((,class :foreground ,cyan :slant 
,modus-theme-slant)))
    ;;;; undo-tree
-   `(undo-tree-visualizer-active-branch-face ((,class (:foreground ,fg-main 
:weight bold))))
-   `(undo-tree-visualizer-current-face ((,class (:foreground ,blue-intense))))
-   `(undo-tree-visualizer-default-face ((,class (:foreground ,fg-alt))))
-   `(undo-tree-visualizer-register-face ((,class (:foreground 
,magenta-intense))))
-   `(undo-tree-visualizer-unmodified-face ((,class (:foreground 
,green-intense))))
+   `(undo-tree-visualizer-active-branch-face ((,class :foreground ,fg-main 
:weight bold)))
+   `(undo-tree-visualizer-current-face ((,class :foreground ,blue-intense)))
+   `(undo-tree-visualizer-default-face ((,class :foreground ,fg-alt)))
+   `(undo-tree-visualizer-register-face ((,class :foreground 
,magenta-intense)))
+   `(undo-tree-visualizer-unmodified-face ((,class :foreground 
,green-intense)))
    ;;;; vc
-   `(vc-conflict-state ((,class (:foreground ,red-active :weight 
,modus-theme-bold))))
-   `(vc-edited-state ((,class (:foreground ,fg-special-warm))))
-   `(vc-locally-added-state ((,class (:foreground ,cyan-active))))
-   `(vc-locked-state ((,class (:foreground ,magenta-active :weight 
,modus-theme-bold))))
-   `(vc-missing-state ((,class (:foreground ,yellow-active :weight 
,modus-theme-bold))))
-   `(vc-needs-update-state ((,class (:foreground ,fg-special-mild :weight 
,modus-theme-bold))))
-   `(vc-removed-state ((,class (:foreground ,red-active))))
-   `(vc-state-base ((,class (:foreground ,fg-active))))
-   `(vc-up-to-date-state ((,class (:foreground ,fg-special-cold))))
+   `(vc-conflict-state ((,class :foreground ,red-active :weight 
,modus-theme-bold)))
+   `(vc-edited-state ((,class :foreground ,fg-special-warm)))
+   `(vc-locally-added-state ((,class :foreground ,cyan-active)))
+   `(vc-locked-state ((,class :foreground ,magenta-active :weight 
,modus-theme-bold)))
+   `(vc-missing-state ((,class :foreground ,yellow-active :weight 
,modus-theme-bold)))
+   `(vc-needs-update-state ((,class :foreground ,fg-special-mild :weight 
,modus-theme-bold)))
+   `(vc-removed-state ((,class :foreground ,red-active)))
+   `(vc-state-base ((,class :foreground ,fg-active)))
+   `(vc-up-to-date-state ((,class :foreground ,fg-special-cold)))
    ;;;; vdiff
-   `(vdiff-addition-face ((,class ,(modus-vivendi-theme-diffs
-                                    bg-main green
-                                    bg-diff-focus-added fg-diff-focus-added))))
-   `(vdiff-change-face ((,class ,(modus-vivendi-theme-diffs
-                                  bg-main yellow
-                                  bg-diff-focus-changed 
fg-diff-focus-changed))))
-   `(vdiff-closed-fold-face ((,class (:background ,bg-diff-neutral-1 
:foreground ,fg-diff-neutral-1))))
-   `(vdiff-refine-added ((,class ,(modus-vivendi-theme-diffs
-                                   bg-diff-added fg-diff-added
-                                   bg-diff-refine-added 
fg-diff-refine-added))))
-   `(vdiff-refine-changed ((,class ,(modus-vivendi-theme-diffs
-                                     bg-diff-changed fg-diff-changed
-                                     bg-diff-refine-changed 
fg-diff-refine-changed))))
-   `(vdiff-subtraction-face ((,class ,(modus-vivendi-theme-diffs
-                                       bg-main red
-                                       bg-diff-focus-removed 
fg-diff-focus-removed))))
-   `(vdiff-target-face ((,class (:inherit modus-theme-intense-blue))))
+   `(vdiff-addition-face ((,class ,@(modus-vivendi-theme-diffs
+                                     bg-main green
+                                     bg-diff-focus-added 
fg-diff-focus-added))))
+   `(vdiff-change-face ((,class ,@(modus-vivendi-theme-diffs
+                                   bg-main yellow
+                                   bg-diff-focus-changed 
fg-diff-focus-changed))))
+   `(vdiff-closed-fold-face ((,class :background ,bg-diff-neutral-1 
:foreground ,fg-diff-neutral-1)))
+   `(vdiff-refine-added ((,class ,@(modus-vivendi-theme-diffs
+                                    bg-diff-added fg-diff-added
+                                    bg-diff-refine-added 
fg-diff-refine-added))))
+   `(vdiff-refine-changed ((,class ,@(modus-vivendi-theme-diffs
+                                      bg-diff-changed fg-diff-changed
+                                      bg-diff-refine-changed 
fg-diff-refine-changed))))
+   `(vdiff-subtraction-face ((,class ,@(modus-vivendi-theme-diffs
+                                        bg-main red
+                                        bg-diff-focus-removed 
fg-diff-focus-removed))))
+   `(vdiff-target-face ((,class :inherit modus-theme-intense-blue)))
    ;;;; vimish-fold
-   `(vimish-fold-fringe ((,class (:foreground ,cyan-active))))
-   `(vimish-fold-mouse-face ((,class (:inherit modus-theme-intense-blue))))
-   `(vimish-fold-overlay ((,class (:background ,bg-alt :foreground 
,fg-special-cold))))
+   `(vimish-fold-fringe ((,class :foreground ,cyan-active)))
+   `(vimish-fold-mouse-face ((,class :inherit modus-theme-intense-blue)))
+   `(vimish-fold-overlay ((,class :background ,bg-alt :foreground 
,fg-special-cold)))
    ;;;; visible-mark
-   `(visible-mark-active ((,class (:background ,blue-intense-bg))))
-   `(visible-mark-face1 ((,class (:background ,cyan-intense-bg))))
-   `(visible-mark-face2 ((,class (:background ,yellow-intense-bg))))
-   `(visible-mark-forward-face1 ((,class (:background ,magenta-intense-bg))))
-   `(visible-mark-forward-face2 ((,class (:background ,green-intense-bg))))
+   `(visible-mark-active ((,class :background ,blue-intense-bg)))
+   `(visible-mark-face1 ((,class :background ,cyan-intense-bg)))
+   `(visible-mark-face2 ((,class :background ,yellow-intense-bg)))
+   `(visible-mark-forward-face1 ((,class :background ,magenta-intense-bg)))
+   `(visible-mark-forward-face2 ((,class :background ,green-intense-bg)))
    ;;;; visual-regexp
-   `(vr/group-0 ((,class (:inherit modus-theme-intense-blue))))
-   `(vr/group-1 ((,class (:inherit modus-theme-intense-magenta))))
-   `(vr/group-2 ((,class (:inherit modus-theme-intense-green))))
-   `(vr/match-0 ((,class (:inherit modus-theme-refine-yellow))))
-   `(vr/match-1 ((,class (:inherit modus-theme-refine-yellow))))
-   `(vr/match-separator-face ((,class (:inherit modus-theme-intense-neutral 
:weight bold))))
+   `(vr/group-0 ((,class :inherit modus-theme-intense-blue)))
+   `(vr/group-1 ((,class :inherit modus-theme-intense-magenta)))
+   `(vr/group-2 ((,class :inherit modus-theme-intense-green)))
+   `(vr/match-0 ((,class :inherit modus-theme-refine-yellow)))
+   `(vr/match-1 ((,class :inherit modus-theme-refine-yellow)))
+   `(vr/match-separator-face ((,class :inherit modus-theme-intense-neutral 
:weight bold)))
    ;;;; volatile-highlights
-   `(vhl/default-face ((,class (,@(and (>= emacs-major-version 27) '(:extend 
t))
-                                :background ,bg-alt :foreground 
,blue-nuanced))))
+   `(vhl/default-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
+                               :background ,bg-alt :foreground ,blue-nuanced)))
    ;;;; vterm
-   `(vterm-color-black ((,class (:background "black" :foreground "black"))))
-   `(vterm-color-blue ((,class (:background ,blue :foreground ,blue))))
-   `(vterm-color-cyan ((,class (:background ,cyan :foreground ,cyan))))
-   `(vterm-color-default ((,class (:background ,bg-main :foreground 
,fg-main))))
-   `(vterm-color-green ((,class (:background ,green :foreground ,green))))
-   `(vterm-color-inverse-video ((,class (:background ,bg-main :inverse-video 
t))))
-   `(vterm-color-magenta ((,class (:background ,magenta :foreground 
,magenta))))
-   `(vterm-color-red ((,class (:background ,red :foreground ,red))))
-   `(vterm-color-underline ((,class (:foreground ,fg-special-warm :underline 
t))))
-   `(vterm-color-white ((,class (:background "white" :foreground "white"))))
-   `(vterm-color-yellow ((,class (:background ,yellow :foreground ,yellow))))
+   `(vterm-color-black ((,class :background "black" :foreground "black")))
+   `(vterm-color-blue ((,class :background ,blue :foreground ,blue)))
+   `(vterm-color-cyan ((,class :background ,cyan :foreground ,cyan)))
+   `(vterm-color-default ((,class :background ,bg-main :foreground ,fg-main)))
+   `(vterm-color-green ((,class :background ,green :foreground ,green)))
+   `(vterm-color-inverse-video ((,class :background ,bg-main :inverse-video 
t)))
+   `(vterm-color-magenta ((,class :background ,magenta :foreground ,magenta)))
+   `(vterm-color-red ((,class :background ,red :foreground ,red)))
+   `(vterm-color-underline ((,class :foreground ,fg-special-warm :underline 
t)))
+   `(vterm-color-white ((,class :background "white" :foreground "white")))
+   `(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow)))
    ;;;; wcheck-mode
-   `(wcheck-default-face ((,class (:foreground ,red :underline t))))
+   `(wcheck-default-face ((,class :foreground ,red :underline t)))
    ;;;; web-mode
-   `(web-mode-annotation-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-annotation-html-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-annotation-tag-face ((,class (:inherit web-mode-comment-face 
:underline t))))
-   `(web-mode-block-attr-name-face ((,class (:foreground ,blue))))
-   `(web-mode-block-attr-value-face ((,class (:foreground ,cyan-alt-other))))
-   `(web-mode-block-comment-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-block-control-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(web-mode-block-delimiter-face ((,class (:foreground ,fg-main))))
-   `(web-mode-block-face ((,class (:background ,bg-dim))))
-   `(web-mode-block-string-face ((,class (:inherit web-mode-string-face))))
-   `(web-mode-bold-face ((,class (:weight bold))))
-   `(web-mode-builtin-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(web-mode-comment-face ((,class (:foreground ,fg-alt :slant 
,modus-theme-slant))))
-   `(web-mode-comment-keyword-face ((,class (:background ,bg-dim :foreground 
,yellow :weight bold))))
-   `(web-mode-constant-face ((,class (:foreground ,blue-alt-other))))
-   `(web-mode-css-at-rule-face ((,class (:foreground ,blue-alt-other))))
-   `(web-mode-css-color-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(web-mode-css-comment-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-css-function-face ((,class (:foreground ,magenta-alt :weight 
,modus-theme-bold))))
-   `(web-mode-css-priority-face ((,class (:foreground ,yellow-alt :weight 
,modus-theme-bold))))
-   `(web-mode-css-property-name-face ((,class (:foreground ,cyan))))
-   `(web-mode-css-pseudo-class-face ((,class (:foreground ,cyan-alt-other))))
-   `(web-mode-css-selector-face ((,class (:foreground ,magenta-alt-other 
:weight ,modus-theme-bold))))
-   `(web-mode-css-string-face ((,class (:inherit web-mode-string-face))))
-   `(web-mode-css-variable-face ((,class (:foreground ,fg-special-warm))))
-   `(web-mode-current-column-highlight-face ((,class (:background ,bg-alt))))
-   `(web-mode-current-element-highlight-face ((,class (:inherit 
modus-theme-special-mild))))
-   `(web-mode-doctype-face ((,class (:foreground ,fg-special-cold :slant 
,modus-theme-slant))))
-   `(web-mode-error-face ((,class (:inherit modus-theme-intense-red))))
-   `(web-mode-filter-face ((,class (:foreground ,magenta))))
-   `(web-mode-folded-face ((,class (:underline t))))
-   `(web-mode-function-call-face ((,class (:foreground ,magenta))))
-   `(web-mode-function-name-face ((,class (:foreground ,magenta))))
-   `(web-mode-html-attr-custom-face ((,class (:foreground ,cyan))))
-   `(web-mode-html-attr-engine-face ((,class (:foreground ,fg-main))))
-   `(web-mode-html-attr-equal-face ((,class (:foreground ,fg-main))))
-   `(web-mode-html-attr-name-face ((,class (:foreground ,cyan))))
-   `(web-mode-html-attr-value-face ((,class (:foreground ,blue-alt-other))))
-   `(web-mode-html-entity-face ((,class (:foreground ,yellow-alt-other :slant 
,modus-theme-slant))))
-   `(web-mode-html-tag-bracket-face ((,class (:foreground ,fg-dim))))
-   `(web-mode-html-tag-custom-face ((,class (:foreground ,magenta))))
-   `(web-mode-html-tag-face ((,class (:foreground ,magenta))))
-   `(web-mode-html-tag-namespaced-face ((,class (:foreground ,magenta-alt 
:weight ,modus-theme-bold))))
-   `(web-mode-html-tag-unclosed-face ((,class (:foreground ,red :underline 
t))))
-   `(web-mode-inlay-face ((,class (:background ,bg-alt))))
-   `(web-mode-italic-face ((,class (:slant italic))))
-   `(web-mode-javascript-comment-face ((,class (:inherit 
web-mode-comment-face))))
-   `(web-mode-javascript-string-face ((,class (:inherit 
web-mode-string-face))))
-   `(web-mode-json-comment-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-json-context-face ((,class (:foreground ,magenta-alt))))
-   `(web-mode-json-key-face ((,class (:foreground ,blue-nuanced))))
-   `(web-mode-json-string-face ((,class (:inherit web-mode-string-face))))
-   `(web-mode-jsx-depth-1-face ((,class (:background ,blue-intense-bg 
:foreground ,fg-main))))
-   `(web-mode-jsx-depth-2-face ((,class (:background ,blue-subtle-bg 
:foreground ,fg-main))))
-   `(web-mode-jsx-depth-3-face ((,class (:background ,bg-special-cold 
:foreground ,fg-special-cold))))
-   `(web-mode-jsx-depth-4-face ((,class (:background ,bg-alt :foreground 
,blue-refine-fg))))
-   `(web-mode-jsx-depth-5-face ((,class (:background ,bg-alt :foreground 
,blue-nuanced))))
-   `(web-mode-keyword-face ((,class (:foreground ,magenta-alt-other :weight 
,modus-theme-bold))))
-   `(web-mode-param-name-face ((,class (:foreground ,magenta))))
-   `(web-mode-part-comment-face ((,class (:inherit web-mode-comment-face))))
-   `(web-mode-part-face ((,class (:inherit web-mode-block-face))))
-   `(web-mode-part-string-face ((,class (:inherit web-mode-string-face))))
-   `(web-mode-preprocessor-face ((,class (:foreground ,magenta))))
-   `(web-mode-script-face ((,class (:inherit web-mode-part-face))))
-   `(web-mode-sql-keyword-face ((,class (:foreground ,yellow :weight bold))))
-   `(web-mode-string-face ((,class (:foreground ,blue-alt))))
-   `(web-mode-style-face ((,class (:inherit web-mode-part-face))))
-   `(web-mode-symbol-face ((,class (:foreground ,blue-alt-other))))
-   `(web-mode-type-face ((,class (:foreground ,magenta-alt))))
-   `(web-mode-underline-face ((,class (:underline t))))
-   `(web-mode-variable-name-face ((,class (:foreground ,cyan))))
-   `(web-mode-warning-face ((,class (:background ,bg-alt :foreground 
,yellow-alt-other :weight bold))))
-   `(web-mode-whitespace-face ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
+   `(web-mode-annotation-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-annotation-html-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-annotation-tag-face ((,class :inherit web-mode-comment-face 
:underline t)))
+   `(web-mode-block-attr-name-face ((,class :foreground ,blue)))
+   `(web-mode-block-attr-value-face ((,class :foreground ,cyan-alt-other)))
+   `(web-mode-block-comment-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-block-control-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(web-mode-block-delimiter-face ((,class :foreground ,fg-main)))
+   `(web-mode-block-face ((,class :background ,bg-dim)))
+   `(web-mode-block-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-bold-face ((,class :weight bold)))
+   `(web-mode-builtin-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(web-mode-comment-face ((,class :foreground ,fg-alt :slant 
,modus-theme-slant)))
+   `(web-mode-comment-keyword-face ((,class :background ,bg-dim :foreground 
,yellow :weight bold)))
+   `(web-mode-constant-face ((,class :foreground ,blue-alt-other)))
+   `(web-mode-css-at-rule-face ((,class :foreground ,blue-alt-other)))
+   `(web-mode-css-color-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(web-mode-css-comment-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-css-function-face ((,class :foreground ,magenta-alt :weight 
,modus-theme-bold)))
+   `(web-mode-css-priority-face ((,class :foreground ,yellow-alt :weight 
,modus-theme-bold)))
+   `(web-mode-css-property-name-face ((,class :foreground ,cyan)))
+   `(web-mode-css-pseudo-class-face ((,class :foreground ,cyan-alt-other)))
+   `(web-mode-css-selector-face ((,class :foreground ,magenta-alt-other 
:weight ,modus-theme-bold)))
+   `(web-mode-css-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-css-variable-face ((,class :foreground ,fg-special-warm)))
+   `(web-mode-current-column-highlight-face ((,class :background ,bg-alt)))
+   `(web-mode-current-element-highlight-face ((,class :inherit 
modus-theme-special-mild)))
+   `(web-mode-doctype-face ((,class :foreground ,fg-special-cold :slant 
,modus-theme-slant)))
+   `(web-mode-error-face ((,class :inherit modus-theme-intense-red)))
+   `(web-mode-filter-face ((,class :foreground ,magenta)))
+   `(web-mode-folded-face ((,class :underline t)))
+   `(web-mode-function-call-face ((,class :foreground ,magenta)))
+   `(web-mode-function-name-face ((,class :foreground ,magenta)))
+   `(web-mode-html-attr-custom-face ((,class :foreground ,cyan)))
+   `(web-mode-html-attr-engine-face ((,class :foreground ,fg-main)))
+   `(web-mode-html-attr-equal-face ((,class :foreground ,fg-main)))
+   `(web-mode-html-attr-name-face ((,class :foreground ,cyan)))
+   `(web-mode-html-attr-value-face ((,class :foreground ,blue-alt-other)))
+   `(web-mode-html-entity-face ((,class :foreground ,yellow-alt-other :slant 
,modus-theme-slant)))
+   `(web-mode-html-tag-bracket-face ((,class :foreground ,fg-dim)))
+   `(web-mode-html-tag-custom-face ((,class :foreground ,magenta)))
+   `(web-mode-html-tag-face ((,class :foreground ,magenta)))
+   `(web-mode-html-tag-namespaced-face ((,class :foreground ,magenta-alt 
:weight ,modus-theme-bold)))
+   `(web-mode-html-tag-unclosed-face ((,class :foreground ,red :underline t)))
+   `(web-mode-inlay-face ((,class :background ,bg-alt)))
+   `(web-mode-italic-face ((,class :slant italic)))
+   `(web-mode-javascript-comment-face ((,class :inherit 
web-mode-comment-face)))
+   `(web-mode-javascript-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-json-comment-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-json-context-face ((,class :foreground ,magenta-alt)))
+   `(web-mode-json-key-face ((,class :foreground ,blue-nuanced)))
+   `(web-mode-json-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-jsx-depth-1-face ((,class :background ,blue-intense-bg 
:foreground ,fg-main)))
+   `(web-mode-jsx-depth-2-face ((,class :background ,blue-subtle-bg 
:foreground ,fg-main)))
+   `(web-mode-jsx-depth-3-face ((,class :background ,bg-special-cold 
:foreground ,fg-special-cold)))
+   `(web-mode-jsx-depth-4-face ((,class :background ,bg-alt :foreground 
,blue-refine-fg)))
+   `(web-mode-jsx-depth-5-face ((,class :background ,bg-alt :foreground 
,blue-nuanced)))
+   `(web-mode-keyword-face ((,class :foreground ,magenta-alt-other :weight 
,modus-theme-bold)))
+   `(web-mode-param-name-face ((,class :foreground ,magenta)))
+   `(web-mode-part-comment-face ((,class :inherit web-mode-comment-face)))
+   `(web-mode-part-face ((,class :inherit web-mode-block-face)))
+   `(web-mode-part-string-face ((,class :inherit web-mode-string-face)))
+   `(web-mode-preprocessor-face ((,class :foreground ,magenta)))
+   `(web-mode-script-face ((,class :inherit web-mode-part-face)))
+   `(web-mode-sql-keyword-face ((,class :foreground ,yellow :weight bold)))
+   `(web-mode-string-face ((,class :foreground ,blue-alt)))
+   `(web-mode-style-face ((,class :inherit web-mode-part-face)))
+   `(web-mode-symbol-face ((,class :foreground ,blue-alt-other)))
+   `(web-mode-type-face ((,class :foreground ,magenta-alt)))
+   `(web-mode-underline-face ((,class :underline t)))
+   `(web-mode-variable-name-face ((,class :foreground ,cyan)))
+   `(web-mode-warning-face ((,class :background ,bg-alt :foreground 
,yellow-alt-other :weight bold)))
+   `(web-mode-whitespace-face ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
    ;;;; wgrep
-   `(wgrep-delete-face ((,class (:inherit modus-theme-refine-yellow))))
-   `(wgrep-done-face ((,class (:inherit modus-theme-refine-blue))))
-   `(wgrep-face ((,class (:inherit modus-theme-refine-green))))
-   `(wgrep-file-face ((,class (:foreground ,fg-special-warm))))
-   `(wgrep-reject-face ((,class (:inherit modus-theme-intense-red :weight 
bold))))
+   `(wgrep-delete-face ((,class :inherit modus-theme-refine-yellow)))
+   `(wgrep-done-face ((,class :inherit modus-theme-refine-blue)))
+   `(wgrep-face ((,class :inherit modus-theme-refine-green)))
+   `(wgrep-file-face ((,class :foreground ,fg-special-warm)))
+   `(wgrep-reject-face ((,class :inherit modus-theme-intense-red :weight 
bold)))
    ;;;; which-function-mode
-   `(which-func ((,class (:foreground ,magenta-active))))
+   `(which-func ((,class :foreground ,magenta-active)))
    ;;;; which-key
-   `(which-key-command-description-face ((,class (:foreground ,cyan))))
-   `(which-key-group-description-face ((,class (:foreground ,magenta-alt))))
-   `(which-key-highlighted-command-face ((,class (:foreground ,cyan-alt 
:underline t))))
-   `(which-key-key-face ((,class (:foreground ,blue-intense :weight bold))))
-   `(which-key-local-map-description-face ((,class (:foreground ,fg-main))))
-   `(which-key-note-face ((,class (:background ,bg-dim :foreground 
,fg-special-mild))))
-   `(which-key-separator-face ((,class (:foreground ,fg-alt))))
-   `(which-key-special-key-face ((,class (:foreground ,yellow-intense :weight 
bold))))
+   `(which-key-command-description-face ((,class :foreground ,cyan)))
+   `(which-key-group-description-face ((,class :foreground ,magenta-alt)))
+   `(which-key-highlighted-command-face ((,class :foreground ,cyan-alt 
:underline t)))
+   `(which-key-key-face ((,class :foreground ,blue-intense :weight bold)))
+   `(which-key-local-map-description-face ((,class :foreground ,fg-main)))
+   `(which-key-note-face ((,class :background ,bg-dim :foreground 
,fg-special-mild)))
+   `(which-key-separator-face ((,class :foreground ,fg-alt)))
+   `(which-key-special-key-face ((,class :foreground ,yellow-intense :weight 
bold)))
    ;;;; whitespace-mode
-   `(whitespace-big-indent ((,class (:inherit modus-theme-subtle-red))))
-   `(whitespace-empty ((,class (:inherit modus-theme-intense-magenta))))
-   `(whitespace-hspace ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-indentation ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-line ((,class (:inherit modus-theme-special-warm))))
-   `(whitespace-newline ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-space ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-space-after-tab ((,class (:inherit 
modus-theme-subtle-magenta))))
-   `(whitespace-space-before-tab ((,class (:inherit modus-theme-subtle-cyan))))
-   `(whitespace-tab ((,class (:background ,bg-whitespace :foreground 
,fg-whitespace))))
-   `(whitespace-trailing ((,class (:inherit modus-theme-intense-red))))
+   `(whitespace-big-indent ((,class :inherit modus-theme-subtle-red)))
+   `(whitespace-empty ((,class :inherit modus-theme-intense-magenta)))
+   `(whitespace-hspace ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-indentation ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-line ((,class :inherit modus-theme-special-warm)))
+   `(whitespace-newline ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-space ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-space-after-tab ((,class :inherit modus-theme-subtle-magenta)))
+   `(whitespace-space-before-tab ((,class :inherit modus-theme-subtle-cyan)))
+   `(whitespace-tab ((,class :background ,bg-whitespace :foreground 
,fg-whitespace)))
+   `(whitespace-trailing ((,class :inherit modus-theme-intense-red)))
    ;;;; window-divider-mode
-   `(window-divider ((,class (:foreground ,fg-window-divider-inner))))
-   `(window-divider-first-pixel ((,class (:foreground 
,fg-window-divider-outer))))
-   `(window-divider-last-pixel ((,class (:foreground 
,fg-window-divider-outer))))
+   `(window-divider ((,class :foreground ,fg-window-divider-inner)))
+   `(window-divider-first-pixel ((,class :foreground 
,fg-window-divider-outer)))
+   `(window-divider-last-pixel ((,class :foreground ,fg-window-divider-outer)))
    ;;;; winum
-   `(winum-face ((,class (:foreground ,cyan-active :weight 
,modus-theme-bold))))
+   `(winum-face ((,class :foreground ,cyan-active :weight ,modus-theme-bold)))
    ;;;; writegood-mode
-   `(writegood-duplicates-face ((,class (:background ,bg-alt :foreground 
,red-alt :underline t))))
-   `(writegood-passive-voice-face ((,class (:foreground ,yellow-nuanced 
:underline (:color ,fg-lang-warning :style line)))))
-   `(writegood-weasels-face ((,class (:foreground ,red-nuanced :underline 
(:color ,fg-lang-error :style line)))))
+   `(writegood-duplicates-face ((,class :background ,bg-alt :foreground 
,red-alt :underline t)))
+   `(writegood-passive-voice-face ((,class :foreground ,yellow-nuanced 
:underline (:color ,fg-lang-warning :style line))))
+   `(writegood-weasels-face ((,class :foreground ,red-nuanced :underline 
(:color ,fg-lang-error :style line))))
    ;;;; woman
-   `(woman-addition ((,class (:foreground ,magenta-alt-other))))
-   `(woman-bold ((,class (:foreground ,magenta :weight bold))))
-   `(woman-italic ((,class (:foreground ,cyan :slant italic))))
-   `(woman-unknown ((,class (:foreground ,yellow :slant italic))))
+   `(woman-addition ((,class :foreground ,magenta-alt-other)))
+   `(woman-bold ((,class :foreground ,magenta :weight bold)))
+   `(woman-italic ((,class :foreground ,cyan :slant italic)))
+   `(woman-unknown ((,class :foreground ,yellow :slant italic)))
    ;;;; xah-elisp-mode
-   `(xah-elisp-at-symbol ((,class (:foreground ,red-alt :weight bold))))
-   `(xah-elisp-cap-variable ((,class (:foreground ,red-alt-other))))
-   `(xah-elisp-command-face ((,class (:foreground ,cyan-alt-other))))
-   `(xah-elisp-dollar-symbol ((,class (:foreground ,green))))
+   `(xah-elisp-at-symbol ((,class :foreground ,red-alt :weight bold)))
+   `(xah-elisp-cap-variable ((,class :foreground ,red-alt-other)))
+   `(xah-elisp-command-face ((,class :foreground ,cyan-alt-other)))
+   `(xah-elisp-dollar-symbol ((,class :foreground ,green)))
    ;;;; xref
-   `(xref-file-header ((,class (:foreground ,fg-special-cold :weight bold))))
-   `(xref-line-number ((,class (:foreground ,fg-alt))))
-   `(xref-match ((,class (:inherit match))))
+   `(xref-file-header ((,class :foreground ,fg-special-cold :weight bold)))
+   `(xref-line-number ((,class :foreground ,fg-alt)))
+   `(xref-match ((,class :inherit match)))
    ;;;; yaml-mode
-   `(yaml-tab-face ((,class (:inherit modus-theme-intense-red))))
+   `(yaml-tab-face ((,class :inherit modus-theme-intense-red)))
    ;;;; yasnippet
-   `(yas-field-highlight-face ((,class (:background ,bg-alt :foreground 
,fg-main))))
+   `(yas-field-highlight-face ((,class :background ,bg-alt :foreground 
,fg-main)))
    ;;;; ztree
-   `(ztreep-arrow-face ((,class (:foreground ,fg-inactive))))
-   `(ztreep-diff-header-face ((,class (:height 1.2 :foreground 
,fg-special-cold :weight bold))))
-   `(ztreep-diff-header-small-face ((,class (:foreground ,fg-special-mild 
:weight bold))))
-   `(ztreep-diff-model-add-face ((,class (:foreground ,green))))
-   `(ztreep-diff-model-diff-face ((,class (:foreground ,red))))
-   `(ztreep-diff-model-ignored-face ((,class (:foreground ,fg-alt 
:strike-through t))))
-   `(ztreep-diff-model-normal-face ((,class (:foreground ,fg-alt))))
-   `(ztreep-expand-sign-face ((,class (:foreground ,blue))))
-   `(ztreep-header-face ((,class (:height 1.2 :foreground ,fg-special-cold 
:weight bold))))
-   `(ztreep-leaf-face ((,class (:foreground ,cyan))))
-   `(ztreep-node-count-children-face ((,class (:foreground ,fg-special-warm))))
-   `(ztreep-node-face ((,class (:foreground ,fg-main)))))
+   `(ztreep-arrow-face ((,class :foreground ,fg-inactive)))
+   `(ztreep-diff-header-face ((,class :height 1.2 :foreground ,fg-special-cold 
:weight bold)))
+   `(ztreep-diff-header-small-face ((,class :foreground ,fg-special-mild 
:weight bold)))
+   `(ztreep-diff-model-add-face ((,class :foreground ,green)))
+   `(ztreep-diff-model-diff-face ((,class :foreground ,red)))
+   `(ztreep-diff-model-ignored-face ((,class :foreground ,fg-alt 
:strike-through t)))
+   `(ztreep-diff-model-normal-face ((,class :foreground ,fg-alt)))
+   `(ztreep-expand-sign-face ((,class :foreground ,blue)))
+   `(ztreep-header-face ((,class :height 1.2 :foreground ,fg-special-cold 
:weight bold)))
+   `(ztreep-leaf-face ((,class :foreground ,cyan)))
+   `(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm)))
+   `(ztreep-node-face ((,class :foreground ,fg-main))))
   (when (>= emacs-major-version 27) ; EXPERIMENTAL this form is subject to 
review
     (custom-theme-set-faces
      'modus-vivendi
      ;;;; tab-bar-mode
-     `(tab-bar ((,class (:background ,bg-tab-bar :foreground ,fg-main))))
-     `(tab-bar-tab ((,class (:box (:line-width 2 :color ,bg-tab-active)
-                                  :background ,bg-tab-active :foreground 
,fg-main :weight bold))))
-     `(tab-bar-tab-inactive ((,class (:box (:line-width 2 :color 
,bg-tab-inactive)
-                                           :background ,bg-tab-inactive 
:foreground ,fg-dim))))
+     `(tab-bar ((,class :background ,bg-tab-bar :foreground ,fg-main)))
+     `(tab-bar-tab ((,class :box (:line-width 2 :color ,bg-tab-active)
+                            :background ,bg-tab-active :foreground ,fg-main 
:weight bold)))
+     `(tab-bar-tab-inactive ((,class :box (:line-width 2 :color 
,bg-tab-inactive)
+                                     :background ,bg-tab-inactive :foreground 
,fg-dim)))
      ;;;; tab-line-mode
-     `(tab-line ((,class (:height 0.95 :background ,bg-tab-bar :foreground 
,fg-main))))
-     `(tab-line-close-highlight ((,class (:foreground ,red))))
-     `(tab-line-highlight ((,class (:background ,blue-subtle-bg :foreground 
,fg-dim))))
-     `(tab-line-tab ((,class (:box (:line-width 2 :color ,bg-tab-active)
-                                   :background ,bg-tab-active :foreground 
,fg-main :weight bold))))
-     `(tab-line-tab-current ((,class (:inherit tab-line-tab))))
-     `(tab-line-tab-inactive ((,class (:box (:line-width 2 :color 
,bg-tab-inactive)
-                                            :background ,bg-tab-inactive 
:foreground ,fg-dim))))))
+     `(tab-line ((,class :height 0.95 :background ,bg-tab-bar :foreground 
,fg-main)))
+     `(tab-line-close-highlight ((,class :foreground ,red)))
+     `(tab-line-highlight ((,class :background ,blue-subtle-bg :foreground 
,fg-dim)))
+     `(tab-line-tab ((,class :box (:line-width 2 :color ,bg-tab-active)
+                             :background ,bg-tab-active :foreground ,fg-main 
:weight bold)))
+     `(tab-line-tab-current ((,class :inherit tab-line-tab)))
+     `(tab-line-tab-inactive ((,class :box (:line-width 2 :color 
,bg-tab-inactive)
+                                      :background ,bg-tab-inactive :foreground 
,fg-dim)))))
   ;;; Theme Variables
   (custom-theme-set-variables
    'modus-vivendi



reply via email to

[Prev in Thread] Current Thread [Next in Thread]