md: 2026-08-16T12:25:10+02:00

1 files changed, 311 insertions, 111 deletions

diff --git a/themes/tinty-theme.el b/themes/tinty-theme.el
index 4fc283d..b3c7cd9 100644
--- a/themes/tinty-theme.el
+++ b/themes/tinty-theme.el
@@ -16,70 +16,124 @@
 
 ;;; Code:
 
+(defgroup tinty nil
+  "Tinty theme."
+  :group 'faces
+  :prefix "tinty-"
+  :tag "Tinty")
+
+(defcustom tinty-scale-headings t
+  "Whether to scale document and outline headings."
+  :type 'boolean
+  :group 'tinty)
+
+(defcustom tinty-height-document-title 1.4
+  "Height multiplier for document titles."
+  :type 'number
+  :group 'tinty)
+
+(defcustom tinty-height-1 1.3
+  "Height multiplier for level-one headings."
+  :type 'number
+  :group 'tinty)
+
+(defcustom tinty-height-2 1.2
+  "Height multiplier for level-two headings."
+  :type 'number
+  :group 'tinty)
+
+(defcustom tinty-height-3 1.1
+  "Height multiplier for level-three headings."
+  :type 'number
+  :group 'tinty)
+
+(defcustom tinty-italic-comments t
+  "Whether to render comments in italic."
+  :type 'boolean
+  :group 'tinty)
+
+(defcustom tinty-flat-mode-line nil
+  "Whether to render the mode line without a surrounding box."
+  :type 'boolean
+  :group 'tinty)
+
+(defcustom tinty-use-variable-pitch nil
+  "Whether to render headings in a variable-pitch font."
+  :type 'boolean
+  :group 'tinty)
+
 (deftheme tinty "Noctalia theme with proper color contrast.")
 
 (let* (;; Tinted8 UI surface colors
-       (ui-bg "#1e1e2e")
-       (ui-fg "#cdd6f4")
-       (ui-fg-dim "#a6adc8")
+       (ui-bg "#282a36")
+       (ui-fg "#f8f8f2")
+       (ui-fg-dim "#6272a4")
        ;; Use dim foreground for borders/muted chrome so they stay visible in
        ;; light variants (the raw border color is nearly white on latte).
-       (ui-border "#a6adc8")
-       (ui-line-highlight "#232336")
-       (ui-bg-dark "#181825")
-       (ui-bg-light "#45475a")
+       (ui-border "#6272a4")
+       (ui-line-highlight "#353747")
+       (ui-bg-dark "#191a21")
+       (ui-bg-light "#343746")
 
        ;; Tinted8 UI accent/status colors
-       (ui-accent "#b4befe")
-       (ui-link "#89b4fa")
-       (ui-info "#fab387")
-       (ui-error "#f38ba8")
-       (ui-success "#a6e3a1")
-       (ui-warning "#f9e2af")
+       (ui-accent "#bd93f9")
+       (ui-link "#8be9fd")
+       (ui-info "#8be9fd")
+       (ui-error "#ff5555")
+       (ui-success "#50fa7b")
+       (ui-warning "#ffb86c")
 
        ;; Tinted8 UI container colors (for BACKGROUNDS only)
-       (ui-selection-bg "#45475a")
-       (ui-selection-fg "#cdd6f4")
-       (ui-button-bg "#45475a")
-       (ui-button-fg "#cdd6f4")
-       (ui-tooltip-bg "#313244")
-       (ui-tooltip-fg "#cdd6f4")
-       (ui-active-text-bg "#9399b2")
-       (ui-active-text-fg "#cdd6f4")
-       (ui-search-bg "#94e2d5")
-       (ui-search-fg "#1e1e2e")
+       (ui-selection-bg "#44475a")
+       (ui-selection-fg "#f8f8f2")
+       (ui-button-bg "#343746")
+       (ui-button-fg "#f8f8f2")
+       (ui-tooltip-bg "#343746")
+       (ui-tooltip-fg "#f8f8f2")
+       (ui-active-text-bg "#44475a")
+       (ui-active-text-fg "#ffffff")
+       (ui-search-bg "#ffb86c")
+       (ui-search-fg "#282a36")
 
        ;; Tinted8 syntax colors
        ;; Comments use dim foreground instead of the raw syntax-comment gray,
        ;; which becomes almost invisible in light variants.
-       (syntax-comment "#a6adc8")
-       (syntax-constant "#fab387")
-       (syntax-function "#89b4fa")
-       (syntax-keyword "#cba6f7")
-       (syntax-string "#a6e3a1")
-       (syntax-type "#f9e2af")
+       (syntax-comment "#6272a4")
+       (syntax-constant "#ffb86c")
+       (syntax-function "#50fa7b")
+       (syntax-keyword "#ff79c6")
+       (syntax-string "#f1fa8c")
+       (syntax-type "#8be9fd")
        ;; Give variables/imported names a distinct hue instead of blending into
        ;; the default foreground.
-       (syntax-variable "#aa69f7")
-       (syntax-warning "#f6c5d3")
-       (syntax-preprocessor "#488dfd")
-       (syntax-annotation "#f9e2af")
-       (syntax-attribute "#c7dafa")
-       (syntax-number "#fab387")
-       (syntax-operator "#89dceb")
+       (syntax-variable "#f8f8f2")
+       (syntax-warning "#ff6e6e")
+       (syntax-preprocessor "#9954fb")
+       (syntax-annotation "#f1fa8c")
+       (syntax-attribute "#8be9fd")
+       (syntax-number "#ffb86c")
+       (syntax-operator "#8be9fd")
 
        ;; Raw palette colors for rainbow headings, delimiters, terminal faces,
        ;; and anywhere else we need a predictable hue cycle.
-       (pal-red "#f38ba8")
-       (pal-orange "#fab387")
-       (pal-yellow "#f9e2af")
-       (pal-green "#a6e3a1")
-       (pal-cyan "#94e2d5")
-       (pal-blue "#89b4fa")
-       (pal-magenta "#cba6f7")
-       (pal-gray "#9399b2")
-       (pal-white "#cdd6f4")
-       (pal-black "#1e1e2e"))
+       (pal-red "#ff5555")
+       (pal-orange "#ffb86c")
+       (pal-yellow "#f1fa8c")
+       (pal-green "#50fa7b")
+       (pal-cyan "#8be9fd")
+       (pal-blue "#bd93f9")
+       (pal-magenta "#ff79c6")
+       (pal-gray "#6272a4")
+       (pal-white "#f8f8f2")
+       (pal-black "#21222c")
+       (h1 (if tinty-scale-headings tinty-height-1 1.0))
+       (h2 (if tinty-scale-headings tinty-height-2 1.0))
+       (h3 (if tinty-scale-headings tinty-height-3 1.0))
+       (h-doc (if tinty-scale-headings tinty-height-document-title 1.0))
+       (comment-slant (if tinty-italic-comments 'italic 'normal))
+       (mode-line-box (unless tinty-flat-mode-line
+                        (list :line-width -1 :color ui-border)))
+       (vpitch (if tinty-use-variable-pitch 'variable-pitch 'default)))
 
   (custom-theme-set-faces
    'tinty
@@ -110,10 +164,10 @@
 
    ;; === Font-lock (driven by Tinted8 syntax properties) ===
    `(font-lock-builtin-face ((t (:foreground ,syntax-constant))))
-   `(font-lock-comment-face ((t (:foreground ,syntax-comment :slant italic))))
-   `(font-lock-comment-delimiter-face ((t (:foreground ,syntax-comment))))
+   `(font-lock-comment-face ((t (:foreground ,syntax-comment :slant ,comment-slant))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,syntax-comment :slant ,comment-slant))))
    `(font-lock-constant-face ((t (:foreground ,syntax-constant :weight bold))))
-   `(font-lock-doc-face ((t (:foreground ,syntax-comment :slant italic))))
+   `(font-lock-doc-face ((t (:foreground ,syntax-comment :slant ,comment-slant))))
    `(font-lock-doc-markup-face ((t (:foreground ,syntax-annotation))))
    `(font-lock-function-name-face ((t (:foreground ,syntax-function :weight bold))))
    `(font-lock-function-call-face ((t (:foreground ,syntax-function))))
@@ -143,8 +197,8 @@
    `(show-paren-mismatch ((t (:background ,ui-active-text-bg :foreground ,ui-error :weight bold :underline t))))
 
    ;; === Mode line ===
-   `(mode-line ((t (:background ,ui-line-highlight :foreground ,ui-fg :box (:line-width -1 :color ,ui-border)))))
-   `(mode-line-inactive ((t (:background ,ui-bg-dark :foreground ,ui-fg-dim :box (:line-width -1 :color ,ui-border)))))
+   `(mode-line ((t (:background ,ui-line-highlight :foreground ,ui-fg :box ,mode-line-box))))
+   `(mode-line-inactive ((t (:background ,ui-bg-dark :foreground ,ui-fg-dim :box ,mode-line-box))))
    `(mode-line-buffer-id ((t (:foreground ,ui-accent :weight bold))))
    `(mode-line-emphasis ((t (:foreground ,ui-fg :weight bold))))
    `(mode-line-highlight ((t (:foreground ,ui-accent :box nil))))
@@ -158,15 +212,15 @@
    `(org-meta-line ((t (:foreground ,ui-border :slant italic))))
 
    ;; === Org headings - rainbow cycle across the available palette ===
-   `(org-level-1 ((t (:foreground ,pal-red :weight bold :height 1.2))))
-   `(org-level-2 ((t (:foreground ,pal-orange :weight bold :height 1.1))))
-   `(org-level-3 ((t (:foreground ,pal-yellow :weight bold))))
-   `(org-level-4 ((t (:foreground ,pal-green :weight bold))))
-   `(org-level-5 ((t (:foreground ,pal-cyan :weight bold))))
-   `(org-level-6 ((t (:foreground ,pal-blue :weight bold))))
-   `(org-level-7 ((t (:foreground ,pal-magenta :weight bold))))
-   `(org-level-8 ((t (:foreground ,pal-gray :weight bold))))
-   `(org-document-title ((t (:foreground ,pal-red :weight bold :height 1.3))))
+   `(org-level-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1))))
+   `(org-level-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2))))
+   `(org-level-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3))))
+   `(org-level-4 ((t (:inherit ,vpitch :foreground ,pal-green :weight bold))))
+   `(org-level-5 ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold))))
+   `(org-level-6 ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold))))
+   `(org-level-7 ((t (:inherit ,vpitch :foreground ,pal-magenta :weight bold))))
+   `(org-level-8 ((t (:inherit ,vpitch :foreground ,pal-gray :weight bold))))
+   `(org-document-title ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h-doc))))
    `(org-document-info ((t (:foreground ,ui-fg-dim))))
    `(org-todo ((t (:foreground ,pal-orange :weight bold))))
    `(org-done ((t (:foreground ,pal-green :weight bold))))
@@ -290,13 +344,13 @@
 
    ;; === Terminal colors - mapped to the palette so they stay correct in both variants ===
    `(term-color-black ((t (:foreground ,ui-bg-dark :background ,ui-bg-dark))))
-   `(term-color-red ((t (:foreground "#f38ba8" :background "#f38ba8"))))
-   `(term-color-green ((t (:foreground "#a6e3a1" :background "#a6e3a1"))))
-   `(term-color-yellow ((t (:foreground "#f9e2af" :background "#f9e2af"))))
-   `(term-color-blue ((t (:foreground "#89b4fa" :background "#89b4fa"))))
-   `(term-color-magenta ((t (:foreground "#cba6f7" :background "#cba6f7"))))
-   `(term-color-cyan ((t (:foreground "#94e2d5" :background "#94e2d5"))))
-   `(term-color-white ((t (:foreground "#cdd6f4" :background "#cdd6f4"))))
+   `(term-color-red ((t (:foreground "#ff5555" :background "#ff5555"))))
+   `(term-color-green ((t (:foreground "#50fa7b" :background "#50fa7b"))))
+   `(term-color-yellow ((t (:foreground "#f1fa8c" :background "#f1fa8c"))))
+   `(term-color-blue ((t (:foreground "#bd93f9" :background "#bd93f9"))))
+   `(term-color-magenta ((t (:foreground "#ff79c6" :background "#ff79c6"))))
+   `(term-color-cyan ((t (:foreground "#8be9fd" :background "#8be9fd"))))
+   `(term-color-white ((t (:foreground "#f8f8f2" :background "#f8f8f2"))))
 
    ;; === EShell ===
    `(eshell-prompt ((t (:foreground ,ui-accent :weight bold))))
@@ -314,12 +368,12 @@
 
    ;; === Markdown - rainbow heading cycle ===
    `(markdown-header-face ((t (:foreground ,pal-red :weight bold))))
-   `(markdown-header-face-1 ((t (:foreground ,pal-red :weight bold :height 1.2))))
-   `(markdown-header-face-2 ((t (:foreground ,pal-orange :weight bold :height 1.1))))
-   `(markdown-header-face-3 ((t (:foreground ,pal-yellow :weight bold))))
-   `(markdown-header-face-4 ((t (:foreground ,pal-green :weight bold))))
-   `(markdown-header-face-5 ((t (:foreground ,pal-cyan :weight bold))))
-   `(markdown-header-face-6 ((t (:foreground ,pal-blue :weight bold))))
+   `(markdown-header-face-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1))))
+   `(markdown-header-face-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2))))
+   `(markdown-header-face-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3))))
+   `(markdown-header-face-4 ((t (:inherit ,vpitch :foreground ,pal-green :weight bold))))
+   `(markdown-header-face-5 ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold))))
+   `(markdown-header-face-6 ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold))))
    `(markdown-inline-code-face ((t (:foreground ,pal-cyan :background ,ui-bg-dark :inherit fixed-pitch))))
    `(markdown-code-face ((t (:background ,ui-bg-dark :extend t :inherit fixed-pitch))))
    `(markdown-pre-face ((t (:background ,ui-bg-dark :inherit fixed-pitch))))
