diff --git a/dev/flake-module.nix b/dev/flake-module.nix
index 6da9db55..3d1ea1ce 100644
--- a/dev/flake-module.nix
+++ b/dev/flake-module.nix
@@ -53,7 +53,7 @@
             help = "generate new screenshots";
             category = "emacs";
             command = ''
-              exec nix run $PRJ_ROOT/dev#updateScreenshots
+              exec nix run $PRJ_ROOT#updateScreenshots
             '';
           }
         ];
@@ -88,7 +88,7 @@
           text = ''
             EMACS_DIR="$(mktemp -td emacs.XXXXXXXXXX)"
             lndir -silent ${config.packages.emacs-config} "$EMACS_DIR"
-            emacs -fs --init-directory "$EMACS_DIR" --load ${./screenshots.el} --eval '(kill-emacs)'
+            emacs --fullscreen --init-directory "$EMACS_DIR" --load ${./screenshots.el} --eval '(kill-emacs)'
           '';
         };
       };
diff --git a/dev/screenshots.el b/dev/screenshots.el
index 5a4e1180..b9b6d27e 100644
--- a/dev/screenshots.el
+++ b/dev/screenshots.el
@@ -24,28 +24,29 @@
        (captures
         `((org-mode
            . ((find-file (expand-file-name "samples/sample.org" ,media-dir))
-              (no-fringes)
+              (goto-char 49)
               (follow-mode 1)
               (split-window-right)
-              (goto-char 49)))
+              (follow-redraw)))
           (markdown-mode
            . ((find-file (expand-file-name "samples/sample.md" ,media-dir))
-              (no-fringes)
+              (goto-char 51)
               (follow-mode 1)
               (split-window-right)
-              (goto-char 51)))
+              (follow-redraw)))
           (rst-mode
            . ((find-file (expand-file-name "samples/sample.rst" ,media-dir))
-              (no-fringes)
+              (goto-char 239)
               (follow-mode 1)
               (split-window-right)
-              (goto-char 239)))
+              (follow-redraw)))
           (emacs-lisp-mode
            . ((find-file (expand-file-name "../lisp/readable-mono-theme.el" ,media-dir))
-              (no-fringes)
+              (goto-char 1223)
               (follow-mode 1)
               (split-window-right)
-              (goto-char 1443))))))
+              (follow-redraw))))))
+  (global-hide-fringes-mode 1)
   (blink-cursor-mode 0)
 
   (dolist (capture captures)
@@ -55,17 +56,19 @@
 
       (dolist (action actions) (eval action))
 
+      (font-lock-update)
+
       (dolist (background-mode '(light dark))
         (customize-set-variable 'frame-background-mode background-mode)
         (customize-set-variable 'custom-enabled-themes custom-enabled-themes)
         (message nil)
-        (unwind-protect (with-temp-file (expand-file-name
-                                         (concat name
-                                                 "-"
-                                                 (symbol-name background-mode)
-                                                 ".png")
-                                         media-dir)
-                          (insert (x-export-frames nil 'png))))))))
+        (with-temp-file (expand-file-name
+                         (concat name
+                                 "-"
+                                 (symbol-name background-mode)
+                                 ".png")
+                         media-dir)
+          (insert (x-export-frames nil 'png)))))))
 
 (provide 'screenshots)
 ;;; screenshots.el ends here
diff --git a/flake.nix b/flake.nix
index 34ce4f62..563c3d87 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,6 +45,7 @@
       partitionedAttrs = {
         checks = "dev";
         devShells = "dev";
+        packages = "dev";
       };
 
       partitions.dev = {
diff --git a/lisp/readable-mono-theme.el b/lisp/readable-mono-theme.el
index e4b7c2d1..eb0d5830 100644
--- a/lisp/readable-mono-theme.el
+++ b/lisp/readable-mono-theme.el
@@ -24,14 +24,6 @@
 
 ;;; Commentary:
 ;; Minimal and mostly monochromatic theme.
-;;
-;; TODO faces:
-;; - ivy
-;; - edebug
-;; - hi
-;; - rainbow-delimiters
-;; - hl-todo
-;; - ert
 
 ;;; Code:
 (deftheme readable-mono "Minimal and monochromatic theme.")
@@ -45,38 +37,33 @@
   "Minimal and monochromatic light theme customization options."
   :group 'readable-mono-theme)
 
-(defcustom readable-mono-theme-light-cursor "#bb3e06"
-  "Cursor for light theme."
+(defcustom readable-mono-theme-light-background "#fffce9"
+  "Default background color for light theme."
   :type 'string
   :group 'readable-mono-theme-light)
 
-(defcustom readable-mono-theme-light-attention "#cc1f24"
-  "Main attention color for light theme."
+(defcustom readable-mono-theme-light-secondary-background "#f2efdc"
+  "Secondary background color for light theme."
   :type 'string
   :group 'readable-mono-theme-light)
 
-(defcustom readable-mono-theme-light-secondary-attention "#c42475"
-  "Secondary attention color for light theme."
+(defcustom readable-mono-theme-light-highlight-background "#f1e9d2"
+  "Highlight background color for light theme."
   :type 'string
   :group 'readable-mono-theme-light)
 
-(defcustom readable-mono-theme-light-foreground "#002b37"
-  "Default foreground for light theme."
+(defcustom readable-mono-theme-light-foreground "#000011"
+  "Default foreground color for light theme."
   :type 'string
   :group 'readable-mono-theme-light)
 
-(defcustom readable-mono-theme-light-secondary-foreground "#596e76"
-  "Secondary foreground for light theme."
+(defcustom readable-mono-theme-light-secondary-foreground "#474747"
+  "Secondary foreground color for light theme."
   :type 'string
   :group 'readable-mono-theme-light)
 
-(defcustom readable-mono-theme-light-background "#fffce9"
-  "Default background for light theme."
-  :type 'string
-  :group 'readable-mono-theme-light)
-
-(defcustom readable-mono-theme-light-secondary-background "#f4eedb"
-  "Secondary background for light theme."
+(defcustom readable-mono-theme-light-attention "#d6000c"
+  "Attention color for light theme."
   :type 'string
   :group 'readable-mono-theme-light)
 
@@ -85,72 +72,37 @@
   "Minimal and monochromatic dark theme customization options."
   :group 'readable-mono-theme)
 
-(defcustom readable-mono-theme-dark-cursor "#db5823"
-  "Cursor for dark theme."
+(defcustom readable-mono-theme-dark-background "#002732"
+  "Default background color for dark theme."
   :type 'string
   :group 'readable-mono-theme-dark)
 
-(defcustom readable-mono-theme-dark-attention "#ec423a"
-  "Main attention color for dark theme."
+(defcustom readable-mono-theme-dark-secondary-background "#01323d"
+  "Secondary background color for dark theme."
   :type 'string
   :group 'readable-mono-theme-dark)
 
-(defcustom readable-mono-theme-dark-secondary-attention "#e2468f"
-  "Secondary attention color for dark theme."
+(defcustom readable-mono-theme-dark-highlight-background "#01323d"
+  "Highlight background color for dark theme."
   :type 'string
   :group 'readable-mono-theme-dark)
 
 (defcustom readable-mono-theme-dark-foreground "#ffffee"
-  "Default foreground for dark theme."
+  "Default foreground color for dark theme."
   :type 'string
   :group 'readable-mono-theme-dark)
 
 (defcustom readable-mono-theme-dark-secondary-foreground "#8d9fa1"
-  "Secondary foreground for dark theme."
+  "Secondary foreground color for dark theme."
   :type 'string
   :group 'readable-mono-theme-dark)
 
-(defcustom readable-mono-theme-dark-background "#002732"
-  "Default background for dark theme."
-  :type 'string
-  :group 'readable-mono-theme-dark)
-
-(defcustom readable-mono-theme-dark-secondary-background "#01323d"
-  "Secondary background for dark theme."
+(defcustom readable-mono-theme-dark-attention "#ec423a"
+  "Attention color for dark theme."
   :type 'string
   :group 'readable-mono-theme-dark)
 
 ;;;; Faces
-(defface readable-mono-theme-critical
-  `((((background light)) (:background ,readable-mono-theme-light-attention :foreground "#ffffff"))
-    (((background dark)) (:background ,readable-mono-theme-dark-attention :foreground "#ffffff")))
-  "Face used for critical information that requires immediate action/attention."
-  :group 'readable-mono-theme)
-
-(defface readable-mono-theme-emphasis
-  `((((background light)) (:foreground ,readable-mono-theme-light-secondary-attention))
-    (((background dark)) (:foreground ,readable-mono-theme-dark-secondary-attention)))
-  "Face used for information that needs action/attention."
-  :group 'readable-mono-theme)
-
-(defface readable-mono-theme-strong
-  '((t (:inherit bold)))
-  "Face used for information of strong importance."
-  :group 'readable-mono-theme)
-
-(defface readable-mono-theme-subordinate
-  `((((background light)) (:foreground ,readable-mono-theme-light-secondary-foreground))
-    (((background dark)) (:foreground ,readable-mono-theme-dark-secondary-foreground)))
-  "Face used for information of less importance."
-  :group 'readable-mono-theme)
-
-(defface readable-mono-theme-actionable
-  '((((background light)) (:foreground "#007ec4"))
-    (((background dark)) (:foreground "#3c98e0")))
-  "Face used for information that is actionable.
-For example links."
-  :group 'readable-mono-theme)
-
 (defface readable-mono-theme-secondary
   `((((background light)) (:background ,readable-mono-theme-light-secondary-background))
     (((background dark)) (:background ,readable-mono-theme-dark-secondary-background)))
@@ -159,98 +111,72 @@ For example links."
 
 (let ((l-bg readable-mono-theme-light-background)
       (l-bg-s readable-mono-theme-light-secondary-background)
+      (l-bg-hl readable-mono-theme-light-highlight-background)
       (l-fg readable-mono-theme-light-foreground)
       (l-fg-s readable-mono-theme-light-secondary-foreground)
       (l-attention readable-mono-theme-light-attention)
-      (l-cursor readable-mono-theme-light-cursor)
-
-      (l-green "#eeedcb")
-      (l-green-s "#d9d8b8")
-      (l-red "#ffe1cb")
-      (l-red-s "#e6cbb8")
-      (l-blue "#c5d8ed")
-      (l-blue-s "#b4c5d9")
 
       (d-bg readable-mono-theme-dark-background)
       (d-bg-s readable-mono-theme-dark-secondary-background)
+      (d-bg-hl readable-mono-theme-dark-highlight-background)
       (d-fg readable-mono-theme-dark-foreground)
       (d-fg-s readable-mono-theme-dark-secondary-foreground)
-      (d-attention readable-mono-theme-dark-attention)
-      (d-cursor readable-mono-theme-dark-cursor)
-
-      (d-green "#1e3531")
-      (d-green-s "#354725")
-      (d-red "#2f2c31")
-      (d-red-s "#582b29")
-      (d-blue "#023447")
-      (d-blue-s "#004363"))
+      (d-attention readable-mono-theme-dark-attention))
+
 ;;;; Theme faces
   (custom-theme-set-faces
    'readable-mono
+
+;;;;; Basic
    `(default
      ((((type graphic) (background light)) (:background ,l-bg :foreground ,l-fg))
       (((type graphic) (background dark)) (:background ,d-bg :foreground ,d-fg))
       (((type tty) (background light)) (:background unspecified :foreground ,l-fg))
       (((type tty) (background dark)) (:background unspecified :foreground ,d-fg))))
 
-;;;;; Semantic
-   `(link ((t (:inherit readable-mono-theme-actionable :underline t))))
-   `(shadow ((t (:inherit readable-mono-theme-subordinate))))
-   `(success ((t (:foreground unspecified))))
-   `(warning ((t (:inherit readable-mono-theme-emphasis))))
-   `(error ((t (:inherit readable-mono-theme-critical))))
-   `(font-lock-comment-face ((t (:italic t))))
-   `(font-lock-function-name-face ((t (:foreground unspecified))))
-   `(font-lock-variable-name-face ((t (:foreground unspecified))))
-   `(font-lock-constant-face ((t (:foreground unspecified))))
-   `(font-lock-doc-string-face ((t (:foreground unspecified))))
-   `(font-lock-doc-face ((t (:foreground unspecified))))
-   `(font-lock-preprocessor-face ((t (:foreground unspecified))))
-   `(font-lock-reference-face ((t (:foreground unspecified))))
-   `(font-lock-string-face ((t (:foreground unspecified))))
-   `(font-lock-type-face ((t (:inherit readable-mono-theme-strong))))
-   `(font-lock-builtin-face ((t (:inherit readable-mono-theme-strong))))
-   `(font-lock-keyword-face ((t (:inherit readable-mono-theme-strong))))
-   `(font-lock-warning-face ((t (:inherit warning))))
-
-   `(semantic-tag-boundary-face ((((background light)) (:overline ,l-fg-s))
-				 (((background dark)) (:overline ,d-fg-s))))
-   `(semantic-decoration-on-unparsed-includes ((t (:inherit readable-mono-theme-subordinate))))
-   `(semantic-decoration-on-unknown-includes ((((background light)) (:background ,l-red-s))
-					      (((background dark)) (:background ,d-red-s))))
+   `(shadow
+     ((((background light)) (:foreground ,l-fg-s))
+      (((background dark)) (:foreground ,d-fg-s))))
 
-;;;;; Headlines
-   `(custom-group-tag ((t (:inherit readable-mono-theme-strong))))
-   `(custom-state ((t (:inherit readable-mono-theme-emphasis))))
-   `(custom-variable-tag ((t (:inherit readable-mono-theme-strong))))
-
-;;;;; Search and highlight
-   `(completions-annotations ((t (:inherit italic))))
-   `(completions-common-part ((t (:inherit readable-mono-theme-strong))))
-   `(completions-first-difference ((t (:inherit readable-mono-theme-emphasis))))
-   `(highlight ((t (:inverse-video t))))
-   `(isearch ((((background light)) (:inherit highlight :foreground ,l-fg))
-	      (((background dark)) (:inherit highlight :foreground ,d-fg))))
-   `(isearch-fail ((t (:inherit error))))
-   `(lazy-highlight ((t (:inherit (highlight readable-mono-theme-subordinate)))))
-   `(match ((t (:inherit highlight))))
+   `(highlight
+     ((((background light)) (:background ,l-bg-hl))
+      (((background dark)) (:background ,d-bg-hl))))
    `(region
-     ((((background light)) (:foreground ,l-bg :background ,l-fg))
-      (((background dark)) (:foreground ,d-bg :background ,d-fg))))
+     ((((background light)) (:background ,l-bg :foreground ,l-fg :inverse-video t))
+      (((background dark)) (:background ,d-bg :foreground ,l-bg :inverse-video t))))
+   '(secondary-selection ((t (:inherit highlight))))
+
+   `(help-key-binding
+     ((((background light)) (:background ,l-bg-hl :foreground ,l-fg-s))
+      (((background dark)) (:background ,d-bg-hl :foreground ,d-fg-s))))
+
+   `(error
+     ((((background light)) (:background ,l-attention :foreground "#ffffff"))
+      (((background dark)) (:background ,d-attention :foreground "#ffffff"))))
+   '(warning ((t (:inherit bold))))
+   '(success ((t (:foreground unspecified))))
 
 ;;;;; Visual aid
    `(cursor
-     ((((background light)) (:background ,l-cursor))
-      (((background dark)) (:background ,d-cursor))))
-   `(hl-line ((t (:inherit readable-mono-theme-secondary))))
+     ((((background light)) (:background ,l-attention))
+      (((background dark)) (:background ,d-attention))))
    `(line-number-current-line
-     ((((background light)) (:inherit readable-mono-theme-strong :foreground ,l-cursor))
-      (((background dark)) (:inherit readable-mono-theme-strong :foreground ,d-cursor))))
-   `(show-paren-match ((t (:inherit readable-mono-theme-strong :underline t))))
-   `(show-paren-mismatch ((t (:inherit error))))
-   `(trailing-whitespace ((t (:inherit error))))
-   `(whitespace-line ((t (:inherit error))))
-   `(whitespace-trailing ((t (:inherit error))))
+     ((((background light)) (:inherit bold :foreground ,l-attention))
+      (((background dark)) (:inherit bold :foreground ,d-attention))))
+   '(hl-line ((t (:inherit highlight))))
+   '(show-paren-match ((t (:inherit bold :underline t))))
+   '(show-paren-mismatch ((t (:inherit error))))
+   '(trailing-whitespace ((t (:inherit error))))
+   '(whitespace-line ((t (:inherit error))))
+   '(whitespace-trailing ((t (:inherit error))))
+
+;;;;; Search
+   '(completions-annotations ((t (:inherit italic))))
+   '(completions-common-part ((t (:inherit region))))
+   '(isearch ((t (:inherit region))))
+   '(isearch-fail ((t (:inherit error))))
+   '(lazy-highlight ((t (:inherit highlight))))
+   '(match ((t (:inherit highlight))))
 
 ;;;;; Interface
    `(mode-line-active
@@ -261,84 +187,91 @@ For example links."
       (((type graphic) (background dark)) (:background ,d-bg :box (:line-width 6 :color ,d-bg)))
       (((type tty) (background light)) (:background unspecified :foreground ,l-fg-s))
       (((type tty) (background dark)) (:background unspecified :foreground ,d-fg-s))))
-   `(mode-line-emphasis ((t :bold nil)))
-   `(mode-line-buffer-id ((t :inherit readable-mono-theme-strong)))
+   '(mode-line-emphasis ((t :bold nil)))
+   '(mode-line-buffer-id ((t :inherit bold)))
 
-   `(button ((t (:inherit readable-mono-theme-actionable :underline t))))
-   `(custom-button-face ((t (:inherit button))))
-   `(fringe ((t (:inherit readable-mono-theme-subordinate))))
    `(header-line
      ((((background light)) (:foreground ,l-bg :background ,l-fg :box (:line-width 6 :color ,l-fg)))
       (((background dark)) (:foreground ,d-bg :background ,d-fg :box (:line-width 6 :color ,d-fg)))))
-   `(menu ((t (:inherit readable-mono-theme-secondary))))
-   `(minibuffer-prompt ((t (:inherit readable-mono-theme-strong))))
-   `(secondary-selection ((t (:inherit (region highlight)))))
-   `(tool-bar ((t (:inherit readable-mono-theme-secondary))))
-   `(tooltip ((t (:inherit readable-mono-theme-secondary))))
-   `(vertical-border
-     ((((background light)) (:foreground ,l-bg-s))
-      (((background dark)) (:foreground ,d-bg-s))))
-   `(widget-button ((t (:inherit button))))
+
+   '(minibuffer-prompt ((t (:inherit bold))))
+
+   '(fringe ((t (:inherit shadow))))
+
+   '(button ((t (:inherit underline))))
+   '(widget-button ((t (:inherit button))))
    `(widget-field
      ((((background light)) (:inherit readable-mono-theme-secondary :box (:line-width 1 :color ,l-bg)))
       (((background dark)) (:inherit readable-mono-theme-secondary :box (:line-width 1 :color ,d-bg)))))
-   `(window-divider ((t (:inherit vertical-border))))
-   `(window-divider-first-pixel ((t (:inherit window-divider))))
-   `(window-divider-last-pixel ((t (:inherit window-divider))))
+
+   '(menu ((t (:inherit readable-mono-theme-secondary))))
+   '(tool-bar ((t (:inherit readable-mono-theme-secondary))))
+   '(tooltip ((t (:inherit readable-mono-theme-secondary))))
+
+   `(vertical-border
+     ((((background light)) (:foreground ,l-bg-s))
+      (((background dark)) (:foreground ,d-bg-s))))
+   '(window-divider ((t (:inherit vertical-border))))
+   '(window-divider-first-pixel ((t (:inherit window-divider))))
+   '(window-divider-last-pixel ((t (:inherit window-divider))))
+
+;;;;; Headlines
+   '(custom-group-tag ((t (:inherit bold))))
+   '(custom-state ((t (:inherit bold))))
+   '(custom-variable-tag ((t (:inherit bold))))
+
+;;;;; font-lock
+   '(font-lock-function-name-face ((t (:foreground unspecified))))
+   '(font-lock-variable-name-face ((t (:foreground unspecified))))
+   '(font-lock-constant-face ((t (:foreground unspecified))))
+   '(font-lock-doc-string-face ((t (:foreground unspecified))))
+   '(font-lock-doc-face ((t (:foreground unspecified))))
+   '(font-lock-preprocessor-face ((t (:foreground unspecified))))
+   '(font-lock-reference-face ((t (:foreground unspecified))))
+   '(font-lock-string-face ((t (:foreground unspecified))))
+   '(font-lock-warning-face ((t (:inherit warning))))
 
 ;;;;; Diff
-   `(diff-header ((t (:inherit readable-mono-theme-secondary))))
-   `(diff-file-header ((t (:inherit header-line))))
-   `(diff-hunk-header ((t (:inherit shadow))))
+   '(diff-header ((t (:inherit readable-mono-theme-secondary))))
+   '(diff-file-header ((t (:inherit header-line))))
+   '(diff-hunk-header ((t (:inherit shadow))))
    `(diff-indicator-removed
-     ((((background light)) (:background ,l-red :foreground ,l-red))
-      (((background dark)) (:background ,d-red :foreground ,d-red))))
-   `(diff-removed
-     ((((background light)) (:background ,l-red))
-      (((background dark)) (:background ,d-red))))
-   `(diff-refine-removed
-     ((((background light)) (:background ,l-red-s))
-      (((background dark)) (:background ,d-red-s))))
+     ((((background light)) (:background ,l-attention :foreground ,l-attention))
+      (((background dark)) (:background ,d-attention :foreground ,d-attention))))
+   `(diff-removed ((t (:inherit shadow :strike-through t))))
+   `(diff-refine-removed ((t (:inherit diff-removed))))
    `(diff-indicator-added
-     ((((background light)) (:background ,l-green :foreground ,l-green))
-      (((background dark)) (:background ,d-green :foreground ,d-green))))
-   `(diff-added
-     ((((background light)) (:background ,l-green))
-      (((background dark)) (:background ,d-green))))
-   `(diff-refine-added
-     ((((background light)) (:background ,l-green-s))
-      (((background dark)) (:background ,d-green-s))))
+     ((((background light)) (:background ,l-fg :foreground ,l-fg))
+      (((background dark)) (:background ,d-fg :foreground ,d-fg))))
+   `(diff-added ((t (:inherit highlight))))
+   `(diff-refine-added ((t (:inherit diff-added))))
    `(diff-indicator-changed
-     ((((background light)) (:background ,l-blue :foreground ,l-blue))
-      (((background dark)) (:background ,d-blue :foreground ,d-blue))))
-   `(diff-refine-changed ((t (:inverse-video t))))
-   `(diff-error ((t (:inherit error))))
-
-   `(ediff-current-diff-A ((t (:inherit diff-removed))))
-   `(ediff-fine-diff-A ((t (:inherit diff-refine-removed))))
-   `(ediff-current-diff-B ((t (:inherit diff-added))))
-   `(ediff-fine-diff-B ((t (:inherit diff-refine-added))))
-   `(ediff-current-diff-C
-     ((((background light)) (:background ,l-blue))
-      (((background dark)) (:background ,d-blue))))
-   `(ediff-fine-diff-C
-     ((((background light)) (:background ,l-blue-s))
-      (((background dark)) (:background ,d-blue-s))))
-   `(ediff-current-diff-Ancestor ((t (:inherit readable-mono-theme-secondary))))
-   `(ediff-fine-diff-Ancestor ((t (:inherit highlight))))
-
-   `(smerge-base ((t (:inherit readable-mono-theme-secondary))))
-   `(smerge-lower ((t (:background unspecified))))
-   `(smerge-upper ((t (:background unspecified))))
-   `(smerge-refined-added ((t (:inherit diff-refine-added))))
-   `(smerge-refined-changed ((t (:inherit diff-refine-changed))))
-   `(smerge-refined-removed ((t (:inherit diff-refine-removed))))
-
-   `(diff-hl-insert ((t (:inherit diff-indicator-added))))
+     ((((background light)) (:background ,l-fg-s :foreground ,l-fg-s))
+      (((background dark)) (:background ,d-fg-s :foreground ,d-fg-s))))
+   '(diff-refine-changed ((t (:inverse-video t))))
+   '(diff-error ((t (:inherit error))))
+
+   '(ediff-current-diff-A ((t (:inherit highlight))))
+   '(ediff-fine-diff-A ((t (:inherit region))))
+   '(ediff-current-diff-B ((t (:inherit highlight))))
+   '(ediff-fine-diff-B ((t (:inherit region))))
+   `(ediff-current-diff-C ((t (:inherit highlight))))
+   `(ediff-fine-diff-C ((t (:inherit region))))
+   '(ediff-current-diff-Ancestor ((t (:inherit readable-mono-theme-secondary))))
+   '(ediff-fine-diff-Ancestor ((t (:inherit highlight))))
+
+   '(smerge-base ((t (:inherit readable-mono-theme-secondary))))
+   '(smerge-lower ((t (:background unspecified))))
+   '(smerge-upper ((t (:background unspecified))))
+   '(smerge-refined-added ((t (:inherit diff-refine-added))))
+   '(smerge-refined-changed ((t (:inherit diff-refine-changed))))
+   '(smerge-refined-removed ((t (:inherit diff-refine-removed))))
+
+   '(diff-hl-insert ((t (:inherit diff-indicator-added))))
    `(diff-hl-change
-     ((((background light)) (:background ,l-blue :foreground ,l-blue))
-      (((background dark)) (:background ,d-blue :foreground ,d-blue))))
-   `(diff-hl-delete ((t (:inherit diff-indicator-removed))))
+     ((((background light)) (:background ,l-bg-s :foreground ,l-bg-s))
+      (((background dark)) (:background ,d-bg-s :foreground ,d-bg-s))))
+   '(diff-hl-delete ((t (:inherit diff-indicator-removed))))
    `(diff-hl-unknown
      ((((background light)) (:background ,l-bg-s :foreground ,l-bg-s))
       (((background dark)) (:background ,d-bg-s :foreground ,d-bg-s))))
@@ -353,48 +286,48 @@ For example links."
    `(ansi-color-red
      ((((background light)) (:foreground ,l-attention))
       (((background dark)) (:foreground ,d-attention))))
-   `(ansi-color-bright-red ((t (:inherit ansi-color-red))))
-   `(ansi-color-green ((t (:inherit success))))
-   `(ansi-color-bright-green ((t (:inherit ansi-color-green))))
-   `(ansi-color-yellow ((t (:inherit shadow))))
-   `(ansi-color-bright-yellow ((t (:inherit ansi-color-yellow))))
-   `(ansi-color-blue ((t (:inherit ansi-color-black))))
-   `(ansi-color-bright-blue ((t (:inherit ansi-color-blue))))
-   `(ansi-color-magenta ((t (:inherit ansi-color-black))))
-   `(ansi-color-bright-magenta ((t (:inherit ansi-color-magenta))))
-   `(ansi-color-cyan ((t (:inherit ansi-color-black))))
-   `(ansi-color-bright-cyan ((t (:inherit ansi-color-cyan))))
-   `(ansi-color-white ((t (:inherit shadow))))
-   `(ansi-color-bright-white ((t (:inherit ansi-color-white))))
+   '(ansi-color-bright-red ((t (:inherit ansi-color-red))))
+   '(ansi-color-green ((t (:inherit success))))
+   '(ansi-color-bright-green ((t (:inherit ansi-color-green))))
+   '(ansi-color-yellow ((t (:inherit shadow))))
+   '(ansi-color-bright-yellow ((t (:inherit ansi-color-yellow))))
+   '(ansi-color-blue ((t (:inherit ansi-color-black))))
+   '(ansi-color-bright-blue ((t (:inherit ansi-color-blue))))
+   '(ansi-color-magenta ((t (:inherit ansi-color-black))))
+   '(ansi-color-bright-magenta ((t (:inherit ansi-color-magenta))))
+   '(ansi-color-cyan ((t (:inherit ansi-color-black))))
+   '(ansi-color-bright-cyan ((t (:inherit ansi-color-cyan))))
+   '(ansi-color-white ((t (:inherit shadow))))
+   '(ansi-color-bright-white ((t (:inherit ansi-color-white))))
 
 ;;;;; cider
-   `(cider-test-failure-face ((t (:inherit error))))
-   `(cider-result-overlay-face ((t (:inherit highlight))))
+   '(cider-test-failure-face ((t (:inherit error))))
+   '(cider-result-overlay-face ((t (:inherit highlight))))
 
 ;;;;; company
-   `(company-echo-common ((t (:inherit completions-common-part))))
-   `(company-preview ((t (:inherit shadow))))
-   `(company-preview-common ((t (:inherit completions-common-part))))
-   `(company-preview-search ((t (:inverse-video t))))
-   `(company-scrollbar-bg ((t (:inherit region))))
-   `(company-scrollbar-fg ((t (:inherit cursor))))
-   `(company-tooltip ((t (:inherit readable-mono-theme-secondary))))
-   `(company-tooltip-annotation ((t (:inherit shadow))))
-   `(company-tooltip-common ((t (:inherit completions-common-part))))
-   `(company-tooltip-selection ((t (:inherit highlight))))
+   '(company-echo-common ((t (:inherit completions-common-part))))
+   '(company-preview ((t (:inherit shadow))))
+   '(company-preview-common ((t (:inherit completions-common-part))))
+   '(company-preview-search ((t (:inverse-video t))))
+   '(company-scrollbar-bg ((t (:inherit region))))
+   '(company-scrollbar-fg ((t (:inherit cursor))))
+   '(company-tooltip ((t (:inherit tooltip))))
+   '(company-tooltip-annotation ((t (:inherit shadow))))
+   '(company-tooltip-common ((t (:inherit completions-common-part))))
+   '(company-tooltip-selection ((t (:inherit highlight))))
 
 ;;;;; compilation
-   `(compilation-mode-line-fail ((t (:inherit compilation-error))))
+   '(compilation-mode-line-fail ((t (:inherit compilation-error))))
 
 ;;;;; corfu
-   `(corfu-default ((t (:inherit readable-mono-theme-secondary))))
-   `(corfu-bar ((t (:inherit nil :inverse-video t))))
-   `(corfu-current ((t (:inherit highlight))))
+   '(corfu-default ((t (:inherit readable-mono-theme-secondary))))
+   '(corfu-bar ((t (:inherit nil :inverse-video t))))
+   '(corfu-current ((t (:inherit highlight))))
 
 ;;;;; cov
    `(cov-none-face
-     ((((background light)) (:foreground ,l-red-s))
-      (((background dark)) (:foreground ,d-red-s))))
+     ((((background light)) (:foreground ,l-attention))
+      (((background dark)) (:foreground ,d-attention))))
    `(cov-light-face
      ((((background light)) (:foreground ,l-fg-s))
       (((background dark)) (:foreground ,d-fg-s))))
@@ -406,47 +339,47 @@ For example links."
       (((background dark)) (:foreground ,d-fg))))
 
    `(cov-coverage-not-run-face
-     ((((background light)) (:foreground ,l-red-s))
-      (((background dark)) (:foreground ,d-red-s))))
+     ((((background light)) (:foreground ,l-attention))
+      (((background dark)) (:foreground ,d-attention))))
    `(cov-coverage-run-face
-     ((((background light)) (:foreground ,l-green-s))
-      (((background dark)) (:foreground ,d-green-s))))
+     ((((background light)) (:foreground ,l-fg))
+      (((background dark)) (:foreground ,d-fg))))
 
 ;;;;; dired
