Reorganise the links to other Modus projects in the README.md and clarify I am not endorsing anybody's views

I wrote a patch for it in emacs.git.

README.md

@@ -20,6 +20,12 @@ Such major versions are not backward-compatible due to the limited
 resources at my disposal to support multiple versions of Emacs and of
 the themes across the years.
 
+Starting with version `5.0.0` of the `modus-themes`, other packages
+can be built on top to provide their own "Modus" derivative themes.
+The manual has a section about building on top of Modus. My
+`ef-themes` and `standard-themes` are done in this way (versions
+`2.0.0` and `3.0.0`, respectively).
+
 + Package name (GNU ELPA): `modus-themes`
 + Official manual: <https://protesilaos.com/emacs/modus-themes>
 + Change log: <https://protesilaos.com/emacs/modus-themes-changelog>
@@ -29,3 +35,103 @@ the themes across the years.
   + GitHub: <https://github.com/protesilaos/modus-themes>
   + GitLab: <https://gitlab.com/protesilaos/modus-themes>
 + Backronym: My Old Display Unexpectedly Sharpened ... themes.
+
+```elisp
+(use-package modus-themes
+  :ensure t
+  :demand t
+  :init
+  ;; Starting with version 5.0.0 of the `modus-themes', other packages
+  ;; can be built on top to provide their own "Modus" derivatives.
+  ;; For example, this is what I do with my `ef-themes' and
+  ;; `standard-themes' (starting with versions 2.0.0 and 3.0.0,
+  ;; respectively).
+  ;;
+  ;; The `modus-themes-include-derivatives-mode' makes all Modus
+  ;; commands that act on a theme consider all such derivatives, if
+  ;; their respective packages are available and have been loaded.
+  ;;
+  ;; Note that those packages can even completely take over from the
+  ;; Modus themes such that, for example, `modus-themes-rotate' only
+  ;; goes through the Ef themes (to this end, the Ef themes provide
+  ;; the `ef-themes-take-over-modus-themes-mode' and the Standard
+  ;; themes have the `standard-themes-take-over-modus-themes-mode'
+  ;; equivalent).
+  ;;
+  ;; If you only care about the Modus themes, then (i) you do not need
+  ;; to enable the `modus-themes-include-derivatives-mode' and (ii) do
+  ;; not install and activate those other theme packages.
+  (modus-themes-include-derivatives-mode 1)
+  :bind
+  (("<f5>" . modus-themes-rotate)
+   ("C-<f5>" . modus-themes-select)
+   ("M-<f5>" . modus-themes-load-random))
+  :config
+  ;; Your customizations here.  All customizations must evaluated
+  ;; BEFORE loading the theme.
+  (setq modus-themes-to-toggle '(modus-operandi modus-vivendi)
+        modus-themes-to-rotate modus-themes-items
+        modus-themes-mixed-fonts t
+        modus-themes-variable-pitch-ui t
+        modus-themes-italic-constructs t
+        modus-themes-bold-constructs t
+        modus-themes-completions '((t . (bold)))
+        modus-themes-prompts '(bold)
+        modus-themes-headings
+        '((agenda-structure . (variable-pitch light 2.2))
+          (agenda-date . (variable-pitch regular 1.3))
+          (t . (regular 1.15))))
+
+  (setq modus-themes-common-palette-overrides nil)
+
+  ;; Finally, load your theme of choice (or a random one with
+  ;; `modus-themes-load-random', `modus-themes-load-random-dark',
+  ;; `modus-themes-load-random-light').
+  (modus-themes-load-theme 'modus-operandi))
+```
+
+## Links to other projects
+
+In this section I collect links to other themes built on top of Modus,
+have Modus as a dependency, or are porting Modus to some other
+platform. You are welcome to append your project to the relevant list.
+
+In linking to these projects, I am not endorsing anybody's views.
+
+### Emacs themes based on Modus
+
+This is not an exhaustive list. You are welcome to add your package
+here. Newer projects are at the bottom and are added as I am made
+aware of them.
+
+- `ef-themes` by Protesilaos <https://github.com/protesilaos/ef-themes>
+- `standard-themes` by Protesilaos <https://github.com/protesilaos/standard-themes>
+- `modus-ewal-theme` by Oliwier Czerwiński <https://github.com/deadendpl/modus-ewal-theme>
+- `modus-flexoki` by Derek Passen <https://github.com/dpassen/modus-flexoki>
+- `faff-theme` (since version 4) by James Ferguson <https://github.com/WJCFerguson/emacs-faff-theme>
+- `modus-catpuccin` by Magnus Therning <https://gitlab.com/magus/modus-catppuccin>
+- `pixel-themes` by Lucas <https://github.com/lucasobx/pixel-themes>
+- `modus-nordic` (`modus-nordic-night` and `modus-nordic-midnight`) by Ashton Wiersdorf <https://codeberg.org/ashton314/modus-nordic-night>
+- `folio-theme` by kn66 (nobu43) <https://github.com/kn66/folio-theme.el>
+- `modus-alabaster` by Derek Passen <https://github.com/dpassen/modus-alabaster>
+- `modus-vague` by Ashish Panigrahi <https://github.com/paniash/modus-vague.git>
+- `peppers-theme` by Joar von Arndt <https://codeberg.org/joar/peppers-theme>
+
+### Other Emacs packages based on Modus
+
+- `modus-themes-exporter` by Protesilaos <https://github.com/protesilaos/modus-themes-exporter>
+
+### Projects inspired by the Modus themes
+
+This is not an exhaustive list. You are welcome to add your project here.
+
+- `hugo-modus` by Yejun Su is a theme for the Hugo static site
+  generator: <https://github.com/goofansu/hugo-modus>. It uses colours
+  from the Modus themes.
+- `modus-themes.nvim` by Miika Nissi and others is a port for NeoVim:
+  <https://github.com/miikanissi/modus-themes.nvim>.
+- `zed-modus-themes` by Vitaly Slobodin is a port for the Zed editor:
+  <https://github.com/vitallium/zed-modus-themes>.
+- `word-smith` by Sadsnake1 is a distraction-free writing for Obsidian
+  that includes ports of the Modus themes: <https://github.com/Sadsnake1/word-smith>
+- `omarchy-modus-themes` by Dhavan Vaidya: <https://github.com/codingquark/omarchy-modus-themes>

modus-operandi-deuteranopia-theme.el

@@ -1,9 +1,9 @@
 ;;; modus-operandi-deuteranopia-theme.el --- Deuteranopia-optimized theme with a white background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026  Free Software Foundation, Inc.
 
-;; Author: Protesilaos Stavrou <info@protesilaos.com>
-;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+;; Author: Protesilaos <info@protesilaos.com>
+;; Maintainer: Protesilaos <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
 ;; Keywords: faces, theme, accessibility
 
@@ -26,490 +26,35 @@
 ;;
 ;; The Modus themes conform with the highest standard for
 ;; color-contrast accessibility between background and foreground