@@ -351,10 +405,10 @@
    `(lsp-face-highlight-write ((t (:background ,ui-tooltip-bg :foreground ,ui-tooltip-fg :weight bold))))
 
    ;; === Info titles - rainbow heading cycle ===
-   `(info-title-1 ((t (:foreground ,pal-red :weight bold :height 1.3))))
-   `(info-title-2 ((t (:foreground ,pal-orange :weight bold :height 1.2))))
-   `(info-title-3 ((t (:foreground ,pal-yellow :weight bold :height 1.1))))
-   `(info-title-4 ((t (:foreground ,pal-green :weight bold))))
+   `(info-title-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1))))
+   `(info-title-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2))))
+   `(info-title-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3))))
+   `(info-title-4 ((t (:inherit ,vpitch :foreground ,pal-green :weight bold))))
    `(Info-quoted ((t (:foreground ,pal-cyan))))
    `(info-menu-header ((t (:foreground ,pal-red :weight bold))))
    `(info-menu-star ((t (:foreground ,pal-red))))
@@ -411,22 +465,22 @@
    `(linum-highlight-face ((t (:foreground ,ui-fg :weight normal))))
 
    ;; === Outline (non-org) - rainbow cycle ===
-   `(outline-1 ((t (:foreground ,pal-red :weight ultra-bold))))
-   `(outline-2 ((t (:foreground ,pal-orange :weight bold))))
-   `(outline-3 ((t (:foreground ,pal-yellow :weight bold))))
-   `(outline-4 ((t (:foreground ,pal-green))))
-   `(outline-5 ((t (:foreground ,pal-cyan))))
-   `(outline-6 ((t (:foreground ,pal-blue))))
-   `(outline-7 ((t (:foreground ,pal-magenta))))
-   `(outline-8 ((t (:foreground ,pal-gray))))
-   `(outline-minor-1 ((t (:foreground ,pal-red :weight ultra-bold))))
-   `(outline-minor-2 ((t (:foreground ,pal-orange :weight bold))))
-   `(outline-minor-3 ((t (:foreground ,pal-yellow :weight bold))))
-   `(outline-minor-4 ((t (:foreground ,pal-green))))
-   `(outline-minor-5 ((t (:foreground ,pal-cyan))))
-   `(outline-minor-6 ((t (:foreground ,pal-blue))))
-   `(outline-minor-7 ((t (:foreground ,pal-magenta))))
-   `(outline-minor-8 ((t (:foreground ,pal-gray))))
+   `(outline-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight ultra-bold :height ,h1))))
+   `(outline-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2))))
+   `(outline-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3))))
+   `(outline-4 ((t (:inherit ,vpitch :foreground ,pal-green))))
+   `(outline-5 ((t (:inherit ,vpitch :foreground ,pal-cyan))))
+   `(outline-6 ((t (:inherit ,vpitch :foreground ,pal-blue))))
+   `(outline-7 ((t (:inherit ,vpitch :foreground ,pal-magenta))))
+   `(outline-8 ((t (:inherit ,vpitch :foreground ,pal-gray))))
+   `(outline-minor-1 ((t (:inherit ,vpitch :foreground ,pal-red :weight ultra-bold :height ,h1))))
+   `(outline-minor-2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2))))
+   `(outline-minor-3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3))))
+   `(outline-minor-4 ((t (:inherit ,vpitch :foreground ,pal-green))))
+   `(outline-minor-5 ((t (:inherit ,vpitch :foreground ,pal-cyan))))
+   `(outline-minor-6 ((t (:inherit ,vpitch :foreground ,pal-blue))))
+   `(outline-minor-7 ((t (:inherit ,vpitch :foreground ,pal-magenta))))
+   `(outline-minor-8 ((t (:inherit ,vpitch :foreground ,pal-gray))))
 
    ;; === Org (missing faces) ===
    `(org-archived ((t (:foreground ,ui-border))))
