themes tweaks

4 files changed, 48 insertions, 28 deletions

diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
index bcd3a04..25b0e1a 100644
--- a/themes/jao-light-theme.el
+++ b/themes/jao-light-theme.el
@@ -5,21 +5,21 @@
             (button ((c 13 nil) nbf nul) (bx))
             (hilite ((c nil 15))) ;; 5
             (strike-through ((c 1)) (st))
-            (italic (it))
-            (link ((c 14) ul nbf nit))
-            (visited-link ((c 24) ul nbf))
+            (italic (it) (nit (c 96)))
+            (link (ul nbf nit) ((c 29) nul nbf))
+            (visited-link ((c 24) nul nbf))
             (tab-sel ((~ mode-line)))
             (tab-unsel ((~ mode-line-inactive)))
-            (comment ((c 239) it)) ;; italic
-            (keyword ((c 14) nul bf) ((c 10) nul nbf))
-            (type ((c 23) nbf nul) ((c 14) nbf))
-            (function ((c 13 nil) bf) ((c 8 nil) nbf))
+            (comment ((c 239) it))
+            (keyword ((c 24 nil) nbf))
+            (type ((c 25) nbf nul) ((c 14) nbf))
+            (function ((c 31 nil) nbf) ((c 30 nil) nbf))
             (variable-name ((c 0)))
             (constant ((c 14)))
-            (string ((c 13)))
+            (string ((c 13)) ((c 29)))
             (warning ((c 9)))
             (error ((c 1)))
-            (dimm ((c 12)))
+            (dimm ((c "grey69")) ((c 12)))
             (gnus-mail ((c 0)))
             (gnus-news ((c 0)))
             (outline ((c 0)))
@@ -29,7 +29,7 @@
             (f10 ((p f00)))
             (f11 ((p f01)))
             (f12 ((p f02))))
-  (:faces (bold (c 0) bf)
+  (:faces (bold (c 256) bf)
           (company-tooltip-common (c 1 6) nbf)
           (company-tooltip-common-selection (~ company-tooltip-selection)
                                             (c nil 6) bf)
@@ -39,12 +39,12 @@
           (gnus-summary-selected (c 13 nil) nul)
           (gnus-summary-normal-unread (c 0 nil))
           (header-line (c nil 15) nul)
-;;          (italic it)
-          (mode-line (c 0 15) nbf nul)
-          (mode-line-inactive (c 11 15) nbf nul)
-          (org-hide (c 7 7))
-          (vertical-border (c 11 nil) :inherit nil)
-          (w3m-tab-selected (c 9 5) bf)
+          (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 "grey80" 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))
@@ -54,16 +54,20 @@
             (gnus-button (c nil nil) nbf)
             (compilation-info (c 14 nil) nbf)
             (cursor (c 1 1))
-            (fringe (c 11 nil))
+            (diff-hl-change (c "white" "light goldenrod yellow"))
+            (diff-hl-insert (c "white" "honeydew2"))
+            (diff-hl-delete (c "white" "moccasin"))
+            (fringe (c "grey70" nil))
             (gnus-summary-selected (c 2) nbf)
             (gnus-summary-cancelled (c 1) st)
             (header-line (c nil "#efebe7"))
-            (mode-line (c 0 7) :box (:line-width -1 :color "grey90"))
-            (mode-line-inactive (~ mode-line) (c "grey30"))
-            (org-hide (c 7 nil))
-            (vertical-border (c "grey72" nil))
-            (w3m-image (c 3))
-            (w3m-bold (c 9) nbf)
+            (mode-line (c "grey15" 7) :box (:line-width -1 :color "grey90"))
+            (mode-line-inactive (c "grey30")
+                                :box (:line-width -1 :color "grey90"))
+            (org-hide (c "white" "white"))
+            (vertical-border (c "grey70" nil))
+            (w3m-image (c "midnightblue" "azure2"))
+            (w3m-bold (c 10) nbf)
             (w3m-tab-selected (c 9 15) bf)
             (w3m-tab-selected-retrieving (~ w3m-tab-selected) (c 1))
             (w3m-tab-background (c 15 15) nul))