-   `(all-the-icons-dired-dir-face ((t (:foreground unspecified))))
-   `(dired-directory ((t (:inherit readable-mono-theme-strong))))
-   `(dired-broken-symlink ((t (:inherit error))))
-   `(dired-flagged ((t (:inherit readable-mono-theme-emphasis))))
+   '(all-the-icons-dired-dir-face ((t (:foreground unspecified))))
+   '(dired-directory ((t (:inherit bold))))
+   '(dired-broken-symlink ((t (:inherit error))))
+   '(dired-flagged ((t (:inherit bold))))
 
 ;;;;; erc
-   `(erc-current-nick-face ((t (:inherit readable-mono-theme-emphasis))))
-   `(erc-input-face ((t (:inherit readable-mono-theme-secondary :extend t))))
-   `(erc-my-nick-face ((t (:inherit readable-mono-theme-emphasis))))
-   `(erc-nick-default-face ((t (:inherit readable-mono-theme-strong))))
-   `(erc-notice-face ((t (:inherit nil))))
-   `(erc-prompt-face ((t (:inherit readable-mono-theme-strong))))
-   `(erc-timestamp-face ((t (:inherit readable-mono-theme-subordinate))))
+   '(erc-current-nick-face ((t (:inherit bold))))
+   '(erc-input-face ((t (:inherit readable-mono-theme-secondary :extend t))))
+   '(erc-my-nick-face ((t (:inherit bold))))
+   '(erc-nick-default-face ((t (:inherit bold))))
+   '(erc-notice-face ((t (:inherit nil))))
+   '(erc-prompt-face ((t (:inherit bold))))
+   '(erc-timestamp-face ((t (:inherit shadow))))
 
 ;;;;; eros
-   `(eros-result-overlay-face ((t (:inherit highlight))))
+   '(eros-result-overlay-face ((t (:inherit highlight))))
 
 ;;;;; eshell
-   `(eshell-prompt ((t (:inherit readable-mono-theme-strong))))
-   `(eshell-ls-archive ((t (:inherit readable-mono-theme-strong))))
-   `(eshell-ls-backup ((t (:inherit font-lock-comment-face))))
-   `(eshell-ls-clutter ((t (:inherit font-lock-comment-face))))
-   `(eshell-ls-directory ((t (:inherit readable-mono-theme-strong))))
-   `(eshell-ls-executable ((t (:inherit readable-mono-theme-strong))))
-   `(eshell-ls-unreadable ((t (:inherit nil))))
-   `(eshell-ls-missing ((t (:inherit font-lock-warning-face))))
-   `(eshell-ls-product ((t (:inherit font-lock-doc-face))))
-   `(eshell-ls-special ((t (:inherit readable-mono-theme-strong))))
-   `(eshell-ls-symlink ((t (:inherit readable-mono-theme-strong))))
+   '(eshell-prompt ((t (:inherit bold))))
+   '(eshell-ls-archive ((t (:inherit bold))))
+   '(eshell-ls-backup ((t (:inherit font-lock-comment-face))))
+   '(eshell-ls-clutter ((t (:inherit font-lock-comment-face))))
+   '(eshell-ls-directory ((t (:inherit bold))))
+   '(eshell-ls-executable ((t (:inherit bold))))
+   '(eshell-ls-unreadable ((t (:inherit nil))))
+   '(eshell-ls-missing ((t (:inherit font-lock-warning-face))))
+   '(eshell-ls-product ((t (:inherit font-lock-doc-face))))
+   '(eshell-ls-special ((t (:inherit bold))))
+   '(eshell-ls-symlink ((t (:inherit bold))))
 
 ;;;;; flymake
    `(flymake-error
-     ((((background light)) (:background ,l-red :extend t))
-      (((background dark)) (:background ,d-red :extend t))))
+     ((((background light)) (:underline (:style wave :color ,l-attention)))
+      (((background dark)) (:underline (:style wave :color ,d-attention)))))
 
 ;;;;; flyspell
    `(flyspell-duplicate
@@ -457,160 +390,153 @@ For example links."
       (((background dark)) (:underline (:style wave :color ,d-fg)))))
 
 ;;;;; ghelp
-   `(ghelp-header-button ((t (:inherit info-header-node :box nil))))
+   '(ghelp-header-button ((t (:inherit info-header-node :box nil))))
 
 ;;;;; gotest
