[elpa] externals/modus-operandi-theme e4714ff 02/54: Finalise palette implementation and customisation

[Stefan Monnier]

branch: externals/modus-operandi-theme
commit e4714ff9f7d3adec509b388485bdb5af2e2bc351
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Finalise palette implementation and customisation
    
    This is the product of the information provided in issue 39:
    https://gitlab.com/protesilaos/modus-themes/-/issues/39
---
 modus-operandi-theme.el | 198 +++++++++++++++++-------------------------------
 modus-vivendi-theme.el  | 198 +++++++++++++++++-------------------------------
 2 files changed, 136 insertions(+), 260 deletions(-)

diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 012aeae..d7a8743 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -49,6 +49,7 @@
 ;;     modus-operandi-theme-distinct-org-blocks
 ;;     modus-operandi-theme-3d-modeline
 ;;     modus-operandi-theme-subtle-diffs
+;;     modus-operandi-theme-override-colors-alist
 ;;
 ;; The default scale is as follows (it can be customised as well):
 ;;
@@ -499,8 +500,6 @@ AMOUNT is a customisation option."
   (when modus-operandi-theme-scale-headings
     (list :height amount)))
 
-
-
 ;; Define colour palette.  Each colour must have a >= 7:1 contrast
 ;; ratio relative to the foreground/background colour it is rendered
 ;; against.
