fix(theme): ansi-color-bright-magenta inherits magenta, not itself

The bright-magenta face was self-referential, so it resolved to no color and difftastic's bright-magenta string literals rendered near-black. Point it at ansi-color-magenta like the other bright faces. Also a broader WIP ansi/palette pass.

2 files changed, 259 insertions, 256 deletions

diff --git a/scripts/theme-studio/WIP.json b/scripts/theme-studio/WIP.json
index 871f76efa..105daee6c 100644
--- a/scripts/theme-studio/WIP.json
+++ b/scripts/theme-studio/WIP.json
@@ -287,22 +287,27 @@
    "ground"
   ],
   [
-   "#050801",
+   "#1f2217",
+   "olive-drab-5",
+   "olive-drab"
+  ],
+  [
+   "#2e361d",
    "olive-drab-4",
    "olive-drab"
   ],
   [
-   "#1b2506",
+   "#3f4c23",
    "olive-drab-3",
    "olive-drab"
   ],
   [
-   "#374712",
+   "#506328",
    "olive-drab-2",
    "olive-drab"
   ],
   [
-   "#546c20",
+   "#627b2c",
    "olive-drab-1",
    "olive-drab"
   ],
@@ -312,26 +317,31 @@
    "olive-drab"
   ],
   [
-   "#8ea85e",
+   "#809c50",
    "olive-drab+1",
    "olive-drab"
   ],
   [
-   "#a9be87",
+   "#8ca46c",
    "olive-drab+2",
    "olive-drab"
   ],
   [
-   "#c5d4ae",
+   "#98ac86",
    "olive-drab+3",
    "olive-drab"
   ],
   [
-   "#e2e9d6",
+   "#a5b49f",
    "olive-drab+4",
    "olive-drab"
   ],
   [
+   "#b2bcb7",
+   "olive-drab+5",
+   "olive-drab"
+  ],
+  [
    "#bfc4d0",
    "fg",
    "ground"
@@ -1332,7 +1342,6 @@
   "pkg:shr:shr-h4",
   "pkg:shr:shr-h5",
   "pkg:shr:shr-h6",
-  "pkg:shr:shr-text",
   "pkg:shr:shr-code",
   "pkg:shr:shr-mark",
   "pkg:shr:shr-sup",
@@ -1386,22 +1395,6 @@
   "pkg:alert:alert-urgent-face",
   "pkg:alert:alert-moderate-face",
   "pkg:alert:alert-low-face",
-  "pkg:ansi-color:ansi-color-black",
-  "pkg:ansi-color:ansi-color-red",
-  "pkg:ansi-color:ansi-color-green",
-  "pkg:ansi-color:ansi-color-yellow",
-  "pkg:ansi-color:ansi-color-blue",
-  "pkg:ansi-color:ansi-color-magenta",
-  "pkg:ansi-color:ansi-color-cyan",
-  "pkg:ansi-color:ansi-color-white",
-  "pkg:ansi-color:ansi-color-bright-black",
-  "pkg:ansi-color:ansi-color-bright-red",
-  "pkg:ansi-color:ansi-color-bright-green",
-  "pkg:ansi-color:ansi-color-bright-yellow",
-  "pkg:ansi-color:ansi-color-bright-blue",
-  "pkg:ansi-color:ansi-color-bright-magenta",
-  "pkg:ansi-color:ansi-color-bright-cyan",
-  "pkg:ansi-color:ansi-color-bright-white",
   "pkg:dashboard:dashboard-banner-logo-title",
   "pkg:json-mode:json-mode-object-name-face",
   "pkg:malyon:malyon-face-bold",
@@ -1522,7 +1515,24 @@
   "pkg:eat:eat-term-color-bright-green",
   "pkg:eat:eat-term-color-bright-red",
   "pkg:eat:eat-term-slow-blink",
-  "pkg:eat:eat-term-fast-blink"
+  "pkg:eat:eat-term-fast-blink",
+  "pkg:shr:shr-text",
+  "pkg:ansi-color:ansi-color-black",
+  "pkg:ansi-color:ansi-color-red",
+  "pkg:ansi-color:ansi-color-yellow",
+  "pkg:ansi-color:ansi-color-blue",
+  "pkg:ansi-color:ansi-color-magenta",
+  "pkg:ansi-color:ansi-color-cyan",
+  "pkg:ansi-color:ansi-color-bright-black",
+  "pkg:ansi-color:ansi-color-bright-red",
+  "pkg:ansi-color:ansi-color-bright-yellow",
+  "pkg:ansi-color:ansi-color-bright-blue",
+  "pkg:ansi-color:ansi-color-bright-magenta",
+  "pkg:ansi-color:ansi-color-bright-cyan",
+  "pkg:ansi-color:ansi-color-green",
+  "pkg:ansi-color:ansi-color-bright-green",
+  "pkg:ansi-color:ansi-color-white",
+  "pkg:ansi-color:ansi-color-bright-white"
  ],
  "packages": {
   "org-mode": {
@@ -1756,13 +1766,13 @@
     "source": "cleared"
    },
    "org-block-begin-line": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": "#100f0f",
     "inherit": null,
     "source": "user"
    },
    "org-block-end-line": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": "#100f0f",
     "inherit": null,
     "source": "user"
