Use named colors

1 files changed, 102 insertions, 93 deletions

diff --git a/yoshi-theme.el b/yoshi-theme.el
index 76cbe2b..ab4957c 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -29,101 +29,110 @@
 (deftheme yoshi
   "Created 2012-09-24")
 
-(custom-theme-set-faces
- 'yoshi
+(let ((lblack   "#a5a5a4") (dblack   "#111113")
+      (lblue    "#78a2c1") (dblue    "#2729b6")
+      (lcyan    "#93d8d8") (dcyan    "#208181")
+      (lgreen   "#9ad870") (dgreen   "#405c2e")
+      (lmagenta "#c39cc3") (dmagenta "#5e325d")
+      (lred     "#e09591") (dred     "#973732")
+      (lwhite   "#eeeeec") (dwhite   "#222224")
+      (lyellow  "#cfce29") (dyellow  "#6a6a15")
+      (lorange  "#ffbb56") (dorange  "#b26900"))
+  (custom-theme-set-faces
+   'yoshi
 
- '(default ((t (:background "#111113" :foreground "#eeeeec"))))
- '(diff-hl-change ((t (:background "#835c0e" :foreground "#ffbb56"))))
- '(diff-hl-delete ((t (:background "#973732" :foreground "#e98591" :inherit unspecified))))
- '(diff-hl-insert ((t (:background "#405c2e" :foreground "#9ad870" :inherit unspecified))))
- '(flycheck-error-face ((t (:inherit unspecified :underline (:color "#e09591" :style wave)))))
- '(flycheck-warning-face ((t (:inherit unspecified :underline (:color "#ffbb56" :style wave)))))
- '(flymake-errline ((t (:background unspecified :underline (:color "#e09591" :style wave)))))
- '(flymake-infoline ((t (:background unspecified :underline (:color "#78a2c1" :style wave)))))
- '(flymake-warnline ((t (:background unspecified :underline (:color "#ffbb56" :style wave)))))
- '(flyspell-duplicate ((t (:inherit unspecified :underline (:color "#ffbb56" :style wave)))))
- '(flyspell-incorrect ((t (:inherit unspecified :underline (:color "#e09591" :style wave)))))
- '(font-lock-comment-delimiter-face ((t (:foreground "#999999" :slant italic :weight bold :inherit unspecified))))
- '(font-lock-comment-face ((t (:foreground "#a9a9a9" :slant italic))))
- '(font-lock-constant-face ((t (:foreground "#93d8d8"))))
- '(font-lock-doc-face ((t (:foreground "#9ad870" :inherit unspecified))))
- '(font-lock-function-name-face ((t (:foreground "#c39cc3"))))
- '(font-lock-keyword-face ((t (:foreground "#cfce29"))))
- '(font-lock-string-face ((t (:foreground "#ffbd5c"))))
- '(font-lock-type-face ((t (:foreground "#78a2c1" :weight bold))))
- '(font-lock-variable-name-face ((t (:foreground "#e09591"))))
- '(font-lock-warning-face ((t (:foreground "#ff9800" :inherit unspecified))))
- '(highlight ((t (:background "#171719"))))
- '(highlight-80+ ((t (:underline (:color "#e09591" :style wave) :background unspecified))))
- '(identica-stripe-face ((t (:background "#222224"))))
- '(identica-uri-face ((t (:foreground "#ffbb56" :underline t))))
- '(identica-username-face ((t (:foreground "#78a2c1" :weight bold :underline unspecified))))
- '(ido-subdir ((t (:foreground "#e09591"))))
- '(italic ((t (:slant italic))))
- '(jabber-chat-prompt-foreign ((t (:foreground "#e09591"))))
- '(jabber-chat-prompt-local ((t (:foreground "#78a2c1"))))
- '(jabber-chat-prompt-system ((t (:foreground "#cfce29"))))
- '(jabber-rare-time-face ((t (:foreground "#63a0a0" :weight bold))))
- '(jabber-roster-user-online ((t (:foreground "#769ff2"))))
- '(link ((t (:foreground "#ffbb56" :underline t))))
- '(link-visited ((t (:foreground "#ee82ee" :underline t))))
- '(magit-item-highlight ((t (:weight bold :inherit unspecified))))
- '(markdown-header-face-1 ((t (:foreground "#78a2c1"))))
- '(markdown-header-face-2 ((t (:foreground "#93d8d8"))))
- '(markdown-header-face-3 ((t (:foreground "#9ad870"))))
- '(markdown-header-face-4 ((t (:foreground "#c39cc3"))))
- '(markdown-header-face-5 ((t (:foreground "#e09591"))))
- '(markdown-header-face-6 ((t (:foreground "#a9a9a9"))))
- '(minibuffer-prompt ((t (:foreground "#78a2c1"))))
- '(mode-line ((t (:background "#222224" :foreground "#eeeeec" :box unspecified))))
- '(mode-line-inactive ((t (:weight normal :background "#171719" :foreground "#999999" :box unspecified :inherit unspecified))))
- '(org-agenda-calendar-sexp ((t (:foreground "#cfce29"))))
- '(org-agenda-current-time ((t (:foreground "#ff9800" :weight bold))))
- '(org-agenda-date ((t (:foreground "#63a0a0"))))
- '(org-agenda-date-today ((t (:foreground "#93d8d8" :underline t))))
- '(org-agenda-date-weekend ((t (:foreground "#518484"))))
- '(org-agenda-structure ((t (:foreground "#78a2c1"))))
- '(org-checkbox-statistics-done ((t (:foreground "#406868"))))
- '(org-checkbox-statistics-todo ((t (:foreground "#518484"))))
- '(org-document-title ((t (:foreground "#ffbb56" :height 1.5))))
- '(org-headline-done ((t (:foreground "#a9a9a9" :strike-through t))))
- '(org-level-1 ((t (:foreground "#78a2c1"))))
- '(org-level-2 ((t (:foreground "#93d8d8"))))
- '(org-level-3 ((t (:foreground "#9ad870"))))
- '(org-level-4 ((t (:foreground "#c39cc3"))))
- '(org-level-5 ((t (:foreground "#e09591"))))
- '(org-level-6 ((t (:foreground "#a9a9a9"))))
- '(org-level-7 ((t (:foreground "#ffbb56"))))
- '(org-level-8 ((t (:foreground "#999999"))))
- '(org-scheduled ((t (:foreground "#b26900"))))
- '(org-scheduled-previously ((t (:foreground "#e09591" :bold t))))
- '(org-scheduled-today ((t (:foreground "#ffbb56" :underline t))))
- '(org-time-grid ((t (:foreground "#ffbb56"))))
- '(pp^L-highlight ((t (:box unspecified :foreground "#555557"))))
- '(region ((t (:background "#2729b6"))))
- '(rst-level-1 ((t (:background unspecified))))
- '(rst-level-2 ((t (:background unspecified))))
- '(rst-level-3 ((t (:background unspecified))))
- '(rst-level-4 ((t (:background unspecified))))
- '(rst-level-5 ((t (:background unspecified))))
- '(rst-level-6 ((t (:background unspecified))))
- '(sh-heredoc ((t (:foreground "#ffbb56"))))
- '(show-paren-match ((t (:background "#555557" :weight bold))))
- '(show-paren-mismatch ((t (:background unspecified :foreground "#e09591"))))
- '(slime-repl-input-face ((t (:foreground "#828281"))))
- '(slime-repl-inputed-output-face ((t (:foreground "#a5a5a4"))))
- '(slime-repl-output-face ((t (:foreground "#eeeeec"))))
- '(slime-repl-prompt-face ((t (:foreground "#78a2c1"))))
- '(term-color-black ((t (:background "#171719" :foreground "#999999"))))
- '(term-color-blue ((t (:background "#2729b6" :foreground "#78a2c1"))))
- '(term-color-cyan ((t (:background "#208181" :foreground "#93d8d8"))))
- '(term-color-green ((t (:background "#405c2e" :foreground "#9ad870"))))
- '(term-color-magenta ((t (:background "#5e325d" :foreground "#c39cc3"))))
- '(term-color-red ((t (:background "#973732" :foreground "#e09591"))))
- '(term-color-white ((t (:background "#222224" :foreground "#a9a9a9"))))
- '(term-color-yellow ((t (:background "#835c0e" :foreground "#ffbb56"))))
+   `(default ((t (:background ,dblack :foreground ,lwhite))))
+   `(diff-hl-change ((t (:background ,dyellow :foreground ,lyellow))))
+   `(diff-hl-delete ((t (:background ,dred :foreground ,lred :inherit unspecified))))
+   `(diff-hl-insert ((t (:background ,dgreen :foreground ,lgreen :inherit unspecified))))
+   `(flycheck-error-face ((t (:inherit unspecified :underline (:color ,lred :style wave)))))
+   `(flycheck-warning-face ((t (:inherit unspecified :underline (:color ,lorange :style wave)))))
+   `(flymake-errline ((t (:background unspecified :underline (:color ,lred :style wave)))))
+   `(flymake-infoline ((t (:background unspecified :underline (:color ,lblue :style wave)))))
+   `(flymake-warnline ((t (:background unspecified :underline (:color ,lorange :style wave)))))
+   `(flyspell-duplicate ((t (:inherit unspecified :underline (:color ,lorange :style wave)))))
+   `(flyspell-incorrect ((t (:inherit unspecified :underline (:color ,lred :style wave)))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,lblack :weight bold :inherit unspecified))))
+   `(font-lock-comment-face ((t (:foreground ,lblack :slant italic))))
+   `(font-lock-constant-face ((t (:foreground ,lcyan))))
+   `(font-lock-doc-face ((t (:foreground ,lgreen :inherit unspecified))))
+   `(font-lock-function-name-face ((t (:foreground ,lmagenta))))
+   `(font-lock-keyword-face ((t (:foreground ,lyellow :weight bold))))
+   `(font-lock-string-face ((t (:foreground ,lorange))))
+   `(font-lock-type-face ((t (:foreground ,lblue))))
+   `(font-lock-variable-name-face ((t (:foreground ,lred))))
+   `(font-lock-warning-face ((t (:foreground ,lorange :weight bold :inherit unspecified))))
+   `(highlight ((t (:background ,dwhite ))))
+   `(highlight-80+ ((t (:underline (:color ,lred :style wave) :background unspecified))))
+   `(identica-stripe-face ((t (:background ,dwhite))))
+   `(identica-uri-face ((t (:foreground ,lorange :underline t))))
+   `(identica-username-face ((t (:foreground ,lblue :weight bold :underline unspecified))))
+   `(ido-subdir ((t (:foreground ,lred))))
+   `(italic ((t (:slant italic))))
+   `(jabber-chat-prompt-foreign ((t (:foreground ,lred))))
+   `(jabber-chat-prompt-local ((t (:foreground ,lblue))))
+   `(jabber-chat-prompt-system ((t (:foreground ,lyellow))))
+   `(jabber-rare-time-face ((t (:foreground ,dcyan :weight bold))))
+   `(jabber-roster-user-online ((t (:foreground ,lblue))))
+   `(link ((t (:foreground ,lorange :underline t))))
+   `(link-visited ((t (:foreground ,lmagenta :underline t))))
+   `(magit-item-highlight ((t (:weight bold :inherit unspecified))))
+   `(markdown-header-face-1 ((t (:foreground ,lblue))))
+   `(markdown-header-face-2 ((t (:foreground ,lcyan))))
+   `(markdown-header-face-3 ((t (:foreground ,lgreen))))
+   `(markdown-header-face-4 ((t (:foreground ,lmagenta))))
+   `(markdown-header-face-5 ((t (:foreground ,lred))))
+   `(markdown-header-face-6 ((t (:foreground ,lblack))))
+   `(minibuffer-prompt ((t (:foreground ,lblue))))
+   `(mode-line ((t (:background ,dwhite :foreground ,lwhite :box unspecified))))
+   `(mode-line-inactive ((t (:weight normal :background ,dblack :foreground ,lblack :box unspecified :inherit unspecified))))
+   `(org-agenda-calendar-sexp ((t (:foreground ,lyellow))))
+   `(org-agenda-current-time ((t (:foreground ,lorange :weight bold))))
+   `(org-agenda-date ((t (:foreground ,dcyan))))
+   `(org-agenda-date-today ((t (:foreground ,lcyan :slant italic))))
+   `(org-agenda-date-weekend ((t (:foreground ,lcyan))))
+   `(org-agenda-structure ((t (:foreground ,lblue))))
+   `(org-checkbox-statistics-done ((t (:foreground ,dcyan))))
+   `(org-checkbox-statistics-todo ((t (:foreground ,lcyan))))
+   `(org-document-title ((t (:foreground ,lorange :height 1.5))))
+   `(org-headline-done ((t (:foreground ,lblack :strike-through t))))
+   `(org-level-1 ((t (:foreground ,lblue))))
+   `(org-level-2 ((t (:foreground ,lcyan))))
+   `(org-level-3 ((t (:foreground ,lgreen))))
+   `(org-level-4 ((t (:foreground ,lmagenta))))
+   `(org-level-5 ((t (:foreground ,lred))))
+   `(org-level-6 ((t (:foreground ,lblack))))
+   `(org-level-7 ((t (:foreground ,lorange))))
+   `(org-level-8 ((t (:foreground ,lwhite))))
+   `(org-scheduled ((t (:foreground ,dorange))))
+   `(org-scheduled-previously ((t (:foreground ,lred :bold t))))
+   `(org-scheduled-today ((t (:foreground ,lorange :slant italic))))
+   `(org-time-grid ((t (:foreground ,lorange))))
+   `(pp^L-highlight ((t (:box unspecified :foreground ,lblack))))
+   `(region ((t (:background ,dblue))))
+   `(rst-level-1 ((t (:background unspecified))))
+   `(rst-level-2 ((t (:background unspecified))))
+   `(rst-level-3 ((t (:background unspecified))))
+   `(rst-level-4 ((t (:background unspecified))))
+   `(rst-level-5 ((t (:background unspecified))))
+   `(rst-level-6 ((t (:background unspecified))))
+   `(sh-heredoc ((t (:foreground ,lorange))))
+   `(show-paren-match ((t (:background ,dwhite :weight bold))))
+   `(show-paren-mismatch ((t (:background unspecified :foreground ,lred))))
+   `(slime-repl-input-face ((t (:foreground ,lblack))))
+   `(slime-repl-inputed-output-face ((t (:foreground ,lblack))))
+   `(slime-repl-output-face ((t (:foreground ,lwhite))))
+   `(slime-repl-prompt-face ((t (:foreground ,lblue))))
+   `(term-color-black ((t (:background ,dblack :foreground ,lblack))))
+   `(term-color-blue ((t (:background ,dblue :foreground ,lblue))))
+   `(term-color-cyan ((t (:background ,dcyan :foreground ,lcyan))))
+   `(term-color-green ((t (:background ,dgreen :foreground ,lgreen))))
+   `(term-color-magenta ((t (:background ,dmagenta :foreground ,lmagenta))))
+   `(term-color-red ((t (:background ,dred :foreground ,lred))))
+   `(term-color-white ((t (:background ,dwhite :foreground ,lwhite))))
+   `(term-color-yellow ((t (:background ,dyellow :foreground ,lyellow))))
 
- )
+   ))
 
 (provide-theme 'yoshi)
 ;;; yoshi-theme.el ends here