Initial contents

6 files changed, 941 insertions, 0 deletions

diff --git a/themes/autumn-ec b/themes/autumn-ec
new file mode 100755
index 0000000..ca63787
--- /dev/null
+++ b/themes/autumn-ec
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+font=${EC_TERM_FACE:-xft:Inconsolata:size=11,[codeset=iso8859-7]xft:Andale Mono:size=12}
+
+frg="grey55"
+bkg="grey1"
+bw=4
+bw=${EC_TERM_BORDER:-3}
+tr="-tr -sh 8"
+tr="+tr"
+
+exec urxvtcd -cr tomato -sl 0 +rv +ptab +ssr -b $bw -bd "$bkg" \
+             -bg "$bkg" -fg "$frg" \
+             +sbg $tr -fn "${font}" -name "emacsclient" \
+             -xrm "*colorBD: ${frg}" \
+             -xrm "*colorUL: ${frg}" \
+             -xrm "*color0: ${frg}" \
+             -xrm "*color8: grey20" \
+             -xrm "*color1: tan3" \
+             -xrm "*color9: sienna3" \
+             -xrm "*color2: peachpuff4" \
+             -xrm "*color10: navajowhite4" \
+             -xrm "*color3: grey40" \
+             -xrm "*color11: darkseagreen4" \
+             -xrm "*color4: #9D9064" \
+             -xrm "*color12: #BAA68F" \
+             -xrm "*color5: cornsilk3" \
+             -xrm "*color13: sienna4" \
+             -xrm "*color6: grey40" \
+             -xrm "*color14: tan4" \
+             -xrm "*color7: ${frg}" \
+             -xrm "*color15: grey50" \
+             -e emacsclient -t $*
+
+
+
+# fname=${EC_XTERM_FN:-Inconsolata}
+# fsize=${EC_XTERM_FS:-11}
+# exec xterm -cr tomato -sl 0 +rv -b 4 -bg "$bkg" -bd "$bkg" -fg "$frg" \
+#            -bdc -ulc -u8 -fa "$fname" -fs $fsize -name "emacsclient" \
diff --git a/themes/dark-ec b/themes/dark-ec
new file mode 100755
index 0000000..caed4f4
--- /dev/null
+++ b/themes/dark-ec
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# font=${EC_TERM_FACE:-xft:Andale Mono:size=11}
+font=${EC_TERM_FACE:-xft:Inconsolata:size=11,[codeset=iso8859-7]xft:Andale Mono:size=12}
+# font=${EC_TERM_FACE:-xft:Terminus:size=12,[codeset=iso8859-7]xft:Andale Mono:size=12}
+# font=${EC_TERM_FACE:-xft:DejaVu Sans Mono:size=11}
+
+frg="grey50"
+bkg="black"
+bw=${EC_TERM_BORDER:-2}
+tr=${EC_TRANS_SPEC}
+
+exec urxvtcd -cr tomato -sl 0 +ptab +rv +ssr -b $bw -bd "$bkg" \
+             -bg "$bkg" -fg "$frg" \
+             +sbg $tr -fn "${font}" -name "emacsclient" \
+             -xrm "*colorBD: ${frg}" \
+             -xrm "*colorUL: ${frg}" \
+             -xrm "*color0: ${bkg}" \
+             -xrm "*color8: grey20" \
+             -xrm "*color1: lightgoldenrod3" \
+             -xrm "*color9: sienna3" \
+             -xrm "*color2: darkslategray" \
+             -xrm "*color10: #44836e" \
+             -xrm "*color3: grey40" \
+             -xrm "*color11: #648f81" \
+             -xrm "*color4: lightcyan4" \
+             -xrm "*color12: darkseagreen4" \
+             -xrm "*color5: paleturquoise4" \
+             -xrm "*color13: aquamarine4" \
+             -xrm "*color6: grey7" \
+             -xrm "*color14: azure4" \
+             -xrm "*color7: ${frg}" \
+             -xrm "*color15: grey50" \
+             -e emacsclient -t $*
+
+
+#             -xrm "*color6: #3F4D5C" \
+
+# fname=${EC_XTERM_FN:-Inconsolata}
+# fsize=${EC_XTERM_FS:-11}
+# exec xterm -cr tomato -sl 0 +rv -b 4 -bg "$bkg" -bd "$bkg" -fg "$frg" \
+#            -bdc -ulc -u8 -fa "$fname" -fs $fsize -name "emacsclient" \
diff --git a/themes/jao-dark-theme.el b/themes/jao-dark-theme.el
new file mode 100644
index 0000000..7976337
--- /dev/null
+++ b/themes/jao-dark-theme.el
@@ -0,0 +1,63 @@
+(jao-define-custom-theme jao-dark-theme
+  (:palette (fg unspecified "grey55")
+            (bg unspecified "grey2")
+            (box "yellow" "grey30")
+            (button ((c 11) nul))
+            (hilite ((c nil 8)))
+            (strike-through ((c 8)))
+            (italic ((c 13)))
+            (link ((c 5) ul))
+            (visited-link ((c 3) ul))
+            (tab-sel ((c 9 8) nbf))
+            (tab-unsel ((c 15 6) bx))
+            (comment ((c 3)))
+;;            (keyword ((c 12) nbf))
+            (keyword ((c 11) nbf))
+            (type ((c 11) nbf))
+;;            (function ((c 10) nbf))
+            (function ((c 10) nbf))
+            (variable-name ((c nil)))
+            (constant ((c 3)))
+            (string ((c 14)))
+            (warning ((c 1)))
+            (error ((c 9)))
+            (dimm ((c 3)))
+            (gnus-mail ((c 15 nil)))
+            (gnus-news ((c 15 nil)))
+            (outline ((c 7)))
+            (f00 ((c 5)))
+            (f01 ((c 11)))
+            (f02 ((c 10)))
+            (f10 ((p f00)))
+            (f11 ((p f01)))
+            (f12 ((p f02))))
+  (:faces (bold (c nil nil) nul)
+          (gnus-button (c nil nil) nul)
+          (gnus-summary-selected (c nil nil) ul nbf)
+          (mm-uu-extract (c nil 6))
+          (mode-line (c 7 8) nbf nul)
+          (mode-line-inactive (c 8 6) nbf nul)
+          (org-hide (c 0 nil))
+          (rcirc-other-nick (c 14))
+          (vertical-border (c 8 nil) :inherit nil)
+          (w3m-image (c 1))
+          (w3m-tab-background (c 0 0))
+          (w3m-tab-line (c 0 0))
+          (widget-button (c nil nil) nul))
+  (:x-faces (gnus-button (c nil nil) nul)
+            (gnus-summary-selected (c "grey40" nil) ul)
+            (mode-line (c 14 8) bf nul bx)
+            (mode-line-inactive (c 3 8) nbf nul bx)
+            (org-hide (c 0 nil))
+            (fringe (p dimm))
+            (rcirc-other-nick (c 6))
+            (vertical-border (c 8 nil) :inherit nil)
+            (w3m-image (c 9))
+            (w3m-tab-background (c 0 0))
+            (widget-button (c nil nil) nul))
+  (:x-colors "black" "lightgoldenrod3" "darkslategray" "grey40" "lightcyan4"
+             "paleturquoise4" "#3F4D5C" "grey55"
+             "grey20" "lightgoldenrod4" "#44836e" "#648f81" "darkseagreen4"
+             "aquamarine4" "azure4" "grey60"))
+
+(provide 'jao-dark-theme)
diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
new file mode 100644
index 0000000..3b826b0
--- /dev/null
+++ b/themes/jao-light-theme.el
@@ -0,0 +1,74 @@
+(jao-define-custom-theme jao-light-theme
+  (:palette (fg "black" "black")
+            (bg "white" "#efebe7")
+            (box "color-86" "antiquewhite3")
+            (button ((c 13 nil) nbf nul) (bx))
+            (hilite ((c nil 5)))
+            (strike-through ((c 1)) (st))
+            (italic ((c 4) nbf it) (dfg dbg it))
+            (link ((c 8) ul nbf))
+            (visited-link (link))
+            (tab-sel ((~ mode-line)))
+            (tab-unsel ((~ mode-line-inactive)))
+            (comment ((c 11) it)) ;; italic
+            (keyword ((c 14) nul bf))
+            (type ((c 4) nbf nul) ((c "grey30") bf))
+            (function ((c 0 nil) bf))
+            (variable-name ((c 0)))
+            (constant ((c 8)) ((c "grey40")))
+            (string ((c 10)) ((c "dark olive green")))
+            (warning ((c 9)))
+            (error ((c 1)))
+            (dimm ((c 12)))
+            (gnus-mail ((c 0)))
+            (gnus-news ((c 0)))
+            (outline ((c 0)))
+            (f00 ((c 14)))
+            (f01 ((c 10)))
+            (f02 ((c 8)))
+            (f10 ((p f00)))
+            (f11 ((p f01)))
+            (f12 ((p f02))))
+  (:faces (bold (c 80) bf)
+          (company-tooltip-common (c 1 6) nbf)
+          (company-tooltip-common-selection (~ company-tooltip-selection)
+                                            (c nil 6) bf)
+          (company-tooltip-selection (~ company-tooltip) bf nul)
+          (compilation-info (c nil nil) bf)
+          (diary (c 14) bf)
+          (gnus-summary-selected (c nil 79))
+          (jao-gnus-face-tree (c nil 78))
+          (header-line (c nil 79) nul)
+          (italic it)
+          (mode-line (c 0 5) nbf nul)
+          (mode-line-inactive (c 12 5) nbf nul)
+          (org-hide (c 7 nil))
+          (vertical-border (c 11 nil) :inherit nil)
+          (w3m-bold (c nil nil) bf)
+          (w3m-image (c 3))
+          (w3m-tab-background (c 12 5)))
+  (:x-faces (button (c 10 nil) nbf)
+            (gnus-button (c nil nil) nbf)
+            (company-tooltip-common (c 1 6) nbf)
+            (company-tooltip-common-selection (~ company-tooltip-selection)
+                                              (c nil 6) bf)
+            (company-tooltip-selection (~ company-tooltip) bf nul)
+            (compilation-info (c nil nil) bf)
+            (fringe (c 9 nil))
+            (gnus-summary-selected (c nil "white"))
+            (header-line (~ mode-line-inactive) (c 14))
+            (mode-line (c 0 7) :box (:line-width -1 :color "grey60"))
+            (mode-line-inactive (~ mode-line) (c 12))
+            (org-hide (c 7 nil))
+            (vertical-border (c 12 nil))
+            (w3m-image (c 3))
+            (w3m-tab-selected (c nil "white") nbf)
+            (w3m-tab-selected-retrieving (~ w3m-tab-selected) (c 1))
+           (w3m-tab-background (c 7 7) nul))
+  (:x-colors "black" "sienna3" "#597B59" "#D38108" "#3B3152"
+             "#E0DACC" "lightyellow3"
+             "#EFEBE7" "grey20" "orangered4" "darkslategray" "#59513A"
+             "lemonchiffon4" "#386858" "#223142" "#EFEBE7"))
+
+(provide 'jao-light-theme)
+
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
new file mode 100644
index 0000000..bcedc36
--- /dev/null
+++ b/themes/jao-themes.el
@@ -0,0 +1,682 @@
+;;; palette
+(defvar jao-themes--face-family "Inconsolata")
+(defvar jao-themes--fg "black")
+(defvar jao-themes--bg "white")
+(defvar jao-themes--box "grey75")
+(defvar jao-themes--hilite nil)
+(defvar jao-themes--italic '(it))
+(defvar jao-themes--button '(ul))
+(defvar jao-themes--strike-through '(:strike-through t))
+(defvar jao-themes--outline '((c "darkslategrey")))
+(defvar jao-themes--link '((c "darkgoldenrod4")))
+(defvar jao-themes--visited-link '((c "darkolivegreen4") nul))
+(defvar jao-themes--gnus-mail '(dfg))
+(defvar jao-themes--gnus-news '(dfg))
+(defvar jao-themes--tab-sel '((c nil "grey90") bx))
+(defvar jao-themes--tab-unsel '((c "grey30" "grey85") nbf bx))
+(defvar jao-themes--comment '((c "grey30")))
+(defvar jao-themes--warning '((c "indianred3") nbf))
+(defvar jao-themes--error '((c "indianred3") bf))
+(defvar jao-themes--constant '((c "darkolivegreen") nbf))
+(defvar jao-themes--function '((c "darkolivegreen") nbf))
+(defvar jao-themes--keyword '((c "darkslategrey") nbf))
+(defvar jao-themes--string '((c "skyblue4")))
+(defvar jao-themes--type '((c "darkslategrey")))
+(defvar jao-themes--variable-name '((c "DodgerBlue4")))
+(defvar jao-themes--dimm '((c "grey30") nbf))
+(defvar jao-themes--f00 '((c "dodgerblue4")))
+(defvar jao-themes--f01 '((c "cadetblue4")))
+(defvar jao-themes--f02 '((c "darkslategrey")))
+(defvar jao-themes--f10 '((c "dodgerblue4")))
+(defvar jao-themes--f11 '((c "cadetblue4")))
+(defvar jao-themes--f12 '((c "darkslategrey")))
+
+(defsubst jao-themes--palette-face (face)
+  (intern (format "jao-themes--%s" face)))
+
+(defun jao-themes--normalize-body (body)
+  (dolist (p '(:inverse-video :underline :inherit) body)
+    (unless (member p body)
+      (setq body (append body (list p nil))))))
+
+(defun jao-themes--parse-face-body (f)
+  (cond ((null f) nil)
+        ((listp f)
+         (jao-themes--normalize-body
+          (apply 'append (mapcar 'jao-themes--parse-face-sym f))))))
+
+(defvar jao-themes--cidxs
+  '("black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"
+    "brightblack" "brightred" "brightgreen" "brightyellow" "brightblue"
+    "brightmagenta" "brightcyan" "brightwhite"))
+
+(defvar jao-themes--x-colors nil)
+
+(defun jao-themes--color (clr)
+  (cond ((stringp clr) clr)
+        ((numberp clr) (or (nth clr jao-themes--cidxs)
+                           (format "color-%s" clr)))
+        (t 'unspecified)))
+
+(defun jao-themes--parse-face-sym (s)
+  (cond ((listp s)
+         (case (car s)
+           (c `(:foreground ,(jao-themes--color (cadr s))
+                            :background ,(jao-themes--color (caddr s))))
+           (p (let ((var (jao-themes--palette-face (cadr s))))
+                (when (boundp var)
+                  (let ((val (symbol-value var)))
+                    (if (listp val)
+                        (jao-themes--parse-face-body val)
+                      val)))))
+           (~ (cdr (assq (cadr s) *jao--parsed-faces*)))
+           (t (list s))))
+        ((atom s)
+         (case s
+           (~ '(:inherit))
+           (dbg `(:background ,jao-themes--bg))
+           (dfg `(:foreground ,jao-themes--fg))
+           (link (jao-themes--parse-face-body jao-themes--link))
+           (vlink (jao-themes--parse-face-body jao-themes--visited-link))
+           (bf '(:bold t :weight bold))
+           (nbf '(:bold t :weight normal))
+           (it '(:italic t :slant italic))
+           (nit '(:italic nil :slant normal))
+           (niv '(:inverse-video nil))
+           (ul '(:underline t))
+           (nul '(:underline nil))
+           (st '(:strike-through t))
+           (bx `(:box (:line-width -1 :color ,jao-themes--box)))
+           (t (list s))))))
+
+(defun jao-themes--make-faces (fs &optional cidxs)
+  (let ((*jao--parsed-faces* nil)
+        (jao-themes--cidxs (or cidxs jao-themes--cidxs))
+        (result nil))
+    (dolist (f (sort (jao-themes--dfs fs) 'jao--cmp-faces) (reverse result))
+      (let ((body (jao-themes--parse-face-body (cdr f))))
+        (push (cons (car f) body) *jao--parsed-faces*)
+        (push (list (car f) body) result)))))
+
+(defun jao--cmp-faces (a b)
+  (let ((ai (cadr (assq '~ a)))
+        (bi (cadr (assq '~ b))))
+    (cond ((and ai (not bi)) nil)
+          ((and bi (not ai)) t)
+          ((eq (car a) bi) t)
+          ((eq (car b) ai) nil)
+          (t (string< (symbol-name (car a))
+                      (symbol-name (car b)))))))
+
+(defun jao-themes--dfs (fs)
+  (let ((dfs
+         (append
+          `((bbdb-company)
+            (bbdb-field-name bf)
+            (bbdb-field-value nil)
+            (bbdb-name ul)
+            (bmk-mgr-bookmark-face nil)
+            (bmk-mgr-folder-face bf)
+            (bmk-mgr-sel-bookmark-face link)
+            (bmk-mgr-sel-folder-face bf)
+            (bold bf)
+            (bold-italic bf)
+            (border (c nil nil))
+            (buffer-menu-buffer bf)
+            (button (p button)))
+          `((calendar-holiday-marker (p f00))
+            (cursor (p error)))
+          `((diredp-compressed-file-suffix (~ diredp-file-suffix))
+            (diredp-date-time (p f01))
+            (diredp-deletion (p error))
+            (diredp-deletion-file-name (~ diredp-deletion))
+            (diredp-dir-heading bf dfg dbg)
+            (diredp-dir-priv dfg dbg bf)
+            (diredp-display-msg (p f00))
+            (diredp-exec-priv dfg dbg bf)
+            (diredp-executable-tag (p error))
+            (diredp-file-name dfg dbg)
+            (diredp-file-suffix (~ diredp-file-name))
+            (diredp-flag-mark (p f00) bf)
+            (diredp-flag-mark-line (p hilite))
+            (diredp-ignored-file-name (p dimm))
+            (diredp-link-priv (~ diredp-symlink))
+            (diredp-no-priv (~ diredp-read-priv))
+            (diredp-other-priv dfg dbg)
+            (diredp-rare-priv dfg dfg)
+            (diredp-read-priv dfg dbg bf)
+            (diredp-symlink (p warning))
+            (diredp-write-priv dfg dbg bf))
+          `((change-log-acknowledgement (p f02))
+            (change-log-conditionals (p f02))
+            (change-log-date (p f01))
+            (change-log-email (p f00))
+            (change-log-file (p f10))
+            (change-log-function (p function))
+            (change-log-list (p f11))
+            (change-log-name (p keyword))
+            (comint-highlight-input (p f01) nbf)
+            (comint-highlight-prompt (p f00))
+            (company-tooltip (~ highlight))
+            (company-tooltip-selection (~ company-tooltip) ul)
+            (company-tooltip-common (~ company-tooltip) bf)
+            (company-tooltip-common-selection
+             (~ company-tooltip-selection) bf)
+            (company-preview (~ highlight))
+            (company-preview-common (~ company-preview) bf)
+            (compilation-column-number (p f00) nul)
+            (compilation-error nbf (p error) nul)
+            (compilation-info nbf (p f02) nul)
+            (compilation-line-number (p f01) nul)
+            (compilation-warning nbf (p warning) nul)
+            (completions-common-part nbf :width normal)
+            (completions-first-difference bf dfg dbg)
+            (cursor dfg dbg)
+            (custom-button (~ button))
+            (custom-button-mouse (~ button))
+            (custom-button-pressed (~ button))
+            (custom-button-pressed-unraised (~ button))
+            (custom-button-unraised (~ button))
+            (custom-changed (p warning))
+            (custom-comment (p string))
+            (custom-comment-tag (p keyword))
+            (custom-documentation (p string))
+            (custom-face-tag nbf)
+            (custom-group-tag bf (p f00) :height 11)
+            (custom-group-tag-1 bf :family ,jao-themes--face-family
+                                (p f00) :height 11)
+            (custom-invalid (p error))
+            (custom-link link)
+            (custom-modified (p f10))
+            (custom-rogue (p error))
+            (custom-saved ul)
+            (custom-set (p f11))
+            (custom-state (p f12))
+            (custom-themed (p f00))
+            (custom-variable-button (~ button))
+            (custom-variable-tag (p variable-name) bf)
+            (cvs-handled (p dimm)))
+          `((darcsum-change-line-face (p warning))
+            (darcsum-filename-face (p f00))
+            (darcsum-header-face (p f01))
+            (darcsum-marked-face (p f00) bf)
+            (darcsum-need-action-face (p warning))
+            (darcsum-need-action-marked-face bf (p warning))
+            (diary (p f02))
+            (diff-added (p warning))
+            (diff-changed (p f02))
+            (diff-context (p dimm))
+            (diff-file-header dfg dbg nbf)
+            (diff-function (p function))
+            (diff-header nbf dfg dbg)
+            (diff-hunk-header (~ diff-file-header))
+            (diff-index bf dfg dbg)
+            (diff-indicator-added (~ diff-added))
+            (diff-indicator-changed (~ diff-changed))
+            (diff-indicator-removed (~ diff-removed))
+            (diff-nonexistent bf (p error))
+            (diff-refine-change (~ diff-changed) ul)
+            (diff-removed (p error))
+            (dired-directory (p f02))
+            (dired-flagged bf)
+            (dired-header (p f01))
+            (dired-ignored (p dimm))
+            (dired-mark (p f00) bf)
+            (dired-marked bf (p f00))
+            (dired-symlink (p f11))
+            (dired-warn-writable (p warning))
+            (dired-warning (p warning)))
+          `((ediff-current-diff-A (~ diff-added))
+            (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-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-B (~ ediff-fine-diff-A))
+            (ediff-fine-diff-C (~ ediff-fine-diff-A))
+            (ediff-odd-diff-A (~ ediff-even-diff-A))
+            (ediff-odd-diff-Ancestor (~ ediff-odd-diff-A) nbf)
+            (ediff-odd-diff-B (~ ediff-odd-diff-A))
+            (ediff-odd-diff-C (~ ediff-odd-diff-A))
+            (emms-browser-album-face (p f00) :height 1.0)
+            (emms-browser-artist-face (p f01) :height 1.0)
+            (emms-browser-composer-face (p f02) :height 1.0)
+            (emms-browser-track-face (p f10) :height 1.0)
+            (emms-browser-year/genre-face (p f11) :height 1.0)
+            (emms-metaplaylist-mode-current-face (p f00) bf)
+            (emms-metaplaylist-mode-face (p f00))
+            (emms-playlist-selected-face (p f00) bf)
+            (emms-playlist-track-face (p f00) nbf)
+            (emms-stream-name-face (p f00))
+            (emms-stream-url-face link)
+            (epa-field-body)
+            (epa-field-name bf)
+            (epa-mark bf (p f00))
+            (epa-string (p f01))
+            (epa-validity-disabled)
+            (epa-validity-high bf)
+            (epa-validity-low)
+            (epa-validity-medium)
+            (escape-glyph (p dimm))
+            (eshell-ls-archive (p f12))
+            (eshell-ls-backup (p dimm))
+            (eshell-ls-clutter (p dimm))
+            (eshell-ls-directory (p f02))
+            (eshell-ls-executable (p warning))
+            (eshell-ls-missing (p dimm))
+            (eshell-ls-product (p f01))
+            (eshell-ls-readonly (p f01) bf)
+            (eshell-ls-special bf (p f10))
+            (eshell-ls-symlink bf (p f11))
+            (eshell-ls-unreadable (p dimm))
+            (eshell-prompt (p f00)))
+          `((factor-font-lock-comment (~ font-lock-comment-face))
+            (factor-font-lock-constructor (~ font-lock-function-name-face))
+            (factor-font-lock-declaration (~ font-lock-type-face))
+            (factor-font-lock-getter-word (~ font-lock-function-name-face))
+            (factor-font-lock-parsing-word (~ font-lock-keyword-face))
+            (factor-font-lock-setter-word (~ font-lock-function-name-face))
+            (factor-font-lock-stack-effect (~ font-lock-comment-face))
+            (factor-font-lock-string (~ font-lock-string-face))
+            (factor-font-lock-symbol (~ font-lock-keyword-face))
+            (factor-font-lock-symbol-definition (~ font-lock-builtin-face))
+            (factor-font-lock-type-definition (~ font-lock-type-face))
+            (factor-font-lock-type-name (~ font-lock-type-face))
+            (factor-font-lock-vocabulary-name (~ font-lock-constant-face))
+            (factor-font-lock-word (~ font-lock-function-name-face))
+            (ffap)
+            (file-name-shadow (p dimm))
+            (fixed-pitch :family ,jao-themes--face-family)
+            (flyspell-duplicate nbf (p warning))
+            (flyspell-incorrect nbf (p error))
+            (font-lock-builtin-face (p keyword))
+            (font-lock-comment-delimiter-face (p comment))
+            (font-lock-comment-face (p comment))
+            (font-lock-constant-face (p constant))
+            (font-lock-doc-face (p comment))
+            (font-lock-function-name-face (p function))
+            (font-lock-keyword-face (p keyword))
+            (font-lock-negation-char-face nil)
+            (font-lock-preprocessor-face (p constant))
+            (font-lock-regexp-grouping-backslash bf)
+            (font-lock-regexp-grouping-construct bf)
+            (font-lock-string-face (p string))
+            (font-lock-type-face (p type))
+            (font-lock-variable-name-face (p variable-name))
+            (font-lock-warning-face (p warning))
+            (fringe nil)
+            (fuel-font-lock-debug-error (p error) nul)
+            (fuel-font-lock-debug-info (p f01) nul)
+            (fuel-font-lock-stack-region (p hilite))
+            (fuel-font-lock-xref-link link nul)
+            (fuel-font-lock-xref-vocab italic nul)
+            (fuel-font-lock-markup-link link)
+            (fuel-font-lock-markup-title (~ outline-1))
+            (fuel-font-lock-markup-emphasis (~ italic))
+            (fuel-font-lock-markup-heading (~ outline-1))
+            (fuel-font-lock-markup-strong (~ bold)))
+          `((geiser-font-lock-autodoc-current-arg (~ highlight))
+            (geiser-font-lock-autodoc-identifier
+             (~ font-lock-function-name-face))
+            (geiser-font-lock-doc-button (~ button))
+            (geiser-font-lock-doc-link link)
+            (geiser-font-lock-doc-title bf)
+            (geiser-font-lock-xref-header bf)
+            (geiser-font-lock-xref-link link nul)
+            (gnus-button (~ button))
+            (gnus-cite-attribution nil)
+            (gnus-cite-1 (p f10))
+            (gnus-cite-2 (p f11))
+            (gnus-cite-3 (p f12))
+            (gnus-cite-4 (p dimm))
+            (gnus-cite-5 (p dimm))
+            (gnus-cite-6 (p dimm))
+            (gnus-cite-7 (p dimm))
+            (gnus-cite-8 (p dimm))
+            (gnus-cite-9 (p dimm))
+            (gnus-cite-10 (p dimm))
+            (gnus-cite-11 (p dimm))
+            (gnus-emphasis-bold bf)
+            (gnus-emphasis-bold-italic bf)
+            (gnus-emphasis-highlight-words (p hilite))
+            (gnus-emphasis-italic nil)
+            (gnus-emphasis-strikethru st)
+            (gnus-emphasis-underline ul)
+            (gnus-emphasis-underline-bold bf ul)
+            (gnus-emphasis-underline-bold-italic bf ul)
+            (gnus-emphasis-underline-italic ul)
+            (gnus-group-mail-1 (p gnus-mail) bf)
+            (gnus-group-mail-1-empty (p gnus-mail) nbf)
+            (gnus-group-mail-2 (~ gnus-group-mail-1))
+            (gnus-group-mail-2-empty (~ gnus-group-mail-1-empty))
+            (gnus-group-mail-3 (~ gnus-group-mail-1))
+            (gnus-group-mail-3-empty (~ gnus-group-mail-1-empty))
+            (gnus-group-mail-4 (~ gnus-group-mail-1))
+            (gnus-group-mail-4-empty (~ gnus-group-mail-1-empty))
+            (gnus-group-mail-5 (p f00) bf)
+            (gnus-group-mail-5-empty (p f00))
+            (gnus-group-mail-6 (p dimm) bf)
+            (gnus-group-mail-6-empty (p dimm))
+            (gnus-group-mail-low bf (p dimm))
+            (gnus-group-mail-low-empty (p dimm))
+            (gnus-group-news-low bf (p dimm))
+            (gnus-group-news-low-empty (p dimm))
+            (gnus-group-news-1 (p gnus-news) bf)
+            (gnus-group-news-1-empty (p gnus-news) nbf)
+            (gnus-group-news-2 (~ gnus-group-news-1))
+            (gnus-group-news-2-empty (~ gnus-group-news-1-empty))
+            (gnus-group-news-3 (~ gnus-group-news-1))
+            (gnus-group-news-3-empty (~ gnus-group-news-1-empty))
+            (gnus-group-news-4 (~ gnus-group-news-1))
+            (gnus-group-news-4-empty (~ gnus-group-news-1-empty))
+            (gnus-group-news-5 (p f00) bf)
+            (gnus-group-news-5-empty (p f00))
+            (gnus-group-news-6 (p dimm) bf)
+            (gnus-group-news-6-empty (p dimm))
+            (gnus-header-content (p f02))
+            (gnus-header-from (p f01))
+            (gnus-header-name nbf (p f02))
+            (gnus-header-newsgroups (p dimm))
+            (gnus-header-subject (p f00) nbf)
+            (gnus-mouse-face nil)
+            (gnus-server-agent nbf)
+            (gnus-server-closed (p warning))
+            (gnus-server-denied bf (p error))
+            (gnus-server-offline (p dimm))
+            (gnus-server-opened bf)
+            (gnus-signature nit (p f10))
+            (gnus-splash dfg dbg)
+            (gnus-summary-high-undownloaded bf nit dfg dbg)
+            (gnus-summary-cancelled (p strike-through))
+            (gnus-summary-high-unread bf nit)
+            (gnus-summary-normal-ancient (p dimm))
+            (gnus-summary-normal-read (p dimm))
+            (gnus-summary-high-ticked bf nit dfg dbg)
+            (gnus-summary-low-ancient (p dimm))
+            (gnus-summary-low-read (p dimm) st)
+            (gnus-summary-low-ticked (p dimm))
+            (gnus-summary-low-unread (p dimm))
+            (gnus-summary-low-undownloaded (p dimm))
+            (gnus-summary-normal-ancient (p dimm))
+            (gnus-summary-normal-read (p dimm))
+            (gnus-summary-normal-ticked (p f10) nbf)
+            (gnus-summary-normal-undownloaded bf dfg dbg)
+            (gnus-summary-normal-unread dfg dbg)
+            (gnus-summary-selected (p hilite))
+            (gnus-x-face)
+            (gui-button-face (~ button))
+            (gui-element (~ gui-button-face)))
+          `((header-line (~ mode-line))
+            (help-argument-name)
+            (highlight (p hilite)))
+          `((ido-first-match (p warning))
+            (ido-incomplete-regexp (p error))
+            (ido-indicator (p error) nbf)
+            (ido-only-match (p f00))
+            (ido-subdir (p f01))
+            (info-header-node bf dfg)
+            (info-header-xref dfg)
+            (info-menu-header bf)
+            (info-menu-star bf dfg)
+            (info-node (p f00))
+            (info-title-1 (~ outline-1) bf)
+            (info-title-2 (~ outline-2) bf)
+            (info-title-3 (~ outline-3) bf)
+            (info-title-4 (~ outline-4) bf)
+            (info-xref link)
+            (info-xref-visited vlink)
+            (isearch bf (p hilite))
+            (isearch-fail (p error))
+            (italic (p italic)))
+          `((jabber-activity-face dbg dfg nbf)
+            (jabber-activity-personal-face (p warning) nbf)
+            (jabber-chat-error (p error))
+            (jabber-chat-prompt-foreign (p f00) nbf)
+            (jabber-chat-prompt-local (p f01) nbf)
+            (jabber-chat-prompt-system (p f02) nbf)
+            (jabber-rare-time-face (p dimm))
+            (jabber-roster-user-away (p dimm))
+            (jabber-roster-user-chatty (p warning) nbf)
+            (jabber-roster-user-offline (p dimm))
+            (jabber-roster-user-online (p f01) nbf)
+            (jabber-roster-user-xa (p dimm))
+            (jabber-title-large (~ default) bf)
+            (jabber-title-medium bf)
+            (jabber-title-roster bf (p warning))
+            (jao-emms-font-lock-album (p f01))
+            (jao-emms-font-lock-artist (p f02))
+            (jao-emms-font-lock-title (p f01))
+            (jao-emms-font-lock-track dfg dbg)
+            (jao-frm-from-face (p f00))
+            (jao-frm-mailbox-face bf)
+            (jao-frm-subject-face (p f01))
+            (jao-frm-mailno-face bf)
+            (jao-gnus-face-tree (p dimm))
+            (jde-java-font-lock-constant-face (~ font-lock-constant-face))
+            (jde-java-font-lock-doc-tag-face (p f02))
+            (jde-java-font-lock-package-face (p f02))
+            (jde-java-font-lock-link-face (p link))
+            (jde-java-font-lock-number-face (~ font-lock-constant-face))
+            (jde-java-font-lock-public-face (~ font-lock-keyword-face))
+            (jde-java-font-lock-private-face (~ font-lock-keyword-face))
+            (jde-java-font-lock-protected-face (~ font-lock-keyword-face))
+            (jde-java-font-lock-modifier-face (~ font-lock-keyword-face)))
+          `((lazy-highlight (p hilite))
+            (link link nul)
+            (link-visited vlink nul))
+          `((magit-diff-add (~ diff-added))
+            (magit-diff-del (~ diff-removed))
+            (magit-diff-file-header (~ diff-file-header))
+            (magit-diff-hunk-header (~ diff-hunk-header))
+            (magit-diff-none (p dimm))
+            (magit-item-highlight (p hilite))
+            (magit-item-mark (p warning))
+            (magit-log-head-label (p keyword) bf)
+            (magit-log-tag-label (p keyword))
+            (match (p hilite))
+            (menu nil)
+            (message-cited-text (p f01) nbf)
+            (message-header-cc (p f00) nbf)
+            (message-header-name (p f01) nbf)
+            (message-header-newsgroups (p dimm) nbf)
+            (message-header-other (p f00) nbf)
+            (message-header-subject (p f00) nbf)
+            (message-header-to (p f00) nbf)
+            (message-header-xheader (p f00) nbf)
+            (message-mml (p warning) nbf)
+            (message-separator (p warning) nbf)
+            (mm-uu-extract (p hilite))
+            (minibuffer-prompt (p f00))
+            (mode-line-buffer-id nbf (c nil nil))
+            (mode-line-emphasis (p warning))
+            (mode-line-highlight (~ mode-line))
+            (modeline-mousable (~ mode-line-active))
+            (modeline-mousable-minor-mode (~ modeline-mousable))
+            (mouse dfg dbg ul)
+            (muse-link link)
+            (muse-verbatim (p f02)))
+          `((next-error (p hilite))
+            (nobreak-space dbg dfg ul))
+          `((org-agenda-date-weekend (p dimm))
+            (org-agenda-done (p dimm))
+            (org-agenda-restriction-lock (~ default))
+            (org-agenda-structure (p f00))
+            (org-archived (p dimm))
+            (org-code (p f02))
+            (org-column dfg dbg :height 1.0)
+            (org-date (p f02) nul)
+            (org-done (p dimm) nbf niv)
+            (org-drawer (p f02))
+            (org-ellipsis (p dimm))
+            (org-formula (p f02))
+            (org-headline-done (p dimm))
+            (org-hide (c ,jao-themes--bg))
+            (org-latex-and-export-specials (~ default))
+            (org-level-1 (~ outline-1))
+            (org-level-2 (~ outline-2))
+            (org-level-3 (~ outline-3))
+            (org-level-4 (~ outline-4))
+            (org-level-5 (~ outline-5))
+            (org-level-6 (~ outline-6))
+            (org-level-7 (~ outline-7))
+            (org-level-8 (~ outline-8))
+            (org-link link)
+            (org-property-value nil)
+            (org-scheduled (p f01))
+            (org-scheduled-previously (p warning) nbf)
+            (org-scheduled-today (p f00))
+            (org-sexp-date (p f01))
+            (org-special-keyword (p keyword))
+            (org-table (p f01))
+            (org-tag (p dimm) nbf)
+            (org-target ul)
+            (org-time-grid dfg dbg)
+            (org-todo bf niv (p warning))
+            (org-upcoming-deadline (p f02))
+            (org-verbatim  (p hilite))
+            (org-warning bf (p warning))
+            (outline-1 bf (p outline))
+            (outline-2 bf (p outline))
+            (outline-3 nbf (p outline))
+            (outline-4 nbf (p outline))
+            (outline-5 nbf (p outline))
+            (outline-6 nbf (p outline))
+            (outline-7 nbf (p outline))
+            (outline-8 nbf (p outline)))
+          `((query-replace bf (p hilite)))
+          `((rcirc-bright-nick (p hilite))
+            (rcirc-my-nick (p error))
+            (rcirc-nick-in-message (p error))
+            (rcirc-nick-in-message-full-line nbf)
+            (rcirc-other-nick (p keyword))
+            (rcirc-prompt bf)
+            (rcirc-server (p dimm))
+            (rcirc-timestamp (p dimm))
+            (rcirc-track-nick (~ rcirc-my-nick) niv)
+            (rcirc-url nbf link)
+            (reb-match-0 (p hilite))
+            (reb-match-1 (~ secondary-selection))
+            (reb-match-2 (~ secondary-selection) bf)
+            (reb-match-3 (~ secondary-selection) ul)
+            (region (p hilite)))
+          `((secondary-selection (p hilite))
+            (sh-quoted-exec (p f00))
+            (show-paren-match (p hilite))
+            (show-paren-mismatch (p error))
+            (slime-repl-prompt-face (p f00))
+            (slime-repl-input-face (p f00) bf)
+            (slime-repl-inputed-output-face (p f02))
+            (slime-repl-output-face (p string))
+            (speedbar-directory-face (~ diredp-dir-heading))
+            (speedbar-file-face (~ diredp-file-name))
+            (speedbar-highlight-face (p hilite))
+            (speedbar-selected-face ul)
+            (speedbar-separator-face (p f00))
+            (scroll-bar nil)
+            (shadow nil))
+          `((tool-bar nil)
+            (tooltip :family ,jao-themes--face-family (c nil "lightyellow"))
+            (trailing-whitespace (p error)))
+          `((underline nul))
+          `((variable-pitch :family ,jao-themes--face-family :height 11)
+            (vertical-border (c ,jao-themes--box nil) :inherit default))
+          `((w3m-anchor link)
+            (w3m-arrived-anchor vlink)
+            (w3m-bold bf dbg dfg)
+            (w3m-current-anchor nbf ul)
+            (w3m-form dfg dbg ul)
+            (w3m-form-button (~ button))
+            (w3m-form-button-mouse (~ custom-button-mouse))
+            (w3m-form-button-pressed (~ custom-button-pressed))
+            (w3m-header-line-location-content
+             :box (:line-width 3 :color ,jao-themes--bg) dfg dbg)
+            (w3m-header-line-location-title
+             :box (:line-width 3 :color ,jao-themes--bg) dfg dbg)
+            (w3m-history-current-url (c nil nil) ul)
+            (w3m-image (p f10))
+            (w3m-image-anchor (c nil nil))
+            (w3m-insert (p f12))
+            (w3m-italic (~ italic))
+            (w3m-linknum-match (p warning))
+            (w3m-linknum-minibuffer-prompt (~ minibuffer-prompt))
+            (w3m-session-select (p f10))
+            (w3m-session-selected bf nul (p f10))
+            (w3m-strike-through st)
+            (w3m-tab-background nul (c nil nil))
+            (w3m-tab-mouse nil)
+            (w3m-tab-selected (p tab-sel))
+            (w3m-tab-selected-background nil)
+            (w3m-tab-selected-retrieving (p tab-sel) it)
+            (w3m-tab-unselected (p tab-unsel))
+            (w3m-tab-unselected-retrieving (p tab-unsel) it)
+            (w3m-tab-unselected-unseen (p tab-unsel))
+            (w3m-underline ul)
+            (widget-button (~ button))
+            (widget-button-pressed nbf (~ custom-button-pressed))
+            (widget-button-face (~ button))
+            (widget-button-pressed-face (~ button))
+            (widget-documentation (p dimm))
+            (widget-field (p hilite) bx)
+            (widget-inactive (p dimm))
+            (Widget-single-line-field (~ widget-field))
+            (woman-bold (p f00) bf)
+            (woman-italic (p f01) nul nit)
+            (woman-italic-no-ul (p f01) nul nit)))))
+    (dolist (df dfs fs)
+      (when (not (assq (car df) fs))
+        (push df fs)))))
+
+(defsubst jao-themes--let-palette (palette xp)
+  (mapcar (lambda (f)
+            `(,(jao-themes--palette-face (car f))
+              ',(or (and xp (caddr f)) (cadr f))))
+          palette))
+
+(defun jao-themes--extract-faces (t-faces x-faces)
+  (let ((result))
+    (dolist (f t-faces (reverse result))
+      (let ((xfb (cdr (assq (car f) x-faces))))
+        (push `(,(car f) ((((type x darwin)) ,@xfb)
+                          (t ,@(cdr f)))) result)))))
+
+(defun jao-themes--set-fbg (kind)
+  (let* ((kvs (cdr (assoc kind window-system-default-frame-alist)))
+         (f-alist (assq-delete-all 'background-color kvs))
+         (f-alist (assq-delete-all 'foreground-color f-alist)))
+    (when jao-themes--fg
+      (push (cons 'foreground-color jao-themes--fg) f-alist))
+    (when jao-themes--bg
+      (push (cons 'background-color jao-themes--bg) f-alist))
+    (setq window-system-default-frame-alist
+          (cons
+           (cons kind f-alist)
+           (assq-delete-all kind window-system-default-frame-alist)))))
+
+(defmacro jao-define-custom-theme (name &rest args)
+  (let ((t-faces (make-symbol "t-faces"))
+        (xfaces (make-symbol "xfaces"))
+        (tx-faces (make-symbol "tx-faces"))
+        (palette (cdr (assoc :palette args)))
+        (faces (cdr (assoc :faces args)))
+        (x-faces (cdr (assoc :x-faces args)))
+        (x-colors (cdr (assoc :x-colors args))))
+    `(let* ,(jao-themes--let-palette palette nil)
+       (jao-themes--set-fbg nil)
+       (let ((,t-faces (jao-themes--make-faces ',faces)))
+         (let* ,(jao-themes--let-palette palette t)
+           (jao-themes--set-fbg 'x)
+           (let* ((,xfaces (jao-themes--make-faces ',x-faces ',x-colors))
+                  (,tx-faces (jao-themes--extract-faces ,t-faces ,xfaces)))
+             (deftheme ,name)
+             (put ',name 'theme-immediate t)
+             (apply 'custom-theme-set-faces (cons ',name ,tx-faces))
+             (provide-theme ',name)))))))
+
+(put 'jao-define-custom-theme 'lisp-indent-function 1)
+
+
+(provide 'jao-themes)
diff --git a/themes/light-ec b/themes/light-ec
new file mode 100755
index 0000000..bde38f9
--- /dev/null
+++ b/themes/light-ec
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+font=${EC_TERM_FACE:-xft:Inconsolata:size=11,[codeset=iso8859-7]xft:Andale Mono:size=12,[codeset=japanese-jisx0208]xft:Andale Mono:size=12}
+ifont=${EC_TERM_FACE_ITALIC:-xft:Inconsolata-11:slant=italic}
+#font="xft:DejaVu Sans Mono-9"
+#ifont="xft:DejaVu Sans Mono-9:italic"
+
+frg="black"
+bkg="#EFEBE7"
+
+bw=${EC_TERM_BORDER:-2}
+tr=${EC_TRANS_SPEC}
+
+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" \
+             -xrm "*colorUL: grey20" \
+             -xrm "*color0: ${frg}" \
+             -xrm "*color8: grey20" \
+             -xrm "*color1: sienna3" \
+             -xrm "*color9: orangered4" \
+             -xrm "*color2: #597B59" \
+             -xrm "*color10: #254242" \
+             -xrm "*color3: #D38108" \
+             -xrm "*color11: #59513A" \
+             -xrm "*color4: #3B3152" \
+             -xrm "*color12: lemonchiffon4" \
+             -xrm "*color5: #E0DACC" \
+             -xrm "*color13: #386858" \
+             -xrm "*color6: lightyellow3" \
+             -xrm "*color14: #1F3D4F" \
+             -xrm "*color7: ${bkg}" \
+             -xrm "*color15: #EFEBE7" \
+             -name "emacsclient" \
+             -e emacsclient -t $*
+
+# fname=${EC_XTERM_FN:-Inconsolata}
+# fsize=${EC_XTERM_FS:-11}
+# exec xterm -cr tomato -sl 0 +rv -b "$bw" -bg "$bkg" -bd "$bkg" -fg "$frg" \
+#            -bdc -ulc -u8 -fa "$fname" -fs $fsize \