@@ -2832,7 +2842,7 @@
     "source": "user"
    },
    "elfeed-log-info-level-face": {
-    "fg": "#546c20",
+    "fg": "#627b2c",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -2865,7 +2875,7 @@
     "source": "user"
    },
    "mu4e-ok-face": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -3020,7 +3030,7 @@
    },
    "mu4e-compose-separator-face": {
     "fg": "#100f0f",
-    "bg": "#546c20",
+    "bg": "#627b2c",
     "weight": "bold",
     "inherit": null,
     "source": "user"
@@ -3040,7 +3050,7 @@
     "source": "user"
    },
    "gnus-header-subject": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -3174,19 +3184,19 @@
   },
   "org-faces": {
    "org-faces-todo": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
    },
    "org-faces-project": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
    },
    "org-faces-doing": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -3210,7 +3220,7 @@
     "source": "user"
    },
    "org-faces-delegated": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -3271,19 +3281,19 @@
     "source": "user"
    },
    "org-faces-todo-dim": {
-    "fg": "#546c20",
+    "fg": "#627b2c",
     "bg": "#100f0f",
     "inherit": null,
     "source": "user"
    },
    "org-faces-project-dim": {
-    "fg": "#546c20",
+    "fg": "#627b2c",
     "bg": "#100f0f",
     "inherit": null,
     "source": "user"
    },
    "org-faces-doing-dim": {
-    "fg": "#546c20",
+    "fg": "#627b2c",
     "bg": "#100f0f",
     "inherit": null,
     "source": "user"
@@ -3307,7 +3317,7 @@
     "source": "user"
    },
    "org-faces-delegated-dim": {
-    "fg": "#546c20",
+    "fg": "#627b2c",
     "bg": "#100f0f",
     "inherit": null,
     "source": "user"
@@ -3368,126 +3378,10 @@
     "source": "user"
    }
   },
