Use (new) color names where possible

1 files changed, 25 insertions, 25 deletions

diff --git a/yoshi-theme.el b/yoshi-theme.el
index c4e46a8..8922cb3 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -48,13 +48,13 @@
    'yoshi
 
    `(compilation-info ((t (:foreground ,fgblue :inherit unspecified))))
-   `(cursor ((t (:background "#969696"))))
+   `(cursor ((t (:background ,fgdim))))
    `(default ((t (:background ,bgdefault :foreground ,fgdefault))))
    `(diff-added ((t (:background ,bggreen :inherit unspecified))))
    `(diff-changed ((t (:background ,bgorange))))
    `(diff-file-header ((t (:foreground "#ededed" :background unspecified))))
    `(diff-function ((t (:inherit unspecified :foreground ,fgorange))))
-   `(diff-header ((t (:background "#3d3d3d"))))
+   `(diff-header ((t (:background ,bgbright))))
    `(diff-hl-change ((t (:foreground ,fgyellow :background unspecified :inherit diff-changed))))
    `(diff-hl-delete ((t (:foreground ,fgred :inherit diff-removed))))
    `(diff-hl-insert ((t (:foreground ,fggreen :inherit diff-added))))
@@ -70,8 +70,8 @@
    `(erc-input-face ((t (:inherit shadow))))
    `(erc-my-nick-face ((t (:inherit erc-current-nick-face))))
    `(erc-notice-face ((t (:foreground ,fgblue :weight normal))))
-   `(erc-prompt-face ((t (:foreground "#ededed" :weight bold))))
-   `(erc-timestamp-face ((t (:foreground "#969696" :weight normal))))
+   `(erc-prompt-face ((t (:foreground ,fgbright :weight bold))))
+   `(erc-timestamp-face ((t (:foreground ,fgdim :weight normal))))
    `(error ((t (:foreground ,fgred :weight unspecified))))
    `(flycheck-error ((t (:inherit unspecified :underline (:color ,fgred :style wave)))))
    `(flycheck-warning ((t (:inherit unspecified :underline (:color ,fgorange :style wave)))))
@@ -81,8 +81,8 @@
    `(flyspell-duplicate ((t (:inherit unspecified :underline (:color ,fgorange :style wave)))))
    `(flyspell-incorrect ((t (:inherit unspecified :underline (:color ,fgred :style wave)))))
    `(font-lock-builtin-face ((t (:foreground ,fgcyan))))
-   `(font-lock-comment-delimiter-face ((t (:foreground "#969696" :weight bold :inherit unspecified))))
-   `(font-lock-comment-face ((t (:foreground "#969696" :slant italic))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,fgdim :weight bold :inherit unspecified))))
+   `(font-lock-comment-face ((t (:foreground ,fgdim :slant italic))))
    `(font-lock-constant-face ((t (:foreground ,fgred))))
    `(font-lock-doc-face ((t (:foreground "#969696" :inherit unspecified))))
    `(font-lock-function-name-face ((t (:foreground ,fgblue))))
@@ -98,7 +98,7 @@
    `(gnus-button ((t (:weight bold))))
    `(gnus-cite-1 ((t (:foreground ,fgred))))
    `(gnus-cite-10 ((t (:foreground ,fgpink))))
-   `(gnus-cite-11 ((t (:foreground "#ededed"))))
+   `(gnus-cite-11 ((t (:foreground ,fgbright))))
    `(gnus-cite-2 ((t (:foreground ,fgorange))))
    `(gnus-cite-3 ((t (:foreground ,fgyellow))))
    `(gnus-cite-4 ((t (:foreground ,fggreen))))
@@ -111,14 +111,14 @@
    `(gnus-group-mail-3-empty ((t (:foreground ,fgcyan))))
    `(gnus-group-news-3 ((t (:foreground ,fgred :weight bold))))
    `(gnus-group-news-3-empty ((t (:foreground ,fgred))))
-   `(gnus-header-content ((t (:foreground "#969696" :slant italic))))
+   `(gnus-header-content ((t (:foreground ,fgdim :slant italic))))
    `(gnus-header-from ((t (:weight bold))))
    `(gnus-header-name ((t (:foreground ,fgblue :weight bold))))
-   `(gnus-header-newsgroups ((t (:foreground "#ededed" :weight bold))))
+   `(gnus-header-newsgroups ((t (:foreground ,fgbright :weight bold))))
    `(gnus-header-subject ((t (:foreground ,fgyellow))))
    `(gnus-signature ((t (:foreground "#696969" :slant italic))))
    `(gnus-splash ((t (:foreground ,fgdefault))))