@@ -509,14 +563,14 @@
    `(ansi-color-magenta ((t (:foreground ,pal-magenta :background ,pal-magenta))))
    `(ansi-color-cyan ((t (:foreground ,pal-cyan :background ,pal-cyan))))
    `(ansi-color-white ((t (:foreground ,pal-white :background ,pal-white))))
-   `(ansi-color-bright-black ((t (:foreground "#45475a" :background "#45475a"))))
-   `(ansi-color-bright-red ((t (:foreground "#f6c5d3" :background "#f6c5d3"))))
-   `(ansi-color-bright-green ((t (:foreground "#d4efd2" :background "#d4efd2"))))
-   `(ansi-color-bright-yellow ((t (:foreground "#fcf6e9" :background "#fcf6e9"))))
-   `(ansi-color-bright-blue ((t (:foreground "#c7dafa" :background "#c7dafa"))))
-   `(ansi-color-bright-magenta ((t (:foreground "#ece0fb" :background "#ece0fb"))))
-   `(ansi-color-bright-cyan ((t (:foreground "#c6ede6" :background "#c6ede6"))))
-   `(ansi-color-bright-white ((t (:foreground "#bac2de" :background "#bac2de"))))
+   `(ansi-color-bright-black ((t (:foreground "#6272a4" :background "#6272a4"))))
+   `(ansi-color-bright-red ((t (:foreground "#ff6e6e" :background "#ff6e6e"))))
+   `(ansi-color-bright-green ((t (:foreground "#69ff94" :background "#69ff94"))))
+   `(ansi-color-bright-yellow ((t (:foreground "#ffffa5" :background "#ffffa5"))))
+   `(ansi-color-bright-blue ((t (:foreground "#d6acff" :background "#d6acff"))))
+   `(ansi-color-bright-magenta ((t (:foreground "#ff92df" :background "#ff92df"))))
+   `(ansi-color-bright-cyan ((t (:foreground "#a4ffff" :background "#a4ffff"))))
+   `(ansi-color-bright-white ((t (:foreground "#ffffff" :background "#ffffff"))))
 
    ;; === Anzu ===
    `(anzu-replace-highlight ((t (:background ,ui-line-highlight :foreground ,ui-error :weight bold :strike-through t))))