-  "ghostel": {
-   "ghostel-default": {
-    "fg": "#edeff1",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-fake-cursor": {
-    "fg": "#100f0f",
-    "bg": "#a9b2bb",
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-fake-cursor-box": {
-    "fg": "#bac1c8",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-color-black": {
-    "fg": "#8e919a",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-color-red": {
-    "fg": "#cb6b4d",
-    "bg": null,
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-color-green": {
-    "fg": "#8ea85e",
-    "bg": null,
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-color-yellow": {
-    "fg": "#ab8d2e",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-color-blue": {
-    "fg": "#899bb1",
-    "bg": null,
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-color-magenta": {
-    "fg": "#9f80c9",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-color-cyan": {
-    "fg": "#0096b0",
-    "bg": null,
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-color-white": {
-    "fg": "#bac1c8",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-color-bright-black": {
-    "fg": "#bfc4d0",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-color-bright-red": {
-    "fg": "#cb8b7a",
-    "bg": null,
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-color-bright-green": {
-    "fg": "#8ea85e",
-    "bg": null,
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-color-bright-yellow": {
-    "fg": "#e6ce88",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-color-bright-blue": {
-    "fg": "#adb6c6",
-    "bg": null,
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-color-bright-magenta": {
-    "fg": "#bea9dc",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   },
-   "ghostel-color-bright-cyan": {
-    "fg": "#6ba9bd",
-    "bg": null,
-    "inherit": null,
-    "source": "user"
-   },
-   "ghostel-color-bright-white": {
-    "fg": "#edeff1",
-    "bg": null,
-    "inherit": null,
-    "source": "default"
-   }
-  },
   "ansi-color": {
    "ansi-color-black": {
-    "fg": "#100f0f",
-    "bg": "#bfc4d0",
+    "fg": "#222223",
+    "bg": "#a9b2bb",
     "inherit": null,
     "source": "user"
    },
@@ -3498,95 +3392,87 @@
     "source": "user"
    },
    "ansi-color-green": {
-    "fg": "#8ea85e",
+    "fg": "#627b2c",
     "bg": null,
     "inherit": null,
     "source": "user"
    },
    "ansi-color-yellow": {
-    "fg": "#e0c266",
+    "fg": "#ab8d2e",
     "bg": null,
     "inherit": null,
     "source": "user"
    },
    "ansi-color-blue": {
-    "fg": "#899bb1",
+    "fg": "#67809c",
     "bg": null,
     "inherit": null,
     "source": "user"
    },
    "ansi-color-magenta": {
-    "fg": "#9f80c9",
+    "fg": "#8255b5",
     "bg": null,
     "inherit": null,
     "source": "user"
    },
    "ansi-color-cyan": {
-    "fg": "#47a0b7",
+    "fg": "#18788c",
     "bg": null,
     "inherit": null,
     "source": "user"
    },
    "ansi-color-white": {
-    "fg": null,
+    "fg": "#bac1c8",
     "bg": null,
     "inherit": null,
-    "source": "default"
+    "source": "user"
    },
    "ansi-color-bright-black": {
-    "fg": "#363638",
+    "fg": "#100f0f",
     "bg": null,
-    "weight": "bold",
     "inherit": "ansi-color-black",
     "source": "user"
    },
    "ansi-color-bright-red": {
-    "fg": null,
+    "fg": "#cb8b7a",
     "bg": null,
-    "weight": "bold",
     "inherit": "ansi-color-red",
     "source": "user"
    },
    "ansi-color-bright-green": {
-    "fg": null,
+    "fg": "#809c50",
     "bg": null,
-    "weight": "bold",
     "inherit": "ansi-color-green",
     "source": "user"
    },
    "ansi-color-bright-yellow": {
-    "fg": null,
+    "fg": "#e0c266",
     "bg": null,
-    "weight": "bold",
     "inherit": "ansi-color-yellow",
     "source": "user"
    },
    "ansi-color-bright-blue": {
-    "fg": null,
+    "fg": "#899bb1",
     "bg": null,
-    "weight": "bold",
     "inherit": "ansi-color-blue",
     "source": "user"
    },
    "ansi-color-bright-magenta": {
-    "fg": null,
+    "fg": "#bea9dc",
     "bg": null,
-    "weight": "bold",
-    "inherit": "ansi-color-bright-magenta",
+    "inherit": "ansi-color-magenta",
     "source": "user"
    },
    "ansi-color-bright-cyan": {
-    "fg": null,
+    "fg": "#47a0b7",
     "bg": null,
-    "weight": "bold",
     "inherit": "ansi-color-cyan",
     "source": "user"
    },
    "ansi-color-bright-white": {
-    "fg": null,
+    "fg": "#dce0e3",
     "bg": null,
-    "weight": "bold",
-    "inherit": "ansi-color-bright-white",
+    "inherit": "ansi-color-white",
     "source": "user"
    }
   },
@@ -4081,7 +3967,7 @@
     "source": "user"
    },
    "dired-symlink": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -4440,7 +4326,7 @@
     "source": "user"
    },
    "calibredb-author-face": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -4795,7 +4681,7 @@
   },
   "org-noter": {
    "org-noter-notes-exist-face": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -4815,7 +4701,7 @@
     "source": "user"
    },
    "signel-my-msg-face": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -4844,7 +4730,7 @@
    },
    "pearl-editable-comment": {
     "fg": "#dce0e3",
-    "bg": "#374712",
+    "bg": "#506328",
     "inherit": null,
     "source": "user"
    },
@@ -5872,7 +5758,7 @@
     "source": "user"
    },
    "shr-text": {
-    "fg": "#bfc4d0",
+    "fg": "#a9b2bb",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -5977,7 +5863,7 @@
     "source": "user"
    },
    "nerd-icons-dgreen": {
-    "fg": "#546c20",
+    "fg": "#627b2c",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -6043,7 +5929,7 @@
     "source": "user"
    },
    "nerd-icons-lgreen": {
-    "fg": "#a9be87",
+    "fg": "#8ca46c",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -6147,7 +6033,7 @@
   },
   "2048-game": {
    "twentyfortyeight-face-1024": {
-    "fg": "#a9be87",
+    "fg": "#8ca46c",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -6231,7 +6117,7 @@
     "source": "user"
    },
    "alert-moderate-face": {
-    "fg": "#a9be87",
+    "fg": "#8ca46c",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -6829,7 +6715,7 @@
   },
   "emms": {
    "emms-browser-album-face": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "inherit": null,
     "source": "user"
@@ -6904,6 +6790,122 @@
     "source": "user"
    }
   },