@@ -510,140 +509,95 @@ AMOUNT is a customisation option."
 ;; https://github.com/bbatsov/zenburn-emacs
 (defvar modus-operandi-theme-default-colors-alist
   '(;; base values
-    ("fg-main" . "#000000")
-    ("bg-main" . "#ffffff")
-    ("fg-alt" . "#505050")
-    ("bg-alt" . "#f3f1f3")
-    ("fg-dim" . "#282828")
-    ("bg-dim" . "#f8f8f8")
+    ("bg-main" . "#ffffff") ("fg-main" . "#000000")
+    ("bg-alt" . "#f3f1f3") ("fg-alt" . "#505050")
+    ("bg-dim" . "#f8f8f8") ("fg-dim" . "#282828")
     ;; specifically for on/off states (e.g. `mode-line')
     ;;
     ;; must be combined with themselves
-    ("fg-active" . "#191919")
-    ("bg-active" . "#e0e0e0")
-    ("fg-inactive" . "#424242")
-    ("bg-inactive" . "#efedef")
+    ("bg-active" . "#e0e0e0") ("fg-active" . "#191919")
+    ("bg-inactive" . "#efedef") ("fg-inactive" . "#424242")
     ;; special base values, used only for cases where the above
     ;; fg-* or bg-* cannot or should not be used (to avoid confusion)
     ;; must be combined with: {fg,bg}-{main,alt,dim}
-    ("fg-special-cold" . "#093060")
-    ("bg-special-cold" . "#dde3f4")
-    ("fg-special-mild" . "#184034")
-    ("bg-special-mild" . "#c4ede0")
-    ("fg-special-warm" . "#5d3026")
-    ("bg-special-warm" . "#f0e0d4")
-    ("fg-special-calm" . "#61284f")
-    ("bg-special-calm" . "#f8ddea")
+    ("bg-special-cold" . "#dde3f4") ("fg-special-cold" . "#093060")
+    ("bg-special-mild" . "#c4ede0") ("fg-special-mild" . "#184034")
+    ("bg-special-warm" . "#f0e0d4") ("fg-special-warm" . "#5d3026")
+    ("bg-special-calm" . "#f8ddea") ("fg-special-calm" . "#61284f")
     ;; styles for the main constructs
     ;;
     ;; must be combined with: `bg-main', `bg-alt', `bg-dim'
-    ("red" . "#a80000")
-    ("green" . "#005f00")
-    ("yellow" . "#8b3800")
-    ("blue" . "#0030a6")
-    ("magenta" . "#721045")
-    ("cyan" . "#005589")
+    ("red" . "#a80000") ("green" . "#005f00")
+    ("yellow" . "#8b3800") ("blue" . "#0030a6")
+    ("magenta" . "#721045") ("cyan" . "#005589")
     ;; styles for common, but still specialised constructs
     ;;
     ;; must be combined with: `bg-main', `bg-alt', `bg-dim'
-    ("red-alt" . "#972500")
-    ("green-alt" . "#305c00")
-    ("yellow-alt" . "#714900")
-    ("blue-alt" . "#223fbf")
-    ("magenta-alt" . "#8f0075")
-    ("cyan-alt" . "#185870")
+    ("red-alt" . "#972500") ("green-alt" . "#305c00")
+    ("yellow-alt" . "#714900") ("blue-alt" . "#223fbf")
+    ("magenta-alt" . "#8f0075") ("cyan-alt" . "#185870")
     ;; same purpose as above, just slight differences
     ;;
     ;; must be combined with: `bg-main', `bg-alt', `bg-dim'
-    ("red-alt-other" . "#a0132f")
-    ("green-alt-other" . "#095f1c")
-    ("yellow-alt-other" . "#804000")
-    ("blue-alt-other" . "#0000bb")
-    ("magenta-alt-other" . "#5317ac")
-    ("cyan-alt-other" . "#005a68")
+    ("red-alt-other" . "#a0132f") ("green-alt-other" . "#095f1c")
+    ("yellow-alt-other" . "#804000") ("blue-alt-other" . "#0000bb")
+    ("magenta-alt-other" . "#5317ac") ("cyan-alt-other" . "#005a68")
     ;; styles for elements that should be very subtle
     ;;
     ;; must be combined with: `bg-main', `bg-alt', `bg-dim'
-    ("red-nuanced" . "#4d0006")
-    ("green-nuanced" . "#003000")
-    ("yellow-nuanced" . "#3a2a00")
-    ("blue-nuanced" . "#001170")
-    ("magenta-nuanced" . "#381050")
-    ("cyan-nuanced" . "#003434")
+    ("red-nuanced" . "#4d0006") ("green-nuanced" . "#003000")
+    ("yellow-nuanced" . "#3a2a00") ("blue-nuanced" . "#001170")
+    ("magenta-nuanced" . "#381050") ("cyan-nuanced" . "#003434")
     ;; styles for slightly accented background
     ;;
     ;; must be combined with any of the above foreground values
-    ("red-nuanced-bg" . "#fef2f2")
-    ("green-nuanced-bg" . "#f4faf4")
-    ("yellow-nuanced-bg" . "#fcf6f1")
-    ("blue-nuanced-bg" . "#f4f4ff")
-    ("magenta-nuanced-bg" . "#fff4fc")
-    ("cyan-nuanced-bg" . "#f0f6fa")
+    ("red-nuanced-bg" . "#fef2f2") ("green-nuanced-bg" . "#f4faf4")
+    ("yellow-nuanced-bg" . "#fcf6f1") ("blue-nuanced-bg" . "#f4f4ff")
+    ("magenta-nuanced-bg" . "#fff4fc") ("cyan-nuanced-bg" . "#f0f6fa")
     ;; styles for elements that should draw attention to themselves
     ;;
     ;; must be combined with: `bg-main'
-    ("red-intense" . "#b60000")
-    ("green-intense" . "#006800")
-    ("yellow-intense" . "#904200")
-    ("blue-intense" . "#1111ee")
-    ("magenta-intense" . "#7000e0")
-    ("cyan-intense" . "#205b93")
+    ("red-intense" . "#b60000") ("green-intense" . "#006800")
+    ("yellow-intense" . "#904200") ("blue-intense" . "#1111ee")
+    ("magenta-intense" . "#7000e0") ("cyan-intense" . "#205b93")
     ;; styles for background elements that should be visible yet
     ;; subtle
     ;;
     ;; must be combined with: `fg-dim'
-    ("red-subtle-bg" . "#f2b0a2")
-    ("green-subtle-bg" . "#aecf90")
-    ("yellow-subtle-bg" . "#e4c340")
-    ("blue-subtle-bg" . "#b5d0ff")
-    ("magenta-subtle-bg" . "#f0d3ff")
-    ("cyan-subtle-bg" . "#c0efff")
+    ("red-subtle-bg" . "#f2b0a2") ("green-subtle-bg" . "#aecf90")
+    ("yellow-subtle-bg" . "#e4c340") ("blue-subtle-bg" . "#b5d0ff")
+    ("magenta-subtle-bg" . "#f0d3ff") ("cyan-subtle-bg" . "#c0efff")
     ;; styles for background elements that should be visible and
     ;; distinguishable
     ;;
     ;; must be combined with: `fg-main'
-    ("red-intense-bg" . "#ff8892")
-    ("green-intense-bg" . "#5ada88")
-    ("yellow-intense-bg" . "#f5df23")
-    ("blue-intense-bg" . "#6aaeff")
-    ("magenta-intense-bg" . "#d5baff")
-    ("cyan-intense-bg" . "#42cbd4")
-    ;; styles for refined git diffs and other contexts where both the
-    ;; foreground and the background need to have the same/similar hue
+    ("red-intense-bg" . "#ff8892") ("green-intense-bg" . "#5ada88")
+    ("yellow-intense-bg" . "#f5df23") ("blue-intense-bg" . "#6aaeff")
+    ("magenta-intense-bg" . "#d5baff") ("cyan-intense-bg" . "#42cbd4")
+    ;; styles for refined contexts where both the foreground and the
+    ;; background need to have the same/similar hue
     ;;
     ;; must be combined with themselves OR the foregrounds can be
     ;; combined with any of the base backgrounds
-    ("red-refine-bg" . "#ffcccc")
-    ("green-refine-bg" . "#aceaac")
-    ("yellow-refine-bg" . "#fff29a")
-    ("blue-refine-bg" . "#8ac7ff")
-    ("magenta-refine-bg" . "#ffccff")
-    ("cyan-refine-bg" . "#8eecf4")
-    ("red-refine-fg" . "#780000")
-    ("green-refine-fg" . "#004c00")
-    ("yellow-refine-fg" . "#604000")
-    ("blue-refine-fg" . "#002288")
-    ("magenta-refine-fg" . "#770077")
-    ("cyan-refine-fg" . "#004850")
+    ("red-refine-bg" . "#ffcccc") ("red-refine-fg" . "#780000")
+    ("green-refine-bg" . "#aceaac") ("green-refine-fg" . "#004c00")
+    ("yellow-refine-bg" . "#fff29a") ("yellow-refine-fg" . "#604000")
+    ("blue-refine-bg" . "#8ac7ff") ("blue-refine-fg" . "#002288")
+    ("magenta-refine-bg" . "#ffccff") ("magenta-refine-fg" . "#770077")
+    ("cyan-refine-bg" . "#8eecf4") ("cyan-refine-fg" . "#004850")
     ;; styles that are meant exclusively for the mode line
     ;;
     ;; must be combined with: `bg-active', `bg-inactive'
-    ("red-active" . "#930000")
-    ("green-active" . "#005300")
-    ("yellow-active" . "#703700")
-    ("blue-active" . "#0033c0")
-    ("magenta-active" . "#6320a0")
-    ("cyan-active" . "#004882")
+    ("red-active" . "#930000") ("green-active" . "#005300")
+    ("yellow-active" . "#703700") ("blue-active" . "#0033c0")
+    ("magenta-active" . "#6320a0") ("cyan-active" . "#004882")
     ;; styles that are meant exclusively for the fringes
     ;;
     ;; must have a minimum contrast ratio of 1.5:1 with `bg-inactive'
     ;; and be combined with `fg-main' or `fg-dim'
-    ("red-fringe-bg" . "#ff9a9a")
-    ("green-fringe-bg" . "#86cf86")
-    ("yellow-fringe-bg" . "#e0c050")
-    ("blue-fringe-bg" . "#82afff")
-    ("magenta-fringe-bg" . "#f0a3ff")
-    ("cyan-fringe-bg" . "#00d6e0")
+    ("red-fringe-bg" . "#ff9a9a") ("green-fringe-bg" . "#86cf86")
+    ("yellow-fringe-bg" . "#e0c050") ("blue-fringe-bg" . "#82afff")
+    ("magenta-fringe-bg" . "#f0a3ff") ("cyan-fringe-bg" . "#00d6e0")
     ;; styles reserved for specific faces
     ;;
     ;; `bg-hl-line' is between `bg-dim' and `bg-alt', so it should
@@ -695,48 +649,30 @@ AMOUNT is a customisation option."
 
     ("fg-unfocused" . "#56576d")
 
-    ("fg-header" . "#2a2a2a")
-    ("bg-header" . "#e5e5e5")
+    ("bg-header" . "#e5e5e5") ("fg-header" . "#2a2a2a")
 
-    ("fg-whitespace" . "#645060")
-    ("bg-whitespace" . "#fff8fc")
+    ("bg-whitespace" . "#fff8fc") ("fg-whitespace" . "#645060")
 
-    ("fg-diff-heading" . "#043355")
-    ("bg-diff-heading" . "#b7c2dd")
-    ("fg-diff-added" . "#004500")
-    ("bg-diff-added" . "#d4fad4")
-    ("fg-diff-changed" . "#524200")
-    ("bg-diff-changed" . "#fcefcf")
-    ("fg-diff-removed" . "#691616")
-    ("bg-diff-removed" . "#ffe8ef")
+    ("bg-diff-heading" . "#b7c2dd") ("fg-diff-heading" . "#043355")
+    ("bg-diff-added" . "#d4fad4") ("fg-diff-added" . "#004500")
+    ("bg-diff-changed" . "#fcefcf") ("fg-diff-changed" . "#524200")
+    ("bg-diff-removed" . "#ffe8ef") ("fg-diff-removed" . "#691616")
 
-    ("fg-diff-refine-added" . "#002a00")
-    ("bg-diff-refine-added" . "#94cf94")
-    ("fg-diff-refine-changed" . "#302010")
-    ("bg-diff-refine-changed" . "#cccf8f")
-    ("fg-diff-refine-removed" . "#400000")
-    ("bg-diff-refine-removed" . "#daa2b0")
+    ("bg-diff-refine-added" . "#94cf94") ("fg-diff-refine-added" . "#002a00")
+    ("bg-diff-refine-changed" . "#cccf8f") ("fg-diff-refine-changed" . 
"#302010")
+    ("bg-diff-refine-removed" . "#daa2b0") ("fg-diff-refine-removed" . 
"#400000")
 
-    ("fg-diff-focus-added" . "#002c00")
-    ("bg-diff-focus-added" . "#bbeabb")
-    ("fg-diff-focus-changed" . "#392900")
-    ("bg-diff-focus-changed" . "#ecdfbf")
-    ("fg-diff-focus-removed" . "#4a0000")
-    ("bg-diff-focus-removed" . "#efcbcf")
+    ("bg-diff-focus-added" . "#bbeabb") ("fg-diff-focus-added" . "#002c00")
+    ("bg-diff-focus-changed" . "#ecdfbf") ("fg-diff-focus-changed" . "#392900")
+    ("bg-diff-focus-removed" . "#efcbcf") ("fg-diff-focus-removed" . "#4a0000")
 
-    ("fg-diff-neutral-0" . "#040404")
-    ("bg-diff-neutral-0" . "#979797")
-    ("fg-diff-neutral-1" . "#252525")
-    ("bg-diff-neutral-1" . "#b0b0b0")
-    ("fg-diff-neutral-2" . "#3a3a3a")
-    ("bg-diff-neutral-2" . "#cccccc")
+    ("bg-diff-neutral-0" . "#979797") ("fg-diff-neutral-0" . "#040404")
+    ("bg-diff-neutral-1" . "#b0b0b0") ("fg-diff-neutral-1" . "#252525")
+    ("bg-diff-neutral-2" . "#cccccc") ("fg-diff-neutral-2" . "#3a3a3a")
 
-    ("fg-mark" . "#005040")
-    ("bg-mark" . "#a0f0cf")
-    ("fg-mark-del" . "#840040")
-    ("bg-mark-del" . "#ffccbb")
-    ("fg-mark-other" . "#782900")
-    ("bg-mark-other" . "#f5d88f"))
+    ("bg-mark" . "#a0f0cf") ("fg-mark" . "#005040")
+    ("bg-mark-del" . "#ffccbb") ("fg-mark-del" . "#840040")
+    ("bg-mark-other" . "#f5d88f") ("fg-mark-other" . "#782900"))
   "The entire palette of `modus-operandi-theme'.
 Each element has the form (NAME . HEX).")
 
