themes: doomish tweaks

1 files changed, 35 insertions, 23 deletions

diff --git a/themes/jao-doomish-theme.el b/themes/jao-doomish-theme.el
index 46b9115..83052ee 100644
--- a/themes/jao-doomish-theme.el
+++ b/themes/jao-doomish-theme.el
@@ -21,19 +21,22 @@
           (dark-cyan "#6e7899" "#5699AF" "cyan")
           (dimm-line-fg "#3f3f3f")
           (doc-comments "#9299b2" "#80b2c3" "cyan")
-          (error "#e1c1ee" "#ff6655" "red")
+          (error "#e1c1ee")
+          (error2 "#ff6655")
           (fg "#c6c6c6")
           (fg-05 "#c0c0c0")
           (fg-1 "#a6a6a6")
           (fg-2 "#2d2d2d")
           (fg-alt "#c9d9ff" "#bfbfbf" "brightwhite")
-          (functions "#7ebebd" "#44b9b1" "brightgreen")
+          (functions "#7ebebd")
+          (functions2 "#44b9b1")
           (green "#5b94ab")
           (green2 "#99bb66")
           (grey "#515462" "#3f3f3f" "brightblack")
           (hidden "#282b33" "black" "black")
           (highlight "#819cd6" "#51afef" "brightblue")
-          (keywords "#819cd6" "#51afef" "brightblue")
+          (keywords "#819cd6")
+          (keywords2 "#51afef")
           (light-blue "#90a6db" "#ECBE7B" "yellow")
           (magenta "#a6c1e0" "#c678dd" "magenta")
           (methods "#7289bc" "#46D9FF" "brightcyan")
@@ -44,7 +47,8 @@
           (modeline-fg-alt "#888395" "#525252" "brightblack")
           (numbers "#a6c1e0" "#c678dd" "magenta")
           (operators "#819cd6" "#51afef" "brightblue")
-          (orange "#a6c1e0" "#dd8844" "brightred")
+          (orange "#a6c1e0")
+          (orange2 "#dd8844")
           (red "#e1c1ee" "#ff6655" "red")
           (region "#41454b")
           (region2 "#262626")
@@ -52,7 +56,8 @@
           (strings "#5b94ab" "#99bb66" "green")
           (success "#5b94ab" "#99bb66" "green")
           (teal "#7ebebd" "#44b9b1" "brightgreen")
-          (type "#b0a2e7" "#a9a1e1" "brightmagenta")
+          (type "#b0a2e7")
+          (type2 "#a9a1e1")
           (variables "#a6c1e0" "#c678dd" "magenta")
           (vc-added "#5b94ab" "#99bb66" "green")
           (vc-deleted "#e1c1ee" "#ff6655" "red")
@@ -72,30 +77,37 @@
             (hilite ((c nil region) ex))
             (strike-through ((c 237)) (st))
             (italic ((c 137) it) (it))
-            (link ((c green) nit nul))
-            (visited-link ((c green2) nit nul))
+            (link ((c blue) nit nul))
+            (visited-link ((c green) nit nul))
             (tab-sel ((c 252 232) nbf))
             (tab-unsel ((c 245 232)))
             (comment ((c 102) it) ((c comments)))
             (keyword ((c 151) nbf nul nit) ((c keywords)))
             (function ((c 115) nul nbf) ((c functions)))
-            (type ((c 72) nbf) ((c type)))
+            (type ((c 72) nbf) ((c type2)))
             (variable-name ((c nil)))
             (constant ((c 72)) ((c constants) nbf nit nul))
-            (string ((c 36)) ((c "wheat3"))) ;; "slate gray" "medium aquamarine"
-            (error ((c 144)) ((c zenburn-red-1)))
-            (warning ((c 95)) ((c zenburn-orange)))
+            (string ((c 36)) ((c strings))) ;; "wheat3" "slate gray" "medium aquamarine"
+            (error ((c 144)) ((c "pale goldenrod")))
+            (warning ((c 95)) ((c "dark khaki")))
             (success ((c green)))
             (dimm ((c 59)) ((c "#6f6f6f")))
             (gnus-mail ((c nil)))
             (gnus-news ((c nil)))
-            (outline ((c nil)))
-            (f00 ((c 29)) ((c "burlywood3")))
-            (f01 ((c 108)) ((c "burlywood4")))
-            (f02 ((c 102)) ((c "lemonchiffon4")))
-            (f10 ((c "cornsilk3")))
-            (f11 ((c "lemonchiffon3")))
-            (f12 ((c "honeydew4"))))
+            (outline-1 ((c keywords) bf))
+            (outline-2 ((c functions) bf))
+            (outline-3 ((c keywords2) bf))
+            (outline-4 ((c functions2) bf))
+            (outline-5 ((c nil)))
+            ;; (f00 ((c 29)) ((c "burlywood3")))
+            ;; (f01 ((c 108)) ((c "burlywood4")))
+            ;; (f02 ((c 102)) ((c "lemonchiffon4")))
+            (f00 ((c 29)) ((c "steelblue3")))
+            (f01 ((c 102)) ((c "lightsteelblue3")))
+            (f02 ((c 108)) ((c "skyblue4")))
+            (f10 ((c "slategray3")))
+            (f11 ((c "lightskyblue2")))
+            (f12 ((c "lightskyblue3"))))
   (:faces (bold (c nil nil) nul)
           (button (c 66))
           (font-lock-doc-face (c 30))
@@ -117,8 +129,8 @@
           (widget-field (c 143 236)))
   (:x-faces (company-scrollbar-bg (c nil "#383941"))
             (company-scrollbar-fg (c nil "#484951"))
-            (diff-hl-change (c dimm-line-fg "#313131"))
-            (diff-hl-delete (c dimm-line-fg red))
+            (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)
             (font-lock-doc-face (~ font-lock-comment-face) it)
@@ -128,7 +140,7 @@
             (gnus-cite-2 (c fg-1))
             (gnus-cite-3 (c fg-1))
             (gnus-cite-4 (c fg-1))
-            (gnus-group-mail-3 (c nil nil)) ;; "#252525"
+            (gnus-group-mail-3 (c base8)) ;; "#252525"
             (gnus-group-mail-3-empty (c fg-1))
             (gnus-group-news-3 (~ gnus-group-mail-3))
             (gnus-group-news-3-empty (~ gnus-group-mail-3-empty))
@@ -140,9 +152,9 @@
                        :box (:line-width 2 :color "#22242b"))
             (mode-line-inactive (c "grey35" modeline-bg-inactive)
                                 :box (:line-width 2 :color "#24262d"))
-            (mode-line-buffer-id (c zenburn-green-2))
+            (mode-line-buffer-id (c nil) bf)
             (org-hide (c 0 nil))
-            (scroll-bar (c box-line-fg))
+            (scroll-bar (c modeline-bg))
             (show-paren-match (c "darkseagreen1" "#5f5f5f"))
             (variable-pitch (c nil nil))
             (vertical-border (c "black") :inherit nil)