-   `(gnus-summary-cancelled ((t (:foreground ,fgyellow :background "#3d3d3d"))))
+   `(gnus-summary-cancelled ((t (:foreground ,fgyellow :background ,bgbright))))
    `(gnus-summary-high-ancient ((t (:inherit gnus-summary-normal-ancient :weight bold))))
    `(gnus-summary-high-read ((t (:inherit gnus-summary-normal-read :weight bold))))
    `(gnus-summary-high-ticked ((t (:inherit gnus-summary-normal-ticked :weight bold))))
@@ -128,13 +128,13 @@
    `(gnus-summary-low-ticked ((t (:inherit gnus-summary-normal-ticked :slant italic))))
    `(gnus-summary-low-unread ((t (:inherit gnus-summary-normal-unread :slant italic))))
    `(gnus-summary-normal-ancient ((t (:foreground ,fgcyan))))
-   `(gnus-summary-normal-read ((t (:foreground "#8c8c8c"))))
+   `(gnus-summary-normal-read ((t (:foreground ,fgdim))))
    `(gnus-summary-normal-ticked ((t (:foreground ,fgred))))
    `(gnus-summary-normal-unread ((t (:foreground ,fgdefault))))
    `(gnus-summary-selected ((t (:background ,bgblue :weight bold))))
-   `(highlight ((t (:background "#3d3d3d"))))
+   `(highlight ((t (:background ,bgbright))))
    `(highlight-80+ ((t (:underline (:color ,fgred :style wave) :background unspecified))))
-   `(identica-stripe-face ((t (:background "#3d3d3d"))))
+   `(identica-stripe-face ((t (:background ,bgbright))))
    `(identica-uri-face ((t (:foreground ,fgorange :underline t))))
    `(identica-username-face ((t (:foreground ,fgblue :weight bold :underline unspecified))))
    `(ido-subdir ((t (:foreground ,fgred))))
@@ -152,7 +152,7 @@
    `(jabber-roster-user-chatty ((t (:foreground ,fgpink))))
    `(jabber-roster-user-dnd ((t (:foreground ,fgred :weight unspecified :slant unspecified))))
    `(jabber-roster-user-error ((t (:foreground ,fgred :slant unspecified :weight bold))))
-   `(jabber-roster-user-offline ((t (:foreground "#969696" :slant italic))))
+   `(jabber-roster-user-offline ((t (:foreground ,fgdim :slant italic))))
    `(jabber-roster-user-online ((t (:foreground ,fgblue))))
    `(jabber-roster-user-xa ((t (:foreground ,fgmagenta))))
    `(js2-external-variable ((t (:foreground ,fgmagenta))))
@@ -172,9 +172,9 @@
    `(markdown-header-face-4 ((t (:inherit org-level-4))))
    `(markdown-header-face-5 ((t (:inherit org-level-5))))
    `(markdown-header-face-6 ((t (:inherit org-level-6))))
-   `(message-header-cc ((t (:foreground "#969696"))))
+   `(message-header-cc ((t (:foreground ,fgdim))))
    `(message-header-name ((t (:inherit gnus-header-name))))
-   `(message-header-newsgroups ((t (:foreground "#969696" :weight bold))))
+   `(message-header-newsgroups ((t (:foreground ,fgdim :weight bold))))
    `(message-header-other ((t (:inherit gnus-header-content))))
    `(message-header-subject ((t (:inherit gnus-header-subject))))
    `(message-header-to ((t (:foreground "#96969696" :weight bold))))
@@ -182,9 +182,9 @@
    `(message-mml ((t (:foreground ,fggreen))))
    `(message-separator ((t (:foreground ,fgblue))))
    `(minibuffer-prompt ((t (:foreground ,fgblue))))
-   `(mode-line ((t (:background "#12366b" :foreground "#ededed" :box (:color "#12366d" :line-width 2 :style nil)))))
+   `(mode-line ((t (:background "#12366b" :foreground ,fgbright :box (:color "#12366d" :line-width 2 :style nil)))))
    `(mode-line-buffer-id ((t (:foreground "#d78f24" :weight bold))))
