more ligth theme tweaks

2 files changed, 21 insertions, 18 deletions

diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
index eb7457a..9ad1ae7 100644
--- a/themes/jao-light-theme.el
+++ b/themes/jao-light-theme.el
@@ -1,36 +1,37 @@
 (jao-define-custom-theme jao-light
+  (:names (dimm-background "#F4F4F4")
+          (string-green "#00552a")
+          (func-green "#005555")
+          (greyish "#626262")
+          (blueish "#d4d4aa"))
   (:palette (fg unspecified "black")
             (bg unspecified "white")
             (box "grey80" "antiquewhite3")
-            (button ((c 13 nil) nbf nul) (~ mode-line-inactive))
-;;            (hilite ((c nil "grey90")) ((c nil "#EFEBE7"))) ;; 5
-            (hilite ((c nil "grey90")) ((c nil "#F4F4F4"))) ;; 5
+            (button ((c 13 nil) nbf nul) ((c string-green) nit))
+            (hilite ((c nil "grey90")) ((c nil dimm-background)))
             (strike-through ((c 1)) (st))
-;;            (italic ((c nil) it :family "DejaVu Sans Mono" :height 90))
-;;            (italic ((c "darkslategray4")))
             (italic (it))
-            ;; (italic (it :family "Inconsolata LGC" :height 90))
-            (link ((c 22) nul nbf nit) ((c 29) nul nbf))
+            (link ((c 22) nul nbf nit) ((c string-green) nul nbf))
             (visited-link ((c 3) nul nbf))
             (tab-sel ((~ mode-line)))
             (tab-unsel ((~ mode-line-inactive)))
-            (comment ((c 241) it :family "Inconsolata LGC" :height 90)
-                     ((c 241) it))
+            (comment ((c greyish) it :family "Inconsolata LGC" :height 90)
+                     ((c greyish) it))
             (keyword ((c "lightsteelblue4" nil) bf))
             (type ((c 59) nbf nul nit) ((c "#223142") nbf))
-            (function ((c 30 nil) nbf))
+            (function ((c func-green nil) nbf))
             (variable-name ((c 0)) ((c "black")))
             (constant ((c 23)))
-            (string ((c 58)) ((c 29)))
+            (string ((c 58)) ((c string-green)))
             (warning ((c 9)) ((c "orangered4")))
             (error ((c 1) (c "sienna3")))
             (dimm ((c 102)) ((c "lemonchiffon4")))
             (gnus-mail ((c 232)) ((c "black")))
             (gnus-news ((c 232)) ((c "black")))
             (outline ((c "black")))
-            (f00 ((c 30)) ((c 23))) ;; 14
+            (f00 ((c func-green)) ((c 23))) ;; 14
             (f01 ((c 31)) ((c 24)))
-            (f02 ((c 37)) ((c 30))) ;; 8
+            (f02 ((c 37)) ((c func-green))) ;; 8
             ;; (f00 ((c 8))) ;; 14
             ;; (f01 ((c 14)))
             ;; (f02 ((c 10))) ;; 8
@@ -38,7 +39,7 @@
             (f11 ((p f01)))
             (f12 ((p f02))))
   (:faces (bold bf)
-          (button (c 31) nul nbf)
+          (button (c 13 nil) nbf nul)
           (company-tooltip-common (c 1 6) nbf)
           (company-tooltip-common-selection (~ company-tooltip-selection)
                                             (c nil 6) bf)
@@ -64,8 +65,7 @@
           (w3m-image (c 94))
           (w3m-tab-background (c 12 15)))
   (:x-faces (bold (c "#223142") bf)
-            (button (c "darkslategray") nbf nul)
-            (gnus-button (c nil nil) nbf)
+            (gnus-button (p f01) it)
             (compilation-info (c "#223142" nil) nbf)
             (company-scrollbar-bg (c nil "grey95"))
             (company-scrollbar-fg (c nil "grey90"))
@@ -94,6 +94,7 @@
             (spaceline-modified (c "darkorange3" "white") bf nit)
             (spaceline-unmodified (c "royalblue4" "white") bf)
             (org-hide (c "white" "white"))
+            (scroll-bar (c "grey80"))
             (vertical-border (c "grey70" nil))
             (w3m-image (c "midnightblue" "azure2"))
             (w3m-bold (c "darkslategray") bf)
@@ -109,4 +110,6 @@
              "sienna3"
              "lemonchiffon3"))
 
+;; (enable-theme 'jao-light)
+
 (provide 'jao-light-theme)
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index a84c85e..59f8b9b 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -585,7 +585,7 @@
             (isearch-fail (p error))
             (italic (p italic))
             (ivy-confirm (p f01))
-            (ivy-current-match (p warning))
+            (ivy-current-match (p error) ul)
             (ivy-highlight-face (p hilite))
             (ivy-match-required-face (p warning))
             (ivy-minibuffer-match-highlight (c nil nil) ul)
@@ -593,7 +593,7 @@
             (ivy-minibuffer-match-face-2 (p f00))
             (ivy-minibuffer-match-face-3 (p f00))
             (ivy-minibuffer-match-face-4 (p f00))
-            (ivy-modified-buffer bf)
+            (ivy-modified-buffer it)
             (ivy-subdir (p f12)))
           `((jabber-activity-face dbg dfg nbf)
             (jabber-activity-personal-face (p warning) nbf)