themes: dark-forest theme tweaks

2 files changed, 14 insertions, 12 deletions

diff --git a/themes/jao-dark-forest-theme.el b/themes/jao-dark-forest-theme.el
index 4cadfb1..51f1f43 100644
--- a/themes/jao-dark-forest-theme.el
+++ b/themes/jao-dark-forest-theme.el
@@ -4,19 +4,22 @@
           (zenburn-yellow "#F0DFAF")
           (zenburn-yellow-1 "#E0CF9F")
           (zenburn-yellow-2 "#D0BF8F")
+          (zenburn-green "#7F9F7F")
           (zenburn-green+1 "#8FB28F")
           (zenburn-green-5 "#2F4F2F")
           (zenburn-green-4 "#3F5F3F")
           (zenburn-green-3 "#4F6F4F")
           (zenburn-green-2 "#5F7F5F")
-          (zenburn-green-1" #6F8F6F")
+          (zenburn-green-1 "#6F8F6F")
           (zenburn-orange "#DFAF8F")
+          (zenburn-blue-5 "#366060")
           (zenburn-red "#CC9393")
           (zenburn-red-1 "#BC8383")
           (zenburn-red-2 "#AC7373")
           (zenburn-red-3 "#9C6363")
           (spaceline-bg "#1F1F1F")
-          (dimm-line-fg "#3f3f3f"))
+          (dimm-line-fg "#3f3f3f")
+          (box-line-fg "#303030"))
   (:palette (fg unspecified "dark grey")
             (bg unspecified "#1f1f1f")
             (box zenburn-fg-05 "grey25")
@@ -24,8 +27,8 @@
             (hilite ((c nil "#303336") ex))
             (strike-through ((c 237)) (st))
             (italic ((c 137) it) (it))
-            (link ((c zenburn-yellow-1) nit nul))
-            (visited-link ((c "burlywood3") nit nul))
+            (link ((c zenburn-green) nit nul))
+            (visited-link ((c zenburn-green-2) nit nul))
             (tab-sel ((c 252 232) nbf))
             (tab-unsel ((c 245 232)))
             (comment ((c 102) it) ((c "grey45")))
@@ -38,8 +41,8 @@
             (warning ((c 144)) ((c zenburn-red-1)))
             (error ((c 95)) ((c zenburn-orange)))
             (dimm ((c 59)) ((c "#6f6f6f")))
-            (gnus-mail ((c "gray70" nil)))
-            (gnus-news ((c "gray70" nil)))
+            (gnus-mail ((c zenburn-fg-05)))
+            (gnus-news ((c zenburn-fg-05)))
             (outline ((c nil)))
             (f00 ((c 29)) ((c "burlywood3")))
             (f01 ((c 108)) ((c "burlywood4")))
@@ -68,10 +71,10 @@
           (widget-field (c 143 236)))
   (:x-faces (company-scrollbar-bg (c nil "#383941"))
             (company-scrollbar-fg (c nil "#484951"))
-            (diff-hl-change (c "#3f3f3f" "#D0BF8F"))
-            (diff-hl-delete (c "#3f3f3f" "#6C3333"))
-            (diff-hl-insert (c "#3f3f3f" zenburn-green-5))
-            (fill-column-indicator (c "#303030") :inherit nil)
+            (diff-hl-change (c dimm-line-fg zenburn-blue-5))
+            (diff-hl-delete (c dimm-line-fg zenburn-red-3))
+            (diff-hl-insert (c dimm-line-fg zenburn-green-5))
+            (fill-column-indicator (c box-line-fg) :inherit nil)
             (font-lock-doc-face (c "lightcyan3") it)
             (fringe (p dimm))
             (gnus-button (c "lightyellow3") nul)
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index c494192..23d134a 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -131,7 +131,7 @@
   (cond ((listp s)
          (case (car s)
            (c `(:foreground ,(jao-themes--color (cadr s))
-                            :background ,(jao-themes--color (caddr s))))
+                :background ,(jao-themes--color (caddr s))))
            (p (let ((var (jao-themes--palette-face (cadr s))))
                 (when (boundp var)
                   (let ((val (symbol-value var)))
@@ -641,7 +641,6 @@
           `((magit-branch (p f00))
             (magit-cherry-equivalent (p warning))
             (magit-diff-add (~ diff-added))
-            (magit-diff-added-highlight (~ diff-added) ex)
             (magit-diff-context-highlight (p hilite))
             (magit-diff-del (~ diff-removed))
             (magit-diff-file-heading (p keyword))