themes: dark forest updates

2 files changed, 24 insertions, 16 deletions

diff --git a/themes/jao-dark-forest-theme.el b/themes/jao-dark-forest-theme.el
index 51f1f43..bee319b 100644
--- a/themes/jao-dark-forest-theme.el
+++ b/themes/jao-dark-forest-theme.el
@@ -19,12 +19,13 @@
           (zenburn-red-3 "#9C6363")
           (spaceline-bg "#1F1F1F")
           (dimm-line-fg "#3f3f3f")
-          (box-line-fg "#303030"))
+          (box-line-fg "#303030")
+          (zenburn-bg-05 "#212121"))
   (:palette (fg unspecified "dark grey")
             (bg unspecified "#1f1f1f")
             (box zenburn-fg-05 "grey25")
             (button ((c 240) nul) (bx nul))
-            (hilite ((c nil "#303336") ex))
+            (hilite ((c nil "#2a2b2c") ex))
             (strike-through ((c 237)) (st))
             (italic ((c 137) it) (it))
             (link ((c zenburn-green) nit nul))
@@ -71,9 +72,9 @@
           (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 zenburn-blue-5))
+            (diff-hl-change (c dimm-line-fg "#313131"))
             (diff-hl-delete (c dimm-line-fg zenburn-red-3))
-            (diff-hl-insert (c dimm-line-fg zenburn-green-5))
+            (diff-hl-insert (c dimm-line-fg "#414141"))
             (fill-column-indicator (c box-line-fg) :inherit nil)
             (font-lock-doc-face (c "lightcyan3") it)
             (fringe (p dimm))
@@ -85,9 +86,13 @@
             (gnus-summary-cancelled  (c "dark slate gray" nil) st)
             (gnus-summary-selected (p warning) nul nbf)
             (header-line (p hilite))
-            (mode-line (c "grey60" "#2f2f2f") bx)
-            (mode-line-inactive (c "grey50" "#3f3f3f") bx)
+            (mode-line (c "grey60" "#2b2b2b")
+                       :box (:line-width 1 :color "grey18"))
+            (mode-line-inactive (c "grey35" zenburn-bg-05)
+                                :box (:line-width 1 :color "grey17"))
+            (mode-line-buffer-id (c zenburn-green-2))
             (org-hide (c 0 nil))
+            (scroll-bar (c box-line-fg))
             (show-paren-match (c "darkseagreen1" "#5f5f5f"))
             (spaceline-read-only (c "burlywood3" spaceline-bg) niv)
             (spaceline-modified (c zenburn-orange spaceline-bg) nbf nit)
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index 8eb57c7..626d857 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -309,7 +309,7 @@
             (dictionary-reference-face (p f11))
             (dictionary-word-definition-face nil)
             (dictionary-word-entry-face (p f10))
-            (diff-added (p warning))
+            (diff-added (p warning) ex)
             (diff-changed (p f02) nul)
             (diff-context (p dimm))
             (diff-file-header dfg dbg nbf)
@@ -327,7 +327,7 @@
             (diff-refine-added (~ diff-changed) ul)
             (diff-refine-change (~ diff-changed) ul)
             (diff-refine-removed (~ diff-removed) ul)
-            (diff-removed (p error))
+            (diff-removed (p error) ex)
             (dired-directory (p f02))
             (dired-flagged bf)
             (dired-header (p f01))
@@ -338,16 +338,16 @@
             (dired-warn-writable (p warning))
             (dired-warning (p warning))
             (diredp-number (p f11)))
-          `((ediff-current-diff-A (~ diff-added))
+          `((ediff-current-diff-A (~ diff-added) ex)
             (ediff-current-diff-Ancestor (c nil ,jao-themes--box))
-            (ediff-current-diff-B (~ ediff-current-diff-A))
-            (ediff-current-diff-C (~ ediff-current-diff-A))
-            (ediff-even-diff-A (~ diff-added) bf)
-            (ediff-even-diff-Ancestor (c nil ,jao-themes--box))
+            (ediff-current-diff-B (~ ediff-current-diff-A) ex)
+            (ediff-current-diff-C (~ ediff-current-diff-A) ex)
+            (ediff-even-diff-A (~ diff-added) bf ex)
+            (ediff-even-diff-Ancestor (c nil ,jao-themes--box) ex)
             (ediff-even-diff-B (~ ediff-even-diff-A))
             (ediff-even-diff-C (~ ediff-even-diff-A))
             (ediff-fine-diff-A (~ ediff-current-diff-A) nbf ul)
-            (ediff-fine-diff-Ancestor (c nil ,jao-themes--box))
+            (ediff-fine-diff-Ancestor (c nil ,jao-themes--box) ex)
             (ediff-fine-diff-B (~ ediff-fine-diff-A))
             (ediff-fine-diff-C (~ ediff-fine-diff-A))
             (ediff-odd-diff-A (~ ediff-even-diff-A))
@@ -776,7 +776,7 @@
             (reb-match-1 (~ secondary-selection))
             (reb-match-2 (~ secondary-selection) bf)
             (reb-match-3 (~ secondary-selection) ul)
-            (region (p hilite))
+            (region (p hilite) ex)
             (rst-level-1-face (~ outline-1))
             (rst-level-2-face (~ outline-2))
             (rst-level-3-face (~ outline-3))
@@ -819,7 +819,10 @@
             (speedbar-selected-face ul)
             (speedbar-separator-face (p f00))
             (scroll-bar nil)
-            (shadow nil))
+            (shadow nil)
+            (sunshine-forecast-date-face nil)
+            (sunshine-forecast-day-divider-face (p dimm))
+            (sunshine-forecast-headline-face (~ header-line)))
           `((term nil)
             (tool-bar nil)
             (tooltip :family ,jao-themes--face-family (c nil "lightyellow"))