@@ -768,6 +704,8 @@ Also bind `class' to ((class color) (min-colors 89))."
           (if modus-operandi-theme-proportional-fonts 'variable-pitch 
'default)))
      ,@body))
 
+
+
 (modus-operandi-theme-with-color-variables
   (custom-theme-set-faces
    'modus-operandi
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 836cb40..0e33162 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -49,6 +49,7 @@
 ;;     modus-vivendi-theme-distinct-org-blocks
 ;;     modus-vivendi-theme-3d-modeline
 ;;     modus-vivendi-theme-subtle-diffs
+;;     modus-vivendi-theme-override-colors-alist
 ;;
 ;; The default scale is as follows (it can be customised as well):
 ;;
@@ -499,8 +500,6 @@ AMOUNT is a customisation option."
   (when modus-vivendi-theme-scale-headings
     (list :height amount)))
 
-
-
 ;; Define colour palette.  Each colour must have a >= 7:1 contrast
 ;; ratio relative to the foreground/background colour it is rendered
 ;; against.
@@ -510,140 +509,95 @@ AMOUNT is a customisation option."
 ;; https://github.com/bbatsov/zenburn-emacs
 (defvar modus-vivendi-theme-default-colors-alist
   '(;; base values
-    ("fg-main" . "#ffffff")
-    ("bg-main" . "#000000")
-    ("fg-alt" . "#a8a8a8")
-    ("bg-alt" . "#181a20")
-    ("fg-dim" . "#e0e6f0")
-    ("bg-dim" . "#110b11")
+    ("bg-main" . "#000000") ("fg-main" . "#ffffff")
+    ("bg-alt" . "#181a20") ("fg-alt" . "#a8a8a8")
+    ("bg-dim" . "#110b11") ("fg-dim" . "#e0e6f0")
     ;; specifically for on/off states (e.g. `mode-line')
     ;;
     ;; must be combined with themselves
