Themes tweaks

6 files changed, 47 insertions, 28 deletions

diff --git a/themes/dark-ec b/themes/dark-ec
index 7d3754c..75d9a62 100755
--- a/themes/dark-ec
+++ b/themes/dark-ec
@@ -1,22 +1,22 @@
 #!/bin/bash
 
-font=${EC_TERM_FACE:-xft:Terminus:size=12,[codeset=iso8859-7]xft:Andale Mono:size=12}
+font=${EC_TERM_FACE:-xft:Inconsolata-11}
+ifont=${EC_TERM_ITALIC_FACE}
 
-font=${EC_TERM_FACE:-xft:Inconsolata:size=10}
-
-frg="grey60"
-bkg="#101010"
+frg="grey80"
 bkg="black"
-bkg="rgba:0000/0000/0000/6666"
-bkg="grey5"
 bw=${EC_TERM_BORDER:-2}
 tr=${EC_TRANS_SPEC}
-# tr="+tr"
 usr=${EC_USR_OPTS}
 
-exec xterm -cr tomato -b $bw -fa $font -fi $EC_TERM_ITALIC_FACE \
-           -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}" \
+             -name "emacsclient" ${usr} \
+#             -e emacsclient -t $*
+
+# exec xterm -cr tomato -b $bw -fa $font -fi $EC_TERM_ITALIC_FACE \
+#            -fg $frg -bg $bkg
+#            -e emacsclient -t $*
 
 exec urxvtcd -cr tomato -sl 0 +ptab +rv +ssr -b $bw -bd "$bkg" \
              -bg "$bkg" -fg "$frg" \
diff --git a/themes/jao-dark-theme.el b/themes/jao-dark-theme.el
index 8608e1f..1c2725e 100644
--- a/themes/jao-dark-theme.el
+++ b/themes/jao-dark-theme.el
@@ -5,7 +5,7 @@
             (button ((c 11) nul))
             (hilite ((c nil 8)))
             (strike-through ((c 8)))
-            (italic ((c 101) nul) (it :family "DejaVu Sans Mono" :height 120))
+            (italic ((c 101) nul) (it :family "DejaVu Sans Mono" :height 100))
             (link ((c 2) nul))
             (visited-link ((c 2) nul))
             (tab-sel ((c 9 8) nbf))
diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
index fefcbed..0d03469 100644
--- a/themes/jao-light-theme.el
+++ b/themes/jao-light-theme.el
@@ -3,33 +3,34 @@
             (bg unspecified "white")
             (box "grey80" "antiquewhite3")
             (button ((c 13 nil) nbf nul) (~ mode-line-inactive))
-            (hilite ((c nil "grey89")) ((c nil 15))) ;; 5
+            (hilite ((c nil "grey90")) ((c nil 15))) ;; 5
             (strike-through ((c 1)) (st))
 ;;            (italic ((c nil) it :family "DejaVu Sans Mono" :height 90))
-            (italic ((c "darkslategray4")))
-            (link (ul nbf nit) ((c 29) nul nbf))
-            (visited-link ((c 24) nul nbf))
+;;            (italic ((c "darkslategray4")))
+            (italic (it))
+            (link ((c 22) nul nbf nit) ((c 29) nul nbf))
+            (visited-link ((c 23) nul nbf))
             (tab-sel ((~ mode-line)))
             (tab-unsel ((~ mode-line-inactive)))
             ;; (comment ((c nil) it :family "Inconsolata LGC" :height 80))
-            (comment ((c 237) it))
+            (comment ((c 241) it))
 ;;            (keyword ((c 24 nil) nbf))
-            (keyword ((c 30 nil) bf))
-            (type ((c 25) nbf nul) ((c 14) nbf))
+            (keyword ((c 24 nil) nbf))
+            (type ((c 59) nbf nul nit) ((c 14) nbf))
             (function ((c 30 nil) nbf) ((c 30 nil) nbf))
 ;;            (function ((c 31 nil) nbf) ((c 0 nil) nbf it ul))
             (variable-name ((c 0)))
-            (constant ((c 22)))
-            (string ((c 66)) ((c 29)))
+            (constant ((c 23)))
+            (string ((c 58)) ((c 29)))
             (warning ((c 9)))
             (error ((c 1)))