@@ -586,6 +640,152 @@
    `(custom-visibility ((t (:foreground ,ui-link :height 0.8 :underline t))))
 
    ;; === Built-in packages (batppuccin-inspired additions) ===
+   `(anzu-match-1 ((t (:foreground ,ui-bg :background ,pal-blue))))
+   `(anzu-match-2 ((t (:foreground ,ui-bg :background ,pal-cyan))))
+   `(anzu-match-3 ((t (:foreground ,ui-bg :background ,pal-orange))))
+   `(anzu-mode-line ((t (:foreground ,pal-cyan :weight bold))))
+   `(anzu-mode-line-no-match ((t (:foreground ,ui-error :weight bold))))
+   `(asciidoc-admonition-caution-face ((t (:background ,ui-bg-dark :extend t))))
+   `(asciidoc-admonition-caution-label-face ((t (:foreground ,pal-yellow :weight bold))))
+   `(asciidoc-admonition-important-face ((t (:background ,ui-bg-dark :extend t))))
+   `(asciidoc-admonition-important-label-face ((t (:foreground ,syntax-keyword :weight bold))))
+   `(asciidoc-admonition-note-face ((t (:background ,ui-button-bg :extend t))))
+   `(asciidoc-admonition-note-label-face ((t (:foreground ,pal-blue :weight bold))))
+   `(asciidoc-admonition-tip-face ((t (:background ,ui-tooltip-bg :extend t))))
+   `(asciidoc-admonition-tip-label-face ((t (:foreground ,ui-success :weight bold))))
+   `(asciidoc-admonition-warning-face ((t (:background ,ui-active-text-bg :extend t))))
+   `(asciidoc-admonition-warning-label-face ((t (:foreground ,ui-error :weight bold))))
+   `(asciidoc-anchor-face ((t (:foreground ,pal-magenta))))
+   `(asciidoc-code-face ((t (:foreground ,pal-cyan :background ,ui-bg-dark :extend t))))
+   `(asciidoc-cross-reference-face ((t (:foreground ,pal-magenta :underline t))))
+   `(asciidoc-document-title-face ((t (:inherit ,vpitch :foreground ,ui-fg :weight bold :height ,h-doc))))
+   `(asciidoc-footnote-marker-face ((t (:foreground ,pal-cyan))))
+   `(asciidoc-footnote-text-face ((t (:foreground ,ui-fg-dim))))
+   `(asciidoc-highlight-face ((t (:foreground ,ui-bg :background ,pal-yellow))))
+   `(asciidoc-link-face ((t (:foreground ,pal-blue :underline t))))
+   `(asciidoc-link-mouse-face ((t (:foreground ,pal-blue :background ,ui-bg-light :underline t))))
+   `(asciidoc-markup-face ((t (:foreground ,ui-fg-dim))))
+   `(asciidoc-metadata-key-face ((t (:foreground ,ui-fg-dim))))
+   `(asciidoc-metadata-value-face ((t (:foreground ,ui-fg-dim))))
+   `(asciidoc-overline-face ((t (:overline t))))
+   `(asciidoc-strike-through-face ((t (:foreground ,ui-fg-dim :strike-through t))))
+   `(asciidoc-subscript-face ((t (:foreground ,ui-fg :height 0.8))))
+   `(asciidoc-superscript-face ((t (:foreground ,ui-fg :height 0.8))))
+   `(asciidoc-title-1-face ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1))))
+   `(asciidoc-title-2-face ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2))))
+   `(asciidoc-title-3-face ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3))))
+   `(asciidoc-title-4-face ((t (:inherit ,vpitch :foreground ,pal-green :weight bold))))
+   `(asciidoc-title-5-face ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold))))
+   `(asciidoc-underline-face ((t (:underline t))))
+   `(asciidoc-url-face ((t (:foreground ,pal-blue :underline t))))
+   `(breadcrumb-face ((t (:foreground ,ui-fg-dim))))
+   `(breadcrumb-imenu-base-face ((t (:foreground ,ui-fg-dim :weight bold))))
+   `(breadcrumb-imenu-crumbs-face ((t (:foreground ,ui-fg-dim))))
+   `(breadcrumb-imenu-leaf-face ((t (:foreground ,pal-blue :weight bold))))
+   `(breadcrumb-project-base-face ((t (:foreground ,ui-fg-dim :weight bold))))
+   `(breadcrumb-project-crumbs-face ((t (:foreground ,ui-fg-dim))))
+   `(breadcrumb-project-leaf-face ((t (:foreground ,ui-fg :weight bold))))
+   `(cider-debug-prompt-face ((t (:foreground ,syntax-keyword :weight bold))))
+   `(cider-fringe-bad-face ((t (:foreground ,ui-error))))
+   `(cider-fringe-stale-face ((t (:foreground ,pal-yellow))))
+   `(cider-reader-conditional-face ((t (:foreground ,ui-fg-dim))))
+   `(cider-repl-result-face ((t (:foreground ,pal-cyan))))
+   `(clojure-character-face ((t (:foreground ,ui-success))))
+   `(clojure-discard-face ((t (:foreground ,ui-fg-dim :slant italic))))
+   `(clojure-keyword-face ((t (:foreground ,pal-cyan))))
+   `(completion-preview ((t (:foreground ,ui-fg-dim))))
+   `(completion-preview-common ((t (:foreground ,ui-fg-dim))))
+   `(completion-preview-exact ((t (:foreground ,ui-fg-dim :underline t))))
+   `(copilot-overlay-face ((t (:foreground ,ui-fg-dim :slant italic))))
+   `(corfu-popupinfo ((t (:foreground ,ui-fg :background ,ui-bg-dark))))
+   `(dictionary-button-face ((t (:foreground ,pal-blue :underline t :weight bold))))
+   `(dictionary-reference-face ((t (:foreground ,ui-link :underline t))))
+   `(dictionary-word-definition-face ((t (:foreground ,ui-fg))))
+   `(dictionary-word-entry-face ((t (:foreground ,pal-blue :weight bold))))
+   `(easy-kill-origin ((t (:foreground ,ui-bg :background ,ui-error))))
+   `(easy-kill-selection ((t (:background ,ui-selection-bg :extend t))))
+   `(erlang-edoc-heading ((t (:foreground ,syntax-keyword :weight bold))))
+   `(erlang-edoc-macro ((t (:foreground ,pal-magenta))))
+   `(erlang-edoc-tag ((t (:foreground ,ui-fg-dim))))
+   `(erlang-edoc-todo ((t (:foreground ,ui-error :weight bold))))
+   `(erlang-edoc-verbatim ((t (:foreground ,pal-cyan))))
+   `(erlang-font-lock-exported-function-name-face ((t (:foreground ,pal-blue :weight bold))))
+   `(font-latex-bold-face ((t (:foreground ,ui-fg :weight bold))))
+   `(font-latex-italic-face ((t (:foreground ,ui-fg :slant italic))))
+   `(font-latex-math-face ((t (:foreground ,pal-cyan))))
+   `(font-latex-script-char-face ((t (:foreground ,pal-orange))))
+   `(font-latex-sectioning-0-face ((t (:inherit ,vpitch :foreground ,pal-red :height ,h1 :weight bold))))
+   `(font-latex-sectioning-1-face ((t (:inherit ,vpitch :foreground ,pal-orange :height ,h2 :weight bold))))
+   `(font-latex-sectioning-2-face ((t (:inherit ,vpitch :foreground ,pal-yellow :height ,h3 :weight bold))))
+   `(font-latex-sectioning-3-face ((t (:inherit ,vpitch :foreground ,pal-green :weight bold))))
+   `(font-latex-sectioning-4-face ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold))))
+   `(font-latex-sectioning-5-face ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold))))
+   `(font-latex-sedate-face ((t (:foreground ,ui-fg-dim))))
+   `(font-latex-slide-title-face ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold :height ,h1))))
+   `(font-latex-string-face ((t (:foreground ,ui-success))))
+   `(font-latex-subscript-face ((t (:height 0.9))))
+   `(font-latex-superscript-face ((t (:height 0.9))))
+   `(font-latex-verbatim-face ((t (:foreground ,pal-cyan :inherit fixed-pitch))))
+   `(font-latex-warning-face ((t (:foreground ,pal-orange :weight bold))))
+   `(font-latex-doctex-documentation-face ((t (:background ,ui-bg-dark))))
+   `(font-latex-doctex-preprocessor-face ((t (:foreground ,syntax-keyword))))
+   `(git-timemachine-commit ((t (:foreground ,pal-orange :weight bold))))
+   `(git-timemachine-minibuffer-author-face ((t (:foreground ,pal-blue))))
+   `(git-timemachine-minibuffer-detail-face ((t (:foreground ,pal-cyan))))
+   `(gptel-context-deletion-face ((t (:background ,ui-active-text-bg :extend t))))
+   `(gptel-context-highlight-face ((t (:background ,ui-bg-light :extend t))))
+   `(gptel-response-fringe-highlight ((t (:foreground ,pal-blue))))
+   `(gptel-response-highlight ((t (:background ,ui-bg-dark :extend t))))
+   `(gptel-rewrite-highlight-face ((t (:background ,ui-button-bg :extend t))))
+   `(haskell-constructor-face ((t (:foreground ,pal-yellow))))
+   `(haskell-definition-face ((t (:foreground ,pal-blue))))
+   `(haskell-error-face ((t (:underline (:style wave :color ,ui-error)))))
+   `(haskell-hole-face ((t (:foreground ,pal-yellow :weight bold))))
+   `(haskell-interactive-face-compile-error ((t (:foreground ,ui-error :weight bold))))
+   `(haskell-interactive-face-compile-warning ((t (:foreground ,pal-yellow :weight bold))))
+   `(haskell-interactive-face-garbage ((t (:foreground ,ui-fg-dim))))
+   `(haskell-interactive-face-prompt ((t (:foreground ,pal-blue :weight bold))))
+   `(haskell-interactive-face-prompt-cont ((t (:foreground ,ui-link))))
+   `(haskell-interactive-face-result ((t (:foreground ,ui-success))))
+   `(haskell-keyword-face ((t (:foreground ,syntax-keyword))))
+   `(haskell-literate-comment-face ((t (:foreground ,ui-fg-dim :slant italic))))
+   `(haskell-operator-face ((t (:foreground ,pal-cyan))))
+   `(haskell-pragma-face ((t (:foreground ,pal-magenta))))
+   `(haskell-quasi-quote-face ((t (:foreground ,ui-success))))
+   `(haskell-type-face ((t (:foreground ,pal-yellow))))
+   `(haskell-warning-face ((t (:underline (:style wave :color ,pal-yellow)))))
+   `(inf-ruby-result-overlay-face ((t (:foreground ,ui-success :background ,ui-bg-dark :box (:line-width -1 :color ,ui-bg-light)))))
+   `(jinx-annotation ((t (:foreground ,ui-fg-dim))))
+   `(jinx-highlight ((t (:foreground ,ui-bg :background ,ui-error :weight bold))))
+   `(jinx-key ((t (:foreground ,syntax-keyword :weight bold))))
+   `(jinx-misspelled ((t (:underline (:style wave :color ,ui-error)))))
+   `(jinx-save ((t (:foreground ,pal-orange :weight bold))))
+   `(mistty-fringe-face ((t (:foreground ,ui-border))))
+   `(nrepl-message-1-face ((t (:foreground ,ui-error))))
+   `(nrepl-message-2-face ((t (:foreground ,pal-orange))))
+   `(nrepl-message-3-face ((t (:foreground ,pal-yellow))))
+   `(nrepl-message-4-face ((t (:foreground ,ui-success))))
+   `(nrepl-message-5-face ((t (:foreground ,pal-cyan))))
+   `(nrepl-message-6-face ((t (:foreground ,ui-link))))
+   `(nrepl-message-7-face ((t (:foreground ,pal-blue))))
+   `(nrepl-message-8-face ((t (:foreground ,pal-magenta))))
+   `(shr-h1 ((t (:inherit ,vpitch :foreground ,pal-red :weight bold :height ,h1))))
+   `(shr-h2 ((t (:inherit ,vpitch :foreground ,pal-orange :weight bold :height ,h2))))
+   `(shr-h3 ((t (:inherit ,vpitch :foreground ,pal-yellow :weight bold :height ,h3))))
+   `(shr-h4 ((t (:inherit ,vpitch :foreground ,pal-green :weight bold))))
+   `(shr-h5 ((t (:inherit ,vpitch :foreground ,pal-cyan :weight bold))))
+   `(shr-h6 ((t (:inherit ,vpitch :foreground ,pal-blue :weight bold))))
+   `(shr-link ((t (:foreground ,pal-blue :underline t))))
+   `(shr-selected-link ((t (:foreground ,pal-orange :underline t))))
+   `(shr-code ((t (:foreground ,pal-cyan :background ,ui-bg-dark))))
+   `(shr-mark ((t (:foreground ,ui-bg :background ,pal-yellow))))
+   `(vundo-branch-stem ((t (:foreground ,ui-border))))
+   `(vundo-diff-highlight ((t (:foreground ,pal-orange :weight bold))))
+   `(vundo-highlight ((t (:foreground ,pal-blue :weight bold))))
+   `(vundo-last-saved ((t (:foreground ,ui-success :weight bold))))
+   `(vundo-node ((t (:foreground ,ui-fg-dim))))
+   `(vundo-saved ((t (:foreground ,ui-success))))
+   `(vundo-stem ((t (:foreground ,ui-border))))
    ;; === Calendar ===
    `(calendar-today ((t (:foreground ,pal-blue :weight bold :underline t))))
    `(calendar-weekend-header ((t (:foreground ,ui-error))))
@@ -1016,8 +1216,8 @@
    `(markdown-blockquote-face ((t (:foreground ,ui-border :slant italic))))
    `(markdown-bold-face ((t (:foreground ,ui-fg :weight bold))))
    `(markdown-header-delimiter-face ((t (:foreground ,ui-accent :weight bold))))