-;; values (WCAG AAA).  Please refer to the official Info manual for
-;; further documentation (distributed with the themes, or available
-;; at: <https://protesilaos.com/emacs/modus-themes>).
+;; values (WCAG AAA).  They are also highly customizable and can even
+;; be used as the basis for other themes.  Please refer to the official
+;; Info manual for further documentation (distributed with the themes,
+;; or available at: <https://protesilaos.com/emacs/modus-themes>).
 
 ;;; Code:
 
 
 
-(eval-and-compile
-  (unless (and (fboundp 'require-theme)
-               load-file-name
-               (equal (file-name-directory load-file-name)
-                      (expand-file-name "themes/" data-directory))
-               (require-theme 'modus-themes t))
-    (require 'modus-themes))
-
-;;;###theme-autoload
-  (deftheme modus-operandi-deuteranopia
-    "Deuteranopia-optimized theme with a white background.
-This variant is optimized for users with red-green color
-deficiency (deuteranopia).  It conforms with the highest
-legibility standard for color contrast between background and
-foreground in any given piece of text, which corresponds to a
-minimum contrast in relative luminance of 7:1 (WCAG AAA
-standard)."
-    :background-mode 'light
-    :kind 'color-scheme
-    :family 'modus)
-
-  (defconst modus-operandi-deuteranopia-palette
-    '(
-;;; Basic values
-
-      (bg-main          "#ffffff")
-      (bg-dim           "#f2f2f2")
-      (fg-main          "#000000")
-      (fg-dim           "#595959")
-      (fg-alt           "#193668")
-      (bg-active        "#c4c4c4")
-      (bg-inactive      "#e0e0e0")
-      (border           "#9f9f9f")
-
-;;; Common accent foregrounds
-
-      (red             "#a60000")
-      (red-warmer      "#972500")
-      (red-cooler      "#a0132f")
-      (red-faint       "#7f0000")
-      (red-intense     "#d00000")
-      (green           "#006800")
-      (green-warmer    "#316500")
-      (green-cooler    "#00663f")
-      (green-faint     "#2a5045")
-      (green-intense   "#008900")
-      (yellow          "#695500")
-      (yellow-warmer   "#973300")
-      (yellow-cooler   "#77492f")
-      (yellow-faint    "#624416")
-      (yellow-intense  "#808000")
-      (blue            "#0031a9")
-      (blue-warmer     "#3548cf")
-      (blue-cooler     "#0000b0")
-      (blue-faint      "#003497")
-      (blue-intense    "#0000ff")
-      (magenta         "#721045")
-      (magenta-warmer  "#8f0075")
-      (magenta-cooler  "#531ab6")
-      (magenta-faint   "#7c318f")
-      (magenta-intense "#dd22dd")
-      (cyan            "#005e8b")
-      (cyan-warmer     "#3f578f")
-      (cyan-cooler     "#005f5f")
-      (cyan-faint      "#005077")
-      (cyan-intense    "#008899")
-
-;;; Uncommon accent foregrounds
-
-      (rust       "#8a290f")
-      (gold       "#80601f")
-      (olive      "#56692d")
-      (slate      "#2f3f83")
-      (indigo     "#4a3a8a")
-      (maroon     "#731c52")
-      (pink       "#7b435c")
-
-;;; Common accent backgrounds
-
-      (bg-red-intense     "#ff8f88")
-      (bg-green-intense   "#8adf80")
-      (bg-yellow-intense  "#f3d000")
-      (bg-blue-intense    "#bfc9ff")
-      (bg-magenta-intense "#dfa0f0")
-      (bg-cyan-intense    "#a4d5f9")
-
-      (bg-red-subtle      "#ffcfbf")
-      (bg-green-subtle    "#b3fabf")
-      (bg-yellow-subtle   "#fff576")
-      (bg-blue-subtle     "#ccdfff")
-      (bg-magenta-subtle  "#ffddff")
-      (bg-cyan-subtle     "#bfefff")
-
-      (bg-red-nuanced     "#ffe8e8")
-      (bg-green-nuanced   "#e0f6e0")
-      (bg-yellow-nuanced  "#f8f0d0")
-      (bg-blue-nuanced    "#ecedff")
-      (bg-magenta-nuanced "#f8e6f5")
-      (bg-cyan-nuanced    "#e0f2fa")
-
-;;; Uncommon accent background and foreground pairs
-
-      (bg-clay     "#f1c8b5")
-      (fg-clay     "#63192a")
-
-      (bg-ochre    "#f0e3c0")
-      (fg-ochre    "#573a30")
-
-      (bg-lavender "#dfcdfa")
-      (fg-lavender "#443379")
-
-      (bg-sage     "#c0e7d4")
-      (fg-sage     "#124b41")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#d0b029")
-      (bg-graph-red-1     "#e0cab4")
-      (bg-graph-green-0   "#8ac050")
-      (bg-graph-green-1   "#afdfa5")
-      (bg-graph-yellow-0  "#ffcf00")
-      (bg-graph-yellow-1  "#f9ff00")
-      (bg-graph-blue-0    "#7f9fff")
-      (bg-graph-blue-1    "#afd0ff")
-      (bg-graph-magenta-0 "#b0b0d0")
-      (bg-graph-magenta-1 "#d0dfdf")
-      (bg-graph-cyan-0    "#6faad9")
-      (bg-graph-cyan-1    "#bfe0ff")
-
-;;; Special purpose
-
-      (bg-completion       "#c0deff")
-      (bg-hover            "#b2e4dc")
-      (bg-hover-secondary  "#e5d7a0")
-      (bg-hl-line          "#dae5ec")
-      (bg-region           "#bdbdbd")
-      (fg-region           "#000000")
-
-      (bg-mode-line-active        "#d0d6ff")
-      (fg-mode-line-active        "#0f0f0f")
-      (border-mode-line-active    "#4f4f74")
-      (bg-mode-line-inactive      "#e6e6e6")
-      (fg-mode-line-inactive      "#585858")
-      (border-mode-line-inactive  "#a3a3a3")
-
-      (modeline-err     "#603a00")
-      (modeline-warning "#454500")
-      (modeline-info    "#023d92")
-
-      (bg-tab-bar      "#dfdfdf")
-      (bg-tab-current  "#ffffff")
-      (bg-tab-other    "#c2c2c2")
-
-;;; Diffs
-
-      (bg-added           "#d5d7ff")
-      (bg-added-faint     "#e6e6ff")
-      (bg-added-refine    "#babcef")
-      (bg-added-fringe    "#275acc")
-      (fg-added           "#303099")
-      (fg-added-intense   "#0303cc")
-
-      (bg-changed         "#eecfdf")
-      (bg-changed-faint   "#f0dde5")
-      (bg-changed-refine  "#e0b0d0")
-      (bg-changed-fringe  "#9f6ab0")
-      (fg-changed         "#6f1343")
-      (fg-changed-intense "#7f0f9f")
-
-      (bg-removed         "#f4f099")
-      (bg-removed-faint   "#f6f6b7")
-      (bg-removed-refine  "#ede06f")
-      (bg-removed-fringe  "#c0b200")
-      (fg-removed         "#553d00")
-      (fg-removed-intense "#7f6f00")
-
-      (bg-diff-context    "#f3f3f3")
-
-;;; Paren match
-
-      (bg-paren-match        "#5fcfff")
-      (fg-paren-match        fg-main)
-      (bg-paren-expression   "#efd3f5")
-      (underline-paren-match unspecified)
-
-;;; Mappings
-
-;;;; General mappings
-
-      (fringe bg-dim)
-      (cursor blue-intense)
-
-      (keybind blue-cooler)
-      (name blue-cooler)
-      (identifier yellow-faint)
-
-      (err yellow-warmer)
-      (warning yellow)
-      (info blue)
-
-      (underline-err yellow-intense)
-      (underline-warning magenta-faint)
-      (underline-note cyan)
-
-      (bg-prominent-err bg-yellow-intense)
-      (fg-prominent-err fg-main)
-      (bg-prominent-warning bg-magenta-intense)
-      (fg-prominent-warning fg-main)
-      (bg-prominent-note bg-cyan-intense)
-      (fg-prominent-note fg-main)
-
-      (bg-active-argument bg-yellow-nuanced)
-      (fg-active-argument yellow-warmer)
-      (bg-active-value bg-blue-nuanced)
-      (fg-active-value blue-warmer)
-
-;;;; Code mappings
-
-      (bracket fg-main)
-      (builtin yellow)
-      (comment yellow-cooler)
-      (constant blue-faint)
-      (delimiter fg-main)
-      (docmarkup magenta-faint)
-      (docstring green-faint)
-      (fnname yellow-warmer)
-      (keyword blue-cooler)
-      (number fg-main)
-      (operator fg-main)
-      (preprocessor magenta-cooler)
-      (property cyan)
-      (punctuation fg-main)
-      (rx-backslash blue-cooler)
-      (rx-construct yellow-cooler)
-      (string blue-warmer)
-      (type cyan-cooler)
-      (variable cyan)
-
-;;;; Accent mappings
-
-      (accent-0 blue-warmer)
-      (accent-1 yellow-warmer)
-      (accent-2 cyan)
-      (accent-3 yellow-cooler)
-
-;;;; Button mappings
-
-      (fg-button-active fg-main)
-      (fg-button-inactive fg-dim)
-      (bg-button-active bg-active)
-      (bg-button-inactive bg-dim)
-
-;;;; Completion mappings
-
-      (fg-completion-match-0 blue-warmer)
-      (fg-completion-match-1 yellow-warmer)
-      (fg-completion-match-2 cyan)
-      (fg-completion-match-3 yellow-cooler)
-      (bg-completion-match-0 unspecified)
-      (bg-completion-match-1 unspecified)
-      (bg-completion-match-2 unspecified)
-      (bg-completion-match-3 unspecified)
-
-;;;; Date mappings
-
-      (date-common cyan)
-      (date-deadline yellow-warmer)
-      (date-deadline-subtle red-faint)
-      (date-event fg-alt)
-      (date-holiday yellow-warmer)
-      (date-holiday-other blue)
-      (date-now fg-main)
-      (date-range fg-alt)
-      (date-scheduled yellow-cooler)
-      (date-scheduled-subtle yellow-faint)
-      (date-weekday cyan)
-      (date-weekend blue-cooler)
-
-;;;; Line number mappings
-
-      (fg-line-number-inactive fg-dim)
-      (fg-line-number-active fg-main)
-      (bg-line-number-inactive bg-dim)
-      (bg-line-number-active bg-active)
-
-;;;; Link mappings
-
-      (fg-link blue-warmer)
-      (bg-link unspecified)
-      (underline-link blue-warmer)
-
-      (fg-link-symbolic cyan)
-      (bg-link-symbolic unspecified)
-      (underline-link-symbolic cyan)
-
-      (fg-link-visited yellow-faint)
-      (bg-link-visited unspecified)
-      (underline-link-visited yellow-faint)
-
-;;;; Mail mappings
-
-      (mail-cite-0 blue-warmer)
-      (mail-cite-1 yellow)
-      (mail-cite-2 cyan-faint)
-      (mail-cite-3 yellow-faint)
-      (mail-part blue)
-      (mail-recipient blue)
-      (mail-subject yellow-cooler)
-      (mail-other cyan-faint)
-
-;;;; Mark mappings
-
-      (bg-mark-delete bg-yellow-subtle)
-      (fg-mark-delete yellow)
-      (bg-mark-select bg-cyan-subtle)
-      (fg-mark-select cyan)
-      (bg-mark-other bg-magenta-subtle)
-      (fg-mark-other magenta)
-
-;;;; Prompt mappings
-
-      (fg-prompt blue)
-      (bg-prompt unspecified)
-
-;;;; Prose mappings
-
-      (bg-prose-block-delimiter bg-dim)
-      (fg-prose-block-delimiter fg-dim)
-      (bg-prose-block-contents bg-dim)
-
-      (bg-prose-code unspecified)
-      (fg-prose-code cyan-cooler)
-
-      (bg-prose-macro unspecified)
-      (fg-prose-macro magenta-cooler)
-
-      (bg-prose-verbatim unspecified)
-      (fg-prose-verbatim yellow)
-
-      (prose-done blue)
-      (prose-todo yellow-warmer)
-
-      (prose-metadata fg-dim)
-      (prose-metadata-value fg-alt)
-
-      (prose-table fg-alt)
-      (prose-table-formula yellow-warmer)
-
-      (prose-tag fg-alt)
-
-;;;; Rainbow mappings
-
-      (rainbow-0 blue)
-      (rainbow-1 yellow)
-      (rainbow-2 blue-warmer)
-      (rainbow-3 yellow-cooler)
-      (rainbow-4 blue-cooler)
-      (rainbow-5 yellow-warmer)
-      (rainbow-6 blue-faint)
-      (rainbow-7 yellow-faint)
-      (rainbow-8 cyan)
-
-;;;; Search mappings
-
-      (bg-search-current bg-yellow-intense)
-      (bg-search-lazy bg-blue-intense)
-      (bg-search-replace bg-yellow-intense)
-
-      (bg-search-rx-group-0 bg-cyan-intense)
-      (bg-search-rx-group-1 bg-magenta-intense)
-      (bg-search-rx-group-2 bg-blue-subtle)
-      (bg-search-rx-group-3 bg-yellow-subtle)
-
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
-      (bg-space-err bg-yellow-intense)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "#000000")
-      (fg-term-black           "#000000")
-      (bg-term-black-bright    "#595959")
-      (fg-term-black-bright    "#595959")
-
-      (bg-term-red             red)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue)
-      (fg-term-blue            blue)
-      (bg-term-blue-bright     blue-warmer)
-      (fg-term-blue-bright     blue-warmer)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "#a6a6a6")
-      (fg-term-white           "#a6a6a6")
-      (bg-term-white-bright    "#ffffff")
-      (fg-term-white-bright    "#ffffff")
-
-;;;; Heading mappings
-
-      (fg-heading-0 cyan-cooler)
-      (fg-heading-1 fg-main)
-      (fg-heading-2 yellow-faint)
-      (fg-heading-3 blue-faint)
-      (fg-heading-4 green-faint)
-      (fg-heading-5 magenta-cooler)
-      (fg-heading-6 yellow-cooler)
-      (fg-heading-7 cyan)
-      (fg-heading-8 fg-dim)
-
-      (bg-heading-0 unspecified)
-      (bg-heading-1 unspecified)
-      (bg-heading-2 unspecified)
-      (bg-heading-3 unspecified)
-      (bg-heading-4 unspecified)
-      (bg-heading-5 unspecified)
-      (bg-heading-6 unspecified)
-      (bg-heading-7 unspecified)
-      (bg-heading-8 unspecified)
-
-      (overline-heading-0 unspecified)
-      (overline-heading-1 unspecified)
-      (overline-heading-2 unspecified)
-      (overline-heading-3 unspecified)
-      (overline-heading-4 unspecified)
-      (overline-heading-5 unspecified)
-      (overline-heading-6 unspecified)
-      (overline-heading-7 unspecified)
-      (overline-heading-8 unspecified))
-    "The entire palette of the `modus-operandi-deuteranopia' theme.
-
-Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a named color that already
-exists in the palette and is associated with a HEX-VALUE.")
-
-  (defcustom modus-operandi-deuteranopia-palette-user nil
-    "Like the `modus-operandi-deuteranopia-palette' for user-defined entries.
+(unless (and (fboundp 'require-theme)
+             load-file-name
+             (equal (file-name-directory load-file-name)
+                    (expand-file-name "themes/" data-directory))
+             (require-theme 'modus-themes t))
+  (require 'modus-themes))
+
+(defcustom modus-operandi-deuteranopia-palette-user nil
+  "Like the `modus-operandi-deuteranopia-palette' for user-defined entries.
 This is meant to extend the palette with custom named colors and/or
 semantic palette mappings.  Those may then be used in combination with
 palette overrides (also see `modus-themes-common-palette-overrides' and
 `modus-operandi-deuteranopia-palette-overrides')."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.5.0")
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.5.0")
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
 
-  (defcustom modus-operandi-deuteranopia-palette-overrides nil
-    "Overrides for `modus-operandi-deuteranopia-palette'.
+(defcustom modus-operandi-deuteranopia-palette-overrides nil
+  "Overrides for `modus-operandi-deuteranopia-palette'.
 
 Mirror the elements of the aforementioned palette, overriding
 their value.
@@ -523,18 +68,28 @@ mappings, such as to make the cursor red.  Wherea theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.0.0")
-    :version "30.1"
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Palette overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.0.0")
+  :version "30.1"
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Palette overrides"))
 
-  (modus-themes-theme modus-operandi-deuteranopia
-                      modus-operandi-deuteranopia-palette
-                      modus-operandi-deuteranopia-palette-overrides)
+(modus-themes-theme
+ 'modus-operandi-deuteranopia
+ 'modus-themes
+ "Deuteranopia-optimized theme with a white background.
+This variant is optimized for users with red-green color
+deficiency (deuteranopia).  It conforms with the highest
+legibility standard for color contrast between background and
+foreground in any given piece of text, which corresponds to a
+minimum contrast in relative luminance of 7:1 (WCAG AAA
+standard)."
+ 'light
+ 'modus-themes-operandi-deuteranopia-palette
+ 'modus-operandi-deuteranopia-palette-user
+ 'modus-operandi-deuteranopia-palette-overrides
+ 'modus-themes-faces-deuteranopia)
 
-  (provide-theme 'modus-operandi-deuteranopia))
+(provide 'modus-operandi-deuteranopia-theme)
 
 ;;; modus-operandi-deuteranopia-theme.el ends here

modus-operandi-theme.el

@@ -1,9 +1,9 @@
 ;;; modus-operandi-theme.el --- Elegant, highly legible theme with a white background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026  Free Software Foundation, Inc.
 
-;; Author: Protesilaos Stavrou <info@protesilaos.com>
-;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+;; Author: Protesilaos <info@protesilaos.com>
+;; Maintainer: Protesilaos <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
 ;; Keywords: faces, theme, accessibility
 
@@ -26,488 +26,35 @@
 ;;
 ;; The Modus themes conform with the highest standard for
 ;; color-contrast accessibility between background and foreground
-;; values (WCAG AAA).  Please refer to the official Info manual for
-;; further documentation (distributed with the themes, or available
-;; at: <https://protesilaos.com/emacs/modus-themes>).
+;; values (WCAG AAA).  They are also highly customizable and can even
+;; be used as the basis for other themes.  Please refer to the official
+;; Info manual for further documentation (distributed with the themes,
+;; or available at: <https://protesilaos.com/emacs/modus-themes>).
 
 ;;; Code:
 
 
 
-(eval-and-compile
-  (unless (and (fboundp 'require-theme)
-               load-file-name
-               (equal (file-name-directory load-file-name)
-                      (expand-file-name "themes/" data-directory))
-               (require-theme 'modus-themes t))
-    (require 'modus-themes))
-
-;;;###theme-autoload
-  (deftheme modus-operandi
-    "Elegant, highly legible theme with a white background.
-Conforms with the highest legibility standard for color contrast
-between background and foreground in any given piece of text,
-which corresponds to a minimum contrast in relative luminance of
-7:1 (WCAG AAA standard)."
-    :background-mode 'light
-    :kind 'color-scheme
-    :family 'modus)
-
-  (defconst modus-operandi-palette
-    '(
-;;; Basic values
-
-      (bg-main          "#ffffff")
-      (bg-dim           "#f2f2f2")
-      (fg-main          "#000000")
-      (fg-dim           "#595959")
-      (fg-alt           "#193668")
-      (bg-active        "#c4c4c4")
-      (bg-inactive      "#e0e0e0")
-      (border           "#9f9f9f")
-
-;;; Common accent foregrounds
-
-      (red             "#a60000")
-      (red-warmer      "#972500")
-      (red-cooler      "#a0132f")
-      (red-faint       "#7f0000")
-      (red-intense     "#d00000")
-      (green           "#006800")
-      (green-warmer    "#316500")
-      (green-cooler    "#00663f")
-      (green-faint     "#2a5045")
-      (green-intense   "#008900")
-      (yellow          "#6f5500")
-      (yellow-warmer   "#884900")
-      (yellow-cooler   "#7a4f2f")
-      (yellow-faint    "#624416")
-      (yellow-intense  "#808000")
-      (blue            "#0031a9")
-      (blue-warmer     "#3548cf")
-      (blue-cooler     "#0000b0")
-      (blue-faint      "#003497")
-      (blue-intense    "#0000ff")
-      (magenta         "#721045")
-      (magenta-warmer  "#8f0075")
-      (magenta-cooler  "#531ab6")
-      (magenta-faint   "#7c318f")
-      (magenta-intense "#dd22dd")
-      (cyan            "#005e8b")
-      (cyan-warmer     "#3f578f")
-      (cyan-cooler     "#005f5f")
-      (cyan-faint      "#005077")
-      (cyan-intense    "#008899")
-
-;;; Uncommon accent foregrounds
-
-      (rust       "#8a290f")
-      (gold       "#80601f")
-      (olive      "#56692d")
-      (slate      "#2f3f83")
-      (indigo     "#4a3a8a")
-      (maroon     "#731c52")
-      (pink       "#7b435c")
-
-;;; Common accent backgrounds
-
-      (bg-red-intense     "#ff8f88")
-      (bg-green-intense   "#8adf80")
-      (bg-yellow-intense  "#f3d000")
-      (bg-blue-intense    "#bfc9ff")
-      (bg-magenta-intense "#dfa0f0")
-      (bg-cyan-intense    "#a4d5f9")
-
-      (bg-red-subtle      "#ffcfbf")
-      (bg-green-subtle    "#b3fabf")
-      (bg-yellow-subtle   "#fff576")
-      (bg-blue-subtle     "#ccdfff")
-      (bg-magenta-subtle  "#ffddff")
-      (bg-cyan-subtle     "#bfefff")
-
-      (bg-red-nuanced     "#ffe8e8")
-      (bg-green-nuanced   "#e0f6e0")
-      (bg-yellow-nuanced  "#f8f0d0")
-      (bg-blue-nuanced    "#ecedff")
-      (bg-magenta-nuanced "#f8e6f5")
-      (bg-cyan-nuanced    "#e0f2fa")
-
-;;; Uncommon accent background and foreground pairs
-
-      (bg-clay     "#f1c8b5")
-      (fg-clay     "#63192a")
-
-      (bg-ochre    "#f0e3c0")
-      (fg-ochre    "#573a30")
-
-      (bg-lavender "#dfcdfa")
-      (fg-lavender "#443379")
-
-      (bg-sage     "#c0e7d4")
-      (fg-sage     "#124b41")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#ef7969")
-      (bg-graph-red-1     "#ffaab4")
-      (bg-graph-green-0   "#45c050")
-      (bg-graph-green-1   "#75ef30")
-      (bg-graph-yellow-0  "#ffcf00")
-      (bg-graph-yellow-1  "#f9ff00")
-      (bg-graph-blue-0    "#7f90ff")
-      (bg-graph-blue-1    "#a6c0ff")
-      (bg-graph-magenta-0 "#e07fff")
-      (bg-graph-magenta-1 "#fad0ff")
-      (bg-graph-cyan-0    "#70d3f0")
-      (bg-graph-cyan-1    "#afefff")
-
-;;; Special purpose
-
-      (bg-completion       "#c0deff")
-      (bg-hover            "#b2e4dc")
-      (bg-hover-secondary  "#f5d0a0")
-      (bg-hl-line          "#dae5ec")
-      (bg-region           "#bdbdbd")
-      (fg-region           "#000000")
-
-      (bg-mode-line-active        "#c8c8c8")
-      (fg-mode-line-active        "#000000")
-      (border-mode-line-active    "#5a5a5a")
-      (bg-mode-line-inactive      "#e6e6e6")
-      (fg-mode-line-inactive      "#585858")
-      (border-mode-line-inactive  "#a3a3a3")
-
-      (modeline-err     "#7f0000")
-      (modeline-warning "#5f0070")
-      (modeline-info    "#002580")
-
-      (bg-tab-bar      "#dfdfdf")
-      (bg-tab-current  "#ffffff")
-      (bg-tab-other    "#c2c2c2")
-
-;;; Diffs
-
-      (bg-added           "#c1f2d1")
-      (bg-added-faint     "#d8f8e1")
-      (bg-added-refine    "#aee5be")
-      (bg-added-fringe    "#6cc06c")
-      (fg-added           "#005000")
-      (fg-added-intense   "#006700")
-
-      (bg-changed         "#ffdfa9")
-      (bg-changed-faint   "#ffefbf")
-      (bg-changed-refine  "#fac090")
-      (bg-changed-fringe  "#d7c20a")
-      (fg-changed         "#553d00")
-      (fg-changed-intense "#655000")
-
-      (bg-removed         "#ffd8d5")
-      (bg-removed-faint   "#ffe9e9")
-      (bg-removed-refine  "#f3b5af")
-      (bg-removed-fringe  "#d84a4f")
-      (fg-removed         "#8f1313")
-      (fg-removed-intense "#aa2222")
-
-      (bg-diff-context    "#f3f3f3")
-
-;;; Paren match
-
-      (bg-paren-match        "#5fcfff")
-      (fg-paren-match        fg-main)
-      (bg-paren-expression   "#efd3f5")
-      (underline-paren-match unspecified)
-
-;;; Mappings
-
-;;;; General mappings
-
-      (fringe bg-dim)
-      (cursor fg-main)
-
-      (keybind blue-cooler)
-      (name magenta)
-      (identifier yellow-cooler)
-
-      (err red)
-      (warning yellow-warmer)
-      (info cyan-cooler)
-
-      (underline-err red-intense)
-      (underline-warning yellow-intense)
-      (underline-note cyan-intense)
-
-      (bg-prominent-err bg-red-intense)
-      (fg-prominent-err fg-main)
-      (bg-prominent-warning bg-yellow-intense)
-      (fg-prominent-warning fg-main)
-      (bg-prominent-note bg-cyan-intense)
-      (fg-prominent-note fg-main)
-
-      (bg-active-argument bg-yellow-nuanced)
-      (fg-active-argument yellow-warmer)
-      (bg-active-value bg-cyan-nuanced)
-      (fg-active-value cyan-warmer)
-
-;;;; Code mappings
-
-      (bracket fg-main)
-      (builtin magenta-warmer)
-      (comment fg-dim)
-      (constant blue-cooler)
-      (delimiter fg-main)
-      (docmarkup magenta-faint)
-      (docstring green-faint)
-      (fnname magenta)
-      (keyword magenta-cooler)
-      (number fg-main)
-      (operator fg-main)
-      (preprocessor red-cooler)
-      (property cyan)
-      (punctuation fg-main)
-      (rx-backslash magenta)
-      (rx-construct green-cooler)
-      (string blue-warmer)
-      (type cyan-cooler)
-      (variable cyan)
-
-;;;; Accent mappings
-
-      (accent-0 blue)
-      (accent-1 magenta-warmer)
-      (accent-2 cyan)
-      (accent-3 red)
-
-;;;; Button mappings
-
-      (fg-button-active fg-main)
-      (fg-button-inactive fg-dim)
-      (bg-button-active bg-active)
-      (bg-button-inactive bg-dim)
-
-;;;; Completion mappings
-
-      (fg-completion-match-0 blue)
-      (fg-completion-match-1 magenta-warmer)
-      (fg-completion-match-2 cyan)
-      (fg-completion-match-3 red)
-      (bg-completion-match-0 unspecified)
-      (bg-completion-match-1 unspecified)
-      (bg-completion-match-2 unspecified)
-      (bg-completion-match-3 unspecified)
-
-;;;; Date mappings
-
-      (date-common cyan)
-      (date-deadline red-cooler)
-      (date-deadline-subtle red-faint)
-      (date-event fg-alt)
-      (date-holiday red)
-      (date-holiday-other blue)
-      (date-now fg-main)
-      (date-range fg-alt)
-      (date-scheduled yellow)
-      (date-scheduled-subtle yellow-faint)
-      (date-weekday cyan)
-      (date-weekend magenta)
-
-;;;; Line number mappings
-
-      (fg-line-number-inactive fg-dim)
-      (fg-line-number-active fg-main)
-      (bg-line-number-inactive bg-dim)
-      (bg-line-number-active bg-active)
-
-;;;; Link mappings
-
-      (fg-link blue-warmer)
-      (bg-link unspecified)
-      (underline-link blue-warmer)
-
-      (fg-link-symbolic cyan)
-      (bg-link-symbolic unspecified)
-      (underline-link-symbolic cyan)
-
-      (fg-link-visited magenta)
-      (bg-link-visited unspecified)
-      (underline-link-visited magenta)
-
-;;;; Mail mappings
-
-      (mail-cite-0 blue-faint)
-      (mail-cite-1 yellow-warmer)
-      (mail-cite-2 cyan-cooler)
-      (mail-cite-3 red-cooler)
-      (mail-part cyan)
-      (mail-recipient magenta-cooler)
-      (mail-subject magenta-warmer)
-      (mail-other magenta-faint)
-
-;;;; Mark mappings
-
-      (bg-mark-delete bg-red-subtle)
-      (fg-mark-delete red)
-      (bg-mark-select bg-cyan-subtle)
-      (fg-mark-select cyan)
-      (bg-mark-other bg-yellow-subtle)
-      (fg-mark-other yellow)
-
-;;;; Prompt mappings
-
-      (fg-prompt cyan-cooler)
-      (bg-prompt unspecified)
-
-;;;; Prose mappings
-
-      (bg-prose-block-delimiter bg-dim)
-      (fg-prose-block-delimiter fg-dim)
-      (bg-prose-block-contents bg-dim)
-
-      (bg-prose-code unspecified)
-      (fg-prose-code cyan-cooler)
-
-      (bg-prose-macro unspecified)
-      (fg-prose-macro magenta-cooler)
-
-      (bg-prose-verbatim unspecified)
-      (fg-prose-verbatim magenta-warmer)
-
-      (prose-done green)
-      (prose-todo red)
-
-      (prose-metadata fg-dim)
-      (prose-metadata-value fg-alt)
-
-      (prose-table fg-alt)
-      (prose-table-formula magenta-warmer)
-
-      (prose-tag magenta-faint)
-
-;;;; Rainbow mappings
-
-      (rainbow-0 fg-main)
-      (rainbow-1 magenta-intense)
-      (rainbow-2 cyan-intense)
-      (rainbow-3 red-warmer)
-      (rainbow-4 yellow-intense)
-      (rainbow-5 magenta-cooler)
-      (rainbow-6 green-intense)
-      (rainbow-7 blue-warmer)
-      (rainbow-8 magenta-warmer)
-
-;;;; Search mappings
-
-      (bg-search-current bg-yellow-intense)
-      (bg-search-lazy bg-cyan-intense)
-      (bg-search-replace bg-red-intense)
-
-      (bg-search-rx-group-0 bg-blue-intense)
-      (bg-search-rx-group-1 bg-green-intense)
-      (bg-search-rx-group-2 bg-red-subtle)
-      (bg-search-rx-group-3 bg-magenta-subtle)
-
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
-      (bg-space-err bg-red-intense)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "#000000")
-      (fg-term-black           "#000000")
-      (bg-term-black-bright    "#595959")
-      (fg-term-black-bright    "#595959")
-
-      (bg-term-red             red)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue)
-      (fg-term-blue            blue)
-      (bg-term-blue-bright     blue-warmer)
-      (fg-term-blue-bright     blue-warmer)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "#a6a6a6")
-      (fg-term-white           "#a6a6a6")
-      (bg-term-white-bright    "#ffffff")
-      (fg-term-white-bright    "#ffffff")
-
-;;;; Heading mappings
-
-      (fg-heading-0 cyan-cooler)
-      (fg-heading-1 fg-main)
-      (fg-heading-2 yellow-faint)
-      (fg-heading-3 fg-alt)
-      (fg-heading-4 magenta)
-      (fg-heading-5 green-faint)
-      (fg-heading-6 red-faint)
-      (fg-heading-7 cyan-warmer)
-      (fg-heading-8 fg-dim)
-
-      (bg-heading-0 unspecified)
-      (bg-heading-1 unspecified)
-      (bg-heading-2 unspecified)
-      (bg-heading-3 unspecified)
-      (bg-heading-4 unspecified)
-      (bg-heading-5 unspecified)
-      (bg-heading-6 unspecified)
-      (bg-heading-7 unspecified)
-      (bg-heading-8 unspecified)
-
-      (overline-heading-0 unspecified)
-      (overline-heading-1 unspecified)
-      (overline-heading-2 unspecified)
-      (overline-heading-3 unspecified)
-      (overline-heading-4 unspecified)
-      (overline-heading-5 unspecified)
-      (overline-heading-6 unspecified)
-      (overline-heading-7 unspecified)
-      (overline-heading-8 unspecified))
-    "The entire palette of the `modus-operandi' theme.
-
-Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a named color that already
-exists in the palette and is associated with a HEX-VALUE.")
-
-  (defcustom modus-operandi-palette-user nil
-    "Like the `modus-operandi-palette' for user-defined entries.
+(unless (and (fboundp 'require-theme)
+             load-file-name
+             (equal (file-name-directory load-file-name)
+                    (expand-file-name "themes/" data-directory))
+             (require-theme 'modus-themes t))
+  (require 'modus-themes))
+
+(defcustom modus-operandi-palette-user nil
+  "Like the `modus-operandi-palette' for user-defined entries.
 This is meant to extend the palette with custom named colors and/or
 semantic palette mappings.  Those may then be used in combination with
 palette overrides (also see `modus-themes-common-palette-overrides' and
 `modus-operandi-palette-overrides')."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.5.0")
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.5.0")
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
 
-  (defcustom modus-operandi-palette-overrides nil
-    "Overrides for `modus-operandi-palette'.
+(defcustom modus-operandi-palette-overrides nil
+  "Overrides for `modus-operandi-palette'.
 
 Mirror the elements of the aforementioned palette, overriding
 their value.
@@ -521,18 +68,25 @@ mappings, such as to make the cursor red.  Wherea theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.0.0")
-    :version "30.1"
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Palette overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.0.0")
+  :version "30.1"
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Palette overrides"))
 
-  (modus-themes-theme modus-operandi
-                      modus-operandi-palette
-                      modus-operandi-palette-overrides)
+(modus-themes-theme
+ 'modus-operandi
+ 'modus-themes
+ "Elegant, highly legible theme with a white background.
+Conforms with the highest legibility standard for color contrast
+between background and foreground in any given piece of text,
+which corresponds to a minimum contrast in relative luminance of
+7:1 (WCAG AAA standard)."
+ 'light
+ 'modus-themes-operandi-palette
+ 'modus-operandi-palette-user
+ 'modus-operandi-palette-overrides)
 
-  (provide-theme 'modus-operandi))
+(provide 'modus-operandi-theme)
 
 ;;; modus-operandi-theme.el ends here

modus-operandi-tinted-theme.el

@@ -1,9 +1,9 @@
 ;;; modus-operandi-tinted-theme.el --- Elegant, highly legible theme with a light ochre background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026  Free Software Foundation, Inc.
 
-;; Author: Protesilaos Stavrou <info@protesilaos.com>
-;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+;; Author: Protesilaos <info@protesilaos.com>
+;; Maintainer: Protesilaos <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
 ;; Keywords: faces, theme, accessibility
 
@@ -26,488 +26,35 @@
 ;;
 ;; The Modus themes conform with the highest standard for
 ;; color-contrast accessibility between background and foreground
-;; values (WCAG AAA).  Please refer to the official Info manual for
-;; further documentation (distributed with the themes, or available
-;; at: <https://protesilaos.com/emacs/modus-themes>).
+;; values (WCAG AAA).  They are also highly customizable and can even
+;; be used as the basis for other themes.  Please refer to the official
+;; Info manual for further documentation (distributed with the themes,
+;; or available at: <https://protesilaos.com/emacs/modus-themes>).
 
 ;;; Code:
 
 
 
-(eval-and-compile
-  (unless (and (fboundp 'require-theme)
-               load-file-name
-               (equal (file-name-directory load-file-name)
-                      (expand-file-name "themes/" data-directory))
-               (require-theme 'modus-themes t))
-    (require 'modus-themes))
-
-;;;###theme-autoload
-  (deftheme modus-operandi-tinted
-    "Elegant, highly legible theme with a light ochre background.
-Conforms with the highest legibility standard for color contrast
-between background and foreground in any given piece of text,
-which corresponds to a minimum contrast in relative luminance of
-7:1 (WCAG AAA standard)."
-    :background-mode 'light
-    :kind 'color-scheme
-    :family 'modus)
-
-  (defconst modus-operandi-tinted-palette
-    '(
-;;; Basic values
-
-      (bg-main          "#fbf7f0")
-      (bg-dim           "#efe9dd")
-      (fg-main          "#000000")
-      (fg-dim           "#595959")
-      (fg-alt           "#193668")
-      (bg-active        "#c9b9b0")
-      (bg-inactive      "#dfd5cf")
-      (border           "#9f9690")
-
-;;; Common accent foregrounds
-
-      (red             "#a60000")
-      (red-warmer      "#972500")
-      (red-cooler      "#a0132f")
-      (red-faint       "#7f0000")
-      (red-intense     "#d00000")
-      (green           "#006300")
-      (green-warmer    "#306010")
-      (green-cooler    "#00603f")
-      (green-faint     "#2a5045")
-      (green-intense   "#008900")
-      (yellow          "#6d5000")
-      (yellow-warmer   "#894000")
-      (yellow-cooler   "#602938")
-      (yellow-faint    "#574316")
-      (yellow-intense  "#808000")
-      (blue            "#0031a9")
-      (blue-warmer     "#3546c2")
-      (blue-cooler     "#0000b0")
-      (blue-faint      "#003497")
-      (blue-intense    "#0000ff")
-      (magenta         "#721045")
-      (magenta-warmer  "#8f0075")
-      (magenta-cooler  "#531ab6")
-      (magenta-faint   "#7c318f")
-      (magenta-intense "#dd22dd")
-      (cyan            "#00598b")
-      (cyan-warmer     "#32548f")
-      (cyan-cooler     "#005f5f")
-      (cyan-faint      "#304463")
-      (cyan-intense    "#008899")
-
-;;; Uncommon accent foregrounds
-
-      (rust       "#8a290f")
-      (gold       "#80601f")
-      (olive      "#56692d")
-      (slate      "#2f3f83")
-      (indigo     "#4a3a8a")
-      (maroon     "#731c52")
-      (pink       "#7b435c")
-
-;;; Common accent backgrounds
-
-      (bg-red-intense     "#ff8f88")
-      (bg-green-intense   "#8adf80")
-      (bg-yellow-intense  "#f3d000")
-      (bg-blue-intense    "#bfc9ff")
-      (bg-magenta-intense "#dfa0f0")
-      (bg-cyan-intense    "#a4d5f9")
-
-      (bg-red-subtle      "#ffcfbf")
-      (bg-green-subtle    "#b3fabf")
-      (bg-yellow-subtle   "#fff576")
-      (bg-blue-subtle     "#ccdfff")
-      (bg-magenta-subtle  "#ffddff")
-      (bg-cyan-subtle     "#bfefff")
-
-      (bg-red-nuanced     "#ffe8e8")
-      (bg-green-nuanced   "#e0f6e0")
-      (bg-yellow-nuanced  "#f8f0d0")
-      (bg-blue-nuanced    "#ecedff")
-      (bg-magenta-nuanced "#f8e6f5")
-      (bg-cyan-nuanced    "#e0f2fa")
-
-;;; Uncommon accent background and foreground pairs
-
-      (bg-clay     "#f1c8b5")
-      (fg-clay     "#63192a")
-
-      (bg-ochre    "#f0e3c0")
-      (fg-ochre    "#573a30")
-
-      (bg-lavender "#dfcdfa")
-      (fg-lavender "#443379")
-
-      (bg-sage     "#c0e7d4")
-      (fg-sage     "#124b41")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#ef7969")
-      (bg-graph-red-1     "#ffaab4")
-      (bg-graph-green-0   "#45c050")
-      (bg-graph-green-1   "#75ef30")
-      (bg-graph-yellow-0  "#ffcf00")
-      (bg-graph-yellow-1  "#f9ff00")
-      (bg-graph-blue-0    "#7f90ff")
-      (bg-graph-blue-1    "#a6c0ff")
-      (bg-graph-magenta-0 "#e07fff")
-      (bg-graph-magenta-1 "#fad0ff")
-      (bg-graph-cyan-0    "#70d3f0")
-      (bg-graph-cyan-1    "#afefff")
-
-;;; Special purpose
-
-      (bg-completion       "#f0c1cf")
-      (bg-hover            "#b2e4dc")
-      (bg-hover-secondary  "#dfe09f")
-      (bg-hl-line          "#f1d5d0")
-      (bg-region           "#c2bcb5")
-      (fg-region           "#000000")
-
-      (bg-mode-line-active        "#cab9b2")
-      (fg-mode-line-active        "#000000")
-      (border-mode-line-active    "#545454")
-      (bg-mode-line-inactive      "#dfd9cf")
-      (fg-mode-line-inactive      "#585858")
-      (border-mode-line-inactive  "#a59a94")
-
-      (modeline-err     "#7f0000")
-      (modeline-warning "#5f0070")
-      (modeline-info    "#002580")
-
-      (bg-tab-bar      "#e0d4ce")
-      (bg-tab-current  "#fbf7f0")
-      (bg-tab-other    "#c8b8b2")
-
-;;; Diffs
-
-      (bg-added           "#c3ebc1")
-      (bg-added-faint     "#dcf8d1")
-      (bg-added-refine    "#acd6a5")
-      (bg-added-fringe    "#6cc06c")
-      (fg-added           "#005000")
-      (fg-added-intense   "#006700")
-
-      (bg-changed         "#ffdfa9")
-      (bg-changed-faint   "#ffefbf")
-      (bg-changed-refine  "#fac090")
-      (bg-changed-fringe  "#c0b200")
-      (fg-changed         "#553d00")
-      (fg-changed-intense "#655000")
-
-      (bg-removed         "#f4d0cf")
-      (bg-removed-faint   "#ffe9e5")
-      (bg-removed-refine  "#f3b5a7")
-      (bg-removed-fringe  "#d84a4f")
-      (fg-removed         "#8f1313")
-      (fg-removed-intense "#aa2222")
-
-      (bg-diff-context    "#efe9df")
-
-;;; Paren match
-
-      (bg-paren-match        "#7fdfcf")
-      (fg-paren-match        fg-main)
-      (bg-paren-expression   "#efd3f5")
-      (underline-paren-match unspecified)
-
-;;; Mappings
-
-;;;; General mappings
-
-      (fringe bg-dim)
-      (cursor red-intense)
-
-      (keybind red)
-      (name magenta)
-      (identifier yellow-faint)
-
-      (err red)
-      (warning yellow)
-      (info green)
-
-      (underline-err red-intense)
-      (underline-warning yellow-intense)
-      (underline-note cyan-intense)
-
-      (bg-prominent-err bg-red-intense)
-      (fg-prominent-err fg-main)
-      (bg-prominent-warning bg-yellow-intense)
-      (fg-prominent-warning fg-main)
-      (bg-prominent-note bg-cyan-intense)
-      (fg-prominent-note fg-main)
-
-      (bg-active-argument bg-yellow-nuanced)
-      (fg-active-argument yellow-warmer)
-      (bg-active-value bg-cyan-nuanced)
-      (fg-active-value cyan-warmer)
-
-;;;; Code mappings
-
-      (bracket fg-main)
-      (builtin magenta)
-      (comment red-faint)
-      (constant magenta-cooler)
-      (delimiter fg-main)
-      (docmarkup magenta-faint)
-      (docstring cyan-faint)
-      (fnname yellow-cooler)
-      (keyword blue)
-      (number fg-main)
-      (operator fg-main)
-      (preprocessor yellow-warmer)
-      (property green-cooler)
-      (punctuation fg-main)
-      (rx-backslash magenta-warmer)
-      (rx-construct magenta-cooler)
-      (string cyan)
-      (type green-warmer)
-      (variable green-cooler)
-
-;;;; Accent mappings
-
-      (accent-0 red-cooler)
-      (accent-1 cyan)
-      (accent-2 magenta-cooler)
-      (accent-3 yellow-warmer)
-
-;;;; Button mappings
-
-      (fg-button-active fg-main)
-      (fg-button-inactive fg-dim)
-      (bg-button-active bg-active)
-      (bg-button-inactive bg-dim)
-
-;;;; Completion mappings
-
-      (fg-completion-match-0 blue)
-      (fg-completion-match-1 magenta-warmer)
-      (fg-completion-match-2 cyan)
-      (fg-completion-match-3 red)
-      (bg-completion-match-0 unspecified)
-      (bg-completion-match-1 unspecified)
-      (bg-completion-match-2 unspecified)
-      (bg-completion-match-3 unspecified)
-
-;;;; Date mappings
-
-      (date-common cyan)
-      (date-deadline red-cooler)
-      (date-deadline-subtle red-faint)
-      (date-event fg-alt)
-      (date-holiday red)
-      (date-holiday-other blue)
-      (date-now fg-main)
-      (date-range fg-alt)
-      (date-scheduled yellow)
-      (date-scheduled-subtle yellow-faint)
-      (date-weekday cyan)
-      (date-weekend magenta)
-
-;;;; Line number mappings
-
-      (fg-line-number-inactive fg-dim)
-      (fg-line-number-active fg-main)
-      (bg-line-number-inactive bg-dim)
-      (bg-line-number-active bg-active)
-
-;;;; Link mappings
-
-      (fg-link blue-warmer)
-      (bg-link unspecified)
-      (underline-link blue-warmer)
-
-      (fg-link-symbolic cyan)
-      (bg-link-symbolic unspecified)
-      (underline-link-symbolic cyan)
-
-      (fg-link-visited magenta)
-      (bg-link-visited unspecified)
-      (underline-link-visited magenta)
-
-;;;; Mail mappings
-
-      (mail-cite-0 cyan)
-      (mail-cite-1 yellow)
-      (mail-cite-2 green-warmer)
-      (mail-cite-3 red-cooler)
-      (mail-part green-cooler)
-      (mail-recipient blue-warmer)
-      (mail-subject magenta-warmer)
-      (mail-other magenta)
-
-;;;; Mark mappings
-
-      (bg-mark-delete bg-red-subtle)
-      (fg-mark-delete red)
-      (bg-mark-select bg-cyan-subtle)
-      (fg-mark-select cyan)
-      (bg-mark-other bg-yellow-subtle)
-      (fg-mark-other yellow)
-
-;;;; Prompt mappings
-
-      (fg-prompt green-cooler)
-      (bg-prompt unspecified)
-
-;;;; Prose mappings
-
-      (bg-prose-block-delimiter bg-dim)
-      (fg-prose-block-delimiter fg-dim)
-      (bg-prose-block-contents bg-dim)
-
-      (bg-prose-code unspecified)
-      (fg-prose-code green-cooler)
-
-      (bg-prose-macro unspecified)
-      (fg-prose-macro blue-cooler)
-
-      (bg-prose-verbatim unspecified)
-      (fg-prose-verbatim yellow-warmer)
-
-      (prose-done green)
-      (prose-todo red)
-
-      (prose-metadata fg-dim)
-      (prose-metadata-value fg-alt)
-
-      (prose-table fg-alt)
-      (prose-table-formula magenta-warmer)
-
-      (prose-tag magenta-faint)
-
-;;;; Rainbow mappings
-
-      (rainbow-0 fg-main)
-      (rainbow-1 magenta-intense)
-      (rainbow-2 cyan-intense)
-      (rainbow-3 red-warmer)
-      (rainbow-4 yellow-intense)
-      (rainbow-5 magenta-cooler)
-      (rainbow-6 green-intense)
-      (rainbow-7 blue-warmer)
-      (rainbow-8 magenta-warmer)
-
-;;;; Search mappings
-
-      (bg-search-current bg-yellow-intense)
-      (bg-search-lazy bg-cyan-intense)
-      (bg-search-replace bg-red-intense)
-
-      (bg-search-rx-group-0 bg-blue-intense)
-      (bg-search-rx-group-1 bg-green-intense)
-      (bg-search-rx-group-2 bg-red-subtle)
-      (bg-search-rx-group-3 bg-magenta-subtle)
-
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
-      (bg-space-err bg-red-intense)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "#000000")
-      (fg-term-black           "#000000")
-      (bg-term-black-bright    "#595959")
-      (fg-term-black-bright    "#595959")
-
-      (bg-term-red             red)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue)
-      (fg-term-blue            blue)
-      (bg-term-blue-bright     blue-warmer)
-      (fg-term-blue-bright     blue-warmer)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "#a6a6a6")
-      (fg-term-white           "#a6a6a6")
-      (bg-term-white-bright    "#ffffff")
-      (fg-term-white-bright    "#ffffff")
-
-;;;; Heading mappings
-
-      (fg-heading-0 green-cooler)
-      (fg-heading-1 fg-main)
-      (fg-heading-2 yellow-faint)
-      (fg-heading-3 fg-alt)
-      (fg-heading-4 magenta)
-      (fg-heading-5 green-faint)
-      (fg-heading-6 red-faint)
-      (fg-heading-7 cyan-warmer)
-      (fg-heading-8 fg-dim)
-
-      (bg-heading-0 unspecified)
-      (bg-heading-1 unspecified)
-      (bg-heading-2 unspecified)
-      (bg-heading-3 unspecified)
-      (bg-heading-4 unspecified)
-      (bg-heading-5 unspecified)
-      (bg-heading-6 unspecified)
-      (bg-heading-7 unspecified)
-      (bg-heading-8 unspecified)
-
-      (overline-heading-0 unspecified)
-      (overline-heading-1 unspecified)
-      (overline-heading-2 unspecified)
-      (overline-heading-3 unspecified)
-      (overline-heading-4 unspecified)
-      (overline-heading-5 unspecified)
-      (overline-heading-6 unspecified)
-      (overline-heading-7 unspecified)
-      (overline-heading-8 unspecified))
-    "The entire palette of the `modus-operandi-tinted' theme.
-
-Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a named color that already
-exists in the palette and is associated with a HEX-VALUE.")
-
-  (defcustom modus-operandi-tinted-palette-user nil
-    "Like the `modus-operandi-tinted-palette' for user-defined entries.
+(unless (and (fboundp 'require-theme)
+             load-file-name
+             (equal (file-name-directory load-file-name)
+                    (expand-file-name "themes/" data-directory))
+             (require-theme 'modus-themes t))
+  (require 'modus-themes))
+
+(defcustom modus-operandi-tinted-palette-user nil
+  "Like the `modus-operandi-tinted-palette' for user-defined entries.
 This is meant to extend the palette with custom named colors and/or
 semantic palette mappings.  Those may then be used in combination with
 palette overrides (also see `modus-themes-common-palette-overrides' and
 `modus-operandi-tinted-palette-overrides')."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.5.0")
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.5.0")
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
 
-  (defcustom modus-operandi-tinted-palette-overrides nil
-    "Overrides for `modus-operandi-tinted-palette'.
+(defcustom modus-operandi-tinted-palette-overrides nil
+  "Overrides for `modus-operandi-tinted-palette'.
 
 Mirror the elements of the aforementioned palette, overriding
 their value.
@@ -521,18 +68,25 @@ mappings, such as to make the cursor red.  Wherea theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.0.0")
-    :version "30.1"
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Palette overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.0.0")
+  :version "30.1"
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Palette overrides"))
 
-  (modus-themes-theme modus-operandi-tinted
-                      modus-operandi-tinted-palette
-                      modus-operandi-tinted-palette-overrides)
+(modus-themes-theme
+ 'modus-operandi-tinted
+ 'modus-themes
+ "Elegant, highly legible theme with a light ochre background.
+Conforms with the highest legibility standard for color contrast
+between background and foreground in any given piece of text,
+which corresponds to a minimum contrast in relative luminance of
+7:1 (WCAG AAA standard)."
+ 'light
+ 'modus-themes-operandi-tinted-palette
+ 'modus-operandi-tinted-palette-user
+ 'modus-operandi-tinted-palette-overrides)
 
-  (provide-theme 'modus-operandi-tinted))
+(provide 'modus-operandi-tinted-theme)
 
 ;;; modus-operandi-tinted-theme.el ends here

modus-operandi-tritanopia-theme.el

@@ -1,9 +1,9 @@
 ;;; modus-operandi-tritanopia-theme.el --- Tritanopia-optimized theme with a white background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026  Free Software Foundation, Inc.
 
-;; Author: Protesilaos Stavrou <info@protesilaos.com>
-;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+;; Author: Protesilaos <info@protesilaos.com>
+;; Maintainer: Protesilaos <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
 ;; Keywords: faces, theme, accessibility
 
@@ -26,490 +26,35 @@
 ;;
 ;; The Modus themes conform with the highest standard for
 ;; color-contrast accessibility between background and foreground
-;; values (WCAG AAA).  Please refer to the official Info manual for
-;; further documentation (distributed with the themes, or available
-;; at: <https://protesilaos.com/emacs/modus-themes>).
+;; values (WCAG AAA).  They are also highly customizable and can even
+;; be used as the basis for other themes.  Please refer to the official
+;; Info manual for further documentation (distributed with the themes,
+;; or available at: <https://protesilaos.com/emacs/modus-themes>).
 
 ;;; Code:
 
 
 
-(eval-and-compile
-  (unless (and (fboundp 'require-theme)
-               load-file-name
-               (equal (file-name-directory load-file-name)
-                      (expand-file-name "themes/" data-directory))
-               (require-theme 'modus-themes t))
-    (require 'modus-themes))
-
-;;;###theme-autoload
-  (deftheme modus-operandi-tritanopia
-    "Tritanopia-optimized theme with a white background.
-This variant is optimized for users with blue-yellow color
-deficiency (tritanopia).  It conforms with the highest
-legibility standard for color contrast between background and
-foreground in any given piece of text, which corresponds to a
-minimum contrast in relative luminance of 7:1 (WCAG AAA
-standard)."
-    :background-mode 'light
-    :kind 'color-scheme
-    :family 'modus)
-
-  (defconst modus-operandi-tritanopia-palette
-    '(
-;;; Basic values
-
-      (bg-main          "#ffffff")
-      (bg-dim           "#f2f2f2")
-      (fg-main          "#000000")
-      (fg-dim           "#595959")
-      (fg-alt           "#024960")
-      (bg-active        "#c4c4c4")
-      (bg-inactive      "#e0e0e0")
-      (border           "#9f9f9f")
-
-;;; Common accent foregrounds
-
-      (red             "#a60000")
-      (red-warmer      "#b21100")
-      (red-cooler      "#a0132f")
-      (red-faint       "#702000")
-      (red-intense     "#d00000")
-      (green           "#006800")
-      (green-warmer    "#316500")
-      (green-cooler    "#00663f")
-      (green-faint     "#2a5045")
-      (green-intense   "#008900")
-      (yellow          "#695500")
-      (yellow-warmer   "#973300")
-      (yellow-cooler   "#77492f")
-      (yellow-faint    "#624416")
-      (yellow-intense  "#808000")
-      (blue            "#0031a9")
-      (blue-warmer     "#3548cf")
-      (blue-cooler     "#0000b0")
-      (blue-faint      "#003497")
-      (blue-intense    "#0000ff")
-      (magenta         "#721045")
-      (magenta-warmer  "#8f0075")
-      (magenta-cooler  "#531ab6")
-      (magenta-faint   "#7c318f")
-      (magenta-intense "#cd22bd")
-      (cyan            "#005e8b")
-      (cyan-warmer     "#3f578f")
-      (cyan-cooler     "#005f5f")
-      (cyan-faint      "#004f5f")
-      (cyan-intense    "#008899")
-
-;;; Uncommon accent foregrounds
-
-      (rust       "#8a290f")
-      (gold       "#80601f")
-      (olive      "#56692d")
-      (slate      "#2f3f83")
-      (indigo     "#4a3a8a")
-      (maroon     "#731c52")
-      (pink       "#7b435c")
-
-;;; Common accent backgrounds
-
-      (bg-red-intense     "#ff8f88")
-      (bg-green-intense   "#8adf80")
-      (bg-yellow-intense  "#f3d000")
-      (bg-blue-intense    "#bfc9ff")
-      (bg-magenta-intense "#dfa0f0")
-      (bg-cyan-intense    "#a4d5f9")
-
-      (bg-red-subtle      "#ffcfbf")
-      (bg-green-subtle    "#b3fabf")
-      (bg-yellow-subtle   "#fff576")
-      (bg-blue-subtle     "#ccdfff")
-      (bg-magenta-subtle  "#ffddff")
-      (bg-cyan-subtle     "#bfefff")
-
-      (bg-red-nuanced     "#ffe8e8")
-      (bg-green-nuanced   "#e0f6e0")
-      (bg-yellow-nuanced  "#f8f0d0")
-      (bg-blue-nuanced    "#ecedff")
-      (bg-magenta-nuanced "#f8e6f5")
-      (bg-cyan-nuanced    "#e0f2fa")
-
-;;; Uncommon accent background and foreground pairs
-
-      (bg-clay     "#f1c8b5")
-      (fg-clay     "#63192a")
-
-      (bg-ochre    "#f0e3c0")
-      (fg-ochre    "#573a30")
-
-      (bg-lavender "#dfcdfa")
-      (fg-lavender "#443379")
-
-      (bg-sage     "#c0e7d4")
-      (fg-sage     "#124b41")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#ef7969")
-      (bg-graph-red-1     "#ffaab4")
-      (bg-graph-green-0   "#68c0a0")
-      (bg-graph-green-1   "#a5dfd0")
-      (bg-graph-yellow-0  "#d99f9f")
-      (bg-graph-yellow-1  "#ffb58f")
-      (bg-graph-blue-0    "#80a0df")
-      (bg-graph-blue-1    "#a8cfff")
-      (bg-graph-magenta-0 "#efafcf")
-      (bg-graph-magenta-1 "#ffdaef")
-      (bg-graph-cyan-0    "#7fd3ed")
-      (bg-graph-cyan-1    "#afefff")
-
-;;; Special purpose
-
-      (bg-completion       "#afdfef")
-      (bg-hover            "#ffafbc")
-      (bg-hover-secondary  "#abdfdd")
-      (bg-hl-line          "#dfeaec")
-      (bg-region           "#bdbdbd")
-      (fg-region           "#000000")
-
-      (bg-mode-line-active        "#afe0f2")
-      (fg-mode-line-active        "#0f0f0f")
-      (border-mode-line-active    "#2f4f44")
-      (bg-mode-line-inactive      "#e6e6e6")
-      (fg-mode-line-inactive      "#585858")
-      (border-mode-line-inactive  "#a3a3a3")
-
-      (modeline-err     "#8f0000")
-      (modeline-warning "#6f306f")
-      (modeline-info    "#00445f")
-
-      (bg-tab-bar      "#dfdfdf")
-      (bg-tab-current  "#ffffff")
-      (bg-tab-other    "#c2c2c2")
-
-;;; Diffs
-
-      (bg-added           "#b5e7ff")
-      (bg-added-faint     "#c6f6ff")
-      (bg-added-refine    "#9adcef")
-      (bg-added-fringe    "#1782cc")
-      (fg-added           "#005079")
-      (fg-added-intense   "#0043aa")
-
-      (bg-changed         "#eecfdf")
-      (bg-changed-faint   "#f0dde5")
-      (bg-changed-refine  "#e0b0d0")
-      (bg-changed-fringe  "#9f6ab0")
-      (fg-changed         "#6f1343")
-      (fg-changed-intense "#7f0f9f")
-
-      (bg-removed         "#ffd8d5")
-      (bg-removed-faint   "#ffe9e9")
-      (bg-removed-refine  "#f3b5af")
-      (bg-removed-fringe  "#d84a4f")
-      (fg-removed         "#8f1313")
-      (fg-removed-intense "#aa2222")
-
-      (bg-diff-context    "#f3f3f3")
-
-;;; Paren match
-
-      (bg-paren-match        "#5fcfff")
-      (fg-paren-match        fg-main)
-      (bg-paren-expression   "#efd3f5")
-      (underline-paren-match unspecified)
-
-;;; Mappings
-
-;;;; General mappings
-
-      (fringe bg-dim)
-      (cursor red-intense)
-
-      (keybind red)
-      (name red-cooler)
-      (identifier red-faint)
-
-      (err red-warmer)
-      (warning magenta)
-      (info cyan)
-
-      (underline-err red-intense)
-      (underline-warning magenta-intense)
-      (underline-note cyan-intense)
-
-      (bg-prominent-err bg-red-intense)
-      (fg-prominent-err fg-main)
-      (bg-prominent-warning bg-magenta-intense)
-      (fg-prominent-warning fg-main)
-      (bg-prominent-note bg-cyan-intense)
-      (fg-prominent-note fg-main)
-
-      (bg-active-argument bg-red-nuanced)
-      (fg-active-argument red-warmer)
-      (bg-active-value bg-cyan-nuanced)
-      (fg-active-value cyan)
-
-;;;; Code mappings
-
-      (bracket fg-main)
-      (builtin magenta)
-      (comment red-faint)
-      (constant green-cooler)
-      (delimiter fg-main)
-      (docmarkup magenta-faint)
-      (docstring fg-alt)
-      (fnname cyan-warmer)
-      (keyword red-cooler)
-      (number fg-main)
-      (operator fg-main)
-      (preprocessor red-warmer)
-      (property cyan-cooler)
-      (punctuation fg-main)
-      (rx-backslash magenta)
-      (rx-construct red)
-      (string cyan)
-      (type blue-warmer)
-      (variable cyan-cooler)
-
-;;;; Accent mappings
-
-      (accent-0 cyan)
-      (accent-1 red-warmer)
-      (accent-2 cyan-cooler)
-      (accent-3 magenta)
-
-;;;; Button mappings
-
-      (fg-button-active fg-main)
-      (fg-button-inactive fg-dim)
-      (bg-button-active bg-active)
-      (bg-button-inactive bg-dim)
-
-;;;; Completion mappings
-
-      (fg-completion-match-0 cyan)
-      (fg-completion-match-1 red-warmer)
-      (fg-completion-match-2 magenta)
-      (fg-completion-match-3 cyan-cooler)
-      (bg-completion-match-0 unspecified)
-      (bg-completion-match-1 unspecified)
-      (bg-completion-match-2 unspecified)
-      (bg-completion-match-3 unspecified)
-
-;;;; Date mappings
-
-      (date-common cyan-cooler)
-      (date-deadline red)
-      (date-deadline-subtle red-faint)
-      (date-event fg-alt)
-      (date-holiday red)
-      (date-holiday-other cyan)
-      (date-now fg-main)
-      (date-range fg-alt)
-      (date-scheduled magenta)
-      (date-scheduled-subtle magenta-faint)
-      (date-weekday cyan)
-      (date-weekend magenta-warmer)
-
-;;;; Line number mappings
-
-      (fg-line-number-inactive fg-dim)
-      (fg-line-number-active fg-main)
-      (bg-line-number-inactive bg-dim)
-      (bg-line-number-active bg-active)
-
-;;;; Link mappings
-
-      (fg-link cyan)
-      (bg-link unspecified)
-      (underline-link cyan)
-
-      (fg-link-symbolic cyan-cooler)
-      (bg-link-symbolic unspecified)
-      (underline-link-symbolic cyan-cooler)
-
-      (fg-link-visited magenta)
-      (bg-link-visited unspecified)
-      (underline-link-visited magenta)
-
-;;;; Mail mappings
-
-      (mail-cite-0 cyan-faint)
-      (mail-cite-1 red-faint)
-      (mail-cite-2 magenta-warmer)
-      (mail-cite-3 cyan-warmer)
-      (mail-part cyan-cooler)
-      (mail-recipient cyan)
-      (mail-subject red-cooler)
-      (mail-other cyan)
-
-;;;; Mark mappings
-
-      (bg-mark-delete bg-red-subtle)
-      (fg-mark-delete red)
-      (bg-mark-select bg-cyan-subtle)
-      (fg-mark-select cyan)
-      (bg-mark-other bg-magenta-subtle)
-      (fg-mark-other magenta)
-
-;;;; Prompt mappings
-
-      (fg-prompt cyan-cooler)
-      (bg-prompt unspecified)
-
-;;;; Prose mappings
-
-      (bg-prose-block-delimiter bg-dim)
-      (fg-prose-block-delimiter fg-dim)
-      (bg-prose-block-contents bg-dim)
-
-      (bg-prose-code unspecified)
-      (fg-prose-code cyan)
-
-      (bg-prose-macro unspecified)
-      (fg-prose-macro red-warmer)
-
-      (bg-prose-verbatim unspecified)
-      (fg-prose-verbatim magenta-warmer)
-
-      (prose-done cyan)
-      (prose-todo red)
-
-      (prose-metadata fg-dim)
-      (prose-metadata-value fg-alt)
-
-      (prose-table fg-alt)
-      (prose-table-formula red-cooler)
-
-      (prose-tag fg-alt)
-
-;;;; Rainbow mappings
-
-      (rainbow-0 cyan)
-      (rainbow-1 red)
-      (rainbow-2 cyan-warmer)
-      (rainbow-3 red-cooler)
-      (rainbow-4 cyan-cooler)
-      (rainbow-5 magenta)
-      (rainbow-6 cyan-faint)
-      (rainbow-7 magenta-faint)
-      (rainbow-8 red-faint)
-
-;;;; Search mappings
-
-      (bg-search-current bg-red-intense)
-      (bg-search-lazy bg-cyan-intense)
-      (bg-search-replace bg-magenta-intense)
-
-      (bg-search-rx-group-0 bg-blue-intense)
-      (bg-search-rx-group-1 bg-magenta-intense)
-      (bg-search-rx-group-2 bg-cyan-subtle)
-      (bg-search-rx-group-3 bg-red-subtle)
-
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
-      (bg-space-err bg-red-intense)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "#000000")
-      (fg-term-black           "#000000")
-      (bg-term-black-bright    "#595959")
-      (fg-term-black-bright    "#595959")
-
-      (bg-term-red             red)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue)
-      (fg-term-blue            blue)
-      (bg-term-blue-bright     blue-warmer)
-      (fg-term-blue-bright     blue-warmer)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "#a6a6a6")
-      (fg-term-white           "#a6a6a6")
-      (bg-term-white-bright    "#ffffff")
-      (fg-term-white-bright    "#ffffff")
-
-;;;; Heading mappings
-
-      (fg-heading-0 cyan-cooler)
-      (fg-heading-1 fg-main)
-      (fg-heading-2 red-faint)
-      (fg-heading-3 cyan-faint)
-      (fg-heading-4 magenta)
-      (fg-heading-5 green-faint)
-      (fg-heading-6 magenta-faint)
-      (fg-heading-7 cyan-warmer)
-      (fg-heading-8 fg-dim)
-
-      (bg-heading-0 unspecified)
-      (bg-heading-1 unspecified)
-      (bg-heading-2 unspecified)
-      (bg-heading-3 unspecified)
-      (bg-heading-4 unspecified)
-      (bg-heading-5 unspecified)
-      (bg-heading-6 unspecified)
-      (bg-heading-7 unspecified)
-      (bg-heading-8 unspecified)
-
-      (overline-heading-0 unspecified)
-      (overline-heading-1 unspecified)
-      (overline-heading-2 unspecified)
-      (overline-heading-3 unspecified)
-      (overline-heading-4 unspecified)
-      (overline-heading-5 unspecified)
-      (overline-heading-6 unspecified)
-      (overline-heading-7 unspecified)
-      (overline-heading-8 unspecified))
-    "The entire palette of the `modus-operandi-tritanopia' theme.
-
-Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a named color that already
-exists in the palette and is associated with a HEX-VALUE.")
-
-  (defcustom modus-operandi-tritanopia-palette-user nil
-    "Like the `modus-operandi-tritanopia-palette' for user-defined entries.
+(unless (and (fboundp 'require-theme)
+             load-file-name
+             (equal (file-name-directory load-file-name)
+                    (expand-file-name "themes/" data-directory))
+             (require-theme 'modus-themes t))
+  (require 'modus-themes))
+
+(defcustom modus-operandi-tritanopia-palette-user nil
+  "Like the `modus-operandi-tritanopia-palette' for user-defined entries.
 This is meant to extend the palette with custom named colors and/or
 semantic palette mappings.  Those may then be used in combination with
 palette overrides (also see `modus-themes-common-palette-overrides' and
 `modus-operandi-tritanopia-palette-overrides')."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.5.0")
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.5.0")
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
 
-  (defcustom modus-operandi-tritanopia-palette-overrides nil
-    "Overrides for `modus-operandi-tritanopia-palette'.
+(defcustom modus-operandi-tritanopia-palette-overrides nil
+  "Overrides for `modus-operandi-tritanopia-palette'.
 
 Mirror the elements of the aforementioned palette, overriding
 their value.
@@ -523,18 +68,28 @@ mappings, such as to make the cursor red.  Wherea theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.0.0")
-    :version "30.1"
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Palette overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.0.0")
+  :version "30.1"
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Palette overrides"))
 
-  (modus-themes-theme modus-operandi-tritanopia
-                      modus-operandi-tritanopia-palette
-                      modus-operandi-tritanopia-palette-overrides)
+(modus-themes-theme
+ 'modus-operandi-tritanopia
+ 'modus-themes
+ "Tritanopia-optimized theme with a white background.
+This variant is optimized for users with blue-yellow color
+deficiency (tritanopia).  It conforms with the highest
+legibility standard for color contrast between background and
+foreground in any given piece of text, which corresponds to a
+minimum contrast in relative luminance of 7:1 (WCAG AAA
+standard)."
+ 'light
+ 'modus-themes-operandi-tritanopia-palette
+ 'modus-operandi-tritanopia-palette-user
+ 'modus-operandi-tritanopia-palette-overrides
+ 'modus-themes-faces-tritanopia)
 
-  (provide-theme 'modus-operandi-tritanopia))
+(provide 'modus-operandi-tritanopia-theme)
 
 ;;; modus-operandi-tritanopia-theme.el ends here

modus-vivendi-deuteranopia-theme.el

@@ -1,9 +1,9 @@
 ;;; modus-vivendi-deuteranopia-theme.el --- Deuteranopia-optimized theme with a black background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026  Free Software Foundation, Inc.
 
-;; Author: Protesilaos Stavrou <info@protesilaos.com>
-;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+;; Author: Protesilaos <info@protesilaos.com>
+;; Maintainer: Protesilaos <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
 ;; Keywords: faces, theme, accessibility
 
@@ -26,490 +26,35 @@
 ;;
 ;; The Modus themes conform with the highest standard for
 ;; color-contrast accessibility between background and foreground
-;; values (WCAG AAA).  Please refer to the official Info manual for
-;; further documentation (distributed with the themes, or available
-;; at: <https://protesilaos.com/emacs/modus-themes>).
+;; values (WCAG AAA).  They are also highly customizable and can even
+;; be used as the basis for other themes.  Please refer to the official
+;; Info manual for further documentation (distributed with the themes,
+;; or available at: <https://protesilaos.com/emacs/modus-themes>).
 
 ;;; Code:
 
 
 
-(eval-and-compile
-  (unless (and (fboundp 'require-theme)
-               load-file-name
-               (equal (file-name-directory load-file-name)
-                      (expand-file-name "themes/" data-directory))
-               (require-theme 'modus-themes t))
-    (require 'modus-themes))
-
-;;;###theme-autoload
-  (deftheme modus-vivendi-deuteranopia
-    "Deuteranopia-optimized theme with a black background.
-This variant is optimized for users with red-green color
-deficiency (deuteranopia).  It conforms with the highest
-legibility standard for color contrast between background and
-foreground in any given piece of text, which corresponds to a
-minimum contrast in relative luminance of 7:1 (WCAG AAA
-standard)."
-    :background-mode 'dark
-    :kind 'color-scheme
-    :family 'modus)
-
-  (defconst modus-vivendi-deuteranopia-palette
-    '(
-;;; Basic values
-
-      (bg-main          "#000000")
-      (bg-dim           "#1e1e1e")
-      (fg-main          "#ffffff")
-      (fg-dim           "#989898")
-      (fg-alt           "#c6daff")
-      (bg-active        "#535353")
-      (bg-inactive      "#303030")
-      (border           "#646464")
-
-;;; Common accent foregrounds
-
-      (red             "#ff5f59")
-      (red-warmer      "#ff6b55")
-      (red-cooler      "#ff7f86")
-      (red-faint       "#ff9580")
-      (red-intense     "#ff5f5f")
-      (green           "#44bc44")
-      (green-warmer    "#70b900")
-      (green-cooler    "#00c06f")
-      (green-faint     "#88ca9f")
-      (green-intense   "#44df44")
-      (yellow          "#cabf00")
-      (yellow-warmer   "#ffa00f")
-      (yellow-cooler   "#d8af7a")
-      (yellow-faint    "#d2b580")
-      (yellow-intense  "#efef00")
-      (blue            "#2fafff")
-      (blue-warmer     "#79a8ff")
-      (blue-cooler     "#00bcff")
-      (blue-faint      "#82b0ec")
-      (blue-intense    "#338fff")
-      (magenta         "#feacd0")
-      (magenta-warmer  "#f78fe7")
-      (magenta-cooler  "#b6a0ff")
-      (magenta-faint   "#caa6df")
-      (magenta-intense "#ff66ff")
-      (cyan            "#00d3d0")
-      (cyan-warmer     "#4ae2f0")
-      (cyan-cooler     "#6ae4b9")
-      (cyan-faint      "#9ac8e0")
-      (cyan-intense    "#00eff0")
-
-;;; Uncommon accent foregrounds
-
-      (rust       "#db7b5f")
-      (gold       "#c0965b")
-      (olive      "#9cbd6f")
-      (slate      "#76afbf")
-      (indigo     "#9099d9")
-      (maroon     "#cf7fa7")
-      (pink       "#d09dc0")
-
-;;; Common accent backgrounds
-
-      (bg-red-intense     "#9d1f1f")
-      (bg-green-intense   "#2f822f")
-      (bg-yellow-intense  "#7a6100")
-      (bg-blue-intense    "#1640b0")
-      (bg-magenta-intense "#7030af")
-      (bg-cyan-intense    "#2266ae")
-
-      (bg-red-subtle      "#620f2a")
-      (bg-green-subtle    "#00422a")
-      (bg-yellow-subtle   "#4a4000")
-      (bg-blue-subtle     "#242679")
-      (bg-magenta-subtle  "#552f5f")
-      (bg-cyan-subtle     "#004065")
-
-      (bg-red-nuanced     "#3a0c14")
-      (bg-green-nuanced   "#092f1f")
-      (bg-yellow-nuanced  "#381d0f")
-      (bg-blue-nuanced    "#12154a")
-      (bg-magenta-nuanced "#2f0c3f")
-      (bg-cyan-nuanced    "#042837")
-
-;;; Uncommon accent background and foreground pairs
-
-      (bg-clay     "#49191a")
-      (fg-clay     "#f1b090")
-
-      (bg-ochre    "#462f20")
-      (fg-ochre    "#e0d09c")
-
-      (bg-lavender "#38325c")
-      (fg-lavender "#dfc0f0")
-
-      (bg-sage     "#143e32")
-      (fg-sage     "#c3e7d4")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#bf6000")
-      (bg-graph-red-1     "#733500")
-      (bg-graph-green-0   "#6fbf8f")
-      (bg-graph-green-1   "#2f5f4f")
-      (bg-graph-yellow-0  "#c1c00a")
-      (bg-graph-yellow-1  "#7f6640")
-      (bg-graph-blue-0    "#0f90ef")
-      (bg-graph-blue-1    "#1f2f8f")
-      (bg-graph-magenta-0 "#7f7f8e")
-      (bg-graph-magenta-1 "#4f4f5f")
-      (bg-graph-cyan-0    "#376f9a")
-      (bg-graph-cyan-1    "#00404f")
-
-;;; Special purpose
-
-      (bg-completion       "#2f447f")
-      (bg-hover            "#45605e")
-      (bg-hover-secondary  "#604c30")
-      (bg-hl-line          "#2f3849")
-      (bg-region           "#5a5a5a")
-      (fg-region           "#ffffff")
-
-      (bg-mode-line-active        "#2a2a6a")
-      (fg-mode-line-active        "#f0f0f0")
-      (border-mode-line-active    "#8080a7")
-      (bg-mode-line-inactive      "#2d2d2d")
-      (fg-mode-line-inactive      "#969696")
-      (border-mode-line-inactive  "#606060")
-
-      (modeline-err     "#e5bf00")
-      (modeline-warning "#c0cf35")
-      (modeline-info    "#abeadf")
-
-      (bg-tab-bar      "#313131")
-      (bg-tab-current  "#000000")
-      (bg-tab-other    "#545454")
-
-;;; Diffs
-
-      (bg-added           "#003066")
-      (bg-added-faint     "#001a4f")
-      (bg-added-refine    "#0f4a77")
-      (bg-added-fringe    "#006fff")
-      (fg-added           "#c4d5ff")
-      (fg-added-intense   "#8080ff")
-
-      (bg-changed         "#2f123f")
-      (bg-changed-faint   "#1f022f")
-      (bg-changed-refine  "#3f325f")
-      (bg-changed-fringe  "#7f55a0")
-      (fg-changed         "#e3cfff")
-      (fg-changed-intense "#cf9fe2")
-
-      (bg-removed         "#3d3d00")
-      (bg-removed-faint   "#281f00")
-      (bg-removed-refine  "#555500")
-      (bg-removed-fringe  "#d0c03f")
-      (fg-removed         "#d4d48f")
-      (fg-removed-intense "#d0b05f")
-
-      (bg-diff-context    "#1a1a1a")
-
-;;; Paren match
-
-      (bg-paren-match        "#2f7f9f")
-      (fg-paren-match        fg-main)
-      (bg-paren-expression   "#453040")
-      (underline-paren-match unspecified)
-
-;;; Mappings
-
-;;;; General mappings
-
-      (fringe bg-dim)
-      (cursor yellow-intense)
-
-      (keybind blue-cooler)
-      (name blue-cooler)
-      (identifier yellow-faint)
-
-      (err yellow-warmer)
-      (warning yellow)
-      (info blue)
-
-      (underline-err yellow-intense)
-      (underline-warning magenta-faint)
-      (underline-note cyan)
-
-      (bg-prominent-err bg-yellow-intense)
-      (fg-prominent-err fg-main)
-      (bg-prominent-warning bg-magenta-intense)
-      (fg-prominent-warning fg-main)
-      (bg-prominent-note bg-cyan-intense)
-      (fg-prominent-note fg-main)
-
-      (bg-active-argument bg-yellow-nuanced)
-      (fg-active-argument yellow-warmer)
-      (bg-active-value bg-blue-nuanced)
-      (fg-active-value blue-warmer)
-
-;;;; Code mappings
-
-      (bracket fg-main)
-      (builtin yellow)
-      (comment yellow-cooler)
-      (constant blue-faint)
-      (delimiter fg-main)
-      (docmarkup magenta-faint)
-      (docstring cyan-faint)
-      (fnname yellow-warmer)
-      (keyword blue-cooler)
-      (number fg-main)
-      (operator fg-main)
-      (preprocessor magenta-cooler)
-      (property cyan)
-      (punctuation fg-main)
-      (rx-backslash blue-cooler)
-      (rx-construct yellow-cooler)
-      (string blue-warmer)
-      (type cyan-cooler)
-      (variable cyan)
-
-;;;; Accent mappings
-
-      (accent-0 blue-warmer)
-      (accent-1 yellow)
-      (accent-2 cyan-cooler)
-      (accent-3 yellow-cooler)
-
-;;;; Button mappings
-
-      (fg-button-active fg-main)
-      (fg-button-inactive fg-dim)
-      (bg-button-active bg-active)
-      (bg-button-inactive bg-dim)
-
-;;;; Completion mappings
-
-      (fg-completion-match-0 blue-cooler)
-      (fg-completion-match-1 yellow)
-      (fg-completion-match-2 cyan-cooler)
-      (fg-completion-match-3 yellow-cooler)
-      (bg-completion-match-0 unspecified)
-      (bg-completion-match-1 unspecified)
-      (bg-completion-match-2 unspecified)
-      (bg-completion-match-3 unspecified)
-
-;;;; Date mappings
-
-      (date-common cyan)
-      (date-deadline yellow-warmer)
-      (date-deadline-subtle red-faint)
-      (date-event fg-alt)
-      (date-holiday yellow-warmer)
-      (date-holiday-other blue)
-      (date-now fg-main)
-      (date-range fg-alt)
-      (date-scheduled yellow-cooler)
-      (date-scheduled-subtle yellow-faint)
-      (date-weekday cyan)
-      (date-weekend magenta-cooler)
-
-;;;; Line number mappings
-
-      (fg-line-number-inactive fg-dim)
-      (fg-line-number-active fg-main)
-      (bg-line-number-inactive bg-dim)
-      (bg-line-number-active bg-active)
-
-;;;; Link mappings
-
-      (fg-link blue-warmer)
-      (bg-link unspecified)
-      (underline-link blue-warmer)
-
-      (fg-link-symbolic cyan)
-      (bg-link-symbolic unspecified)
-      (underline-link-symbolic cyan)
-
-      (fg-link-visited yellow-faint)
-      (bg-link-visited unspecified)
-      (underline-link-visited yellow-faint)
-
-;;;; Mail mappings
-
-      (mail-cite-0 blue-warmer)
-      (mail-cite-1 yellow-cooler)
-      (mail-cite-2 cyan-faint)
-      (mail-cite-3 yellow)
-      (mail-part blue)
-      (mail-recipient blue)
-      (mail-subject yellow-warmer)
-      (mail-other cyan-faint)
-
-;;;; Mark mappings
-
-      (bg-mark-delete bg-yellow-subtle)
-      (fg-mark-delete yellow)
-      (bg-mark-select bg-cyan-subtle)
-      (fg-mark-select cyan)
-      (bg-mark-other bg-magenta-subtle)
-      (fg-mark-other magenta-warmer)
-
-;;;; Prompt mappings
-
-      (fg-prompt blue)
-      (bg-prompt unspecified)
-
-;;;; Prose mappings
-
-      (bg-prose-block-delimiter bg-dim)
-      (fg-prose-block-delimiter fg-dim)
-      (bg-prose-block-contents bg-dim)
-
-      (bg-prose-code unspecified)
-      (fg-prose-code cyan-cooler)
-
-      (bg-prose-macro unspecified)
-      (fg-prose-macro magenta-cooler)
-
-      (bg-prose-verbatim unspecified)
-      (fg-prose-verbatim yellow)
-
-      (prose-done blue)
-      (prose-todo yellow-warmer)
-
-      (prose-metadata fg-dim)
-      (prose-metadata-value fg-alt)
-
-      (prose-table fg-alt)
-      (prose-table-formula yellow-warmer)
-
-      (prose-tag fg-alt)
-
-;;;; Rainbow mappings
-
-      (rainbow-0 yellow-warmer)
-      (rainbow-1 blue)
-      (rainbow-2 yellow-cooler)
-      (rainbow-3 blue-warmer)
-      (rainbow-4 yellow)
-      (rainbow-5 cyan-warmer)
-      (rainbow-6 yellow-faint)
-      (rainbow-7 blue-faint)
-      (rainbow-8 magenta-faint)
-
-;;;; Search mappings
-
-      (bg-search-current bg-yellow-intense)
-      (bg-search-lazy bg-blue-intense)
-      (bg-search-replace bg-yellow-intense)
-
-      (bg-search-rx-group-0 bg-cyan-intense)
-      (bg-search-rx-group-1 bg-magenta-intense)
-      (bg-search-rx-group-2 bg-blue-subtle)
-      (bg-search-rx-group-3 bg-yellow-subtle)
-
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
-      (bg-space-err bg-yellow-intense)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "#000000")
-      (fg-term-black           "#000000")
-      (bg-term-black-bright    "#595959")
-      (fg-term-black-bright    "#595959")
-
-      (bg-term-red             red)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue)
-      (fg-term-blue            blue)
-      (bg-term-blue-bright     blue-warmer)
-      (fg-term-blue-bright     blue-warmer)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "#a6a6a6")
-      (fg-term-white           "#a6a6a6")
-      (bg-term-white-bright    "#ffffff")
-      (fg-term-white-bright    "#ffffff")
-
-;;;; Heading mappings
-
-      (fg-heading-0 cyan-cooler)
-      (fg-heading-1 fg-main)
-      (fg-heading-2 yellow-faint)
-      (fg-heading-3 blue-faint)
-      (fg-heading-4 green-faint)
-      (fg-heading-5 magenta-cooler)
-      (fg-heading-6 yellow-cooler)
-      (fg-heading-7 cyan)
-      (fg-heading-8 fg-dim)
-
-      (bg-heading-0 unspecified)
-      (bg-heading-1 unspecified)
-      (bg-heading-2 unspecified)
-      (bg-heading-3 unspecified)
-      (bg-heading-4 unspecified)
-      (bg-heading-5 unspecified)
-      (bg-heading-6 unspecified)
-      (bg-heading-7 unspecified)
-      (bg-heading-8 unspecified)
-
-      (overline-heading-0 unspecified)
-      (overline-heading-1 unspecified)
-      (overline-heading-2 unspecified)
-      (overline-heading-3 unspecified)
-      (overline-heading-4 unspecified)
-      (overline-heading-5 unspecified)
-      (overline-heading-6 unspecified)
-      (overline-heading-7 unspecified)
-      (overline-heading-8 unspecified))
-    "The entire palette of the `modus-vivendi-deuteranopia' theme.
-
-Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a named color that already
-exists in the palette and is associated with a HEX-VALUE.")
-
-  (defcustom modus-vivendi-deuteranopia-palette-user nil
-    "Like the `modus-vivendi-deuteranopia-palette' for user-defined entries.
+(unless (and (fboundp 'require-theme)
+             load-file-name
+             (equal (file-name-directory load-file-name)
+                    (expand-file-name "themes/" data-directory))
+             (require-theme 'modus-themes t))
+  (require 'modus-themes))
+
+(defcustom modus-vivendi-deuteranopia-palette-user nil
+  "Like the `modus-vivendi-deuteranopia-palette' for user-defined entries.
 This is meant to extend the palette with custom named colors and/or
 semantic palette mappings.  Those may then be used in combination with
 palette overrides (also see `modus-themes-common-palette-overrides' and
 `modus-vivendi-deuteranopia-palette-overrides')."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.5.0")
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.5.0")
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
 
-  (defcustom modus-vivendi-deuteranopia-palette-overrides nil
-    "Overrides for `modus-vivendi-deuteranopia-palette'.
+(defcustom modus-vivendi-deuteranopia-palette-overrides nil
+  "Overrides for `modus-vivendi-deuteranopia-palette'.
 
 Mirror the elements of the aforementioned palette, overriding
 their value.
@@ -523,18 +68,28 @@ mappings, such as to make the cursor red.  Wherea theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.0.0")
-    :version "30.1"
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Palette overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.0.0")
+  :version "30.1"
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Palette overrides"))
 
-  (modus-themes-theme modus-vivendi-deuteranopia
-                      modus-vivendi-deuteranopia-palette
-                      modus-vivendi-deuteranopia-palette-overrides)
+(modus-themes-theme
+ 'modus-vivendi-deuteranopia
+ 'modus-themes
+ "Deuteranopia-optimized theme with a black background.
+This variant is optimized for users with red-green color
+deficiency (deuteranopia).  It conforms with the highest
+legibility standard for color contrast between background and
+foreground in any given piece of text, which corresponds to a
+minimum contrast in relative luminance of 7:1 (WCAG AAA
+standard)."
+ 'dark
+ 'modus-themes-vivendi-deuteranopia-palette
+ 'modus-vivendi-deuteranopia-palette-user
+ 'modus-vivendi-deuteranopia-palette-overrides
+ 'modus-themes-faces-deuteranopia)
 
-  (provide-theme 'modus-vivendi-deuteranopia))
+(provide 'modus-vivendi-deuteranopia-theme)
 
 ;;; modus-vivendi-deuteranopia-theme.el ends here

modus-vivendi-theme.el

@@ -1,9 +1,9 @@
 ;;; modus-vivendi-theme.el --- Elegant, highly legible theme with a black background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026  Free Software Foundation, Inc.
 
-;; Author: Protesilaos Stavrou <info@protesilaos.com>
-;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+;; Author: Protesilaos <info@protesilaos.com>
+;; Maintainer: Protesilaos <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
 ;; Keywords: faces, theme, accessibility
 
@@ -26,488 +26,35 @@
 ;;
 ;; The Modus themes conform with the highest standard for
 ;; color-contrast accessibility between background and foreground
-;; values (WCAG AAA).  Please refer to the official Info manual for
-;; further documentation (distributed with the themes, or available
-;; at: <https://protesilaos.com/emacs/modus-themes>).
+;; values (WCAG AAA).  They are also highly customizable and can even
+;; be used as the basis for other themes.  Please refer to the official
+;; Info manual for further documentation (distributed with the themes,
+;; or available at: <https://protesilaos.com/emacs/modus-themes>).
 
 ;;; Code:
 
 
 
-(eval-and-compile
-  (unless (and (fboundp 'require-theme)
-               load-file-name
-               (equal (file-name-directory load-file-name)
-                      (expand-file-name "themes/" data-directory))
-               (require-theme 'modus-themes t))
-    (require 'modus-themes))
-
-;;;###theme-autoload
-  (deftheme modus-vivendi
-    "Elegant, highly legible theme with a black background.
-Conforms with the highest legibility standard for color contrast
-between background and foreground in any given piece of text,
-which corresponds to a minimum contrast in relative luminance of
-7:1 (WCAG AAA standard)."
-    :background-mode 'dark
-    :kind 'color-scheme
-    :family 'modus)
-
-  (defconst modus-vivendi-palette
-    '(
-;;; Basic values
-
-      (bg-main          "#000000")
-      (bg-dim           "#1e1e1e")
-      (fg-main          "#ffffff")
-      (fg-dim           "#989898")
-      (fg-alt           "#c6daff")
-      (bg-active        "#535353")
-      (bg-inactive      "#303030")
-      (border           "#646464")
-
-;;; Common accent foregrounds
-
-      (red             "#ff5f59")
-      (red-warmer      "#ff6b55")
-      (red-cooler      "#ff7f86")
-      (red-faint       "#ff9580")
-      (red-intense     "#ff5f5f")
-      (green           "#44bc44")
-      (green-warmer    "#70b900")
-      (green-cooler    "#00c06f")
-      (green-faint     "#88ca9f")
-      (green-intense   "#44df44")
-      (yellow          "#d0bc00")
-      (yellow-warmer   "#fec43f")
-      (yellow-cooler   "#dfaf7a")
-      (yellow-faint    "#d2b580")
-      (yellow-intense  "#efef00")
-      (blue            "#2fafff")
-      (blue-warmer     "#79a8ff")
-      (blue-cooler     "#00bcff")
-      (blue-faint      "#82b0ec")
-      (blue-intense    "#338fff")
-      (magenta         "#feacd0")
-      (magenta-warmer  "#f78fe7")
-      (magenta-cooler  "#b6a0ff")
-      (magenta-faint   "#caa6df")
-      (magenta-intense "#ff66ff")
-      (cyan            "#00d3d0")
-      (cyan-warmer     "#4ae2f0")
-      (cyan-cooler     "#6ae4b9")
-      (cyan-faint      "#9ac8e0")
-      (cyan-intense    "#00eff0")
-
-;;; Uncommon accent foregrounds
-
-      (rust       "#db7b5f")
-      (gold       "#c0965b")
-      (olive      "#9cbd6f")
-      (slate      "#76afbf")
-      (indigo     "#9099d9")
-      (maroon     "#cf7fa7")
-      (pink       "#d09dc0")
-
-;;; Common accent backgrounds
-
-      (bg-red-intense     "#9d1f1f")
-      (bg-green-intense   "#2f822f")
-      (bg-yellow-intense  "#7a6100")
-      (bg-blue-intense    "#1640b0")
-      (bg-magenta-intense "#7030af")
-      (bg-cyan-intense    "#2266ae")
-
-      (bg-red-subtle      "#620f2a")
-      (bg-green-subtle    "#00422a")
-      (bg-yellow-subtle   "#4a4000")
-      (bg-blue-subtle     "#242679")
-      (bg-magenta-subtle  "#552f5f")
-      (bg-cyan-subtle     "#004065")
-
-      (bg-red-nuanced     "#3a0c14")
-      (bg-green-nuanced   "#092f1f")
-      (bg-yellow-nuanced  "#381d0f")
-      (bg-blue-nuanced    "#12154a")
-      (bg-magenta-nuanced "#2f0c3f")
-      (bg-cyan-nuanced    "#042837")
-
-;;; Uncommon accent background and foreground pairs
-
-      (bg-clay     "#49191a")
-      (fg-clay     "#f1b090")
-
-      (bg-ochre    "#462f20")
-      (fg-ochre    "#e0d09c")
-
-      (bg-lavender "#38325c")
-      (fg-lavender "#dfc0f0")
-
-      (bg-sage     "#143e32")
-      (fg-sage     "#c3e7d4")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#b52c2c")
-      (bg-graph-red-1     "#702020")
-      (bg-graph-green-0   "#0fed00")
-      (bg-graph-green-1   "#007800")
-      (bg-graph-yellow-0  "#f1e00a")
-      (bg-graph-yellow-1  "#b08940")
-      (bg-graph-blue-0    "#2fafef")
-      (bg-graph-blue-1    "#1f2f8f")
-      (bg-graph-magenta-0 "#bf94fe")
-      (bg-graph-magenta-1 "#5f509f")
-      (bg-graph-cyan-0    "#47dfea")
-      (bg-graph-cyan-1    "#00808f")
-
-;;; Special purpose
-
-      (bg-completion       "#2f447f")
-      (bg-hover            "#45605e")
-      (bg-hover-secondary  "#654a39")
-      (bg-hl-line          "#2f3849")
-      (bg-region           "#5a5a5a")
-      (fg-region           "#ffffff")
-
-      (bg-mode-line-active        "#505050")
-      (fg-mode-line-active        "#ffffff")
-      (border-mode-line-active    "#959595")
-      (bg-mode-line-inactive      "#2d2d2d")
-      (fg-mode-line-inactive      "#969696")
-      (border-mode-line-inactive  "#606060")
-
-      (modeline-err     "#ffa9bf")
-      (modeline-warning "#dfcf43")
-      (modeline-info    "#9fefff")
-
-      (bg-tab-bar      "#313131")
-      (bg-tab-current  "#000000")
-      (bg-tab-other    "#545454")
-
-;;; Diffs
-
-      (bg-added           "#00381f")
-      (bg-added-faint     "#002910")
-      (bg-added-refine    "#034f2f")
-      (bg-added-fringe    "#237f3f")
-      (fg-added           "#a0e0a0")
-      (fg-added-intense   "#80e080")
-
-      (bg-changed         "#363300")
-      (bg-changed-faint   "#2a1f00")
-      (bg-changed-refine  "#4a4a00")
-      (bg-changed-fringe  "#8a7a00")
-      (fg-changed         "#efef80")
-      (fg-changed-intense "#c0b05f")
-
-      (bg-removed         "#4f1119")
-      (bg-removed-faint   "#380a0f")
-      (bg-removed-refine  "#781a1f")
-      (bg-removed-fringe  "#b81a1f")
-      (fg-removed         "#ffbfbf")
-      (fg-removed-intense "#ff9095")
-
-      (bg-diff-context    "#1a1a1a")
-
-;;; Paren match
-
-      (bg-paren-match        "#2f7f9f")
-      (fg-paren-match        fg-main)
-      (bg-paren-expression   "#453040")
-      (underline-paren-match unspecified)
-
-;;; Mappings
-
-;;;; General mappings
-
-      (fringe bg-dim)
-      (cursor fg-main)
-
-      (keybind blue-cooler)
-      (name magenta)
-      (identifier yellow-faint)
-
-      (err red)
-      (warning yellow-warmer)
-      (info cyan-cooler)
-
-      (underline-err red-intense)
-      (underline-warning yellow)
-      (underline-note cyan)
-
-      (bg-prominent-err bg-red-intense)
-      (fg-prominent-err fg-main)
-      (bg-prominent-warning bg-yellow-intense)
-      (fg-prominent-warning fg-main)
-      (bg-prominent-note bg-cyan-intense)
-      (fg-prominent-note fg-main)
-
-      (bg-active-argument bg-yellow-nuanced)
-      (fg-active-argument yellow-cooler)
-      (bg-active-value bg-cyan-nuanced)
-      (fg-active-value cyan-cooler)
-
-;;;; Code mappings
-
-      (bracket fg-main)
-      (builtin magenta-warmer)
-      (comment fg-dim)
-      (constant blue-cooler)
-      (delimiter fg-main)
-      (docmarkup magenta-faint)
-      (docstring cyan-faint)
-      (fnname magenta)
-      (keyword magenta-cooler)
-      (number fg-main)
-      (operator fg-main)
-      (preprocessor red-cooler)
-      (property cyan)
-      (punctuation fg-main)
-      (rx-backslash magenta)
-      (rx-construct green-cooler)
-      (string blue-warmer)
-      (type cyan-cooler)
-      (variable cyan)
-
-;;;; Accent mappings
-
-      (accent-0 blue-cooler)
-      (accent-1 magenta-warmer)
-      (accent-2 cyan-cooler)
-      (accent-3 yellow)
-
-;;;; Button mappings
-
-      (fg-button-active fg-main)
-      (fg-button-inactive fg-dim)
-      (bg-button-active bg-active)
-      (bg-button-inactive bg-dim)
-
-;;;; Completion mappings
-
-      (fg-completion-match-0 blue-cooler)
-      (fg-completion-match-1 magenta-warmer)
-      (fg-completion-match-2 cyan-cooler)
-      (fg-completion-match-3 yellow)
-      (bg-completion-match-0 unspecified)
-      (bg-completion-match-1 unspecified)
-      (bg-completion-match-2 unspecified)
-      (bg-completion-match-3 unspecified)
-
-;;;; Date mappings
-
-      (date-common cyan)
-      (date-deadline red-cooler)
-      (date-deadline-subtle red-faint)
-      (date-event fg-alt)
-      (date-holiday magenta-warmer)
-      (date-holiday-other blue)
-      (date-now fg-main)
-      (date-range fg-alt)
-      (date-scheduled yellow-cooler)
-      (date-scheduled-subtle yellow-faint)
-      (date-weekday cyan)
-      (date-weekend magenta)
-
-;;;; Line number mappings
-
-      (fg-line-number-inactive fg-dim)
-      (fg-line-number-active fg-main)
-      (bg-line-number-inactive bg-dim)
-      (bg-line-number-active bg-active)
-
-;;;; Link mappings
-
-      (fg-link blue-warmer)
-      (bg-link unspecified)
-      (underline-link blue-warmer)
-
-      (fg-link-symbolic cyan)
-      (bg-link-symbolic unspecified)
-      (underline-link-symbolic cyan)
-
-      (fg-link-visited magenta)
-      (bg-link-visited unspecified)
-      (underline-link-visited magenta)
-
-;;;; Mail mappings
-
-      (mail-cite-0 blue-warmer)
-      (mail-cite-1 yellow-cooler)
-      (mail-cite-2 cyan-cooler)
-      (mail-cite-3 red-cooler)
-      (mail-part blue)
-      (mail-recipient magenta-cooler)
-      (mail-subject magenta-warmer)
-      (mail-other magenta-faint)
-
-;;;; Mark mappings
-
-      (bg-mark-delete bg-red-subtle)
-      (fg-mark-delete red-cooler)
-      (bg-mark-select bg-cyan-subtle)
-      (fg-mark-select cyan)
-      (bg-mark-other bg-yellow-subtle)
-      (fg-mark-other yellow)
-
-;;;; Prompt mappings
-
-      (fg-prompt cyan-cooler)
-      (bg-prompt unspecified)
-
-;;;; Prose mappings
-
-      (bg-prose-block-delimiter bg-dim)
-      (fg-prose-block-delimiter fg-dim)
-      (bg-prose-block-contents bg-dim)
-
-      (bg-prose-code unspecified)
-      (fg-prose-code cyan-cooler)
-
-      (bg-prose-macro unspecified)
-      (fg-prose-macro magenta-cooler)
-
-      (bg-prose-verbatim unspecified)
-      (fg-prose-verbatim magenta-warmer)
-
-      (prose-done green)
-      (prose-todo red)
-
-      (prose-metadata fg-dim)
-      (prose-metadata-value fg-alt)
-
-      (prose-table fg-alt)
-      (prose-table-formula magenta-warmer)
-
-      (prose-tag magenta-faint)
-
-;;;; Rainbow mappings
-
-      (rainbow-0 fg-main)
-      (rainbow-1 magenta-intense)
-      (rainbow-2 cyan-intense)
-      (rainbow-3 red-warmer)
-      (rainbow-4 yellow-intense)
-      (rainbow-5 magenta-cooler)
-      (rainbow-6 green-intense)
-      (rainbow-7 blue-warmer)
-      (rainbow-8 magenta-warmer)
-
-;;;; Search mappings
-
-      (bg-search-current bg-yellow-intense)
-      (bg-search-lazy bg-cyan-intense)
-      (bg-search-replace bg-red-intense)
-
-      (bg-search-rx-group-0 bg-blue-intense)
-      (bg-search-rx-group-1 bg-green-intense)
-      (bg-search-rx-group-2 bg-red-subtle)
-      (bg-search-rx-group-3 bg-magenta-subtle)
-
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
-      (bg-space-err bg-red-intense)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "#000000")
-      (fg-term-black           "#000000")
-      (bg-term-black-bright    "#595959")
-      (fg-term-black-bright    "#595959")
-
-      (bg-term-red             red)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue)
-      (fg-term-blue            blue)
-      (bg-term-blue-bright     blue-warmer)
-      (fg-term-blue-bright     blue-warmer)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "#a6a6a6")
-      (fg-term-white           "#a6a6a6")
-      (bg-term-white-bright    "#ffffff")
-      (fg-term-white-bright    "#ffffff")
-
-;;;; Heading mappings
-
-      (fg-heading-0 cyan-cooler)
-      (fg-heading-1 fg-main)
-      (fg-heading-2 yellow-faint)
-      (fg-heading-3 blue-faint)
-      (fg-heading-4 magenta)
-      (fg-heading-5 green-faint)
-      (fg-heading-6 red-faint)
-      (fg-heading-7 cyan-faint)
-      (fg-heading-8 fg-dim)
-
-      (bg-heading-0 unspecified)
-      (bg-heading-1 unspecified)
-      (bg-heading-2 unspecified)
-      (bg-heading-3 unspecified)
-      (bg-heading-4 unspecified)
-      (bg-heading-5 unspecified)
-      (bg-heading-6 unspecified)
-      (bg-heading-7 unspecified)
-      (bg-heading-8 unspecified)
-
-      (overline-heading-0 unspecified)
-      (overline-heading-1 unspecified)
-      (overline-heading-2 unspecified)
-      (overline-heading-3 unspecified)
-      (overline-heading-4 unspecified)
-      (overline-heading-5 unspecified)
-      (overline-heading-6 unspecified)
-      (overline-heading-7 unspecified)
-      (overline-heading-8 unspecified))
-    "The entire palette of the `modus-vivendi' theme.
-
-Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a named color that already
-exists in the palette and is associated with a HEX-VALUE.")
-
-  (defcustom modus-vivendi-palette-user nil
-    "Like the `modus-vivendi--palette' for user-defined entries.
+(unless (and (fboundp 'require-theme)
+             load-file-name
+             (equal (file-name-directory load-file-name)
+                    (expand-file-name "themes/" data-directory))
+             (require-theme 'modus-themes t))
+  (require 'modus-themes))
+
+(defcustom modus-vivendi-palette-user nil
+  "Like the `modus-vivendi--palette' for user-defined entries.
 This is meant to extend the palette with custom named colors and/or
 semantic palette mappings.  Those may then be used in combination with
 palette overrides (also see `modus-themes-common-palette-overrides' and
 `modus-vivendi--palette-overrides')."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.5.0")
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.5.0")
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
 
-  (defcustom modus-vivendi-palette-overrides nil
-    "Overrides for `modus-vivendi-palette'.
+(defcustom modus-vivendi-palette-overrides nil
+  "Overrides for `modus-vivendi-palette'.
 
 Mirror the elements of the aforementioned palette, overriding
 their value.
@@ -521,18 +68,25 @@ mappings, such as to make the cursor red.  Wherea theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.0.0")
-    :version "30.1"
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Palette overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.0.0")
+  :version "30.1"
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Palette overrides"))
 
-  (modus-themes-theme modus-vivendi
-                      modus-vivendi-palette
-                      modus-vivendi-palette-overrides)
+(modus-themes-theme
+ 'modus-vivendi
+ 'modus-themes
+ "Elegant, highly legible theme with a black background.
+Conforms with the highest legibility standard for color contrast
+between background and foreground in any given piece of text,
+which corresponds to a minimum contrast in relative luminance of
+7:1 (WCAG AAA standard)."
+ 'dark
+ 'modus-themes-vivendi-palette
+ 'modus-vivendi-palette-user
+ 'modus-vivendi-palette-overrides)
 
-  (provide-theme 'modus-vivendi))
+(provide 'modus-vivendi-theme)
 
 ;;; modus-vivendi-theme.el ends here

modus-vivendi-tinted-theme.el

@@ -1,9 +1,9 @@
 ;;; modus-vivendi-tinted-theme.el --- Elegant, highly legible theme with a night sky background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026  Free Software Foundation, Inc.
 
-;; Author: Protesilaos Stavrou <info@protesilaos.com>
-;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+;; Author: Protesilaos <info@protesilaos.com>
+;; Maintainer: Protesilaos <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
 ;; Keywords: faces, theme, accessibility
 
@@ -26,488 +26,35 @@
 ;;
 ;; The Modus themes conform with the highest standard for
 ;; color-contrast accessibility between background and foreground
-;; values (WCAG AAA).  Please refer to the official Info manual for
-;; further documentation (distributed with the themes, or available
-;; at: <https://protesilaos.com/emacs/modus-themes>).
+;; values (WCAG AAA).  They are also highly customizable and can even
+;; be used as the basis for other themes.  Please refer to the official
+;; Info manual for further documentation (distributed with the themes,
+;; or available at: <https://protesilaos.com/emacs/modus-themes>).
 
 ;;; Code:
 
 
 
-(eval-and-compile
-  (unless (and (fboundp 'require-theme)
-               load-file-name
-               (equal (file-name-directory load-file-name)
-                      (expand-file-name "themes/" data-directory))
-               (require-theme 'modus-themes t))
-    (require 'modus-themes))
-
-;;;###theme-autoload
-  (deftheme modus-vivendi-tinted
-    "Elegant, highly legible theme with a night sky background.
-Conforms with the highest legibility standard for color contrast
-between background and foreground in any given piece of text,
-which corresponds to a minimum contrast in relative luminance of
-7:1 (WCAG AAA standard)."
-    :background-mode 'dark
-    :kind 'color-scheme
-    :family 'modus)
-
-  (defconst modus-vivendi-tinted-palette
-    '(
-;;; Basic values
-
-      (bg-main          "#0d0e1c")
-      (bg-dim           "#1d2235")
-      (fg-main          "#ffffff")
-      (fg-dim           "#989898")
-      (fg-alt           "#c6daff")
-      (bg-active        "#4a4f69")
-      (bg-inactive      "#2b3045")
-      (border           "#61647a")
-
-;;; Common accent foregrounds
-
-      (red             "#ff5f59")
-      (red-warmer      "#ff6b55")
-      (red-cooler      "#ff7f86")
-      (red-faint       "#ef8386")
-      (red-intense     "#ff5f5f")
-      (green           "#44bc44")
-      (green-warmer    "#75c13e")
-      (green-cooler    "#11c777")
-      (green-faint     "#88ca9f")
-      (green-intense   "#44df44")
-      (yellow          "#d0bc00")
-      (yellow-warmer   "#fec43f")
-      (yellow-cooler   "#dfaf7a")
-      (yellow-faint    "#d2b580")
-      (yellow-intense  "#efef00")
-      (blue            "#2fafff")
-      (blue-warmer     "#79a8ff")
-      (blue-cooler     "#00bcff")
-      (blue-faint      "#82b0ec")
-      (blue-intense    "#338fff")
-      (magenta         "#feacd0")
-      (magenta-warmer  "#f78fe7")
-      (magenta-cooler  "#b6a0ff")
-      (magenta-faint   "#caa6df")
-      (magenta-intense "#ff66ff")
-      (cyan            "#00d3d0")
-      (cyan-warmer     "#4ae2f0")
-      (cyan-cooler     "#6ae4b9")
-      (cyan-faint      "#9ac8e0")
-      (cyan-intense    "#00eff0")
-
-;;; Uncommon accent foregrounds
-
-      (rust       "#db7b5f")
-      (gold       "#c0965b")
-      (olive      "#9cbd6f")
-      (slate      "#76afbf")
-      (indigo     "#9099d9")
-      (maroon     "#cf7fa7")
-      (pink       "#d09dc0")
-
-;;; Common accent backgrounds
-
-      (bg-red-intense     "#9d1f1f")
-      (bg-green-intense   "#2f822f")
-      (bg-yellow-intense  "#7a6100")
-      (bg-blue-intense    "#1640b0")
-      (bg-magenta-intense "#7030af")
-      (bg-cyan-intense    "#2266ae")
-
-      (bg-red-subtle      "#620f2a")
-      (bg-green-subtle    "#00422a")
-      (bg-yellow-subtle   "#4a4000")
-      (bg-blue-subtle     "#242679")
-      (bg-magenta-subtle  "#552f5f")
-      (bg-cyan-subtle     "#004065")
-
-      (bg-red-nuanced     "#3a0c14")
-      (bg-green-nuanced   "#092f1f")
-      (bg-yellow-nuanced  "#381d0f")
-      (bg-blue-nuanced    "#12154a")
-      (bg-magenta-nuanced "#2f0c3f")
-      (bg-cyan-nuanced    "#042837")
-
-;;; Uncommon accent background and foreground pairs
-
-      (bg-clay     "#49191a")
-      (fg-clay     "#f1b090")
-
-      (bg-ochre    "#462f20")
-      (fg-ochre    "#e0d09c")
-
-      (bg-lavender "#38325c")
-      (fg-lavender "#dfc0f0")
-
-      (bg-sage     "#143e32")
-      (fg-sage     "#c3e7d4")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#b52c2c")
-      (bg-graph-red-1     "#702020")
-      (bg-graph-green-0   "#0fed00")
-      (bg-graph-green-1   "#007800")
-      (bg-graph-yellow-0  "#f1e00a")
-      (bg-graph-yellow-1  "#b08940")
-      (bg-graph-blue-0    "#2fafef")
-      (bg-graph-blue-1    "#1f2f8f")
-      (bg-graph-magenta-0 "#bf94fe")
-      (bg-graph-magenta-1 "#5f509f")
-      (bg-graph-cyan-0    "#47dfea")
-      (bg-graph-cyan-1    "#00808f")
-
-;;; Special purpose
-
-      (bg-completion       "#483d8a")
-      (bg-hover            "#45605e")
-      (bg-hover-secondary  "#64404f")
-      (bg-hl-line          "#303a6f")
-      (bg-region           "#555a66")
-      (fg-region           "#ffffff")
-
-      (bg-mode-line-active        "#484d67")
-      (fg-mode-line-active        "#ffffff")
-      (border-mode-line-active    "#979797")
-      (bg-mode-line-inactive      "#292d48")
-      (fg-mode-line-inactive      "#969696")
-      (border-mode-line-inactive  "#606270")
-
-      (modeline-err     "#ffa9bf")
-      (modeline-warning "#dfcf43")
-      (modeline-info    "#9fefff")
-
-      (bg-tab-bar      "#2c3045")
-      (bg-tab-current  "#0d0e1c")
-      (bg-tab-other    "#4a4f6a")
-
-;;; Diffs
-
-      (bg-added           "#003a2f")
-      (bg-added-faint     "#002922")
-      (bg-added-refine    "#035542")
-      (bg-added-fringe    "#23884f")
-      (fg-added           "#a0e0a0")
-      (fg-added-intense   "#80e080")
-
-      (bg-changed         "#363300")
-      (bg-changed-faint   "#2a1f00")
-      (bg-changed-refine  "#4a4a00")
-      (bg-changed-fringe  "#8f7a30")
-      (fg-changed         "#efef80")
-      (fg-changed-intense "#c0b05f")
-
-      (bg-removed         "#4f1127")
-      (bg-removed-faint   "#380a19")
-      (bg-removed-refine  "#781a3a")
-      (bg-removed-fringe  "#b81a26")
-      (fg-removed         "#ffbfbf")
-      (fg-removed-intense "#ff9095")
-
-      (bg-diff-context    "#1a1f30")
-
-;;; Paren match
-
-      (bg-paren-match        "#4f7f9f")
-      (fg-paren-match        fg-main)
-      (bg-paren-expression   "#453040")
-      (underline-paren-match unspecified)
-
-;;; Mappings
-
-;;;; General mappings
-
-      (fringe bg-dim)
-      (cursor magenta-intense)
-
-      (keybind magenta-cooler)
-      (name magenta)
-      (identifier yellow-faint)
-
-      (err red)
-      (warning yellow)
-      (info green-cooler)
-
-      (underline-err red-intense)
-      (underline-warning yellow)
-      (underline-note cyan)
-
-      (bg-prominent-err bg-red-intense)
-      (fg-prominent-err fg-main)
-      (bg-prominent-warning bg-yellow-intense)
-      (fg-prominent-warning fg-main)
-      (bg-prominent-note bg-cyan-intense)
-      (fg-prominent-note fg-main)
-
-      (bg-active-argument bg-yellow-nuanced)
-      (fg-active-argument yellow-cooler)
-      (bg-active-value bg-cyan-nuanced)
-      (fg-active-value cyan-cooler)
-
-;;;; Code mappings
-
-      (bracket fg-main)
-      (builtin magenta)
-      (comment red-faint)
-      (constant magenta-cooler)
-      (delimiter fg-main)
-      (docmarkup magenta-faint)
-      (docstring cyan-faint)
-      (fnname magenta-warmer)
-      (keyword blue-warmer)
-      (number fg-main)
-      (operator fg-main)
-      (preprocessor red-cooler)
-      (property cyan-warmer)
-      (punctuation fg-main)
-      (rx-backslash magenta-warmer)
-      (rx-construct magenta-cooler)
-      (string blue)
-      (type green-cooler)
-      (variable cyan-warmer)
-
-;;;; Accent mappings
-
-      (accent-0 magenta-cooler)
-      (accent-1 cyan)
-      (accent-2 magenta-warmer)
-      (accent-3 yellow-warmer)
-
-;;;; Button mappings
-
-      (fg-button-active fg-main)
-      (fg-button-inactive fg-dim)
-      (bg-button-active bg-active)
-      (bg-button-inactive bg-dim)
-
-;;;; Completion mappings
-
-      (fg-completion-match-0 blue-cooler)
-      (fg-completion-match-1 magenta-warmer)
-      (fg-completion-match-2 cyan-cooler)
-      (fg-completion-match-3 yellow)
-      (bg-completion-match-0 unspecified)
-      (bg-completion-match-1 unspecified)
-      (bg-completion-match-2 unspecified)
-      (bg-completion-match-3 unspecified)
-
-;;;; Date mappings
-
-      (date-common cyan)
-      (date-deadline red-cooler)
-      (date-deadline-subtle red-faint)
-      (date-event fg-alt)
-      (date-holiday magenta-warmer)
-      (date-holiday-other blue)
-      (date-now fg-main)
-      (date-range fg-alt)
-      (date-scheduled yellow-cooler)
-      (date-scheduled-subtle yellow-faint)
-      (date-weekday cyan)
-      (date-weekend magenta)
-
-;;;; Line number mappings
-
-      (fg-line-number-inactive fg-dim)
-      (fg-line-number-active fg-main)
-      (bg-line-number-inactive bg-dim)
-      (bg-line-number-active bg-active)
-
-;;;; Link mappings
-
-      (fg-link blue-warmer)
-      (bg-link unspecified)
-      (underline-link blue-warmer)
-
-      (fg-link-symbolic cyan)
-      (bg-link-symbolic unspecified)
-      (underline-link-symbolic cyan)
-
-      (fg-link-visited magenta)
-      (bg-link-visited unspecified)
-      (underline-link-visited magenta)
-
-;;;; Mail mappings
-
-      (mail-cite-0 blue-faint)
-      (mail-cite-1 yellow-cooler)
-      (mail-cite-2 cyan-cooler)
-      (mail-cite-3 red-cooler)
-      (mail-part blue)
-      (mail-recipient blue-warmer)
-      (mail-subject magenta-warmer)
-      (mail-other magenta)
-
-;;;; Mark mappings
-
-      (bg-mark-delete bg-red-subtle)
-      (fg-mark-delete red-cooler)
-      (bg-mark-select bg-cyan-subtle)
-      (fg-mark-select cyan)
-      (bg-mark-other bg-yellow-subtle)
-      (fg-mark-other yellow)
-
-;;;; Prompt mappings
-
-      (fg-prompt cyan-warmer)
-      (bg-prompt unspecified)
-
-;;;; Prose mappings
-
-      (bg-prose-block-delimiter bg-dim)
-      (fg-prose-block-delimiter fg-dim)
-      (bg-prose-block-contents bg-dim)
-
-      (bg-prose-code unspecified)
-      (fg-prose-code cyan-cooler)
-
-      (bg-prose-macro unspecified)
-      (fg-prose-macro magenta-cooler)
-
-      (bg-prose-verbatim unspecified)
-      (fg-prose-verbatim magenta-warmer)
-
-      (prose-done green)
-      (prose-todo red)
-
-      (prose-metadata fg-dim)
-      (prose-metadata-value fg-alt)
-
-      (prose-table fg-alt)
-      (prose-table-formula magenta-warmer)
-
-      (prose-tag magenta-faint)
-
-;;;; Rainbow mappings
-
-      (rainbow-0 fg-main)
-      (rainbow-1 magenta-intense)
-      (rainbow-2 cyan-intense)
-      (rainbow-3 red-warmer)
-      (rainbow-4 yellow-intense)
-      (rainbow-5 magenta-cooler)
-      (rainbow-6 green-intense)
-      (rainbow-7 blue-warmer)
-      (rainbow-8 magenta-warmer)
-
-;;;; Search mappings
-
-      (bg-search-current bg-yellow-intense)
-      (bg-search-lazy bg-cyan-intense)
-      (bg-search-replace bg-red-intense)
-
-      (bg-search-rx-group-0 bg-blue-intense)
-      (bg-search-rx-group-1 bg-green-intense)
-      (bg-search-rx-group-2 bg-red-subtle)
-      (bg-search-rx-group-3 bg-magenta-subtle)
-
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
-      (bg-space-err bg-red-intense)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "#000000")
-      (fg-term-black           "#000000")
-      (bg-term-black-bright    "#595959")
-      (fg-term-black-bright    "#595959")
-
-      (bg-term-red             red)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue)
-      (fg-term-blue            blue)
-      (bg-term-blue-bright     blue-warmer)
-      (fg-term-blue-bright     blue-warmer)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "#a6a6a6")
-      (fg-term-white           "#a6a6a6")
-      (bg-term-white-bright    "#ffffff")
-      (fg-term-white-bright    "#ffffff")
-
-;;;; Heading mappings
-
-      (fg-heading-0 cyan-cooler)
-      (fg-heading-1 fg-main)
-      (fg-heading-2 yellow-faint)
-      (fg-heading-3 blue-faint)
-      (fg-heading-4 magenta)
-      (fg-heading-5 green-faint)
-      (fg-heading-6 red-faint)
-      (fg-heading-7 cyan-faint)
-      (fg-heading-8 fg-dim)
-
-      (bg-heading-0 unspecified)
-      (bg-heading-1 unspecified)
-      (bg-heading-2 unspecified)
-      (bg-heading-3 unspecified)
-      (bg-heading-4 unspecified)
-      (bg-heading-5 unspecified)
-      (bg-heading-6 unspecified)
-      (bg-heading-7 unspecified)
-      (bg-heading-8 unspecified)
-
-      (overline-heading-0 unspecified)
-      (overline-heading-1 unspecified)
-      (overline-heading-2 unspecified)
-      (overline-heading-3 unspecified)
-      (overline-heading-4 unspecified)
-      (overline-heading-5 unspecified)
-      (overline-heading-6 unspecified)
-      (overline-heading-7 unspecified)
-      (overline-heading-8 unspecified))
-    "The entire palette of the `modus-vivendi-tinted' theme.
-
-Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a named color that already
-exists in the palette and is associated with a HEX-VALUE.")
-
-  (defcustom modus-vivendi-tinted-palette-user nil
-    "Like the `modus-vivendi-tinted-palette' for user-defined entries.
+(unless (and (fboundp 'require-theme)
+             load-file-name
+             (equal (file-name-directory load-file-name)
+                    (expand-file-name "themes/" data-directory))
+             (require-theme 'modus-themes t))
+  (require 'modus-themes))
+
+(defcustom modus-vivendi-tinted-palette-user nil
+  "Like the `modus-vivendi-tinted-palette' for user-defined entries.
 This is meant to extend the palette with custom named colors and/or
 semantic palette mappings.  Those may then be used in combination with
 palette overrides (also see `modus-themes-common-palette-overrides' and
 `modus-vivendi-tinted-palette-overrides')."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.5.0")
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.5.0")
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
 
-  (defcustom modus-vivendi-tinted-palette-overrides nil
-    "Overrides for `modus-vivendi-tinted-palette'.
+(defcustom modus-vivendi-tinted-palette-overrides nil
+  "Overrides for `modus-vivendi-tinted-palette'.
 
 Mirror the elements of the aforementioned palette, overriding
 their value.
@@ -521,18 +68,25 @@ mappings, such as to make the cursor red.  Wherea theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.0.0")
-    :version "30.1"
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Palette overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.0.0")
+  :version "30.1"
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Palette overrides"))
 
-  (modus-themes-theme modus-vivendi-tinted
-                      modus-vivendi-tinted-palette
-                      modus-vivendi-tinted-palette-overrides)
+(modus-themes-theme
+ 'modus-vivendi-tinted
+ 'modus-themes
+ "Elegant, highly legible theme with a night sky background.
+Conforms with the highest legibility standard for color contrast
+between background and foreground in any given piece of text,
+which corresponds to a minimum contrast in relative luminance of
+7:1 (WCAG AAA standard)."
+ 'dark
+ 'modus-themes-vivendi-tinted-palette
+ 'modus-vivendi-tinted-palette-user
+ 'modus-vivendi-tinted-palette-overrides)
 
-  (provide-theme 'modus-vivendi-tinted))
+(provide 'modus-vivendi-tinted-theme)
 
 ;;; modus-vivendi-tinted-theme.el ends here

modus-vivendi-tritanopia-theme.el

@@ -1,9 +1,9 @@
 ;;; modus-vivendi-tritanopia-theme.el --- Tritanopia-optimized theme with a black background -*- lexical-binding:t -*-
 
-;; Copyright (C) 2019-2025  Free Software Foundation, Inc.
+;; Copyright (C) 2019-2026  Free Software Foundation, Inc.
 
-;; Author: Protesilaos Stavrou <info@protesilaos.com>
-;; Maintainer: Protesilaos Stavrou <info@protesilaos.com>
+;; Author: Protesilaos <info@protesilaos.com>
+;; Maintainer: Protesilaos <info@protesilaos.com>
 ;; URL: https://github.com/protesilaos/modus-themes
 ;; Keywords: faces, theme, accessibility
 
@@ -26,490 +26,35 @@
 ;;
 ;; The Modus themes conform with the highest standard for
 ;; color-contrast accessibility between background and foreground
-;; values (WCAG AAA).  Please refer to the official Info manual for
-;; further documentation (distributed with the themes, or available
-;; at: <https://protesilaos.com/emacs/modus-themes>).
+;; values (WCAG AAA).  They are also highly customizable and can even
+;; be used as the basis for other themes.  Please refer to the official
+;; Info manual for further documentation (distributed with the themes,
+;; or available at: <https://protesilaos.com/emacs/modus-themes>).
 
 ;;; Code:
 
 
 
-(eval-and-compile
-  (unless (and (fboundp 'require-theme)
-               load-file-name
-               (equal (file-name-directory load-file-name)
-                      (expand-file-name "themes/" data-directory))
-               (require-theme 'modus-themes t))
-    (require 'modus-themes))
-
-;;;###theme-autoload
-  (deftheme modus-vivendi-tritanopia
-    "Tritanopia-optimized theme with a black background.
-This variant is optimized for users with blue-yellow color
-deficiency (tritanopia).  It conforms with the highest
-legibility standard for color contrast between background and
-foreground in any given piece of text, which corresponds to a
-minimum contrast in relative luminance of 7:1 (WCAG AAA
-standard)."
-    :background-mode 'dark
-    :kind 'color-scheme
-    :family 'modus)
-
-  (defconst modus-vivendi-tritanopia-palette
-    '(
-;;; Basic values
-
-      (bg-main          "#000000")
-      (bg-dim           "#1e1e1e")
-      (fg-main          "#ffffff")
-      (fg-dim           "#989898")
-      (fg-alt           "#a0d7f2")
-      (bg-active        "#535353")
-      (bg-inactive      "#303030")
-      (border           "#646464")
-
-;;; Common accent foregrounds
-
-      (red             "#ff5f59")
-      (red-warmer      "#ff6740")
-      (red-cooler      "#ff7f86")
-      (red-faint       "#ff9070")
-      (red-intense     "#ff5f5f")
-      (green           "#44bc44")
-      (green-warmer    "#70b900")
-      (green-cooler    "#00c06f")
-      (green-faint     "#88ca9f")
-      (green-intense   "#44df44")
-      (yellow          "#cabf00")
-      (yellow-warmer   "#ffa00f")
-      (yellow-cooler   "#d8af7a")
-      (yellow-faint    "#d2b580")
-      (yellow-intense  "#efef00")
-      (blue            "#2fafff")
-      (blue-warmer     "#79a8ff")
-      (blue-cooler     "#00bcff")
-      (blue-faint      "#82b0ec")
-      (blue-intense    "#338fff")
-      (magenta         "#feacd0")
-      (magenta-warmer  "#f78fe7")
-      (magenta-cooler  "#b6a0ff")
-      (magenta-faint   "#caa6df")
-      (magenta-intense "#ef7fff")
-      (cyan            "#00d3d0")
-      (cyan-warmer     "#4ae2ff")
-      (cyan-cooler     "#6ae4b9")
-      (cyan-faint      "#7fdbdf")
-      (cyan-intense    "#00eff0")
-
-;;; Uncommon accent foregrounds
-
-      (rust       "#db7b5f")
-      (gold       "#c0965b")
-      (olive      "#9cbd6f")
-      (slate      "#76afbf")
-      (indigo     "#9099d9")
-      (maroon     "#cf7fa7")
-      (pink       "#d09dc0")
-
-;;; Common accent backgrounds
-
-      (bg-red-intense     "#9d1f1f")
-      (bg-green-intense   "#2f822f")
-      (bg-yellow-intense  "#7a6100")
-      (bg-blue-intense    "#1640b0")
-      (bg-magenta-intense "#7030af")
-      (bg-cyan-intense    "#2266ae")
-
-      (bg-red-subtle      "#620f2a")
-      (bg-green-subtle    "#00422a")
-      (bg-yellow-subtle   "#4a4000")
-      (bg-blue-subtle     "#242679")
-      (bg-magenta-subtle  "#552f5f")
-      (bg-cyan-subtle     "#004065")
-
-      (bg-red-nuanced     "#3a0c14")
-      (bg-green-nuanced   "#092f1f")
-      (bg-yellow-nuanced  "#381d0f")
-      (bg-blue-nuanced    "#12154a")
-      (bg-magenta-nuanced "#2f0c3f")
-      (bg-cyan-nuanced    "#042837")
-
-;;; Uncommon accent background and foreground pairs
-
-      (bg-clay     "#49191a")
-      (fg-clay     "#f1b090")
-
-      (bg-ochre    "#462f20")
-      (fg-ochre    "#e0d09c")
-
-      (bg-lavender "#38325c")
-      (fg-lavender "#dfc0f0")
-
-      (bg-sage     "#143e32")
-      (fg-sage     "#c3e7d4")
-
-;;; Graphs
-
-      (bg-graph-red-0     "#b52c2c")
-      (bg-graph-red-1     "#702020")
-      (bg-graph-green-0   "#afd1c0")
-      (bg-graph-green-1   "#607a8f")
-      (bg-graph-yellow-0  "#facfd6")
-      (bg-graph-yellow-1  "#b57b85")
-      (bg-graph-blue-0    "#4f9fdf")
-      (bg-graph-blue-1    "#004559")
-      (bg-graph-magenta-0 "#b6427f")
-      (bg-graph-magenta-1 "#7f506f")
-      (bg-graph-cyan-0    "#57dfea")
-      (bg-graph-cyan-1    "#00808f")
-
-;;; Special purpose
-
-      (bg-completion       "#004253")
-      (bg-hover            "#8e3e3b")
-      (bg-hover-secondary  "#204853")
-      (bg-hl-line          "#2f3849")
-      (bg-region           "#5a5a5a")
-      (fg-region           "#ffffff")
-
-      (bg-mode-line-active        "#003c52")
-      (fg-mode-line-active        "#f0f0f0")
-      (border-mode-line-active    "#5f8fb4")
-      (bg-mode-line-inactive      "#2d2d2d")
-      (fg-mode-line-inactive      "#969696")
-      (border-mode-line-inactive  "#606060")
-
-      (modeline-err     "#ff7fbf")
-      (modeline-warning "#df9f93")
-      (modeline-info    "#4fcfef")
-
-      (bg-tab-bar      "#313131")
-      (bg-tab-current  "#000000")
-      (bg-tab-other    "#545454")
-
-;;; Diffs
-
-      (bg-added           "#004254")
-      (bg-added-faint     "#003042")
-      (bg-added-refine    "#004f7f")
-      (bg-added-fringe    "#008fcf")
-      (fg-added           "#9fdfdf")
-      (fg-added-intense   "#50c0ef")
-
-      (bg-changed         "#2f123f")
-      (bg-changed-faint   "#1f022f")
-      (bg-changed-refine  "#3f325f")
-      (bg-changed-fringe  "#7f55a0")
-      (fg-changed         "#e3cfff")
-      (fg-changed-intense "#cf9fe2")
-
-      (bg-removed         "#4f1119")
-      (bg-removed-faint   "#380a0f")
-      (bg-removed-refine  "#781a1f")
-      (bg-removed-fringe  "#b81a1f")
-      (fg-removed         "#ffbfbf")
-      (fg-removed-intense "#ff9095")
-
-      (bg-diff-context    "#1a1a1a")
-
-;;; Paren match
-
-      (bg-paren-match        "#2f7f9f")
-      (fg-paren-match        fg-main)
-      (bg-paren-expression   "#453040")
-      (underline-paren-match unspecified)
-
-;;; Mappings
-
-;;;; General mappings
-
-      (fringe bg-dim)
-      (cursor red-intense)
-
-      (keybind red)
-      (name red-cooler)
-      (identifier red-faint)
-
-      (err red-warmer)
-      (warning magenta)
-      (info cyan)
-
-      (underline-err red-intense)
-      (underline-warning magenta-intense)
-      (underline-note cyan-intense)
-
-      (bg-prominent-err bg-red-intense)
-      (fg-prominent-err fg-main)
-      (bg-prominent-warning bg-magenta-intense)
-      (fg-prominent-warning fg-main)
-      (bg-prominent-note bg-cyan-intense)
-      (fg-prominent-note fg-main)
-
-      (bg-active-argument bg-red-nuanced)
-      (fg-active-argument red-warmer)
-      (bg-active-value bg-cyan-nuanced)
-      (fg-active-value cyan)
-
-;;;; Code mappings
-
-      (bracket fg-main)
-      (builtin magenta)
-      (comment red-faint)
-      (constant green-faint)
-      (delimiter fg-main)
-      (docmarkup magenta-faint)
-      (docstring fg-alt)
-      (fnname cyan-warmer)
-      (keyword red-cooler)
-      (number fg-main)
-      (operator fg-main)
-      (preprocessor red-warmer)
-      (property cyan-cooler)
-      (punctuation fg-main)
-      (rx-backslash magenta)
-      (rx-construct red)
-      (string cyan)
-      (type blue-warmer)
-      (variable cyan-cooler)
-
-;;;; Accent mappings
-
-      (accent-0 cyan)
-      (accent-1 red-warmer)
-      (accent-2 cyan-cooler)
-      (accent-3 magenta)
-
-;;;; Button mappings
-
-      (fg-button-active fg-main)
-      (fg-button-inactive fg-dim)
-      (bg-button-active bg-active)
-      (bg-button-inactive bg-dim)
-
-;;;; Completion mappings
-
-      (fg-completion-match-0 cyan)
-      (fg-completion-match-1 red-warmer)
-      (fg-completion-match-2 magenta)
-      (fg-completion-match-3 cyan-cooler)
-      (bg-completion-match-0 unspecified)
-      (bg-completion-match-1 unspecified)
-      (bg-completion-match-2 unspecified)
-      (bg-completion-match-3 unspecified)
-
-;;;; Date mappings
-
-      (date-common cyan-cooler)
-      (date-deadline red)
-      (date-deadline-subtle red-faint)
-      (date-event fg-alt)
-      (date-holiday red-intense)
-      (date-holiday-other cyan-warmer)
-      (date-now fg-main)
-      (date-range fg-alt)
-      (date-scheduled magenta)
-      (date-scheduled-subtle magenta-faint)
-      (date-weekday cyan)
-      (date-weekend magenta-warmer)
-
-;;;; Line number mappings
-
-      (fg-line-number-inactive fg-dim)
-      (fg-line-number-active fg-main)
-      (bg-line-number-inactive bg-dim)
-      (bg-line-number-active bg-active)
-
-;;;; Link mappings
-
-      (fg-link cyan)
-      (bg-link unspecified)
-      (underline-link cyan)
-
-      (fg-link-symbolic cyan-cooler)
-      (bg-link-symbolic unspecified)
-      (underline-link-symbolic cyan-cooler)
-
-      (fg-link-visited magenta)
-      (bg-link-visited unspecified)
-      (underline-link-visited magenta)
-
-;;;; Mail mappings
-
-      (mail-cite-0 cyan-faint)
-      (mail-cite-1 red-faint)
-      (mail-cite-2 magenta-warmer)
-      (mail-cite-3 cyan-warmer)
-      (mail-part cyan-cooler)
-      (mail-recipient cyan)
-      (mail-subject red-cooler)
-      (mail-other cyan)
-
-;;;; Mark mappings
-
-      (bg-mark-delete bg-red-subtle)
-      (fg-mark-delete red)
-      (bg-mark-select bg-cyan-subtle)
-      (fg-mark-select cyan)
-      (bg-mark-other bg-magenta-subtle)
-      (fg-mark-other magenta-warmer)
-
-;;;; Prompt mappings
-
-      (fg-prompt cyan-cooler)
-      (bg-prompt unspecified)
-
-;;;; Prose mappings
-
-      (bg-prose-block-delimiter bg-dim)
-      (fg-prose-block-delimiter fg-dim)
-      (bg-prose-block-contents bg-dim)
-
-      (bg-prose-code unspecified)
-      (fg-prose-code cyan)
-
-      (bg-prose-macro unspecified)
-      (fg-prose-macro red-warmer)
-
-      (bg-prose-verbatim unspecified)
-      (fg-prose-verbatim magenta-warmer)
-
-      (prose-done cyan)
-      (prose-todo red)
-
-      (prose-metadata fg-dim)
-      (prose-metadata-value fg-alt)
-
-      (prose-table fg-alt)
-      (prose-table-formula red-cooler)
-
-      (prose-tag fg-alt)
-
-;;;; Rainbow mappings
-
-      (rainbow-0 cyan)
-      (rainbow-1 red)
-      (rainbow-2 cyan-warmer)
-      (rainbow-3 red-cooler)
-      (rainbow-4 cyan-cooler)
-      (rainbow-5 magenta)
-      (rainbow-6 cyan-faint)
-      (rainbow-7 magenta-faint)
-      (rainbow-8 red-faint)
-
-;;;; Search mappings
-
-      (bg-search-current bg-red-intense)
-      (bg-search-lazy bg-cyan-intense)
-      (bg-search-replace bg-magenta-intense)
-
-      (bg-search-rx-group-0 bg-blue-intense)
-      (bg-search-rx-group-1 bg-magenta-intense)
-      (bg-search-rx-group-2 bg-cyan-subtle)
-      (bg-search-rx-group-3 bg-red-subtle)
-
-;;;; Space mappings
-
-      (bg-space unspecified)
-      (fg-space border)
-      (bg-space-err bg-red-intense)
-
-;;;; Terminal mappings
-
-      (bg-term-black           "#000000")
-      (fg-term-black           "#000000")
-      (bg-term-black-bright    "#595959")
-      (fg-term-black-bright    "#595959")
-
-      (bg-term-red             red)
-      (fg-term-red             red)
-      (bg-term-red-bright      red-warmer)
-      (fg-term-red-bright      red-warmer)
-
-      (bg-term-green           green)
-      (fg-term-green           green)
-      (bg-term-green-bright    green-cooler)
-      (fg-term-green-bright    green-cooler)
-
-      (bg-term-yellow          yellow)
-      (fg-term-yellow          yellow)
-      (bg-term-yellow-bright   yellow-warmer)
-      (fg-term-yellow-bright   yellow-warmer)
-
-      (bg-term-blue            blue)
-      (fg-term-blue            blue)
-      (bg-term-blue-bright     blue-warmer)
-      (fg-term-blue-bright     blue-warmer)
-
-      (bg-term-magenta         magenta)
-      (fg-term-magenta         magenta)
-      (bg-term-magenta-bright  magenta-cooler)
-      (fg-term-magenta-bright  magenta-cooler)
-
-      (bg-term-cyan            cyan)
-      (fg-term-cyan            cyan)
-      (bg-term-cyan-bright     cyan-cooler)
-      (fg-term-cyan-bright     cyan-cooler)
-
-      (bg-term-white           "#a6a6a6")
-      (fg-term-white           "#a6a6a6")
-      (bg-term-white-bright    "#ffffff")
-      (fg-term-white-bright    "#ffffff")
-
-;;;; Heading mappings
-
-      (fg-heading-0 cyan-cooler)
-      (fg-heading-1 fg-main)
-      (fg-heading-2 red-faint)
-      (fg-heading-3 cyan-faint)
-      (fg-heading-4 magenta)
-      (fg-heading-5 green-faint)
-      (fg-heading-6 magenta-faint)
-      (fg-heading-7 cyan-faint)
-      (fg-heading-8 fg-dim)
-
-      (bg-heading-0 unspecified)
-      (bg-heading-1 unspecified)
-      (bg-heading-2 unspecified)
-      (bg-heading-3 unspecified)
-      (bg-heading-4 unspecified)
-      (bg-heading-5 unspecified)
-      (bg-heading-6 unspecified)
-      (bg-heading-7 unspecified)
-      (bg-heading-8 unspecified)
-
-      (overline-heading-0 unspecified)
-      (overline-heading-1 unspecified)
-      (overline-heading-2 unspecified)
-      (overline-heading-3 unspecified)
-      (overline-heading-4 unspecified)
-      (overline-heading-5 unspecified)
-      (overline-heading-6 unspecified)
-      (overline-heading-7 unspecified)
-      (overline-heading-8 unspecified))
-    "The entire palette of the `modus-vivendi-tritanopia' theme.
-
-Named colors have the form (COLOR-NAME HEX-VALUE) with the former
-as a symbol and the latter as a string.
-
-Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
-with both as symbols.  The latter is a named color that already
-exists in the palette and is associated with a HEX-VALUE.")
-
-  (defcustom modus-vivendi-tritanopia-palette-user nil
-    "Like the `modus-vivendi-tritanopia-palette' for user-defined entries.
+(unless (and (fboundp 'require-theme)
+             load-file-name
+             (equal (file-name-directory load-file-name)
+                    (expand-file-name "themes/" data-directory))
+             (require-theme 'modus-themes t))
+  (require 'modus-themes))
+
+(defcustom modus-vivendi-tritanopia-palette-user nil
+  "Like the `modus-vivendi-tritanopia-palette' for user-defined entries.
 This is meant to extend the palette with custom named colors and/or
 semantic palette mappings.  Those may then be used in combination with
 palette overrides (also see `modus-themes-common-palette-overrides' and
 `modus-vivendi-tritanopia-palette-overrides')."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.5.0")
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.5.0")
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Option to extend the palette for use with overrides"))
 
-  (defcustom modus-vivendi-tritanopia-palette-overrides nil
-    "Overrides for `modus-vivendi-tritanopia-palette'.
+(defcustom modus-vivendi-tritanopia-palette-overrides nil
+  "Overrides for `modus-vivendi-tritanopia-palette'.
 
 Mirror the elements of the aforementioned palette, overriding
 their value.
@@ -523,18 +68,28 @@ mappings, such as to make the cursor red.  Wherea theme-specific
 overrides can also be used to change the value of a named color,
 such as what hexadecimal RGB value the red-warmer symbol
 represents."
-    :group 'modus-themes
-    :package-version '(modus-themes . "4.0.0")
-    :version "30.1"
-    :type '(repeat (list symbol (choice symbol string)))
-    :set #'modus-themes--set-option
-    :initialize #'custom-initialize-default
-    :link '(info-link "(modus-themes) Palette overrides"))
+  :group 'modus-themes
+  :package-version '(modus-themes . "4.0.0")
+  :version "30.1"
+  :type '(repeat (list symbol (choice symbol string)))
+  :link '(info-link "(modus-themes) Palette overrides"))
 
-  (modus-themes-theme modus-vivendi-tritanopia
-                      modus-vivendi-tritanopia-palette
-                      modus-vivendi-tritanopia-palette-overrides)
+(modus-themes-theme
+ 'modus-vivendi-tritanopia
+ 'modus-themes
+ "Tritanopia-optimized theme with a black background.
+This variant is optimized for users with blue-yellow color
+deficiency (tritanopia).  It conforms with the highest
+legibility standard for color contrast between background and
+foreground in any given piece of text, which corresponds to a
+minimum contrast in relative luminance of 7:1 (WCAG AAA
+standard)."
+ 'dark
+ 'modus-themes-vivendi-tritanopia-palette
+ 'modus-vivendi-tritanopia-palette-user
+ 'modus-vivendi-tritanopia-palette-overrides
+ 'modus-themes-faces-tritanopia)
 
-  (provide-theme 'modus-vivendi-tritanopia))
+(provide 'modus-vivendi-tritanopia-theme)
 
 ;;; modus-vivendi-tritanopia-theme.el ends here

tests/modus-themes-test.el

@@ -0,0 +1,372 @@
+;;; modus-themes-test.el --- Unit tests for the Modus themes -*- lexical-binding: t -*-
+
+;; Copyright (C) 2025-2026  Free Software Foundation, Inc.
+
+;; Author: Protesilaos <info@protesilaos.com>,
+;;         Rudolf Adamkovič <rudolf@adamkovic.org>
+;; Maintainer: Protesilaos <info@protesilaos.com>
+;; URL: https://github.com/protesilaos/modus-themes
+
+;; This file is NOT part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Tests for the Modus themes.  Note that we are using Shorthands in
+;; this file, so the "mtt-" prefix really is "modus-themes-test-".
+;; Evaluate the following to learn more:
+;;
+;;    (info "(elisp) Shorthands")
+
+;;; Code:
+
+(require 'ert)
+(require 'modus-themes)
+
+(defmacro mtt-define-test (symbol &rest body)
+  "Write test for SYMBOL with BODY forms.
+If the `car' of BODY is a string, use it as the docstring of the test.
+Else provide a generic snippet of text."
+  (declare (doc-string 2) (indent defun))
+  (let* ((first (car body))
+         (has-docstring (stringp first))
+         (docstring (if has-docstring
+                        first
+                      (format "Test that `%s' does the right thing." symbol)))
+         (body (if has-docstring (cdr body) body)))
+    `(ert-deftest ,(intern (format "mtt-%s" symbol)) ()
+       ,docstring
+       ,@body)))
+
+(mtt-define-test modus-themes--color-hex-p
+  (should (modus-themes--color-hex-p "#123"))
+  (should (modus-themes--color-hex-p "#123456"))
+  (should (modus-themes--color-hex-p "#abc"))
+  (should (modus-themes--color-hex-p "#ABCDEF"))
+  (should-not (modus-themes--color-hex-p "abc"))
+  (should-not (modus-themes--color-hex-p "#abcd"))
+  (should-not (modus-themes--color-hex-p "#12345"))
+  (should-not (modus-themes--color-hex-p "#1234567"))
+  (should-not (modus-themes--color-hex-p "#zzz"))
+  (should-not (modus-themes--color-hex-p "#zzz"))
+  (should-not (modus-themes--color-hex-p "#12g456")))
+
+(mtt-define-test modus-themes--hex-or-name-to-rgb
+  (should (equal (modus-themes--hex-or-name-to-rgb "#fff") (list 1.0 1.0 1.0)))
+  (should (equal (modus-themes--hex-or-name-to-rgb "#000") (list 0.0 0.0 0.0)))
+  (should (equal (modus-themes--hex-or-name-to-rgb "#f00") (list 1.0 0.0 0.0)))
+  (should (equal (modus-themes--hex-or-name-to-rgb "#0f0") (list 0.0 1.0 0.0)))
+  (should (equal (modus-themes--hex-or-name-to-rgb "#00f") (list 0.0 0.0 1.0)))
+  (should (equal (modus-themes--hex-or-name-to-rgb "#ffffff") (list 1.0 1.0 1.0)))
+  (should (equal (modus-themes--hex-or-name-to-rgb "#000000") (list 0.0 0.0 0.0)))
+  (should (equal (modus-themes--hex-or-name-to-rgb "#ff0000") (list 1.0 0.0 0.0)))
+  (should (equal (modus-themes--hex-or-name-to-rgb "#00ff00") (list 0.0 1.0 0.0)))
+  ;; NOTE 2026-04-12: I do not need it to be precise here, hence the `format'.
+  (let ((rgb-rounded-fn
+         (lambda (hex)
+           (let ((rgb (modus-themes--hex-or-name-to-rgb hex)))
+             (mapcar (lambda (float) (string-to-number (format "%.2f" float))) rgb)))))
+    (should (equal (funcall rgb-rounded-fn "#800000") (list 0.5 0.0 0.0)))
+    (should (equal (funcall rgb-rounded-fn "#008000") (list 0.0 0.5 0.0)))
+    (should (equal (funcall rgb-rounded-fn "#000080") (list 0.0 0.0 0.5))))
+  (should-error (modus-themes--hex-or-name-to-rgb ""))
+  (should-error (modus-themes--hex-or-name-to-rgb "#"))
+  (should-error (modus-themes--hex-or-name-to-rgb "#1"))
+  (should-error (modus-themes--hex-or-name-to-rgb "#12"))
+  (should-error (modus-themes--hex-or-name-to-rgb "#1234"))
+  (should-error (modus-themes--hex-or-name-to-rgb "#12345"))
+  (should-error (modus-themes--hex-or-name-to-rgb "#gggggg"))
+  (should-error (modus-themes--hex-or-name-to-rgb (list 1.0 1.0 1.0))))
+
+(mtt-define-test modus-themes-wcag-formula
+  "Test that `modus-themes-wcag-formula' does the right thing.
+Also see `modus-themes-test--modus-themes--hex-to-rgb'."
+  (should (= (modus-themes-wcag-formula "#ffffff") 1.0))
+  (should (= (modus-themes-wcag-formula "#000000") 0.0))
+  (should-error (modus-themes-wcag-formula "#00000")))
+
+(mtt-define-test modus-themes-contrast
+  "Test that `modus-themes-contrast' works as intended.
+Also see `modus-themes-test--modus-themes--hex-to-rgb'."
+  (should (= (modus-themes-contrast "#ffffff" "#000000") 21.0))
+  (should (= (modus-themes-contrast "#000000" "#ffffff") 21.0))
+  ;; NOTE 2026-04-12: I do not need it to be precise here, hence the `format'.
+  (let ((float-2-fn (lambda (hex1 hex2) (string-to-number (format "%.2f" (modus-themes-contrast hex1 hex2))))))
+    (should (= (funcall float-2-fn "#ff0000" "#ffffff")  4.0))
+    (should (= (funcall float-2-fn "#00ff00" "#ffffff") 1.37))
+    (should (= (funcall float-2-fn "#0000ff" "#ffffff") 8.59))
+    (should (= (funcall float-2-fn "#ffff00" "#ffffff") 1.07))
+    (should (= (funcall float-2-fn "#00ffff" "#ffffff") 1.25))
+    (should (= (funcall float-2-fn "#ff00ff" "#ffffff") 3.14)))
+  (should-error (modus-themes-contrast "#ffffff" "#00000"))
+  (should-error (modus-themes-contrast "#fffff" "#00000")))
+
+(mtt-define-test modus-themes--color-eight-to-six-digits
+  (should (string= (modus-themes--color-eight-to-six-digits "#f00") "#f00"))
+  (should (string= (modus-themes--color-eight-to-six-digits "#ff1919") "#ff1919"))
+  (should (string= (modus-themes--color-eight-to-six-digits "#ffff19991999") "#ff1919")))
+
+(mtt-define-test modus-themes-adjust-value
+  "Test that `modus-themes-adjust-value' does the right thing.
+Also see `modus-themes-test--modus-themes--hex-to-rgb'."
+  (should (string= (modus-themes-adjust-value "#ff0000" 10) "#ff1919"))
+  (should (string= (modus-themes-adjust-value "#505050" 100) "#ffffff"))
+  (should (string= (modus-themes-adjust-value "#505050" -100) "#000000"))
+  (should (string= (modus-themes-adjust-value "#505050" 0) "#505050"))
+  (should-error (modus-themes-adjust-value "#ff00" 10)))
+
+(mtt-define-test modus-themes-activate
+  (if (custom-theme-p 'modus-operandi-tritanopia)
+      (should-not (modus-themes-activate 'modus-operandi-tritanopia))
+    (should (custom-theme-p 'modus-operandi-tritanopia))))
+
+(mtt-define-test modus-themes--belongs-to-family-p
+  (should (modus-themes--belongs-to-family-p 'modus-operandi 'modus-themes))
+  (should-not (modus-themes--belongs-to-family-p 'my-fancy-theme 'modus-themes))
+  (should-not (modus-themes--belongs-to-family-p 'modus-operandi 'my-fancy-themes)))
+
+(mtt-define-test modus-themes-get-all-known-themes
+  (should (equal (modus-themes-get-all-known-themes) modus-themes-items))
+  (should-not (modus-themes-get-all-known-themes 'my-fancy-themes)))
+
+(mtt-define-test modus-themes--background-p
+  (should (modus-themes--background-p 'modus-operandi 'light))
+  (should-not (modus-themes--background-p 'modus-operandi 'dark))
+  (should-not (modus-themes--background-p 'modus-operandi t))
+  (should-not (modus-themes--background-p 'modus-operandi :light)))
+
+(mtt-define-test modus-themes-sort
+  (let ((first-has-prefix-fn (lambda (themes prefix)
+                               (when-let* ((first (car themes))
+                                           (name (symbol-name first)))
+                                 (string-match-p prefix name)))))
+    (should (funcall first-has-prefix-fn (modus-themes-sort (reverse modus-themes-items) 'light) "modus-operandi"))
+    (should (funcall first-has-prefix-fn (modus-themes-sort modus-themes-items 'dark) "modus-vivendi"))))
+
+(mtt-define-test inheritance
+  "Ensure all faces inherit from valid faces."
+  ;; Third-party packages, loaded if possible to better test face inheritance.
+  (require 'font-latex nil t)
+  (let ((current-theme (modus-themes-get-current-theme)))
+    (unwind-protect
+        (progn
+          (modus-themes-load-theme 'modus-operandi)
+          (should-not (seq-filter
+                       (lambda (face)
+                         ;; The face either has no parent ...
+                         (if-let* ((parent (face-attribute face :inherit)))
+                             (and (symbolp parent)
+                                  (not (eq parent 'unspecified))
+                                  ;; ... or its parent is a valid face.
+                                  (not (facep parent)))))
+                       (face-list))))
+      (modus-themes-load-theme current-theme))))
+
+(mtt-define-test color-dark-p
+  (let ((modus-operandi-sample-foregrounds
+         '("#a60000"
+           "#972500"
+           "#a0132f"
+           "#7f0000"
+           "#006800"
+           "#316500"
+           "#00663f"
+           "#2a5045"
+           "#6f5500"
+           "#884900"
+           "#7a4f2f"
+           "#624416"
+           "#0031a9"
+           "#3548cf"
+           "#0000b0"
+           "#003497"
+           "#721045"
+           "#8f0075"
+           "#531ab6"
+           "#7c318f"
+           "#005e8b"
+           "#3f578f"
+           "#005f5f"
+           "#005077"))
+        (modus-vivendi-sample-foregrounds
+         '("#ff5f59"
+           "#ff6b55"
+           "#ff7f86"
+           "#ff9580"
+           "#44bc44"
+           "#70b900"
+           "#00c06f"
+           "#88ca9f"
+           "#d0bc00"
+           "#fec43f"
+           "#dfaf7a"
+           "#d2b580"
+           "#2fafff"
+           "#79a8ff"
+           "#00bcff"
+           "#82b0ec"
+           "#feacd0"
+           "#f78fe7"
+           "#b6a0ff"
+           "#caa6df"
+           "#00d3d0"
+           "#4ae2f0"
+           "#6ae4b9"
+           "#9ac8e0")))
+    (should (seq-every-p #'modus-themes-color-dark-p modus-operandi-sample-foregrounds))
+    (should-not (seq-every-p #'modus-themes-color-dark-p modus-vivendi-sample-foregrounds))))
+
+(mtt-define-test get-readable-foreground
+  (let ((modus-operandi-sample-foregrounds
+         '("#a60000"
+           "#972500"
+           "#a0132f"
+           "#7f0000"
+           "#006800"
+           "#316500"
+           "#00663f"
+           "#2a5045"
+           "#6f5500"
+           "#884900"
+           "#7a4f2f"
+           "#624416"
+           "#0031a9"
+           "#3548cf"
+           "#0000b0"
+           "#003497"
+           "#721045"
+           "#8f0075"
+           "#531ab6"
+           "#7c318f"
+           "#005e8b"
+           "#3f578f"
+           "#005f5f"
+           "#005077"))
+        (modus-vivendi-sample-foregrounds
+         '("#ff5f59"
+           "#ff6b55"
+           "#ff7f86"
+           "#ff9580"
+           "#44bc44"
+           "#70b900"
+           "#00c06f"
+           "#88ca9f"
+           "#d0bc00"
+           "#fec43f"
+           "#dfaf7a"
+           "#d2b580"
+           "#2fafff"
+           "#79a8ff"
+           "#00bcff"
+           "#82b0ec"
+           "#feacd0"
+           "#f78fe7"
+           "#b6a0ff"
+           "#caa6df"
+           "#00d3d0"
+           "#4ae2f0"
+           "#6ae4b9"
+           "#9ac8e0")))
+    (should (seq-every-p
+             (lambda (value)
+               (string= value "#ffffff"))
+             (mapcar #'modus-themes-get-readable-foreground modus-operandi-sample-foregrounds)))
+    (should (seq-every-p
+             (lambda (value)
+               (string= value "#000000"))
+             (mapcar #'modus-themes-get-readable-foreground modus-vivendi-sample-foregrounds)))))
+
+(mtt-define-test complete-palette-mappings
+  "Ensure all built-in palettes contain entries for all palette mappings.
+This computes a complete list of mapping names from the built-in palettes
+and then cross-checks the palettes against the list. This should help ensure
+consistency and completeness where adding a new mapping in one palette will
+fail this test until it is added in all palettes."
+  (let* ((operandi-names (seq-uniq (mapcar #'car modus-themes-operandi-palette)))
+         (operandi-tinted-names (seq-uniq (mapcar #'car modus-themes-operandi-tinted-palette)))
+         (operandi-deuteranopia-names (seq-uniq (mapcar #'car modus-themes-operandi-deuteranopia-palette)))
+         (operandi-tritanopia-names (seq-uniq (mapcar #'car modus-themes-operandi-tritanopia-palette)))
+         (vivendi-names (seq-uniq (mapcar #'car modus-themes-vivendi-palette)))
+         (vivendi-tinted-names (seq-uniq (mapcar #'car modus-themes-vivendi-tinted-palette)))
+         (vivendi-deuteranopia-names (seq-uniq (mapcar #'car modus-themes-vivendi-deuteranopia-palette)))
+         (vivendi-tritanopia-names (seq-uniq (mapcar #'car modus-themes-vivendi-tritanopia-palette)))
+         (all-names (seq-uniq (append operandi-names
+                                      operandi-tinted-names
+                                      operandi-deuteranopia-names
+                                      operandi-tritanopia-names
+                                      vivendi-names
+                                      vivendi-tinted-names
+                                      vivendi-deuteranopia-names
+                                      vivendi-tritanopia-names))))
+    (should (seq-empty-p (seq-difference all-names operandi-names)))
+    (should (seq-empty-p (seq-difference all-names operandi-tinted-names)))
+    (should (seq-empty-p (seq-difference all-names operandi-deuteranopia-names)))
+    (should (seq-empty-p (seq-difference all-names operandi-tritanopia-names)))
+    (should (seq-empty-p (seq-difference all-names vivendi-names)))
+    (should (seq-empty-p (seq-difference all-names vivendi-tinted-names)))
+    (should (seq-empty-p (seq-difference all-names vivendi-deuteranopia-names)))
+    (should (seq-empty-p (seq-difference all-names vivendi-tritanopia-names)))))
+
+(mtt-define-test modus-themes-generate-palette
+  "Ensure `modus-themes-generate-palette' provides enough mapping coverage
+such that the generated palette does not inherit explicit color values
+from a parent core palette."
+  (let* ((generated-palette (modus-themes-generate-palette
+                             '((fg-main "#ffffff")
+                               (bg-main "#000000")
+                               (red "#ff0000")
+                               (green "#00ff00")
+                               (yellow "#ffff00")
+                               (blue "#0000ff")
+                               (magenta "#ff00ff")
+                               (cyan "#00ffff"))))
+         ;; These are colors we expect to have an explicit hex value,
+         ;; either because they were provided explicitly in the call to
+         ;; `modus-themes-generate-palette' above, or because we expect
+         ;; `modus-themes-generate-palette' to generate the color.
+         (explicit-colors '( fg-main bg-main
+                             fg-alt fg-dim bg-inactive bg-active bg-dim border
+                             ;; cyan
+                             cyan bg-cyan-nuanced bg-cyan-subtle bg-cyan-intense
+                             cyan-intense cyan-faint cyan-cooler cyan-warmer
+                             ;; magenta
+                             magenta bg-magenta-nuanced bg-magenta-subtle bg-magenta-intense
+                             magenta-intense magenta-faint magenta-cooler magenta-warmer
+                             ;; blue
+                             blue bg-blue-nuanced bg-blue-subtle bg-blue-intense
+                             blue-intense blue-faint blue-cooler blue-warmer
+                             ;; yellow
+                             yellow bg-yellow-nuanced bg-yellow-subtle bg-yellow-intense
+                             yellow-intense yellow-faint yellow-cooler yellow-warmer
+                             ;; green
+                             green bg-green-nuanced bg-green-subtle bg-green-intense
+                             green-intense green-faint green-cooler green-warmer
+                             ;; red
+                             red bg-red-nuanced bg-red-subtle bg-red-intense
+                             red-intense red-faint red-cooler red-warmer)))
+    ;; Ensure all other colors in the palette map to a color name and not an
+    ;; explicit hex value. If this check fails, the offending color should
+    ;; be mapped to an appropriate color name in `modus-themes-generate-palette'.
+    (should (seq-empty-p (seq-remove (lambda (elem)
+                                       (or (member (car elem) explicit-colors)
+                                           (symbolp (cadr elem))))
+                                     generated-palette)))))
+
+(provide 'modus-themes-test)
+;;; modus-themes-test.el ends here
+
+;; Local Variables:
+;; read-symbol-shorthands: (("mtt" . "modus-themes-test-"))
+;; End: