theme tweaks

3 files changed, 51 insertions, 74 deletions

diff --git a/themes/jao-doomish-theme.el b/themes/jao-doomish-theme.el
index c4d512a..2e1a6bc 100644
--- a/themes/jao-doomish-theme.el
+++ b/themes/jao-doomish-theme.el
@@ -24,10 +24,9 @@
           (error "#e1c1ee")
           (error2 "#ff6655")
           (fg "#c6c6c6")
-          (fg-05 "#c0c0c0")
           (fg-1 "#a6a6a6")
           (fg-2 "#2d2d2d")
-          (fg-alt "#c9d9ff" "#bfbfbf" "brightwhite")
+          (light-purple "#c9d9ff")
           (functions "#7ebebd")
           (functions2 "#44b9b1")
           (green "#5b94ab")
@@ -71,7 +70,8 @@
           (zenburn-orange "#DFAF8F")
           (zenburn-red-1 "#BC8383"))
   (:palette (fg unspecified "#c6c6c6")
-            (bg unspecified "#282b33")
+            ;; (bg unspecified "#282b33")
+            (bg unspecified "#1f2024") ;; bg-alt
             (box "#2d2d2d" "grey25")
             (button ((c 240) nul) ((p f01) bx nul))
             (hilite ((c nil region) ex))
@@ -109,37 +109,21 @@
             (f11 ((c "lightskyblue2")))
             (f12 ((c "lightskyblue3"))))
   (:faces (bold (c nil nil) nul)
-          (button (c 66))
-          (font-lock-doc-face (c 30))
-          (gnus-button (c nil) nul)
-          (gnus-header-subject (p f01))
-          (gnus-summary-selected (c 250))
-          (match ul)
-          (magit-log-tag-label (c 95 240) nbf)
-          (mm-uu-extract (c nil 234))
           (mode-line (c 248 235) nbf nul)
-          (mode-line-inactive (c 243 235) nbf nul)
-          (org-hide (c 0 nil))
-          (rcirc-other-nick (c 108))
-          (vertical-border (c 59 nil) :inherit nil)
-          (w3m-image (c 144))
-          (w3m-tab-background (c 0 0) ul)
-          (w3m-tab-line (c 0 0) ul)
-          (widget-button (c 196))
-          (widget-field (c 143 236)))
+          (mode-line-inactive (c 243 235) nbf nul))
   (:x-faces (company-scrollbar-bg (c nil "#383941"))
             (company-scrollbar-fg (c nil "#484951"))
             (diff-hl-change (c dimm-line-fg green))
             (diff-hl-delete (c dimm-line-fg orange2))
             (diff-hl-insert (c dimm-line-fg dark-blue))
-            (fill-column-indicator (c bg-alt) :inherit nil)
+            (fill-column-indicator (c "black") :inherit nil)
             (font-lock-doc-face (~ font-lock-comment-face) it)
             (fringe (p dimm))
             (gnus-button (c "lightyellow3") nul)
-            (gnus-cite-1 (c fg-05))
+            (gnus-cite-1 (c fg-1))
             (gnus-cite-2 (c fg-1))
-            (gnus-cite-3 (c fg-1))
-            (gnus-cite-4 (c fg-1))
+            (gnus-cite-3 (c fg-2))
+            (gnus-cite-4 (c fg-2))
             (gnus-group-mail-3 (c base8)) ;; "#252525"
             (gnus-group-mail-3-empty (c fg-1))
             (gnus-group-news-3 (~ gnus-group-mail-3))
@@ -154,6 +138,7 @@
                                 :box (:line-width 2 :color "#24262d"))
             (mode-line-buffer-id (c nil) bf)
             (org-hide (c 0 nil))
+            (org-code (c yellow))
             (scroll-bar (c modeline-bg))
             (term-color-blue (c nil nil) it)
             (show-paren-match (c "darkseagreen1" "#5f5f5f"))
diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
index f76a958..8d1afe4 100644
--- a/themes/jao-light-theme.el
+++ b/themes/jao-light-theme.el
@@ -1,82 +1,67 @@
 (jao-define-custom-theme jao-light
   (:names (dimm-background "#f4f4f4")
           (dimm-background-2 "#f0f0f0")
-          (string-green "#00552a")
+          (link "#00552a")
           (yellow "#fdf6e3")
           (pale-yellow "#fff8e5")
           (green "#005555")
+          (light-green "darkseagreen4")
           (greyish "#626262")
           (blueish "#1414aa")
           (blue "#819cd6")
+          (blue2 "#51afef")
           (pale-blue "azure2")
           (dark-blue "#616c96")
           (dark-blue-1 "#2257A0")
-          (blue2 "#51afef")
+          (dark-blue-2 "#023770")
           (keywords "lightsteelblue4")
           (keywords2 "#2257A0")
           (functions "#005555")
-          (red "sienna3")
+          (red "salmon3")
           (red2 "sienna4"))
   (:palette (fg unspecified "black")
             (bg unspecified "white")
             (box "grey80" "antiquewhite3")
-            (button ((c 13 nil) nbf nul) ((c string-green) nit))
-            (hilite ((c nil "grey90")) ((c nil dimm-background)))
+            (button ((c link) nit))
+            (hilite ((c nil dimm-background)))
             (strike-through ((c 1)) (st))
-            (italic (it))
-            (link ((c 22) nul nbf nit) ((c string-green) nul nbf))
-            (visited-link ((c 3) nul nbf))
+            (italic ((it)))
+            (link ((c dark-blue-2) nul nbf))
+            (visited-link ((c dark-blue-1) nul nbf))
             (tab-sel ((~ mode-line)))
             (tab-unsel ((~ mode-line-inactive)))
-            (comment ((c greyish) it :family "Inconsolata LGC" :height 90)
-                     ((c greyish) it))
-            (keyword ((c keywords2 nil) nbf))
-            (type ((c 59) nbf nul nit) ((c "#223142") nbf))
+            (comment ((c greyish) it))
+            (keyword ((c dark-blue-2) nbf))
+            (type ((c light-green) nbf))
             (function ((c green nil) nbf))
-            (variable-name ((c 0)) ((c "black")))
+            (variable-name ((c "black")))
             (constant ((c 23)))
-            (string ((c 58)) ((c string-green)))
-            (warning ((c 9)) ((c "orangered4")))
-            (error ((c 1) (c red)))
-            (dimm ((c 102)) ((c "lemonchiffon4")))
-            (gnus-mail ((c 232)) ((c "black")))
-            (gnus-news ((c 232)) ((c "black")))
+            (string ((c link)))
+            (warning ((c red2)))
+            (error ((c red)))
+            (dimm ((c "lemonchiffon4")))
+            (gnus-mail ((c "black")))
+            (gnus-news ((c "black")))
             (outline ((c "black") nbf))
             (outline-1 ((c dark-blue-1) it bf))
             (outline-2 ((c functions) it nbf))
-            (outline-3 ((c string-green) it nbf))
+            (outline-3 ((c link) it nbf))
             (outline-4 ((c nil) it nbf))
             (outline-5 ((c nil)))
-            (f00 ((c green)) ((c 23))) ;; 14
-            (f01 ((c 31)) ((c 24)))
-            (f02 ((c 37)) ((c green))) ;; 8
+            (f00 ((c green)))
+            (f01 ((c 24)))
+            (f02 ((c light-green)))
             (f10 ((p f00)))
             (f11 ((p f01)))
             (f12 ((p f02))))
-  (:faces (bold bf)
-          (button (c 13 nil) nbf nul)
-          (company-tooltip-common (c 1 6) nbf)
-          (company-tooltip-common-selection (~ company-tooltip-selection)
-                                            (c nil 6) bf)
-          (company-tooltip-selection (~ company-tooltip) bf nul)
-          (compilation-info (c nil nil) bf)
-          (diary (c 14) bf)
-          (gnus-summary-selected (c 240 nil) nul)
-          (gnus-summary-cancelled (c nil 230) nul)
-          (gnus-summary-normal-unread (c 0 nil))
-          (header-line (c nil 15) nul)
-          (italic it)
-          (mode-line (c 0 "grey90") nbf nul)
-          (mode-line-inactive (c 11 "grey90") nbf nul)
-          (org-hide (c 15 15))
-          (vertical-border (c 252 nil) :inherit nil)
-          (w3m-tab-selected (c 9 nil) bf)
-          (w3m-link-numbering (c 12))
-          (w3m-bold (c nil nil) bf)
-          (w3m-image (c 94))
-          (w3m-tab-background (c 12 15)))
+  (:faces (mode-line (c nil dimm-background) ;; "ghost white"
+                     :box (:line-width 1 :color "grey80"))
+          (mode-line-inactive (c "grey40" dimm-background-2)
+                              :box (:line-width 1 :color "grey85"))
+          (mode-line-buffer-id (~ mode-line) nit)
+          (mode-line-emphasis it)
+          (mode-line-highlight (c green nil)))
   (:x-faces (bold (c "#223142") bf)
-            (gnus-button (p f01) it)
             (compilation-info (c "#223142" nil) nbf)
             (company-scrollbar-bg (c nil "grey95"))
             (company-scrollbar-fg (c nil "grey90"))
@@ -87,9 +72,12 @@
             (diff-hl-delete (c "white" "wheat1"))
             (fill-column-indicator (c "grey80"))
             (fringe (c "grey70" nil))
+            (gnus-button (p link))
             (gnus-summary-selected (c green) nbf)
             (gnus-summary-cancelled (c "sienna3") st)
             (header-line (c nil "#efebe7"))
+            (ivy-highlight-face (c nil pale-yellow))
+            (ivy-current-match (c nil pale-yellow))
             (lui-track-bar (p dimm) :height 0.2 nul nil ex)
             (magit-diff-context-highlight (c nil yellow) ex)
             (magit-diff-hunk-heading-highlight (c nil yellow) it bf)
@@ -97,11 +85,13 @@
                        :box (:line-width 1 :color "grey80"))
             (mode-line-inactive (c "grey40" dimm-background-2)
                                 :box (:line-width 1 :color "grey85"))
-            (mode-line-buffer-id (c nil) nbf nit)
-            (mode-line-emphasis it)
+            (mode-line-buffer-id (~ mode-line) nit)
+            (mode-line-emphasis (c green nil))
             (mode-line-highlight (c green nil))
             (scroll-bar (c "grey80"))
+            (success (p f00))
             (vertical-border (c "grey70" nil))
+            (warning (c "burlywood4"))
             (w3m-image (c "midnightblue" "azure2"))
             (w3m-bold (c "darkslategray") bf)
             (w3m-tab-selected (c "orangered4" "white") bf)
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index faa1c3f..c288ef6 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -613,7 +613,8 @@
             (ivy-minibuffer-match-face-3 (p error))
             (ivy-minibuffer-match-face-4 (p error))
             (ivy-modified-buffer it)
-            (ivy-subdir (p f12)))
+            (ivy-subdir (p f02))
+            (ivy-virtual (~ default) it))
           `((jabber-activity-face dbg dfg nbf)
             (jabber-activity-personal-face (p warning) nbf)
             (jabber-chat-error (p error))
@@ -733,7 +734,7 @@
             (org-agenda-restriction-lock (~ default))
             (org-agenda-structure (p f00))
             (org-archived (p dimm))
-            (org-code (p f02))
+            (org-code (p f11))
             (org-column dfg dbg :height 1.0)
             (org-date (p f02) nul)
             (org-done (p dimm) nbf niv)
@@ -754,6 +755,7 @@
             (org-link link)
             (org-noter-notes-exist-face it)
             (org-property-value nil)
+            (org-roam-link (~ org-link) it)
             (org-scheduled (p f01))
             (org-scheduled-previously (p f00) nbf)
             (org-scheduled-today (p f01))