-    ("fg-active" . "#f5f5f5")
-    ("bg-active" . "#2f2f2f")
-    ("fg-inactive" . "#bebebe")
-    ("bg-inactive" . "#202020")
+    ("bg-active" . "#2f2f2f") ("fg-active" . "#f5f5f5")
+    ("bg-inactive" . "#202020") ("fg-inactive" . "#bebebe")
     ;; special base values, used only for cases where the above
     ;; fg-* or bg-* cannot or should not be used (to avoid confusion)
     ;; must be combined with: {fg,bg}-{main,alt,dim}
-    ("fg-special-cold" . "#c6eaff")
-    ("bg-special-cold" . "#203448")
-    ("fg-special-mild" . "#bfebe0")
-    ("bg-special-mild" . "#00322e")
-    ("fg-special-warm" . "#f8dec0")
-    ("bg-special-warm" . "#382f27")
-    ("fg-special-calm" . "#fbd6f4")
-    ("bg-special-calm" . "#392a48")
+    ("bg-special-cold" . "#203448") ("fg-special-cold" . "#c6eaff")
+    ("bg-special-mild" . "#00322e") ("fg-special-mild" . "#bfebe0")
+    ("bg-special-warm" . "#382f27") ("fg-special-warm" . "#f8dec0")
+    ("bg-special-calm" . "#392a48") ("fg-special-calm" . "#fbd6f4")
     ;; styles for the main constructs
     ;;
     ;; must be combined with: `bg-main', `bg-alt', `bg-dim'