-   `(go-test--standard-face ((t (:foreground unspecified))))
-   `(go-test--ok-face ((t (:foreground unspecified))))
-   `(go-test--error-face ((t (:inherit error))))
-   `(go-test--pointer-face ((t (:foreground unspecified))))
-   `(go-test--warning-face ((t (:inherit warning))))
+   '(go-test--standard-face ((t (:foreground unspecified))))
+   '(go-test--ok-face ((t (:foreground unspecified))))
+   '(go-test--error-face ((t (:inherit error))))
+   '(go-test--pointer-face ((t (:foreground unspecified))))
+   '(go-test--warning-face ((t (:inherit warning))))
 
 ;;;;; haskell
-   `(haskell-interactive-face-prompt ((t (:inherit readable-mono-theme-strong))))
+   '(haskell-interactive-face-prompt ((t (:inherit bold))))
 
 ;;;;; idle-highlight
-   `(idle-highlight ((t (:inherit (lazy-highlight)))))
+   '(idle-highlight ((t (:inherit underline))))
 
 ;;;;; imenu-list
-   `(imenu-list-entry-face-0 ((t (:foreground unspecified))))
-   `(imenu-list-entry-face-1 ((t (:foreground unspecified))))
-   `(imenu-list-entry-face-2 ((t (:foreground unspecified))))
-   `(imenu-list-entry-face-3 ((t (:foreground unspecified))))
+   '(imenu-list-entry-face-0 ((t (:foreground unspecified))))
+   '(imenu-list-entry-face-1 ((t (:foreground unspecified))))
+   '(imenu-list-entry-face-2 ((t (:foreground unspecified))))
+   '(imenu-list-entry-face-3 ((t (:foreground unspecified))))
 
 ;;;;; indent-guide
-   `(indent-guide-face ((t (:inherit fringe))))
+   '(indent-guide-face ((t (:inherit fringe))))
 
 ;;;;; Info
