From 3c32afc9cee7575cf97fdc301950f6849c9c6344 Mon Sep 17 00:00:00 2001
From: Jessie Hildebrandt <jessieh@jessieh.net>
Date: Tue, 13 Dec 2022 03:06:22 -0500
Subject: [PATCH] Improve 256-color mode compatibility

---
 mood-adwaita-theme.el | 54 ++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/mood-adwaita-theme.el b/mood-adwaita-theme.el
index 8c022bc..1f1e20d 100644
--- a/mood-adwaita-theme.el
+++ b/mood-adwaita-theme.el
@@ -81,34 +81,36 @@
       (mode-line-padding 10)
 
       ;; Base (Background) Colors
-      (bg (if (mood-adwaita-theme--true-color-p) "#1e1e1e" "#1c1c1c"))
-      (bg-alt (if (mood-adwaita-theme--true-color-p) "#242424" "#121212"))
-      (base-0 (if (mood-adwaita-theme--true-color-p) "#202020" "#080808"))
-      (base-1 (if (mood-adwaita-theme--true-color-p) "#262626" "#1c1c1c"))
-      (base-2 (if (mood-adwaita-theme--true-color-p) "#292929" "#262626"))
-      (base-3 (if (mood-adwaita-theme--true-color-p) "#303030" "#262626"))
-      (base-4 (if (mood-adwaita-theme--true-color-p) "#454545" "#3a3a3a"))
-      (base-5 (if (mood-adwaita-theme--true-color-p) "#656565" "#585858"))
-      (base-6 (if (mood-adwaita-theme--true-color-p) "#7b7b7b" "#767676"))
-      (base-7 (if (mood-adwaita-theme--true-color-p) "#a5a5a5" "#949494"))
-      (base-8 (if (mood-adwaita-theme--true-color-p) "#dfdfdf" "#d0d0d0"))
-      (fg (if (mood-adwaita-theme--true-color-p) "#deddda" "#d7d7ff"))
-      (fg-alt (if (mood-adwaita-theme--true-color-p) "#77767b" "#4e4e4e"))
+      ;; [True color | 256-compatible]
+      (bg (if (mood-adwaita-theme--true-color-p) "#1e1e1e" "gray12"))     ;; #1f1f1f
+      (bg-alt (if (mood-adwaita-theme--true-color-p) "#242424" "gray14")) ;; #242424
+      (base-0 (if (mood-adwaita-theme--true-color-p) "#202020" "gray13")) ;; #212121
+      (base-1 (if (mood-adwaita-theme--true-color-p) "#262626" "gray15")) ;; #262626
+      (base-2 (if (mood-adwaita-theme--true-color-p) "#292929" "gray16")) ;; #292929
+      (base-3 (if (mood-adwaita-theme--true-color-p) "#303030" "gray19")) ;; #303030
+      (base-4 (if (mood-adwaita-theme--true-color-p) "#454545" "gray27")) ;; #454545
+      (base-5 (if (mood-adwaita-theme--true-color-p) "#656565" "gray40")) ;; #666666
+      (base-6 (if (mood-adwaita-theme--true-color-p) "#7b7b7b" "gray48")) ;; #7a7a7a
+      (base-7 (if (mood-adwaita-theme--true-color-p) "#a5a5a5" "gray65")) ;; #a6a6a6
+      (base-8 (if (mood-adwaita-theme--true-color-p) "#dfdfdf" "gray87")) ;; #dedede
+      (fg (if (mood-adwaita-theme--true-color-p) "#deddda" "gray86"))     ;; #dbdbdb
+      (fg-alt (if (mood-adwaita-theme--true-color-p) "#77767b" "gray47")) ;; #787878
 
       ;; Foreground Colors
-      (gray (if (mood-adwaita-theme--true-color-p) "#3d3846" "#444444"))
-      (red (if (mood-adwaita-theme--true-color-p) "#ff6c6b" "#ff5f5f"))
-      (orange (if (mood-adwaita-theme--true-color-p) "#ffa348" "#d75f00"))
-      (green (if (mood-adwaita-theme--true-color-p) "#54d18c" "#5faf5f"))
-      (teal (if (mood-adwaita-theme--true-color-p) "#5bc8af" "#00afaf"))
-      (yellow (if (mood-adwaita-theme--true-color-p) "#f8e45c" "#ffd787"))
-      (blue (if (mood-adwaita-theme--true-color-p) "#64a6f4" "#5fafff"))
-      (dark-blue (if (mood-adwaita-theme--true-color-p) "#1a5fb4" "#005faf"))
-      (magenta (if (mood-adwaita-theme--true-color-p) "#dd80de" "#af5fff"))
-      (pink (if (mood-adwaita-theme--true-color-p) "#edb8ee" "#d7afff"))
-      (violet (if (mood-adwaita-theme--true-color-p) "#7d8ac7" "#afafff"))
-      (cyan (if (mood-adwaita-theme--true-color-p) "#7ee5ff" "#00d7ff"))
-      (dark-cyan (if (mood-adwaita-theme--true-color-p) "#6bacbd" "#5f87af")))
+      ;; [True color | 256-compatible]
+      (gray (if (mood-adwaita-theme--true-color-p) "#3d3846" "gray23"))           ;; #3b3b3b
+      (red (if (mood-adwaita-theme--true-color-p) "#ff6c6b" "indianred2"))        ;; #ee6363
+      (orange (if (mood-adwaita-theme--true-color-p) "#ffa348" "orange2"))        ;; #ee9a00
+      (green (if (mood-adwaita-theme--true-color-p) "#54d18c" "seagreen3"))       ;; #43cd80
+      (teal (if (mood-adwaita-theme--true-color-p) "#5bc8af" "mediumaquamarine")) ;; #66cdaa
+      (yellow (if (mood-adwaita-theme--true-color-p) "#f8e45c" "gold2"))          ;; #eec900
+      (blue (if (mood-adwaita-theme--true-color-p) "#64a6f4" "steelblue2"))       ;; #5cacee
+      (dark-blue (if (mood-adwaita-theme--true-color-p) "#1a5fb4" "dodgerblue4")) ;; #104e8b
+      (magenta (if (mood-adwaita-theme--true-color-p) "#dd80de" "orchid3"))       ;; #cd69c9
+      (pink (if (mood-adwaita-theme--true-color-p) "#edb8ee" "plum"))             ;; #dda0dd
+      (violet (if (mood-adwaita-theme--true-color-p) "#7d8ac7" "mediumpurple3"))  ;; #8968cd
+      (cyan (if (mood-adwaita-theme--true-color-p) "#7ee5ff" "mediumturquoise"))  ;; #48d1cc
+      (dark-cyan (if (mood-adwaita-theme--true-color-p) "#6bacbd" "cadetblue")))  ;; #5f9ea0
 
   ;; Face Definitions
   (custom-theme-set-faces