-    ("red" . "#ff8059")
-    ("green" . "#44bc44")
-    ("yellow" . "#eecc00")
-    ("blue" . "#33beff")
-    ("magenta" . "#feacd0")
-    ("cyan" . "#00d3d0")
+    ("red" . "#ff8059") ("green" . "#44bc44")
+    ("yellow" . "#eecc00") ("blue" . "#33beff")
+    ("magenta" . "#feacd0") ("cyan" . "#00d3d0")
     ;; styles for common, but still specialised constructs
     ;;
     ;; must be combined with: `bg-main', `bg-alt', `bg-dim'
-    ("red-alt" . "#f4923b")
-    ("green-alt" . "#58dd13")
-    ("yellow-alt" . "#e5f040")
-    ("blue-alt" . "#72a4ff")
-    ("magenta-alt" . "#f78fe7")
-    ("cyan-alt" . "#4ae8fc")
+    ("red-alt" . "#f4923b") ("green-alt" . "#58dd13")
+    ("yellow-alt" . "#e5f040") ("blue-alt" . "#72a4ff")
+    ("magenta-alt" . "#f78fe7") ("cyan-alt" . "#4ae8fc")
     ;; same purpose as above, just slight differences
     ;;
     ;; must be combined with: `bg-main', `bg-alt', `bg-dim'