-   `(info-header-node ((t (:inherit readable-mono-theme-strong))))
-   `(info-header-xref ((t (:inherit bold :box nil))))
-
-;;;;; ivy
-   `(ivy-current-match ((t (:inherit highlight))))
-   `(ivy-minibuffer-match-face-1 ((t (:inherit readable-mono-theme-strong))))
-   `(ivy-minibuffer-match-face-2 ((t (:inherit readable-mono-theme-strong))))
-   `(ivy-minibuffer-match-face-3 ((t (:inherit readable-mono-theme-strong))))
-   `(ivy-minibuffer-match-face-4 ((t (:inherit readable-mono-theme-strong))))
+   '(info-header-node ((t (:inherit bold))))
+   '(info-header-xref ((t (:inherit bold :box nil))))
 
 ;;;;; magit
-   `(magit-section-heading-selection ((t (:inherit region))))
-   `(magit-section-highlight ((t (:inherit readable-mono-theme-secondary))))
-   `(magit-diff-file-heading-selection ((t (:inherit region))))
-   `(magit-diff-context ((t (:background unspecified))))
-   `(magit-diff-context-highlight ((t (:inherit readable-mono-theme-secondary))))
-   `(magit-diff-removed ((t (:inherit diff-refine-removed))))
-   `(magit-diff-removed-highlight ((t (:inherit diff-removed))))
-   `(magit-diff-added ((t (:inherit diff-refine-added))))
-   `(magit-diff-added-highlight ((t (:inherit diff-added))))
-   `(magit-diff-hunk-heading ((t (:inherit nil))))
-   `(magit-diff-hunk-heading-highlight ((t (:inherit readable-mono-theme-secondary))))
-   `(magit-diff-hunk-heading-selection ((t (:inherit region))))
-   `(magit-diff-lines-boundary ((t (:inherit region))))
-   `(magit-diff-lines-heading ((t (:inherit region))))
-   `(magit-process-ok ((t (:inherit success))))
-   `(magit-process-ng ((t (:inherit error))))
-
-   `(magit-branch-current ((t (:inherit readable-mono-theme-emphasis :box (:line-width 1)))))
-   `(magit-branch-local ((t (:inherit readable-mono-theme-emphasis))))
-   `(magit-branch-remote ((t (:inherit readable-mono-theme-strong))))
-   `(magit-head ((t (:inherit readable-mono-theme-strong))))
-   `(magit-tag ((t (:inherit italic))))
+   '(magit-section-heading-selection ((t (:inherit region))))
+   '(magit-section-highlight ((t (:inherit readable-mono-theme-secondary))))
+   '(magit-diff-file-heading-selection ((t (:inherit region))))
+   '(magit-diff-context ((t (:background unspecified))))
+   '(magit-diff-context-highlight ((t (:inherit readable-mono-theme-secondary))))
+   '(magit-diff-removed ((t (:inherit diff-refine-removed))))
+   '(magit-diff-removed-highlight ((t (:inherit (diff-removed readable-mono-theme-secondary)))))
+   '(magit-diff-added ((t (:inherit diff-refine-added))))
+   '(magit-diff-added-highlight ((t (:inherit diff-added))))
+   '(magit-diff-hunk-heading ((t (:inherit nil))))
+   '(magit-diff-hunk-heading-highlight ((t (:inherit readable-mono-theme-secondary))))
+   '(magit-diff-hunk-heading-selection ((t (:inherit region))))
+   '(magit-diff-lines-boundary ((t (:inherit region))))
+   '(magit-diff-lines-heading ((t (:inherit region))))
+   '(magit-process-ok ((t (:inherit success))))
+   '(magit-process-ng ((t (:inherit error))))
+
+   '(magit-branch-current ((t (:inherit bold :box (:line-width 1)))))
+   '(magit-branch-local ((t (:inherit bold))))
+   '(magit-branch-remote ((t (:inherit bold))))
+   '(magit-head ((t (:inherit bold))))
+   '(magit-tag ((t (:inherit italic))))
 
 ;;;;; marginalia