diff --git a/themes/jao-mono-dark-theme.el b/themes/jao-mono-dark-theme.el
index bbfcdda..2c63c08 100644
--- a/themes/jao-mono-dark-theme.el
+++ b/themes/jao-mono-dark-theme.el
@@ -6,7 +6,7 @@
             (hilite ((c nil 238)))
             (strike-through ((c 237)) (st))
             (italic ((c 137) nit) (nit (c "lightyellow3")))
-            (link ((c 108) nul) ((c "aquamarine2") nit nul))
+            (link ((c 108) nul) ((c "aquamarine3") nit nul))
             (visited-link ((c 36) nul) ((c "aquamarine3") nul))
             (tab-sel ((c 252 232) nbf))
             (tab-unsel ((c 245 232) bx))
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index 6182a2a..4c957b1 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -206,9 +206,9 @@
             (compilation-error nbf (p error) nul)
             (compilation-info nbf (p f02) nul)
             (compilation-line-number (p f01) nul)
-            (compilation-mode-line-fail (~ error))
+            (compilation-mode-line-fail (p error))
             (compilation-mode-line-exit (p f01) nbf)
-            (compilation-mode-line-run (~ warning))
+            (compilation-mode-line-run (p warning))
             (compilation-warning nbf (p warning) nul)
             (completions-common-part nbf :width normal)
             (completions-first-difference bf dfg dbg)
@@ -253,6 +253,9 @@
             (diff-file-header dfg dbg nbf)
             (diff-function (p function))
             (diff-header nbf dfg dbg)
+            (diff-hl-change (p dimm))
+            (diff-hl-insert (p dimm))
+            (diff-hl-delete (p warn))
             (diff-hunk-header (~ diff-file-header))
             (diff-index bf dfg dbg)
             (diff-indicator-added (~ diff-added))
@@ -369,7 +372,7 @@
             (font-lock-type-face (p type))
             (font-lock-variable-name-face (p variable-name))
             (font-lock-warning-face (p warning))
-            (fringe nil)
+            (fringe (p dimm))
             (fuel-font-lock-debug-error (p error) nul)
             (fuel-font-lock-debug-info (p f01) nul)
             (fuel-font-lock-stack-region (p hilite))
@@ -388,6 +391,9 @@
             (geiser-font-lock-doc-title bf)
             (geiser-font-lock-xref-header bf)
             (geiser-font-lock-xref-link link nul)
+            (git-gutter-fr:added (~ fringe) nbf)
+            (git-gutter-fr:deleted (~ fringe) nbf)
+            (git-gutter-fr:modified (~ fringe) nbf)
             (gnus-button (~ button))
             (gnus-cite-attribution nil)
             (gnus-cite-1 (p f10))
@@ -473,6 +479,9 @@
             (gui-element (~ gui-button-face)))
           `((header-line (~ mode-line-inactive))
             (help-argument-name)
+            (helm-selection (p hilite))
+            (helm-separator (p dimm))
+            (helm-source-header (~ outline-1))
             (highlight (p hilite)))
           `((ido-first-match (p warning))
             (ido-first-match-face (p warning))
@@ -570,6 +579,12 @@
             (modeline-mousable-minor-mode (~ modeline-mousable))
             (moinmoin-table-pi (p f02))
             (mouse dfg dbg ul)
+            (muse-bad-link (p warning))
+            (muse-header-1 (~ outline-1))
+            (muse-header-2 (~ outline-2))
+            (muse-header-3 (~ outline-3))
+            (muse-header-4 (~ outline-4))
+            (muse-header-5 (~ outline-5))
             (muse-link link)
             (muse-verbatim (p f02)))
           `((next-error (p hilite))
diff --git a/themes/light-ec b/themes/light-ec
index e04b5f4..e3cf784 100755
--- a/themes/light-ec
+++ b/themes/light-ec
@@ -11,6 +11,8 @@ usr=${EC_USR_OPTS}
 font=$EC_TERM_FACE
 ifont=$EC_TERM_ITALIC_FACE
 
+exec xterm $usr -b $bw -fg "$frg" -bg "$bkg" -e emacsclient -t $*
+
 exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \
              -sl 0 +rv +ssr -b $bw +sbg -fn "${font}" -fi "${ifont}" \
              -xrm "*colorBD: grey20" \
@@ -33,4 +35,3 @@ exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \
              -xrm "*color15: #EFEBE7" \
              -name "emacsclient" ${usr} \
              -e emacsclient -t $*
-