-   `(markdown-header-face-5 ((t (:foreground ,ui-accent :weight bold))))
-   `(markdown-header-face-6 ((t (:foreground ,ui-link :weight bold))))
+   `(markdown-header-face-5 ((t (:inherit ,vpitch :foreground ,ui-accent :weight bold))))
+   `(markdown-header-face-6 ((t (:inherit ,vpitch :foreground ,ui-link :weight bold))))
    `(markdown-html-attr-name-face ((t (:foreground ,ui-accent))))
    `(markdown-html-attr-value-face ((t (:foreground ,ui-info))))
    `(markdown-html-entity-face ((t (:foreground ,ui-accent :slant italic))))
@@ -1167,14 +1367,14 @@
    ;; === Term (extended) ===
    `(term ((t (:foreground ,ui-fg :background ,ui-bg))))
    `(term-bold ((t (:weight bold))))
-   `(term-color-bright-black ((t (:foreground "#45475a" :background "#45475a"))))
-   `(term-color-bright-red ((t (:foreground "#f6c5d3" :background "#f6c5d3"))))
-   `(term-color-bright-green ((t (:foreground "#d4efd2" :background "#d4efd2"))))
-   `(term-color-bright-yellow ((t (:foreground "#fcf6e9" :background "#fcf6e9"))))
-   `(term-color-bright-blue ((t (:foreground "#c7dafa" :background "#c7dafa"))))
-   `(term-color-bright-magenta ((t (:foreground "#ece0fb" :background "#ece0fb"))))
-   `(term-color-bright-cyan ((t (:foreground "#c6ede6" :background "#c6ede6"))))
-   `(term-color-bright-white ((t (:foreground "#bac2de" :background "#bac2de"))))
+   `(term-color-bright-black ((t (:foreground "#6272a4" :background "#6272a4"))))
+   `(term-color-bright-red ((t (:foreground "#ff6e6e" :background "#ff6e6e"))))
+   `(term-color-bright-green ((t (:foreground "#69ff94" :background "#69ff94"))))
+   `(term-color-bright-yellow ((t (:foreground "#ffffa5" :background "#ffffa5"))))
+   `(term-color-bright-blue ((t (:foreground "#d6acff" :background "#d6acff"))))
+   `(term-color-bright-magenta ((t (:foreground "#ff92df" :background "#ff92df"))))
+   `(term-color-bright-cyan ((t (:foreground "#a4ffff" :background "#a4ffff"))))
+   `(term-color-bright-white ((t (:foreground "#ffffff" :background "#ffffff"))))
 
    ;; === Transient ===
    `(transient-heading ((t (:foreground ,pal-blue :weight bold))))