-    ("red-alt-other" . "#ff9977")
-    ("green-alt-other" . "#90d800")
-    ("yellow-alt-other" . "#f0ce43")
-    ("blue-alt-other" . "#00baf4")
-    ("magenta-alt-other" . "#b6a0ff")
-    ("cyan-alt-other" . "#6ae4b9")
+    ("red-alt-other" . "#ff9977") ("green-alt-other" . "#90d800")
+    ("yellow-alt-other" . "#f0ce43") ("blue-alt-other" . "#00baf4")
+    ("magenta-alt-other" . "#b6a0ff") ("cyan-alt-other" . "#6ae4b9")
     ;; styles for elements that should be very subtle
     ;;
     ;; must be combined with: `bg-main', `bg-alt', `bg-dim'
-    ("red-nuanced" . "#ffcccc")
-    ("green-nuanced" . "#b0f0b0")
-    ("yellow-nuanced" . "#e0e0bb")
-    ("blue-nuanced" . "#ccccff")
-    ("magenta-nuanced" . "#eeccee")
-    ("cyan-nuanced" . "#aaeeee")
+    ("red-nuanced" . "#ffcccc") ("green-nuanced" . "#b0f0b0")
+    ("yellow-nuanced" . "#e0e0bb") ("blue-nuanced" . "#ccccff")
+    ("magenta-nuanced" . "#eeccee") ("cyan-nuanced" . "#aaeeee")
     ;; styles for slightly accented background
     ;;
     ;; must be combined with any of the above foreground values
-    ("red-nuanced-bg" . "#180505")
-    ("green-nuanced-bg" . "#061206")
-    ("yellow-nuanced-bg" . "#18140a")
-    ("blue-nuanced-bg" . "#070722")
-    ("magenta-nuanced-bg" . "#160616")
-    ("cyan-nuanced-bg" . "#091620")
+    ("red-nuanced-bg" . "#180505") ("green-nuanced-bg" . "#061206")
+    ("yellow-nuanced-bg" . "#18140a") ("blue-nuanced-bg" . "#070722")
+    ("magenta-nuanced-bg" . "#160616") ("cyan-nuanced-bg" . "#091620")
     ;; styles for elements that should draw attention to themselves
     ;;
     ;; must be combined with: `bg-main'
-    ("red-intense" . "#fb6859")
-    ("green-intense" . "#00fc50")
-    ("yellow-intense" . "#ffdd00")
-    ("blue-intense" . "#00a2ff")
-    ("magenta-intense" . "#ff8bd4")
-    ("cyan-intense" . "#30ffc0")
+    ("red-intense" . "#fb6859") ("green-intense" . "#00fc50")
+    ("yellow-intense" . "#ffdd00") ("blue-intense" . "#00a2ff")
+    ("magenta-intense" . "#ff8bd4") ("cyan-intense" . "#30ffc0")
     ;; styles for background elements that should be visible yet
     ;; subtle
     ;;
     ;; must be combined with: `fg-dim'