-   `(marginalia-file-priv-no ((t (:inherit nil))))
+   '(marginalia-file-priv-no ((t (:inherit nil))))
 
 ;;;;; markdown
-   `(markdown-code-face ((t (:inherit readable-mono-theme-secondary :extend t))))
+   '(markdown-code-face ((t (:inherit readable-mono-theme-secondary :extend t))))
    `(markdown-inline-code-face
      ((((background light)) (:inherit readable-mono-theme-secondary :box (:line-width 1 :color ,l-bg)))
       (((background dark)) (:inherit readable-mono-theme-secondary :box (:line-width 1 :color ,d-bg)))))
 
 ;;;;; message
-   `(message-cited-text-1 ((t (:foreground unspecified))))
-   `(message-cited-text-2 ((t (:foreground unspecified))))
-   `(message-cited-text-3 ((t (:foreground unspecified))))
-   `(message-cited-text-4 ((t (:foreground unspecified))))
-   `(message-header-cc ((t (:foreground unspecified))))
-   `(message-header-name ((t (:foreground unspecified))))
-   `(message-header-newsgroups ((t (:inherit readable-mono-theme-strong))))
-   `(message-header-other ((t (:foreground unspecified))))
-   `(message-header-subject ((t (:inherit readable-mono-theme-strong))))
-   `(message-header-to ((t (:inherit readable-mono-theme-strong))))
-   `(message-header-xheader ((t (:foreground unspecified))))
-   `(message-mml ((t (:foreground unspecified))))
-   `(message-separator ((t (:inherit readable-mono-theme-subordinate))))
+   '(message-cited-text-1 ((t (:foreground unspecified))))
+   '(message-cited-text-2 ((t (:foreground unspecified))))
+   '(message-cited-text-3 ((t (:foreground unspecified))))
+   '(message-cited-text-4 ((t (:foreground unspecified))))
+   '(message-header-cc ((t (:foreground unspecified))))
+   '(message-header-name ((t (:foreground unspecified))))
+   '(message-header-newsgroups ((t (:inherit bold))))
+   '(message-header-other ((t (:foreground unspecified))))
+   '(message-header-subject ((t (:inherit bold))))
+   '(message-header-to ((t (:inherit bold))))
+   '(message-header-xheader ((t (:foreground unspecified))))
+   '(message-mml ((t (:foreground unspecified))))
+   '(message-separator ((t (:inherit shadow))))
 
 ;;;;; orderless
-   `(orderless-match-face-0 ((t (:inherit completions-common-part))))
-   `(orderless-match-face-1 ((t (:inherit completions-common-part))))
-   `(orderless-match-face-2 ((t (:inherit completions-common-part))))
-   `(orderless-match-face-3 ((t (:inherit completions-common-part))))
+   '(orderless-match-face-0 ((t (:inherit completions-common-part))))
+   '(orderless-match-face-1 ((t (:inherit completions-common-part))))
+   '(orderless-match-face-2 ((t (:inherit completions-common-part))))
+   '(orderless-match-face-3 ((t (:inherit completions-common-part))))
 
 ;;;;; org
