From 41356c145e465d534e95032811e22eadd7ea92f9 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 6 May 2022 00:45:07 +0100
Subject: light theme clean-ups

---
 lib/themes/jao-light-theme.el | 46 ++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el
index d9bf1f0..bd3fcdf 100644
--- a/lib/themes/jao-light-theme.el
+++ b/lib/themes/jao-light-theme.el
@@ -19,21 +19,16 @@
 (defvar jao-theme-light-bold (if (> emacs-major-version 28) 'medium 'semibold))
 
 (jao-define-custom-theme jao-light
-  (:names (bg1 "gray98")
-          (bg2 "gray95")
-          (bg3 "gray90")
-          (bg4 "gray85")
-          (bg5 "gray98")
-          (bg6 "gray99")
-          (bg7 "gray80")
+  (:names (bg-lightest "gray98")
+          (bg-light "gray95")
 
-          (fg1  "black")
-          (fg2 "gray10")
-          (fg3 "gray20")
-          (fg4 "gray30")
-          (fg5 "gray40")
+          (light-gray "gray80")
 
-          (hl "cornsilk1")
+          (black "black")
+          (dark-gray "gray30")
+          (fg-light "gray40")
+
+          (hl "#f2f2f2")
           (dimm "lemonchiffon4")
 
           (search   "#e8e800")
@@ -43,24 +38,24 @@
           (red "burlywood4")
           (blue "#023770")
           (green "#005555"))
-  (:face-family "Fira Code")
   (:face-size 9)
-  (:bold-weight jao-theme-dark-bold)
+  (:face-family "Fira Code")
+  (:bold-weight jao-theme-light-bold)
   (:palette (fg "black")
             (bg "white")
             (box "gray80")
-            (button (c fg5 bg1) (ul bg7))
+            (button (c fg-light bg-lightest) (ul light-gray))
             (hilite (c nil hl))
-            (link (c green) nbf (ul bg7))
-            (visited-link (ul bg7) nbf)
+            (link (c green) nbf (ul light-gray))
+            (visited-link (ul light-gray) nbf)
             (tab-sel (~ mode-line))
             (tab-unsel (~ mode-line-inactive))
-            (comment (c fg5) it)
+            (comment (c fg-light) it)
             (keyword (c blue) bf)
             (type (c blue) nbf)
             (function (c green))
-            (variable-name (c fg1))
-            (constant (c fg4))
+            (variable-name (c black))
+            (constant (c dark-gray))
             (string (c blue) nit)
             (warning (c warning))
             (error (c red) bf)
@@ -75,7 +70,7 @@
             (outline-5 (c blue) nul nbf)
             (f00 (c green))
             (f01 (c blue))
-            (f02 (c fg1))
+            (f02 (c dark-gray))
             (f10 (p f00))
             (f11 (p f01))
             (f12 (p f02)))
@@ -96,13 +91,14 @@
             (gnus-cite-2 (c "slate gray" nil))
             (gnus-cite-3 (c "slate gray" nil))
             (gnus-cite-4 (c "slate gray" nil))
+            (gnus-header-name (c fg-light))
             (gnus-summary-selected (c green) nbf)
             (gnus-summary-cancelled (c "sienna3" nil) st)
-            (header-line (c fg4 bg1)
+            (header-line (c dark-gray bg-lightest)
                          :box (:line-width 1 :color "grey90"))
             (magit-diff-context-highlight (c nil hl) ex)
             (magit-diff-hunk-heading-highlight (c nil hl) it bf)
-            (mode-line (c "grey30" bg2)
+            (mode-line (c "grey30" bg-light)
                        :box (:line-width -1 :color "grey90"))
             (mode-line-inactive (c "grey40" "white")
                                 :box (:line-width -1 :color "grey90"))
@@ -113,7 +109,7 @@
             (scroll-bar (c "grey80" nil))
             (show-paren-match (c nil "grey85"))
             (shr-text (c nil nil))
-            (shr-link (~ link) (ul fg5))
+            (shr-link (~ link) (ul light-gray))
             (shr-code (c blue nil))
             (success (c green))
             (vertical-border (c "grey70" nil))
-- 
cgit v1.2.3