-    ("red-subtle-bg" . "#762422")
-    ("green-subtle-bg" . "#2f4a00")
-    ("yellow-subtle-bg" . "#604200")
-    ("blue-subtle-bg" . "#10387c")
-    ("magenta-subtle-bg" . "#49366e")
-    ("cyan-subtle-bg" . "#00415e")
+    ("red-subtle-bg" . "#762422") ("green-subtle-bg" . "#2f4a00")
+    ("yellow-subtle-bg" . "#604200") ("blue-subtle-bg" . "#10387c")
+    ("magenta-subtle-bg" . "#49366e") ("cyan-subtle-bg" . "#00415e")
     ;; styles for background elements that should be visible and
     ;; distinguishable
     ;;
     ;; must be combined with: `fg-main'
-    ("red-intense-bg" . "#a4202a")
-    ("green-intense-bg" . "#006800")
-    ("yellow-intense-bg" . "#874900")
-    ("blue-intense-bg" . "#2a40b8")
-    ("magenta-intense-bg" . "#7042a2")
-    ("cyan-intense-bg" . "#005f88")
-    ;; styles for refined git diffs and other contexts where both the
-    ;; foreground and the background need to have the same/similar hue
+    ("red-intense-bg" . "#a4202a") ("green-intense-bg" . "#006800")
+    ("yellow-intense-bg" . "#874900") ("blue-intense-bg" . "#2a40b8")
+    ("magenta-intense-bg" . "#7042a2") ("cyan-intense-bg" . "#005f88")
+    ;; styles for refined contexts where both the foreground and the
+    ;; background need to have the same/similar hue
     ;;
     ;; must be combined with themselves OR the foregrounds can be
     ;; combined with any of the base backgrounds
-    ("red-refine-bg" . "#77002a")
-    ("green-refine-bg" . "#00422a")
-    ("yellow-refine-bg" . "#705000")
-    ("blue-refine-bg" . "#242679")
-    ("magenta-refine-bg" . "#71206a")
-    ("cyan-refine-bg" . "#004065")
-    ("red-refine-fg" . "#ffb9ab")
-    ("green-refine-fg" . "#9ff0cf")
-    ("yellow-refine-fg" . "#ffffac")
-    ("blue-refine-fg" . "#8ec6ff")
-    ("magenta-refine-fg" . "#ffcaf0")
-    ("cyan-refine-fg" . "#8ae4f2")
+    ("red-refine-bg" . "#77002a") ("red-refine-fg" . "#ffb9ab")
+    ("green-refine-bg" . "#00422a") ("green-refine-fg" . "#9ff0cf")
+    ("yellow-refine-bg" . "#705000") ("yellow-refine-fg" . "#ffffac")
+    ("blue-refine-bg" . "#242679") ("blue-refine-fg" . "#8ec6ff")
+    ("magenta-refine-bg" . "#71206a") ("magenta-refine-fg" . "#ffcaf0")
+    ("cyan-refine-bg" . "#004065") ("cyan-refine-fg" . "#8ae4f2")
     ;; styles that are meant exclusively for the mode line
     ;;
     ;; must be combined with: `bg-active', `bg-inactive'
-    ("red-active" . "#ffa49e")
-    ("green-active" . "#70e030")
-    ("yellow-active" . "#efdf00")
-    ("blue-active" . "#00ccff")
-    ("magenta-active" . "#d0acff")
-    ("cyan-active" . "#00ddc0")
+    ("red-active" . "#ffa49e") ("green-active" . "#70e030")
+    ("yellow-active" . "#efdf00") ("blue-active" . "#00ccff")
+    ("magenta-active" . "#d0acff") ("cyan-active" . "#00ddc0")
     ;; styles that are meant exclusively for the fringes
     ;;
     ;; must have a minimum contrast ratio of 1.5:1 with `bg-inactive'
     ;; and be combined with `fg-main' or `fg-dim'
-    ("red-fringe-bg" . "#8f0040")
-    ("green-fringe-bg" . "#006000")
-    ("yellow-fringe-bg" . "#6f4a00")
-    ("blue-fringe-bg" . "#3a30ab")
-    ("magenta-fringe-bg" . "#692089")
-    ("cyan-fringe-bg" . "#0068a0")
+    ("red-fringe-bg" . "#8f0040") ("green-fringe-bg" . "#006000")
+    ("yellow-fringe-bg" . "#6f4a00") ("blue-fringe-bg" . "#3a30ab")
+    ("magenta-fringe-bg" . "#692089") ("cyan-fringe-bg" . "#0068a0")
     ;; styles reserved for specific faces
     ;;
     ;; `bg-hl-line' is between `bg-dim' and `bg-alt', so it should
@@ -695,48 +649,30 @@ AMOUNT is a customisation option."
 
     ("fg-unfocused" . "#93959b")
 
-    ("fg-header" . "#dddddd")
-    ("bg-header" . "#2a2a2a")
+    ("bg-header" . "#2a2a2a") ("fg-header" . "#dddddd")
 