-   `(org-meta-line ((t (:inherit (readable-mono-theme-subordinate font-lock-comment-face)))))
-   `(org-ellipsis ((t (:inherit readable-mono-theme-subordinate))))
-   `(org-done ((t (:foreground unspecified))))
-   `(org-todo ((t (:inherit readable-mono-theme-strong))))
-   `(org-headline-done ((t (:foreground unspecified))))
-   `(org-headline-todo ((t (:foreground unspecified))))
-   `(org-block ((t (:inherit readable-mono-theme-secondary :extend t))))
+   '(org-meta-line ((t (:inherit (shadow font-lock-comment-face)))))
+   '(org-ellipsis ((t (:inherit shadow))))
+   '(org-done ((t (:foreground unspecified))))
+   '(org-todo ((t (:inherit bold))))
+   '(org-headline-done ((t (:foreground unspecified))))
+   '(org-headline-todo ((t (:foreground unspecified))))
+   '(org-block ((t (:inherit readable-mono-theme-secondary :extend t))))
    `(org-code
      ((((background light)) (:inherit readable-mono-theme-secondary :box (:line-width 1 :color ,l-bg)))
       (((background dark)) (:inherit readable-mono-theme-secondary :box (:line-width 1 :color ,d-bg)))))
-   `(org-date ((t (:foreground unspecified :underline nil))))
-   `(org-document-info ((t (:foreground unspecified))))
-   `(org-drawer ((t (:inherit readable-mono-theme-subordinate))))
+   '(org-date ((t (:foreground unspecified :underline nil))))
+   '(org-document-info ((t (:foreground unspecified))))
+   '(org-drawer ((t (:inherit shadow))))
    `(org-hide
      ((((background light)) (:foreground ,l-bg))
       (((background dark)) (:foreground ,d-bg))))
-   `(org-table ((t (:foreground unspecified))))
-   `(org-quote ((t (:foreground unspecified))))
+   '(org-table ((t (:foreground unspecified))))
+   '(org-quote ((t (:foreground unspecified))))
 
-   `(org-agenda-structure ((t (:foreground unspecified))))
-   `(org-agenda-date ((t (:foreground unspecified))))
-   `(org-agenda-date-today ((t (:inherit readable-mono-theme-strong))))
-   `(org-agenda-date-weekend ((t (:inherit readable-mono-theme-emphasis))))
-   `(org-scheduled ((t (:foreground unspecified))))
-   `(org-scheduled-today ((t (:inherit readable-mono-theme-actionable))))
-   `(org-scheduled-previously ((t (:inherit readable-mono-theme-emphasis))))
+   '(org-agenda-structure ((t (:foreground unspecified))))
+   '(org-agenda-date ((t (:foreground unspecified))))
+   '(org-agenda-date-today ((t (:inherit (bold highlight)))))
+   '(org-agenda-date-weekend ((t (:inherit bold))))
+   '(org-scheduled ((t (:foreground unspecified))))
+   '(org-scheduled-today ((t (:inherit underline))))
+   '(org-scheduled-previously ((t (:inherit bold))))
 
 ;;;;; org-tree-slide
-   `(org-tree-slide-header-overlay-face ((t (:inherit header-line))))
+   '(org-tree-slide-header-overlay-face ((t (:inherit header-line))))
 
 ;;;;; outline
-   `(outline-minor-0 ((t (:background unspecified))))
+   '(outline-minor-0 ((t (:background unspecified))))
 
 ;;;;; popup
-   `(popup-face ((t (:inherit (readable-mono-theme-secondary default)))))
-   `(popup-isearch-match ((t (:inherit readable-mono-theme-strong))))
-   `(popup-menu-mouse-face ((t (:underline t))))
-   `(popup-menu-selection-face ((t (:inherit (highlight default)))))
-   `(popup-scroll-bar-background-face ((t (:inherit region))))
-   `(popup-scroll-bar-foreground-face ((t (:inherit cursor))))
-   `(popup-summary-face ((t (:inherit (popup-face readable-mono-theme-subordinate)))))
+   '(popup-face ((t (:inherit (readable-mono-theme-secondary default)))))
+   '(popup-isearch-match ((t (:inherit bold))))
+   '(popup-menu-mouse-face ((t (:underline t))))
+   '(popup-menu-selection-face ((t (:inherit (highlight default)))))
+   '(popup-scroll-bar-background-face ((t (:inherit region))))
+   '(popup-scroll-bar-foreground-face ((t (:inherit cursor))))
+   '(popup-summary-face ((t (:inherit (popup-face shadow)))))
    `(popup-tip-face
      ((((background light)) (:inherit default :background ,l-bg-s :box (:line-width 6 :color ,l-bg-s)))
       (((background dark)) (:inherit default :background ,d-bg-s :box (:line-width 6 :color ,d-bg-s)))))
 
 ;;;;; quick-peek
-   `(quick-peek-background-face ((t :inherit readable-mono-theme-secondary)))
+   '(quick-peek-background-face ((t :inherit readable-mono-theme-secondary)))
 
 ;;;;; rainbow-delimiters
-   `(rainbow-delimiters-unmatched-face ((t (:inherit readable-mono-theme-critical))))
+   '(rainbow-delimiters-unmatched-face ((t (:inherit error))))
 
 ;;;;; rst
-   `(rst-directive ((t (:inherit font-lock-comment-face))))
-   `(rst-external ((t (:inherit font-lock-comment-face))))
-   `(rst-literal ((t (:inherit readable-mono-theme-secondary :extend t))))
+   '(rst-directive ((t (:inherit font-lock-comment-face))))
+   '(rst-external ((t (:inherit font-lock-comment-face))))
+   '(rst-literal ((t (:inherit readable-mono-theme-secondary :extend t))))
 
 ;;;;; sh-script