+  "ghostel": {
+   "ghostel-color-black": {
+    "fg": "#8e919a",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-color-blue": {
+    "fg": "#899bb1",
+    "bg": null,
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-color-bright-black": {
+    "fg": "#bfc4d0",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-color-bright-blue": {
+    "fg": "#adb6c6",
+    "bg": null,
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-color-bright-cyan": {
+    "fg": "#6ba9bd",
+    "bg": null,
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-color-bright-green": {
+    "fg": "#809c50",
+    "bg": null,
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-color-bright-magenta": {
+    "fg": "#bea9dc",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-color-bright-red": {
+    "fg": "#cb8b7a",
+    "bg": null,
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-color-bright-white": {
+    "fg": "#edeff1",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-color-bright-yellow": {
+    "fg": "#e6ce88",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-color-cyan": {
+    "fg": "#0096b0",
+    "bg": null,
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-color-green": {
+    "fg": "#809c50",
+    "bg": null,
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-color-magenta": {
+    "fg": "#9f80c9",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-color-red": {
+    "fg": "#cb6b4d",
+    "bg": null,
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-color-white": {
+    "fg": "#bac1c8",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-color-yellow": {
+    "fg": "#ab8d2e",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-default": {
+    "fg": "#edeff1",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   },
+   "ghostel-fake-cursor": {
+    "fg": "#100f0f",
+    "bg": "#a9b2bb",
+    "inherit": null,
+    "source": "user"
+   },
+   "ghostel-fake-cursor-box": {
+    "fg": "#bac1c8",
+    "bg": null,
+    "inherit": null,
+    "source": "default"
+   }
+  },
   "highlight-indent-guides": {
    "highlight-indent-guides-character-face": {
     "fg": null,
@@ -7585,7 +7587,7 @@
     "source": "user"
    },
    "orderless-match-face-1": {
-    "fg": "#8ea85e",
+    "fg": "#809c50",
     "bg": null,
     "weight": "bold",
     "slant": "italic",
@@ -7731,7 +7733,7 @@
     "source": "user"
    },
    "rainbow-delimiters-depth-3-face": {
-    "fg": "#a9be87",
+    "fg": "#8ca46c",
     "bg": null,
     "inherit": "rainbow-delimiters-base-face",
     "source": "user"
diff --git a/themes/WIP-theme.el b/themes/WIP-theme.el
index 19a19a4fa..eb98138d5 100644
--- a/themes/WIP-theme.el
+++ b/themes/WIP-theme.el
@@ -84,8 +84,8 @@
  '(org-link ((t (:foreground "#899bb1" :background "#100f0f" :underline t))))
  '(org-footnote ((t (:foreground "#788da6" :background "#100f0f" :slant italic))))
  '(org-date ((t (:foreground "#bac1c8" :background "#100f0f"))))
- '(org-block-begin-line ((t (:foreground "#8ea85e" :background "#100f0f"))))
- '(org-block-end-line ((t (:foreground "#8ea85e" :background "#100f0f"))))
+ '(org-block-begin-line ((t (:foreground "#809c50" :background "#100f0f"))))
+ '(org-block-end-line ((t (:foreground "#809c50" :background "#100f0f"))))
  '(org-inline-src-block ((t (:foreground "#dab53d"))))
  '(org-quote ((t (:foreground "#74932f" :background "#100f0f" :slant italic))))
  '(org-table ((t (:foreground "#bac1c8"))))
@@ -179,12 +179,12 @@
  '(elfeed-log-date-face ((t (:foreground "#777980"))))
  '(elfeed-log-error-level-face ((t (:foreground "#a85b42" :weight bold))))
  '(elfeed-log-warn-level-face ((t (:foreground "#ab8d2e"))))
- '(elfeed-log-info-level-face ((t (:foreground "#546c20"))))
+ '(elfeed-log-info-level-face ((t (:foreground "#627b2c"))))
  '(elfeed-log-debug-level-face ((t (:foreground "#7c838a"))))
  '(mu4e-title-face ((t (:foreground "#dab53d"))))
  '(mu4e-context-face ((t (:foreground "#dab53d" :weight bold))))
  '(mu4e-modeline-face ((t (:foreground "#8e919a"))))
- '(mu4e-ok-face ((t (:foreground "#8ea85e"))))
+ '(mu4e-ok-face ((t (:foreground "#809c50"))))
  '(mu4e-warning-face ((t (:foreground "#cb6b4d"))))
  '(mu4e-header-title-face ((t (:foreground "#67809c"))))
  '(mu4e-header-key-face ((t (:foreground "#67809c" :weight bold))))
@@ -207,19 +207,19 @@
  '(mu4e-region-code ((t (:foreground "#9f80c9"))))
  '(mu4e-system-face ((t (:foreground "#cb6b4d" :slant italic))))
  '(mu4e-highlight-face ((t (:foreground "#dab53d" :weight bold))))
- '(mu4e-compose-separator-face ((t (:foreground "#100f0f" :background "#546c20" :weight bold))))
+ '(mu4e-compose-separator-face ((t (:foreground "#100f0f" :background "#627b2c" :weight bold))))
  '(gnus-header-name ((t (:foreground "#8e919a"))))
  '(gnus-header-from ((t (:foreground "#74932f"))))
- '(gnus-header-subject ((t (:foreground "#8ea85e"))))
+ '(gnus-header-subject ((t (:foreground "#809c50"))))
  '(gnus-header-content ((t (:foreground "#dab53d"))))
  '(gnus-header-newsgroups ((t (:foreground "#8e919a"))))
- '(org-faces-todo ((t (:foreground "#8ea85e"))))
- '(org-faces-project ((t (:foreground "#8ea85e"))))
- '(org-faces-doing ((t (:foreground "#8ea85e"))))
+ '(org-faces-todo ((t (:foreground "#809c50"))))
+ '(org-faces-project ((t (:foreground "#809c50"))))
+ '(org-faces-doing ((t (:foreground "#809c50"))))
  '(org-faces-waiting ((t (:foreground "#899bb1"))))
  '(org-faces-verify ((t (:foreground "#9ba8bb"))))
  '(org-faces-stalled ((t (:foreground "#dab53d"))))
- '(org-faces-delegated ((t (:foreground "#8ea85e"))))
+ '(org-faces-delegated ((t (:foreground "#809c50"))))
  '(org-faces-failed ((t (:foreground "#777980" :strike-through t))))
  '(org-faces-done ((t (:foreground "#777980" :background "#100f0f" :strike-through t))))
  '(org-faces-cancelled ((t (:foreground "#777980" :strike-through t))))
@@ -227,13 +227,13 @@
  '(org-faces-priority-b ((t (:foreground "#dab53d" :background "#100f0f" :weight bold))))
  '(org-faces-priority-c ((t (:foreground "#ab8d2e" :background "#100f0f" :weight bold))))
  '(org-faces-priority-d ((t (:foreground "#7e671f" :background "#100f0f" :weight bold))))
- '(org-faces-todo-dim ((t (:foreground "#546c20" :background "#100f0f"))))
- '(org-faces-project-dim ((t (:foreground "#546c20" :background "#100f0f"))))
- '(org-faces-doing-dim ((t (:foreground "#546c20" :background "#100f0f"))))
+ '(org-faces-todo-dim ((t (:foreground "#627b2c" :background "#100f0f"))))
+ '(org-faces-project-dim ((t (:foreground "#627b2c" :background "#100f0f"))))
+ '(org-faces-doing-dim ((t (:foreground "#627b2c" :background "#100f0f"))))
  '(org-faces-waiting-dim ((t (:foreground "#788da6" :background "#100f0f"))))
  '(org-faces-verify-dim ((t (:foreground "#788da6" :background "#100f0f"))))
  '(org-faces-stalled-dim ((t (:foreground "#7e671f" :background "#100f0f"))))
- '(org-faces-delegated-dim ((t (:foreground "#546c20" :background "#100f0f"))))
+ '(org-faces-delegated-dim ((t (:foreground "#627b2c" :background "#100f0f"))))
  '(org-faces-failed-dim ((t (:foreground "#4a4b4f" :background "#100f0f" :strike-through t))))
  '(org-faces-done-dim ((t (:foreground "#4a4b4f" :background "#100f0f" :strike-through t))))
  '(org-faces-cancelled-dim ((t (:foreground "#4a4b4f" :background "#100f0f" :strike-through t))))
@@ -241,40 +241,22 @@
  '(org-faces-priority-b-dim ((t (:foreground "#7e671f" :background "#100f0f" :weight bold))))
  '(org-faces-priority-c-dim ((t (:foreground "#544412" :background "#100f0f" :weight bold))))
  '(org-faces-priority-d-dim ((t (:foreground "#544412" :background "#100f0f" :weight bold))))
- '(ghostel-default ((t (:foreground "#edeff1"))))
- '(ghostel-fake-cursor ((t (:foreground "#100f0f" :background "#a9b2bb"))))
- '(ghostel-fake-cursor-box ((t (:foreground "#bac1c8"))))
- '(ghostel-color-black ((t (:foreground "#8e919a"))))
- '(ghostel-color-red ((t (:foreground "#cb6b4d"))))
- '(ghostel-color-green ((t (:foreground "#8ea85e"))))
- '(ghostel-color-yellow ((t (:foreground "#ab8d2e"))))
- '(ghostel-color-blue ((t (:foreground "#899bb1"))))
- '(ghostel-color-magenta ((t (:foreground "#9f80c9"))))
- '(ghostel-color-cyan ((t (:foreground "#0096b0"))))
- '(ghostel-color-white ((t (:foreground "#bac1c8"))))
- '(ghostel-color-bright-black ((t (:foreground "#bfc4d0"))))
- '(ghostel-color-bright-red ((t (:foreground "#cb8b7a"))))
- '(ghostel-color-bright-green ((t (:foreground "#8ea85e"))))
- '(ghostel-color-bright-yellow ((t (:foreground "#e6ce88"))))
- '(ghostel-color-bright-blue ((t (:foreground "#adb6c6"))))
- '(ghostel-color-bright-magenta ((t (:foreground "#bea9dc"))))
- '(ghostel-color-bright-cyan ((t (:foreground "#6ba9bd"))))
- '(ghostel-color-bright-white ((t (:foreground "#edeff1"))))
- '(ansi-color-black ((t (:foreground "#100f0f" :background "#bfc4d0"))))
+ '(ansi-color-black ((t (:foreground "#222223" :background "#a9b2bb"))))
  '(ansi-color-red ((t (:foreground "#cb6b4d"))))
- '(ansi-color-green ((t (:foreground "#8ea85e"))))
- '(ansi-color-yellow ((t (:foreground "#e0c266"))))
- '(ansi-color-blue ((t (:foreground "#899bb1"))))
- '(ansi-color-magenta ((t (:foreground "#9f80c9"))))
- '(ansi-color-cyan ((t (:foreground "#47a0b7"))))
- '(ansi-color-bright-black ((t (:inherit ansi-color-black :foreground "#363638" :weight bold))))
- '(ansi-color-bright-red ((t (:inherit ansi-color-red :weight bold))))
- '(ansi-color-bright-green ((t (:inherit ansi-color-green :weight bold))))
- '(ansi-color-bright-yellow ((t (:inherit ansi-color-yellow :weight bold))))
- '(ansi-color-bright-blue ((t (:inherit ansi-color-blue :weight bold))))
- '(ansi-color-bright-magenta ((t (:inherit ansi-color-bright-magenta :weight bold))))
- '(ansi-color-bright-cyan ((t (:inherit ansi-color-cyan :weight bold))))
- '(ansi-color-bright-white ((t (:inherit ansi-color-bright-white :weight bold))))
+ '(ansi-color-green ((t (:foreground "#627b2c"))))
+ '(ansi-color-yellow ((t (:foreground "#ab8d2e"))))
+ '(ansi-color-blue ((t (:foreground "#67809c"))))
+ '(ansi-color-magenta ((t (:foreground "#8255b5"))))
+ '(ansi-color-cyan ((t (:foreground "#18788c"))))
+ '(ansi-color-white ((t (:foreground "#bac1c8"))))
+ '(ansi-color-bright-black ((t (:inherit ansi-color-black :foreground "#100f0f"))))
+ '(ansi-color-bright-red ((t (:inherit ansi-color-red :foreground "#cb8b7a"))))
+ '(ansi-color-bright-green ((t (:inherit ansi-color-green :foreground "#809c50"))))
+ '(ansi-color-bright-yellow ((t (:inherit ansi-color-yellow :foreground "#e0c266"))))
+ '(ansi-color-bright-blue ((t (:inherit ansi-color-blue :foreground "#899bb1"))))
+ '(ansi-color-bright-magenta ((t (:inherit ansi-color-magenta :foreground "#bea9dc"))))
+ '(ansi-color-bright-cyan ((t (:inherit ansi-color-cyan :foreground "#47a0b7"))))
+ '(ansi-color-bright-white ((t (:inherit ansi-color-white :foreground "#dce0e3"))))
  '(eat-term-color-black ((t (:foreground "#100f0f"))))
  '(eat-term-color-red ((t (:foreground "#cb6b4d"))))
  '(eat-term-color-green ((t (:foreground "#74932f"))))
@@ -347,7 +329,7 @@
  '(flycheck-verify-select-checker ((t (:foreground "#dab53d"))))
  '(dired-header ((t (:foreground "#54677d" :weight bold))))
  '(dired-directory ((t (:foreground "#aac9ea" :weight bold :slant italic))))
- '(dired-symlink ((t (:foreground "#8ea85e"))))
+ '(dired-symlink ((t (:foreground "#809c50"))))
  '(dired-broken-symlink ((t (:foreground "#cb7b64" :weight bold))))
  '(dired-special ((t (:foreground "#777980"))))
  '(dired-set-id ((t (:foreground "#cb7b64" :weight bold :slant italic))))
@@ -403,7 +385,7 @@
  '(calibredb-search-header-highlight-face ((t (:foreground "#dab53d" :weight bold))))
  '(calibredb-id-face ((t (:foreground "#606267"))))
  '(calibredb-title-face ((t (:foreground "#cbd0d6" :weight bold))))
- '(calibredb-author-face ((t (:foreground "#8ea85e"))))
+ '(calibredb-author-face ((t (:foreground "#809c50"))))
  '(calibredb-format-face ((t (:foreground "#7c838a"))))
  '(calibredb-size-face ((t (:foreground "#7c838a"))))
  '(calibredb-tag-face ((t (:foreground "#788da6"))))
@@ -457,14 +439,14 @@
  '(org-drill-hidden-cloze-face ((t (:foreground "#100f0f" :background "#67809c" :slant italic))))
  '(org-drill-visible-cloze-face ((t (:foreground "#e0c266" :weight bold :slant italic))))
  '(org-drill-visible-cloze-hint-face ((t (:foreground "#788da6" :slant italic))))
- '(org-noter-notes-exist-face ((t (:foreground "#8ea85e"))))
+ '(org-noter-notes-exist-face ((t (:foreground "#809c50"))))
  '(org-noter-no-notes-exist-face ((t (:foreground "#606267"))))
  '(signel-timestamp-face ((t (:foreground "#899bb1"))))
- '(signel-my-msg-face ((t (:foreground "#8ea85e"))))
+ '(signel-my-msg-face ((t (:foreground "#809c50"))))
  '(signel-other-msg-face ((t (:foreground "#dab53d"))))
  '(signel-error-face ((t (:foreground "#cb6b4d"))))
  '(pearl-preamble-summary ((t (:foreground "#67809c" :weight bold :slant italic))))
- '(pearl-editable-comment ((t (:foreground "#dce0e3" :background "#374712"))))
+ '(pearl-editable-comment ((t (:foreground "#dce0e3" :background "#506328"))))
  '(pearl-readonly-comment ((t (:foreground "#edeff1" :background "#424f5e"))))
  '(pearl-modified-highlight ((t (:foreground "#dab53d" :slant italic))))
  '(pearl-modified-local ((t (:foreground "#dab53d" :slant italic))))
@@ -623,7 +605,7 @@
  '(shr-h4 ((t (:foreground "#8e919a" :weight bold))))
  '(shr-h5 ((t (:foreground "#777980" :weight bold))))
  '(shr-h6 ((t (:foreground "#606267" :weight bold))))
- '(shr-text ((t (:foreground "#bfc4d0"))))
+ '(shr-text ((t (:foreground "#a9b2bb"))))
  '(shr-link ((t (:foreground "#5f8bf9" :underline t))))
  '(shr-selected-link ((t (:foreground "#777980" :weight bold :underline t))))
  '(shr-code ((t (:foreground "#cb6b4d"))))
@@ -638,7 +620,7 @@
  '(nerd-icons-cyan-alt ((t (:foreground "#47a0b7"))))
  '(nerd-icons-dblue ((t (:foreground "#67809c"))))
  '(nerd-icons-dcyan ((t (:foreground "#18788c"))))
- '(nerd-icons-dgreen ((t (:foreground "#546c20"))))
+ '(nerd-icons-dgreen ((t (:foreground "#627b2c"))))
  '(nerd-icons-dmaroon ((t (:foreground "#a85b42"))))
  '(nerd-icons-dorange ((t (:foreground "#cb8b7a"))))
  '(nerd-icons-dpink ((t (:foreground "#c7a8a5"))))
@@ -649,7 +631,7 @@
  '(nerd-icons-green ((t (:foreground "#74932f"))))
  '(nerd-icons-lblue ((t (:foreground "#aac9ea"))))
  '(nerd-icons-lcyan ((t (:foreground "#88b2c3"))))
- '(nerd-icons-lgreen ((t (:foreground "#a9be87"))))
+ '(nerd-icons-lgreen ((t (:foreground "#8ca46c"))))
  '(nerd-icons-lmaroon ((t (:foreground "#a85b42"))))
  '(nerd-icons-lorange ((t (:foreground "#cb8b7a"))))
  '(nerd-icons-lpink ((t (:foreground "#c99990"))))
@@ -666,14 +648,14 @@
  '(nerd-icons-red-alt ((t (:foreground "#cb6b4d"))))
  '(nerd-icons-silver ((t (:foreground "#a9b2bb"))))
  '(nerd-icons-yellow ((t (:foreground "#e0c266"))))
- '(twentyfortyeight-face-1024 ((t (:foreground "#a9be87"))))
+ '(twentyfortyeight-face-1024 ((t (:foreground "#8ca46c"))))
  '(twentyfortyeight-face-2 ((t (:foreground "#100f0f"))))
  '(twentyfortyeight-face-2048 ((t (:foreground "#dab53d" :weight bold :slant italic))))
  '(twentyfortyeight-face-256 ((t (:foreground "#47a0b7"))))
  '(twentyfortyeight-face-512 ((t (:foreground "#9f80c9"))))
  '(alert-high-face ((t (:foreground "#dab53d" :weight bold))))
  '(alert-low-face ((t (:foreground "#7ba1c5" :weight bold))))
- '(alert-moderate-face ((t (:foreground "#a9be87"))))
+ '(alert-moderate-face ((t (:foreground "#8ca46c"))))
  '(alert-normal-face ((t (:foreground "#bac1c8"))))
  '(alert-trivial-face ((t (:foreground "#9f80c9"))))
  '(alert-urgent-face ((t (:foreground "#cb6b4d"))))
@@ -708,13 +690,32 @@
  '(embark-verbose-indicator-documentation ((t (:inherit completions-annotations))))
  '(embark-verbose-indicator-shadowed ((t (:inherit shadow))))
  '(embark-verbose-indicator-title ((t (:weight bold :height 1.1))))
- '(emms-browser-album-face ((t (:foreground "#8ea85e"))))
+ '(emms-browser-album-face ((t (:foreground "#809c50"))))
  '(emms-browser-track-face ((t (:foreground "#788da6"))))
  '(emms-metaplaylist-mode-current-face ((t (:foreground "#cb8b7a"))))
  '(emms-metaplaylist-mode-face ((t (:foreground "#cb6b4d"))))
  '(emms-playlist-selected-face ((t (:foreground "#e6ce88" :weight bold))))
  '(emms-playlist-track-face ((t (:foreground "#cbd0d6"))))
  '(flyspell-correct-highlight-face ((t (:inherit isearch :background "#363638"))))
+ '(ghostel-color-black ((t (:foreground "#8e919a"))))
+ '(ghostel-color-blue ((t (:foreground "#899bb1"))))
+ '(ghostel-color-bright-black ((t (:foreground "#bfc4d0"))))
+ '(ghostel-color-bright-blue ((t (:foreground "#adb6c6"))))
+ '(ghostel-color-bright-cyan ((t (:foreground "#6ba9bd"))))
+ '(ghostel-color-bright-green ((t (:foreground "#809c50"))))
+ '(ghostel-color-bright-magenta ((t (:foreground "#bea9dc"))))
+ '(ghostel-color-bright-red ((t (:foreground "#cb8b7a"))))
+ '(ghostel-color-bright-white ((t (:foreground "#edeff1"))))
+ '(ghostel-color-bright-yellow ((t (:foreground "#e6ce88"))))
+ '(ghostel-color-cyan ((t (:foreground "#0096b0"))))
+ '(ghostel-color-green ((t (:foreground "#809c50"))))
+ '(ghostel-color-magenta ((t (:foreground "#9f80c9"))))
+ '(ghostel-color-red ((t (:foreground "#cb6b4d"))))
+ '(ghostel-color-white ((t (:foreground "#bac1c8"))))
+ '(ghostel-color-yellow ((t (:foreground "#ab8d2e"))))
+ '(ghostel-default ((t (:foreground "#edeff1"))))
+ '(ghostel-fake-cursor ((t (:foreground "#100f0f" :background "#a9b2bb"))))
+ '(ghostel-fake-cursor-box ((t (:foreground "#bac1c8"))))
  '(json-mode-object-name-face ((t (:foreground "#e0c266"))))
  '(malyon-face-bold ((t (:inherit bold :foreground "#788da6" :weight bold))))
  '(malyon-face-error ((t (:inherit error :foreground "#cb6b4d" :weight bold))))
@@ -794,7 +795,7 @@
  '(markdown-strike-through-face ((t (:strike-through t))))
  '(markdown-url-face ((t (:inherit font-lock-string-face))))
  '(orderless-match-face-0 ((t (:foreground "#e0c266" :weight bold :slant italic))))
- '(orderless-match-face-1 ((t (:foreground "#8ea85e" :weight bold :slant italic))))
+ '(orderless-match-face-1 ((t (:foreground "#809c50" :weight bold :slant italic))))
  '(orderless-match-face-2 ((t (:foreground "#8255b5" :weight bold :slant italic))))
  '(orderless-match-face-3 ((t (:foreground "#0096b0" :weight bold :slant italic))))
  '(org-superstar-first ((t (:inherit org-warning))))
@@ -804,7 +805,7 @@
  '(rainbow-delimiters-base-face ((t (:inherit unspecified :foreground "#cbd0d6"))))
  '(rainbow-delimiters-depth-1-face ((t (:inherit rainbow-delimiters-base-face :foreground "#9f80c9"))))
  '(rainbow-delimiters-depth-2-face ((t (:inherit rainbow-delimiters-base-face :foreground "#788da6"))))
- '(rainbow-delimiters-depth-3-face ((t (:inherit rainbow-delimiters-base-face :foreground "#a9be87"))))
+ '(rainbow-delimiters-depth-3-face ((t (:inherit rainbow-delimiters-base-face :foreground "#8ca46c"))))
  '(rainbow-delimiters-depth-4-face ((t (:inherit rainbow-delimiters-base-face :foreground "#e0c266"))))
  '(rainbow-delimiters-depth-5-face ((t (:inherit rainbow-delimiters-base-face :foreground "#0096b0"))))
  '(rainbow-delimiters-depth-6-face ((t (:inherit rainbow-delimiters-depth-1-face))))