-    ("fg-whitespace" . "#a4959f")
-    ("bg-whitespace" . "#170016")
+    ("bg-whitespace" . "#170016") ("fg-whitespace" . "#a4959f")
 
-    ("fg-diff-heading" . "#dadffe")
-    ("bg-diff-heading" . "#304466")
-    ("fg-diff-added" . "#94ba94")
-    ("bg-diff-added" . "#0a280a")
-    ("fg-diff-changed" . "#b0ba9f")
-    ("bg-diff-changed" . "#2a2000")
-    ("fg-diff-removed" . "#c6adaa")
-    ("bg-diff-removed" . "#40160f")
+    ("bg-diff-heading" . "#304466") ("fg-diff-heading" . "#dadffe")
+    ("bg-diff-added" . "#0a280a") ("fg-diff-added" . "#94ba94")
+    ("bg-diff-changed" . "#2a2000") ("fg-diff-changed" . "#b0ba9f")
+    ("bg-diff-removed" . "#40160f") ("fg-diff-removed" . "#c6adaa")
 
-    ("fg-diff-refine-added" . "#e0f6e0")
-    ("bg-diff-refine-added" . "#005a36")
-    ("fg-diff-refine-changed" . "#ffffcc")
-    ("bg-diff-refine-changed" . "#585800")
-    ("fg-diff-refine-removed" . "#ffd9eb")
-    ("bg-diff-refine-removed" . "#852828")
+    ("bg-diff-refine-added" . "#005a36") ("fg-diff-refine-added" . "#e0f6e0")
+    ("bg-diff-refine-changed" . "#585800") ("fg-diff-refine-changed" . 
"#ffffcc")
+    ("bg-diff-refine-removed" . "#852828") ("fg-diff-refine-removed" . 
"#ffd9eb")
 
-    ("fg-diff-focus-added" . "#b4ddb4")
-    ("bg-diff-focus-added" . "#203d20")
-    ("fg-diff-focus-changed" . "#d0daaf")
-    ("bg-diff-focus-changed" . "#4a3a10")
-    ("fg-diff-focus-removed" . "#eebdba")
-    ("bg-diff-focus-removed" . "#5e2526")
+    ("bg-diff-focus-added" . "#203d20") ("fg-diff-focus-added" . "#b4ddb4")
+    ("bg-diff-focus-changed" . "#4a3a10") ("fg-diff-focus-changed" . "#d0daaf")
+    ("bg-diff-focus-removed" . "#5e2526") ("fg-diff-focus-removed" . "#eebdba")
 
-    ("fg-diff-neutral-0" . "#fcfcfc")
-    ("bg-diff-neutral-0" . "#575757")
-    ("fg-diff-neutral-1" . "#dddddd")
-    ("bg-diff-neutral-1" . "#454545")
-    ("fg-diff-neutral-2" . "#bfbfbf")
-    ("bg-diff-neutral-2" . "#313131")
+    ("bg-diff-neutral-0" . "#575757") ("fg-diff-neutral-0" . "#fcfcfc")
+    ("bg-diff-neutral-1" . "#454545") ("fg-diff-neutral-1" . "#dddddd")
+    ("bg-diff-neutral-2" . "#313131") ("fg-diff-neutral-2" . "#bfbfbf")
 
-    ("fg-mark" . "#60cfa2")
-    ("bg-mark" . "#002f2f")
-    ("fg-mark-del" . "#ff99aa")
-    ("bg-mark-del" . "#5a0000")
-    ("fg-mark-other" . "#f0aa20")
-    ("bg-mark-other" . "#3f2210"))
+    ("bg-mark" . "#002f2f") ("fg-mark" . "#60cfa2")
+    ("bg-mark-del" . "#5a0000") ("fg-mark-del" . "#ff99aa")
+    ("bg-mark-other" . "#3f2210") ("fg-mark-other" . "#f0aa20"))
   "The entire palette of `modus-vivendi-theme'.
 Each element has the form (NAME . HEX).")
 
@@ -768,6 +704,8 @@ Also bind `class' to ((class color) (min-colors 89))."
           (if modus-vivendi-theme-proportional-fonts 'variable-pitch 
'default)))
      ,@body))
 
+
+
 (modus-vivendi-theme-with-color-variables
   (custom-theme-set-faces
    'modus-vivendi