-   `(mode-line-inactive ((t (:weight normal :background "#3d3d3d" :foreground ,fgdefault :box (:color "#3d3d3d" :line-width 2 :style nil) :inherit unspecified))))
+   `(mode-line-inactive ((t (:weight normal :background ,bgbright :foreground ,fgdefault :box (:color ,bgbright :line-width 2 :style nil) :inherit unspecified))))
    `(org-agenda-calendar-sexp ((t (:foreground ,fgyellow))))
    `(org-agenda-current-time ((t (:foreground ,fgorange :weight bold))))
    `(org-agenda-date ((t (:foreground ,bgcyan))))
@@ -219,7 +219,7 @@
    `(outline-6 ((t (:inherit org-level-6))))
    `(outline-7 ((t (:inherit org-level-7))))
    `(outline-8 ((t (:inherit org-level-8))))
-   `(pp^L-highlight ((t (:box unspecified :foreground "#ededed"))))
+   `(pp^L-highlight ((t (:box unspecified :foreground ,fgbright))))
    `(rainbow-delimiters-depth-1-face ((t (:foreground ,fgred))))
    `(rainbow-delimiters-depth-10-face ((t (:foreground ,fgpink))))
    `(rainbow-delimiters-depth-2-face ((t (:foreground ,fgorange))))
@@ -231,7 +231,7 @@
    `(rainbow-delimiters-depth-8-face ((t (:foreground ,fgpurple))))
    `(rainbow-delimiters-depth-9-face ((t (:foreground ,fgmagenta))))
    `(rainbow-delimiters-unmatched-face ((t (:background ,bgred :foreground unspecified))))
-   `(rebase-mode-description-face ((t (:foreground "#ededed"))))
+   `(rebase-mode-description-face ((t (:foreground ,fgbright))))
    `(region ((t (:background ,bgblue))))
    `(rst-level-1 ((t (:background unspecified))))
    `(rst-level-2 ((t (:background unspecified))))
@@ -240,21 +240,21 @@
    `(rst-level-5 ((t (:background unspecified))))
    `(rst-level-6 ((t (:background unspecified))))
    `(sh-heredoc ((t (:foreground ,fgorange))))
-   `(shadow ((t (:foreground "#969696"))))
+   `(shadow ((t (:foreground ,fgdim))))
    `(show-paren-match ((t (:inverse-video t))))
    `(show-paren-mismatch ((t (:background unspecified :foreground ,fgred))))
-   `(slime-repl-input-face ((t (:foreground "#ededed"))))
-   `(slime-repl-inputed-output-face ((t (:foreground "#ededed"))))
+   `(slime-repl-input-face ((t (:foreground ,fgbright))))
+   `(slime-repl-inputed-output-face ((t (:foreground ,fgbright))))
    `(slime-repl-output-face ((t (:foreground ,fgdefault))))
    `(slime-repl-prompt-face ((t (:foreground ,fgblue))))
    `(success ((t (:foreground ,fggreen :weight bold))))
-   `(term-color-black ((t (:background ,bgdefault :foreground "#ededed"))))
+   `(term-color-black ((t (:background ,bgdefault :foreground ,fgbright))))
    `(term-color-blue ((t (:background ,bgblue :foreground ,fgblue))))
    `(term-color-cyan ((t (:background ,bgcyan :foreground ,fgcyan))))
    `(term-color-green ((t (:background ,bggreen :foreground ,fggreen))))
    `(term-color-magenta ((t (:background ,bgmagenta :foreground ,fgmagenta))))
    `(term-color-red ((t (:background ,bgred :foreground ,fgred))))
-   `(term-color-white ((t (:background "#3d3d3d" :foreground ,fgdefault))))
+   `(term-color-white ((t (:background ,bgbright :foreground ,fgdefault))))
    `(term-color-yellow ((t (:background ,bgyellow :foreground ,fgyellow))))
    `(texinfo-heading ((t (:foreground ,fgpink :inherit unspecified :height 1.3))))
    `(warning ((t (:foreground ,fgorange :weight unspecified))))