-            (dimm ((c 109)) ((c 12)))
+            (dimm ((c 102)) ((c 12)))
             (gnus-mail ((c 232)) ((c 0)))
             (gnus-news ((c 232)) ((c 0)))
             (outline ((c 0)))
-            (f00 ((c 30))) ;; 14
-            (f01 ((c 30)))
-            (f02 ((c 31))) ;; 8
+            (f00 ((c 23))) ;; 14
+            (f01 ((c 24)))
+            (f02 ((c 30))) ;; 8
             ;; (f00 ((c 8))) ;; 14
             ;; (f01 ((c 14)))
             ;; (f02 ((c 10))) ;; 8
@@ -37,6 +38,7 @@
             (f11 ((p f01)))
             (f12 ((p f02))))
   (:faces (bold bf)
+          (button (c 23) nul nbf)
           (company-tooltip-common (c 1 6) nbf)
           (company-tooltip-common-selection (~ company-tooltip-selection)
                                             (c nil 6) bf)
@@ -44,13 +46,14 @@
           (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 250 nil) :inherit nil)
+          (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)
diff --git a/themes/jao-mono-dark-theme.el b/themes/jao-mono-dark-theme.el
index cab51d9..8414172 100644
--- a/themes/jao-mono-dark-theme.el
+++ b/themes/jao-mono-dark-theme.el
@@ -10,8 +10,9 @@
             (visited-link ((c 36) nul) ((c "aquamarine3") nul))
             (tab-sel ((c 252 232) nbf))
             (tab-unsel ((c 245 232) bx))
-            (comment ((c 29) nit) ((c nil) :height 110
-                                   :family "Inconsolata LGC" it))
+            ;; (comment ((c 102) it) ((c nil) :height 100
+            ;;                       :family "Inconsolata LGC" it))
+            (comment ((c 102) it) ((c nil) it))
             (keyword ((c 151) nbf nul nit) ((c "darkseagreen3")))
             (function ((c 115) nul nbf) ((c "aquamarine3"))) ;; 108
             (type ((c 72) nbf) ((c "lightyellow4")))
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index 6fd8138..1dfbb93 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -391,6 +391,7 @@
             (geiser-font-lock-doc-title bf)
             (geiser-font-lock-xref-header bf)
             (geiser-font-lock-xref-link link nul)
+            (git-commit-summary-face (p f10))
             (git-gutter-fr:added (~ fringe) nbf)
             (git-gutter-fr:deleted (~ fringe) nbf)
             (git-gutter-fr:modified (~ fringe) nbf)
@@ -732,6 +733,15 @@
             (w3m-tab-unselected-retrieving (p tab-unsel) it)
             (w3m-tab-unselected-unseen (p tab-unsel))
             (w3m-underline ul)
+            (wg-brace-face nil)
+            (wg-command-face (p f00))
+            (wg-current-workgroup-face (p f11) bf)
+            (wg-divider-face nil)
+            (wg-filename-face nil)
+            (wg-frame-face nil)
+            (wg-message-face (p string))
+            (wg-mode-line-face nil)
+            (wg-previous-workgroup-face (p f00))
             (widget-button (~ button))
             (widget-button-pressed nbf (~ custom-button-pressed))
             (widget-button-face (~ button))
diff --git a/themes/light-ec b/themes/light-ec
index e3cf784..0c55b32 100755
--- a/themes/light-ec
+++ b/themes/light-ec
@@ -11,6 +11,11 @@ usr=${EC_USR_OPTS}
 font=$EC_TERM_FACE
 ifont=$EC_TERM_ITALIC_FACE
 
+exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \
+             -sl 0 +rv +ssr -b $bw +sbg -fn "${font}" -fi "${ifont}" \
+             -name "emacsclient" ${usr} \
+             -e emacsclient -t $*
+
 exec xterm $usr -b $bw -fg "$frg" -bg "$bkg" -e emacsclient -t $*
 
 exec urxvtcd $tr -cr tomato +ptab -bg "$bkg" -bd "$bkg" -fg "$frg" \