-   `(sh-quoted-exec ((t (:inherit readable-mono-theme-secondary))))
-   `(sh-heredoc ((t (:foreground unspecified))))
+   '(sh-quoted-exec ((t (:inherit readable-mono-theme-secondary))))
+   '(sh-heredoc ((t (:foreground unspecified))))
 
 ;;;;; spray
    `(spray-accent-face
-     ((((background light)) (:foreground ,l-cursor :underline (:color ,(face-foreground 'default)) :overline ,(face-foreground 'default)))
-      (((background dark)) (:foreground ,d-cursor :underline (:color ,(face-foreground 'default)) :overline ,(face-foreground 'default)))))
+     ((((background light)) (:foreground ,l-attention :underline (:color ,(face-foreground 'default)) :overline ,(face-foreground 'default)))
+      (((background dark)) (:foreground ,d-attention :underline (:color ,(face-foreground 'default)) :overline ,(face-foreground 'default)))))
 
 ;;;;; stripe-buffer
    `(stripe-highlight
@@ -624,51 +550,47 @@ For example links."
    `(term-color-red
      ((((background light)) (:foreground ,l-attention :background ,l-attention))
       (((background dark)) (:foreground ,d-attention :foreground ,d-attention))))
-   `(term-color-green ((t (:inherit term-color-black))))
-   `(term-color-yellow ((t (:inherit shadow))))
-   `(term-color-blue ((t (:inherit term-color-black))))
-   `(term-color-magenta ((t (:inherit term-color-black))))
-   `(term-color-cyan ((t (:inherit term-color-black))))
-   `(term-color-white ((t (:inherit shadow))))
+   '(term-color-green ((t (:inherit term-color-black))))
+   '(term-color-yellow ((t (:inherit shadow))))
+   '(term-color-blue ((t (:inherit term-color-black))))
+   '(term-color-magenta ((t (:inherit term-color-black))))
+   '(term-color-cyan ((t (:inherit term-color-black))))
+   '(term-color-white ((t (:inherit shadow))))
 
 ;;;;; terraform
-   `(terraform-resource-name-face ((t (:foreground unspecified))))
-   `(terraform-resource-type-face ((t (:foreground unspecified))))
-
-;;;;; visual-regexp
-   `(vr/match-0 ((t (:inverse-video t))))
-   `(vr/match-1 ((t (:inherit readable-mono-theme-subordinate :inverse-video t))))
+   '(terraform-resource-name-face ((t (:foreground unspecified))))
+   '(terraform-resource-type-face ((t (:foreground unspecified))))
 
 ;;;;; visual-replace
-   `(visual-replace-region ((t (:inherit readable-mono-theme-secondary))))
-   `(visual-replace-delete-match ((t (:inverse-video t :strike-through t))))
+   '(visual-replace-region ((t (:inherit highlight))))
+   '(visual-replace-delete-match ((t (:inverse-video t :strike-through t))))
 
 ;;;;; web
-   `(web-mode-current-element-highlight-face ((t (:inherit show-paren-match))))
+   '(web-mode-current-element-highlight-face ((t (:inherit show-paren-match))))
 
 ;;;;; wgrep
-   `(wgrep-face ((t (:inverse-video t))))
-   `(wgrep-delete-face ((t (:inverse-video t :strike-through t))))
-   `(wgrep-file-face ((t (:inverse-video t))))
-   `(wgrep-reject-face ((t (:inherit readable-mono-theme-subordinate))))
-   `(wgrep-done-face ((t (:inherit readable-mono-theme-secondary)))))
+   '(wgrep-face ((t (:inverse-video t))))
+   '(wgrep-delete-face ((t (:inverse-video t :strike-through t))))
+   '(wgrep-file-face ((t (:inverse-video t))))
+   '(wgrep-reject-face ((t (:inherit shadow))))
+   '(wgrep-done-face ((t (:inherit readable-mono-theme-secondary)))))
 
 ;;;; Theme variables
   (custom-theme-set-variables
    'readable-mono
 
 ;;;;; hl-todo
-   `(hl-todo-keyword-faces
-     `(("TODO"  . (:inherit readable-mono-theme-strong :box (:line-width 1)))
-       ("FIXME" . (:inherit readable-mono-theme-emphasis :box (:line-width 1)))
+   '(hl-todo-keyword-faces
+     '(("TODO"  . (:inherit bold :box (:line-width 1)))
+       ("FIXME" . (:inherit error :box (:line-width 1)))
        ("NOTE"  . (:box (:line-width 1)))))
 
 ;;;;; indent-bars
-   `(indent-bars-color '(readable-mono-theme-subordinate :blend 0.4))
+   '(indent-bars-color '(shadow :blend 0.4))
 
 ;;;;; rainbow-identifiers
-   `(rainbow-identifiers-cie-l*a*b*-saturation 65)
-   `(rainbow-identifiers-cie-l*a*b*-lightness 45)
+   '(rainbow-identifiers-cie-l*a*b*-saturation 65)
+   '(rainbow-identifiers-cie-l*a*b*-lightness 45)
 
 ;;;;; zoom-window
    `(zoom-window-mode-line-color ,(pcase (frame-parameter nil 'background-mode)
diff --git a/lisp/readable-typo-theme.el b/lisp/readable-typo-theme.el
index f4e575f4..97afab57 100644
--- a/lisp/readable-typo-theme.el
+++ b/lisp/readable-typo-theme.el
@@ -151,16 +151,23 @@
       (level-6-height (if readable-typo-theme-font-scaling readable-typo-theme-font-height-level-6 nil))
       (level-7-height (if readable-typo-theme-font-scaling readable-typo-theme-font-height-level-7 nil))
       (level-8-height (if readable-typo-theme-font-scaling readable-typo-theme-font-height-level-8 nil)))
+
 ;;;; Theme faces
   (custom-theme-set-faces
    'readable-typo
+
    `(default ((t (:height ,default-height :family ,fixed-pitch :weight ,default-weight))))
+
+   `(bold ((t (:weight ,bold-weight))))
+   '(bold-italic ((t (:inherit bold))))
+
    `(fixed-pitch ((t (:family ,fixed-pitch :weight ,default-weight))))
    `(fixed-pitch-serif ((t (:family ,fixed-pitch-serif :weight ,default-weight))))
    `(variable-pitch ((t (:family ,variable-pitch :weight ,default-weight))))
    `(variable-pitch-text ((t (:height 1.1 :family ,serif))))
-   `(bold ((t (:weight ,bold-weight))))
-   `(bold-italic ((t (:inherit bold))))
+
+   '(link ((t (:inherit underline))))
+
    `(readable-typo-theme-echo-area ((t (:family ,variable-pitch :weight ,default-weight))))
 
 ;;;;; Interface
@@ -169,6 +176,13 @@
    `(header-line ((t (:family ,variable-pitch :height ,small-height))))
    `(line-number ((t (:family ,fixed-pitch))))
    `(whitespace-space ((t (:family ,fixed-pitch))))
+   `(help-key-binding ((t (:inherit fixed-pitch))))
+
+;;;;; font-lock
+   '(font-lock-comment-face ((t (:inherit italic))))
+   '(font-lock-type-face ((t (:inherit bold))))
+   '(font-lock-builtin-face ((t (:inherit bold))))
+   '(font-lock-keyword-face ((t (:inherit bold))))
 
 ;;;;; corfu
    `(corfu-default ((t (:family ,fixed-pitch))))
diff --git a/media/emacs-lisp-mode-dark.png b/media/emacs-lisp-mode-dark.png
index a7c81a36..c943fbb4 100644
Binary files a/media/emacs-lisp-mode-dark.png and b/media/emacs-lisp-mode-dark.png differ
diff --git a/media/emacs-lisp-mode-light.png b/media/emacs-lisp-mode-light.png
index 43a4bf70..ec7e90cf 100644
Binary files a/media/emacs-lisp-mode-light.png and b/media/emacs-lisp-mode-light.png differ
diff --git a/media/markdown-mode-dark.png b/media/markdown-mode-dark.png
index 7e4a560a..51346f80 100644
Binary files a/media/markdown-mode-dark.png and b/media/markdown-mode-dark.png differ
diff --git a/media/markdown-mode-light.png b/media/markdown-mode-light.png
index ac51916f..fc5353fb 100644
Binary files a/media/markdown-mode-light.png and b/media/markdown-mode-light.png differ
diff --git a/media/org-mode-dark.png b/media/org-mode-dark.png
index 6295d8e8..727efa67 100644
Binary files a/media/org-mode-dark.png and b/media/org-mode-dark.png differ
diff --git a/media/org-mode-light.png b/media/org-mode-light.png
index 00dba296..ea1826ed 100644
Binary files a/media/org-mode-light.png and b/media/org-mode-light.png differ
diff --git a/media/rst-mode-dark.png b/media/rst-mode-dark.png
index a21cf457..38b220b6 100644
Binary files a/media/rst-mode-dark.png and b/media/rst-mode-dark.png differ
diff --git a/media/rst-mode-light.png b/media/rst-mode-light.png
index a335f936..9f10769e 100644
Binary files a/media/rst-mode-light.png and b/media/rst-mode-light.png differ