emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/apropospriate-theme 0f4321b 047/118: un-nest deep macro ex


From: ELPA Syncer
Subject: [nongnu] elpa/apropospriate-theme 0f4321b 047/118: un-nest deep macro expansion, bump version
Date: Thu, 21 Oct 2021 18:02:20 -0400 (EDT)

branch: elpa/apropospriate-theme
commit 0f4321bee52a2e8b7af6719a04db96e42dea4049
Author: justin talbott <justin@waymondo.com>
Commit: justin talbott <justin@waymondo.com>

    un-nest deep macro expansion, bump version
    
    fixes #11
---
 apropospriate-theme-pkg.el |    5 +-
 apropospriate.el           | 1053 +++++++++++++++++++++-----------------------
 2 files changed, 508 insertions(+), 550 deletions(-)

diff --git a/apropospriate-theme-pkg.el b/apropospriate-theme-pkg.el
index 86ecc7a..69e9d81 100644
--- a/apropospriate-theme-pkg.el
+++ b/apropospriate-theme-pkg.el
@@ -1,4 +1,5 @@
 (define-package
   "apropospriate-theme"
-  "0.0.1"
-  "A colorful, low-contrast, light & dark theme set for Emacs with a fun 
name.")
+  "0.1.0"
+  "A colorful, low-contrast, light & dark theme set for Emacs with a fun name."
+  'nil :url "https://github.com/waymondo/apropospriate-theme"; :keywords 
'("color" "theme"))
diff --git a/apropospriate.el b/apropospriate.el
index b4b397a..b674fb4 100644
--- a/apropospriate.el
+++ b/apropospriate.el
@@ -4,7 +4,7 @@
 
 ;; Author: Justin Talbott <justin@waymondo.com>
 ;; URL: http://github.com/waymondo/apropospriate-theme
-;; Version: 0.0.1
+;; Version: 0.1.0
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -27,555 +27,512 @@
 
 (require 'color)
 
+(defmacro apropospriate-with-color-variables (variant &rest body)
+  (declare (indent 0))
+  `(let* ((class '((class color) (min-colors 89)))
+          (variant ,variant)
+          (base00   (if (eq variant 'light) "#FAFAFA" "#424242"))
+          (base01   (if (eq variant 'light) "#90A4AE" "#757575"))
+          (base02   (if (eq variant 'light) "#78909C" "#9E9E9E"))
+          (base03   (if (eq variant 'light) "#546E7A" "#E0E0E0"))
+          (yellow   (if (eq variant 'light) "#F57F17" "#FFEE58"))
+          (yellow-1 (if (eq variant 'light) "#F9A725" "#FFF59D"))
+          (brown    (if (eq variant 'light) "#4E342E" "#BCAAA4"))
+          (brown-1  (if (eq variant 'light) "#6D4C41" "#D7CCC8"))
+          (orange   (if (eq variant 'light) "#D84315" "#FFCC80"))
+          (orange-1 (if (eq variant 'light) "#FF5722" "#FFA726"))
+          (red      (if (eq variant 'light) "#D50000" "#E57373"))
+          (red-1    (if (eq variant 'light) "#FF1744" "#EF9A9A"))
+          (pink     (if (eq variant 'light) "#F8BBD0" "#F8BBD0"))
+          (pink-1   (if (eq variant 'light) "#EC407A" "#FF80AB"))
+          (purple   (if (eq variant 'light) "#7E57C2" "#E1BEE7"))
+          (purple-1 (if (eq variant 'light) "#B388FF" "#9575CD"))
+          (blue     (if (eq variant 'light) "#42A5F5" "#64B5F6"))
+          (blue-1   (if (eq variant 'light) "#1E88E5" "#42A5F5"))
+          (indigo   (if (eq variant 'light) "#5C6BC0" "#C5CAE9"))
+          (indigo-1 (if (eq variant 'light) "#9FA8DA" "#7986CB"))
+          (cyan     (if (eq variant 'light) "#0097A7" "#80DEEA"))
+          (cyan-1   (if (eq variant 'light) "#00B8D4" "#26C6DA"))
+          (teal     (if (eq variant 'light) "#26A69A" "#80CBC4"))
+          (teal-1   (if (eq variant 'light) "#00897B" "#4DB6AC"))
+          (green    (if (eq variant 'light) "#66BB6A" "#C5E1A5"))
+          (green-1  (if (eq variant 'light) "#558B2F" "#F4FF81"))
+          (base00-1 (if (eq variant 'light)
+                        (color-lighten-name base00 3)
+                      (color-darken-name base00 3)))
+          (base00-2 (if (eq variant 'light)
+                        (color-lighten-name base00 5)
+                      (color-darken-name base00 5)))
+          (base00-3 (if (eq variant 'light)
+                        (color-lighten-name base00 10)
+                      (color-darken-name base00 10)))
+          (base00+1 (if (eq variant 'light)
+                        (color-darken-name base00 2)
+                      (color-lighten-name base00 2)))
+          (base00+2 (if (eq variant 'light)
+                        (color-darken-name base00 8)
+                      (color-lighten-name base00 8)))
+          (base00+3 (if (eq variant 'light)
+                        (color-darken-name base00 12)
+                      (color-lighten-name base00 12)))
+          (light-emphasis (if (eq variant 'light) base00+3 base00-3))
+          (light-emphasis-1 (if (eq variant 'light) base00+2 base00-2))
+          (light-emphasis-2 (if (eq variant 'light) base00+1 base00-1))
+          (flashing-color (if (eq variant 'light) pink (color-darken-name pink 
25)))
+          (highlight-line-color (if (eq variant 'light) base00-1 base00+1)))
+     ,@body))
+
 (defun create-apropospriate-theme (variant theme-name)
   "Create a VARIANT of the theme named THEME-NAME."
-  (let* ((class '((class color) (min-colors 89)))
-         (base00   (if (eq variant 'light) "#FAFAFA" "#424242"))
-         (base01   (if (eq variant 'light) "#90A4AE" "#757575"))
-         (base02   (if (eq variant 'light) "#78909C" "#9E9E9E"))
-         (base03   (if (eq variant 'light) "#546E7A" "#E0E0E0"))
-         (yellow   (if (eq variant 'light) "#F57F17" "#FFEE58"))
-         (yellow-1 (if (eq variant 'light) "#F9A725" "#FFF59D"))
-         (brown    (if (eq variant 'light) "#4E342E" "#BCAAA4"))
-         (brown-1  (if (eq variant 'light) "#6D4C41" "#D7CCC8"))
-         (orange   (if (eq variant 'light) "#D84315" "#FFCC80"))
-         (orange-1 (if (eq variant 'light) "#FF5722" "#FFA726"))
-         (red      (if (eq variant 'light) "#D50000" "#E57373"))
-         (red-1    (if (eq variant 'light) "#FF1744" "#EF9A9A"))
-         (pink     (if (eq variant 'light) "#F8BBD0" "#F8BBD0"))
-         (pink-1   (if (eq variant 'light) "#EC407A" "#FF80AB"))
-         (purple   (if (eq variant 'light) "#7E57C2" "#E1BEE7"))
-         (purple-1 (if (eq variant 'light) "#B388FF" "#9575CD"))
-         (blue     (if (eq variant 'light) "#42A5F5" "#64B5F6"))
-         (blue-1   (if (eq variant 'light) "#1E88E5" "#42A5F5"))
-         (indigo   (if (eq variant 'light) "#5C6BC0" "#C5CAE9"))
-         (indigo-1 (if (eq variant 'light) "#9FA8DA" "#7986CB"))
-         (cyan     (if (eq variant 'light) "#0097A7" "#80DEEA"))
-         (cyan-1   (if (eq variant 'light) "#00B8D4" "#26C6DA"))
-         (teal     (if (eq variant 'light) "#26A69A" "#80CBC4"))
-         (teal-1   (if (eq variant 'light) "#00897B" "#4DB6AC"))
-         (green    (if (eq variant 'light) "#66BB6A" "#C5E1A5"))
-         (green-1  (if (eq variant 'light) "#558B2F" "#F4FF81"))
-         (base00-1 (if (eq variant 'light)
-                       (color-lighten-name base00 3)
-                     (color-darken-name base00 3)))
-         (base00-2 (if (eq variant 'light)
-                       (color-lighten-name base00 5)
-                     (color-darken-name base00 5)))
-         (base00-3 (if (eq variant 'light)
-                       (color-lighten-name base00 10)
-                     (color-darken-name base00 10)))
-         (base00+1 (if (eq variant 'light)
-                       (color-darken-name base00 2)
-                     (color-lighten-name base00 2)))
-         (base00+2 (if (eq variant 'light)
-                       (color-darken-name base00 8)
-                     (color-lighten-name base00 8)))
-         (base00+3 (if (eq variant 'light)
-                       (color-darken-name base00 12)
-                     (color-lighten-name base00 12)))
-         (light-emphasis (if (eq variant 'light) base00+3 base00-3))
-         (light-emphasis-1 (if (eq variant 'light) base00+2 base00-2))
-         (light-emphasis-2 (if (eq variant 'light) base00+1 base00-1))
-         (flashing-color (if (eq variant 'light) pink (color-darken-name pink 
25)))
-         (highlight-line-color (if (eq variant 'light) base00-1 base00+1)))
-
-    (apply 'custom-theme-set-faces theme-name
-           (mapcar
-            (lambda (x) `(,(car x) ((t ,(cdr x)))))
-            `((default :background ,base00 :foreground ,base03)
-              (bold :weight bold)
-              (border :background ,base02)
-              (cursor :background ,pink-1 :inverse-video t)
-              (highlight :background ,base00+1)
-              (hl-line :background ,highlight-line-color)
-              (link :foreground ,blue :underline t)
-              (link-visited :inherit link :foreground ,purple)
-              (minibuffer-prompt :foreground ,blue)
-              (region :background ,base00+2)
-              (vhl/default-face :background ,base00+1)
-              (trailing-whitespace :background ,base00+1 :foreground ,yellow)
-              (next-error :background ,base01)
-              (secondary-selection :background ,base00-1)
-              (header-line :foreground ,purple :background nil)
-              (auto-dim-other-buffers-face :background ,base00+1)
-              (fringe :background ,base00+1 :foreground ,base02)
-              (linum :inherit fringe :foreground ,base01)
-              (vertical-border :foreground ,base00+3)
-              (widget-button :underline t)
-              (widget-field :background ,base02 :box (:line-width 1 :color 
,base03))
-              (error :foreground ,red :weight bold)
-              (warning :foreground ,orange :weight bold)
-              (success :foreground ,green :weight bold)
-              (ace-jump-face-background :foreground ,base00+3)
-              (ace-jump-face-foreground :foreground ,pink-1 :background nil 
:weight bold)
-              (ajb-face :background ,base00+1)
-              (avy-lead-face :inherit ace-jump-face-foreground)
-              (avy-lead-face-0 :inherit ace-jump-face-foreground)
-              (avy-lead-face-1 :inherit ace-jump-face-foreground)
-              (avy-lead-face-2 :inherit ace-jump-face-foreground)
-              (avy-background-face :inherit ace-jump-face-background)
-              (aw-leading-char-face :inherit ace-jump-face-foreground)
-              (aw-background-face :inherit ace-jump-face-background)
-              (parenthesis :foreground ,base00+3)
-
-              (font-lock-comment-face :foreground ,base01)
-              (font-lock-comment-delimiter-face :foreground ,base01)
-              (font-lock-builtin-face :foreground ,cyan)
-              (font-lock-doc-face :foreground ,base02)
-              (font-lock-constant-face :foreground ,indigo)
-              (font-lock-function-name-face :foreground ,blue)
-              (font-lock-keyword-face :foreground ,purple)
-              (font-lock-negation-char-face :foreground ,red-1)
-              (font-lock-preprocessor-face :foreground ,blue-1)
-              (font-lock-regexp-grouping-backslash :foreground ,purple-1)
-              (font-lock-regexp-grouping-construct :foreground ,purple-1)
-              (font-lock-string-face :foreground ,green)
-              (font-lock-type-face :foreground ,orange)
-              (font-lock-variable-name-face :foreground ,teal)
-              (font-lock-warning-face :foreground ,red)
-
-              (mode-line :box (:line-width 4 :color ,light-emphasis :style nil)
-                         :background ,base00-2 :foreground ,base03)
-              (mode-line-inactive :box (:line-width 4 :color ,base00+1 :style 
nil)
-                                  :background ,base00+1 :foreground ,base02)
-
-              (mode-line-buffer-id :foreground unspecified :background nil)
-              (mode-line-emphasis :foreground ,base02 :slant italic)
-              (mode-line-highlight :foreground ,base02 :box nil :weight bold)
-              (powerline-active1 :background ,base00)
-              (powerline-active2 :background ,base00+1)
-              (powerline-inactive1 :background ,base00+1)
-              (powerline-inactive2 :background ,base00+1)
-              (alert-trivial-face :inherit nil :foreground nil :background nil)
-              (anzu-mode-line :foreground ,yellow)
-              (persp-selected-face :foreground ,base03)
-              (mm-command-output :foreground unspecified :background 
unspecified)
-
-              (spaceline-highlight-face :background ,light-emphasis 
:foreground ,base03)
-              (spaceline-evil-normal :background ,yellow :foreground ,base00)
-              (spaceline-evil-insert :background ,red :foreground ,base00)
-              (spaceline-evil-emacs :background ,cyan-1 :foreground ,base00)
-              (spaceline-evil-replace :background ,brown :foreground ,base00)
-              (spaceline-evil-visual :background ,green :foreground ,base00)
-              (spaceline-evil-motion :background ,purple :foreground ,base00)
-              (spaceline-unmodified :background ,orange-1 :foreground ,base00)
-              (spaceline-modified :background ,cyan-1 :foreground ,base00)
-              (spaceline-read-only :background ,purple :foreground ,base00)
-
-              (match :foreground ,yellow :background ,base00+1 :inverse-video 
t :weight bold)
-              (isearch :inherit match)
-              (query-replace :inherit isearch)
-              (anzu-replace-to :foreground ,yellow :background ,base00+1)
-              (lazy-highlight :foreground ,yellow)
-              (isearch-lazy-highlight-face :foreground ,yellow)
-              (isearch-fail :inherit font-lock-warning-face)
-              (regex-tool-matched-face :foreground nil :background nil 
:inherit match)
-              (ag-match-face :inherit isearch-lazy-highlight-face)
-              (custom-state :foreground ,green)
-
-              (visible-mark-active :foreground unspecified :background 
,light-emphasis)
-              (visible-mark-face1 :background ,light-emphasis-1)
-              (visible-mark-face2 :background ,light-emphasis-2)
-
-              (ivy-current-match :foreground unspecified :background 
,light-emphasis-1)
-              (ivy-confirm-face :foregroud ,green)
-              (ivy-match-required-face :foregroud ,red)
-              (ivy-remote :foregroud ,cyan)
-
-              (swiper-minibuffer-match-face-1 :background ,light-emphasis-1)
-              (swiper-minibuffer-match-face-2 :inherit match)
-              (swiper-minibuffer-match-face-3 :background ,cyan)
-              (swiper-minibuffer-match-face-4 :background ,pink-1)
-
-              (wgrep-face :background ,base00+2)
-              (wgrep-file-face :background ,base00+1)
-              (wgrep-delete-face :foreground ,red)
-              (wgrep-reject-face :foreground ,red)
-              (wgrep-done-face :foreground ,green)
-
-              (guide-key/highlight-command-face :foreground ,yellow)
-              (guide-key/key-face :foreground ,pink-1)
-              (guide-key/prefix-command-face :foreground ,cyan)
-
-              (which-key-key-face :foreground ,pink-1)
-              (which-key-special-key-face :inherit which-key-key-face 
:inverse-video nil)
-
-              (tabbar-default :inherit default :foreground ,base02 :background 
"black"
-                              :box (:line-width 4 :color ,base00 :style nil))
-              (tabbar-button :height 0.8 :box (:line-width 4 :color ,base00-2 
:style nil))
-              (tabbar-unselected :inherit tabbar-button :background ,base00-2)
-              (tabbar-modified :inherit tabbar-unselected)
-              (tabbar-selected :inherit tabbar-button
-                               :box (:line-width 4 :color ,base00 :style nil))
-              (tabbar-separator :inherit tabbar-selected)
-
-              (company-tooltip :background ,base00-1 :foreground ,base02)
-              (company-tooltip-selection :background ,base00-2 :foreground 
,base03)
-              (company-tooltip-common :inherit company-tooltip)
-              (company-tooltip-common-selection :inherit 
company-tooltip-selection)
-              (company-tooltip-search :foreground ,yellow)
-              (company-echo-common :inherit company-tooltip :foreground 
,yellow)
-              (company-scrollbar-bg :background ,base00+1)
-              (company-scrollbar-fg :background ,base00+3)
-              (company-tooltip-annotation :inherit company-tooltip :foreground 
,base01)
-              (company-preview :background ,base00 :foreground ,base02)
-              (company-preview-common :foreground ,base02)
-              (company-preview-search :background ,base00)
-
-              (tooltip :background ,base03 :foreground ,base00 :height 0.9)
-              (popup-tip-face :inherit tooltip)
-              (popup-face :foreground ,base00+1 :background ,base03)
-              (popup-menu-selection-face :foreground ,base03 :background ,blue)
-              (popup-isearch-match :foreground ,yellow :background nil)
-              (popup-scroll-bar-foreground-face :inherit company-scrollbar-fg)
-              (popup-scroll-bar-background-face :background ,base02)
-
-              (flymake-warnline :underline ,orange :background ,base00+1)
-              (flymake-errline :underline ,red :background ,base00+1)
-
-              (flycheck-error :underline (:style wave :color ,red) :inherit 
unspecified)
-              (flycheck-info :underline (:style wave :color ,green) :inherit 
unspecified)
-              (flycheck-warning :underline (:style wave :color ,orange) 
:inherit unspecified)
-
-              (swoop-face-target-words :foreground ,yellow)
-              (swoop-face-target-line :background ,base01)
-              (swoop-face-line-buffer-name :inherit header-line :foreground 
,base02)
-              (swoop-face-header-format-line :inherit 
swoop-face-line-buffer-name :foreground ,purple)
-              (swoop-face-line-number :foreground ,base02)
-              (helm-swoop-target-word-face :foreground ,yellow)
-              (helm-swoop-target-line-face :background ,base00+2)
-              (helm-swoop-target-line-block-face :background ,base00+1)
-              (helm-swoop-line-number-face :foreground ,base01)
-
-              (helm-match :foreground ,yellow-1)
-              (helm-source-header :family inherit :inherit header-line 
:foreground ,purple)
-              (helm-visible-mark :background ,green)
-              (helm-header :inherit header-line)
-              (helm-candidate-number :background unspecified)
-              (helm-selection :background ,base00+2)
-              (helm-selection-line :inherit helm-selection)
-              (helm-separator :foreground ,base01)
-              (helm-action :underline nil)
-              (helm-prefarg :foreground ,green)
-              (helm-buffer-saved-out :foreground ,red)
-              (helm-buffer-not-saved :foreground ,red)
-              (helm-buffer-size :foreground ,base02)
-              (helm-buffer-process :foreground ,base02)
-              (helm-buffer-directory :foreground ,brown)
-              (helm-M-x-key :foreground ,base02)
-              (helm-ff-prefix :foreground ,yellow)
-              (helm-ff-executable :foreground ,green)
-              (helm-ff-directory :inherit helm-buffer-directory)
-              (helm-ff-symlink :foreground ,brown)
-              (helm-ff-invalid-symlink :inherit helm-ff-symlink :underline 
(:style wave :color ,red))
-              (helm-grep-match :inherit match)
-              (helm-grep-file :foreground ,base01)
-              (helm-grep-lineno :foreground ,base02)
-              (helm-grep-running :inherit compilation-mode-line-run)
-              (helm-grep-finish :inherit success)
-              (helm-visible-mark :inverse-video t)
-              (helm-ls-git-added-modified-face :foreground ,cyan)
-              (helm-ls-git-conflict-face :foreground ,purple-1)
-              (helm-ls-git-deleted-and-staged-face :foreground ,base02)
-              (helm-ls-git-deleted-not-staged-face :foreground ,orange)
-              (helm-ls-git-modified-and-staged-face :foreground ,orange-1)
-              (helm-ls-git-modified-not-staged-face :foreground ,orange-1)
-              (helm-ls-git-renamed-modified-face :foreground ,orange-1)
-              (helm-ls-git-untracked-face :foreground ,blue)
-
-              (show-paren-match :background unspecified :underline (:style 
line :color ,pink))
-              (show-paren-mismatch :background unspecified :foreground ,red 
:inverse-video t
-                                   :underline (:style line :color ,red))
-              (highlight-symbol-face :foreground unspecified :background 
unspecified
-                                     :underline (:style line :color ,base02))
-              (sp-show-pair-match-face :inherit show-paren-match)
-              (sp-show-pair-mismatch-face :inherit show-paren-mismatch)
-
-              (rainbow-delimiters-depth-1-face :foreground ,purple-1)
-              (rainbow-delimiters-depth-2-face :foreground ,indigo-1)
-              (rainbow-delimiters-depth-3-face :foreground ,cyan-1)
-              (rainbow-delimiters-depth-4-face :foreground ,blue-1)
-              (rainbow-delimiters-depth-5-face :foreground ,teal-1)
-              (rainbow-delimiters-depth-6-face :foreground ,pink-1)
-              (rainbow-delimiters-depth-7-face :foreground ,purple)
-              (rainbow-delimiters-depth-8-face :foreground ,indigo)
-              (rainbow-delimiters-depth-9-face :foreground ,cyan)
-              (rainbow-delimiters-depth-10-face :foreground ,blue)
-              (rainbow-delimiters-depth-11-face :foreground ,teal)
-              (rainbow-delimiters-depth-12-face :foreground ,pink)
-              (rainbow-delimiters-mismatched-face :foreground ,red)
-              (rainbow-delimiters-unmatched-face :foreground ,red)
-
-              (highlight-blocks-depth-1-face :background ,base00-1)
-              (highlight-blocks-depth-2-face :background ,base00-2)
-              (highlight-blocks-depth-3-face :background ,base00-3)
-              (highlight-blocks-depth-4-face :background ,base00-3)
-              (highlight-blocks-depth-5-face :background ,base00-3)
-              (highlight-blocks-depth-6-face :background ,base00-3)
-              (highlight-blocks-depth-7-face :background ,base00-3)
-              (highlight-blocks-depth-8-face :background ,base00-3)
-              (highlight-blocks-depth-9-face :background ,base00-3)
-
-              (ido-subdir :foreground ,brown :weight bold)
-              (ido-first-match :foreground ,orange :weight bold)
-              (ido-only-match :inherit ido-first-match)
-              (ido-indicator :foreground ,red :background ,base00+1)
-              (ido-virtual :foreground ,cyan)
-              (ido-vertical-match-face :foreground unspecified :underline 
(:style line :color ,yellow))
-              (flx-highlight-face :foreground ,yellow)
-
-              (diff-added :foreground ,green)
-              (diff-changed :foreground ,blue)
-              (diff-removed :foreground ,red)
-              (diff-header :background ,base00+1)
-              (diff-file-header :foreground ,base01)
-              (diff-hunk-header :foreground ,base01)
-              (ediff-even-diff-A :foreground nil :background nil 
:inverse-video t)
-              (ediff-even-diff-B :foreground nil :background nil 
:inverse-video t)
-              (ediff-odd-diff-A  :foreground ,base03 :background nil 
:inverse-video t)
-              (ediff-odd-diff-B  :foreground ,base03 :background nil 
:inverse-video t)
-
-              (git-gutter:added :foreground ,base01)
-              (git-gutter:deleted :foreground ,base01)
-              (git-gutter:modified :foreground ,base01)
-
-              (diff-hl-insert :foreground ,green :background ,base00+1)
-              (diff-hl-unknown :foreground ,orange-1 :background ,base00+1)
-              (diff-hl-delete :foreground ,red-1 :background ,base00+1)
-              (diff-hl-change :foreground ,blue-1 :background ,base00+1)
-
-              (eldoc-highlight-function-argument :foreground ,green :weight 
bold)
-
-              (undo-tree-visualizer-default-face :foreground ,base03)
-              (undo-tree-visualizer-current-face :foreground ,green :weight 
bold)
-              (undo-tree-visualizer-active-branch-face :foreground ,red)
-              (undo-tree-visualizer-register-face :foreground ,yellow)
-
-              (dired-directory :inherit ido-subdir)
-              (dired-header :inherit header-line)
-              (diredp-compressed-file-suffix :foreground ,blue)
-              (diredp-dir-heading :inherit dired-header)
-              (diredp-dir-priv :foreground ,cyan :background nil)
-              (diredp-exec-priv :foreground ,blue :background nil)
-              (diredp-executable-tag :foreground ,red :background nil)
-              (diredp-file-name :foreground ,orange)
-              (diredp-file-suffix :foreground ,green)
-              (diredp-flag-mark-line :background nil :inherit highlight)
-              (diredp-ignored-file-name :foreground ,base03)
-              (diredp-link-priv :background nil :foreground ,purple)
-              (diredp-mode-line-flagged :foreground ,red)
-              (diredp-mode-line-marked :foreground ,green)
-              (diredp-no-priv :background nil)
-              (diredp-number :foreground ,orange-1)
-              (diredp-other-priv :background nil :foreground ,purple)
-              (diredp-rare-priv :foreground ,red :background nil)
-              (diredp-read-priv :foreground ,green :background nil)
-              (diredp-symlink :foreground ,purple)
-              (diredp-write-priv :foreground ,yellow :background nil)
-
-              (magit-process-ok :foreground ,green)
-              (magit-process-ng :foreground ,red)
-              (magit-tag :foreground ,cyan-1)
-              (magit-log-author :foreground ,base02)
-              (magit-log-date :foreground ,base02)
-              (magit-log-graph :foreground ,base02)
-              (magit-log-head-label-head :box nil :background ,base00+1 
:foreground ,green-1)
-              (magit-log-head-label-remote :box nil :background ,base00+1 
:foreground ,green-1)
-              (magit-log-head-label-local :box nil :background ,base00+1 
:foreground ,green-1)
-              (magit-log-head-label-tags :box nil :background ,base00+1 
:foreground ,green-1)
-              (magit-log-head-label-patches :box nil :background ,base00+1 
:foreground ,green-1)
-              (magit-hash :foreground ,cyan)
-              (magit-branch :background ,base00+1 :foreground ,green-1)
-              (magit-branch-local :foreground ,green-1)
-              (magit-branch-remote :foreground ,green-1)
-              (magit-branch-label :foreground ,green-1)
-              (magit-branch-current :foreground ,green-1)
-              (magit-head :foreground ,indigo)
-              (magit-section-highlight :inherit highlight)
-              (magit-section-heading :foreground ,purple :weight bold)
-              (magit-dimmed :background ,base00-2)
-              (magit-refname :foreground ,orange)
-              (magit-diff-added :foreground ,green :background unspecified)
-              (magit-diff-removed :foreground ,red :background unspecified)
-              (magit-diff-context :foreground unspecified :background 
unspecified)
-              (magit-diff-added-highlight :foreground ,green :background 
,base00-1)
-              (magit-diff-removed-highlight :foreground ,red :background 
,base00-1)
-              (magit-diff-context-highlight :foreground unspecified 
:background ,base00-1)
-              (magit-diffstat-added :foreground ,green :background unspecified)
-              (magit-diffstat-removed :foreground ,red :background unspecified)
-              (magit-cherry-unmatched :foreground ,cyan)
-              (magit-cherry-equivalent :foreground ,purple)
-              (magit-blame-heading :foreground unspecified :background 
unspecified)
-              (magit-diff-hunk-heading :foreground ,base01)
-              (magit-diff-hunk-heading-highlight :inherit 
magit-diff-hunk-heading :background ,base00-1)
-              (magit-diff-hunk-heading-selection :foregroud unspecified)
-              (magit-diff-lines-heading :background unspecified)
-              (magit-popup-argument :foreground ,base02)
-              (magit-popup-disabled-argument :foreground ,base01)
-              (magit-item-highlight :background ,highlight-line-color)
-              (git-commit-summary :foreground ,base03)
-              (git-timemachine-minibuffer-detail-face :foreground ,orange)
-
-              (ediff-current-diff-A :foreground ,base03 :background ,red-1)
-              (ediff-current-diff-Ancestor :foreground ,base03 :background 
,red-1)
-              (ediff-current-diff-B :foreground ,base03 :background ,green-1)
-              (ediff-current-diff-C :foreground ,base03 :background ,blue-1)
-              (ediff-even-diff-A :background ,base00+2)
-              (ediff-even-diff-Ancestor :background ,base00+2)
-              (ediff-even-diff-B :background ,base00+2)
-              (ediff-even-diff-C :background ,base00+2)
-              (ediff-fine-diff-A :foreground ,base03 :background ,red-1 
:weight bold)
-              (ediff-fine-diff-Ancestor :foreground ,base03 :background ,red-1 
:weight bold)
-              (ediff-fine-diff-B :foreground ,base03 :background ,green-1 
:weight bold)
-              (ediff-fine-diff-C :foreground ,base03 :background ,blue-1 
:weight bold )
-              (ediff-odd-diff-A :background ,base01)
-              (ediff-odd-diff-Ancestor :background ,base01)
-              (ediff-odd-diff-B :background ,base01)
-              (ediff-odd-diff-C :background ,base01)
-
-              (compilation-info :foreground ,base02 :underline t)
-              (compilation-column-number :foreground ,base02)
-              (compilation-line-number :foreground ,base02)
-              (compilation-message-face :foreground ,blue)
-              (compilation-mode-line-exit :inherit nil :foreground unspecified 
:background unspecified)
-              (compilation-mode-line-fail :inherit nil :foreground unspecified 
:background unspecified)
-              (compilation-mode-line-run :inherit nil :foreground unspecified 
:background unspecified)
-
-              (org-date :foreground ,purple)
-              (org-done :foreground ,green)
-              (org-checkbox :foreground ,purple)
-              (org-agenda-structure :foreground ,purple)
-              (org-agenda-date :foreground ,blue :underline nil)
-              (org-agenda-done :foreground ,green)
-              (org-agenda-dimmed-todo-face :foreground ,base03)
-              (org-code :foreground ,orange-1)
-              (org-column :background ,base00+1)
-              (org-column-title :background ,base00 :weight bold :underline t)
-              (org-document-info :foreground ,cyan)
-              (org-document-info-keyword :foreground ,green)
-              (org-document-title :weight bold :foreground ,orange :height 
1.44)
-              (org-ellipsis :foreground ,base03)
-              (org-footnote :foreground ,cyan)
-              (org-formula :foreground ,red)
-              (org-hide :foreground ,base02)
-              (org-link :foreground ,blue)
-              (org-scheduled :foreground ,green)
-              (org-scheduled-previously :foreground ,orange)
-              (org-scheduled-today :foreground ,green)
-              (org-special-keyword :foreground ,orange)
-              (org-table :foreground ,purple)
-              (org-todo :foreground ,red)
-              (org-upcoming-deadline :foreground ,orange)
-              (org-warning :weight bold :foreground ,red)
-              (org-block :foreground ,orange :background ,base00+1)
-              (org-meta-line :inherit font-lock-comment-face)
-              (org-block-end-line :inherit font-lock-comment-face)
-              (org-block-end-line :inherit font-lock-comment-face)
-              (org-block-background :background ,base00+1)
-
-              (markdown-url-face :inherit link)
-              (markdown-link-face :foreground ,blue :underline t)
-
-              (js2-warning :inherit flycheck-warning)
-              (js2-error :foreground nil :inherit flycheck-error)
-              (js2-external-variable :foreground ,orange)
-              (js2-function-param :foreground ,indigo)
-              (js2-instance-member :foreground ,blue)
-              (js2-private-function-call :foreground ,pink)
-
-              (js3-warning-face :inherit js2-warning)
-              (js3-error-face :inherit js2-error)
-              (js3-external-variable-face :inherit js2-external-variable)
-              (js3-function-param-face :inherit js2-function-param)
-              (js3-instance-member-face :inherit js2-instance-member)
-              (js3-private-function-call-face :inherit 
js2-private-function-call)
-
-              (js3-jsdoc-tag-face :foreground ,orange)
-              (js3-jsdoc-type-face :foreground ,cyan)
-              (js3-jsdoc-value-face :foreground ,orange-1)
-              (js3-jsdoc-html-tag-name-face :foreground ,blue)
-              (js3-jsdoc-html-tag-delimiter-face :foreground ,green)
-
-              (erb-face :background ,base00+1 :foreground ,base03)
-              (erb-delim-face :background ,base00+1 :foreground ,red)
-              (erb-exec-face :background ,base00+1 :foreground ,base02)
-              (erb-exec-delim-face :background ,base00+1 :foreground ,red)
-              (erb-out-face :background ,base00+1 :foreground ,base03)
-              (erb-out-delim-face :background ,base00+1 :foreground ,red)
-              (erb-comment-face :background ,base00+1 :foreground ,base02)
-              (erb-comment-delim-face :background ,base00+1 :foreground 
,base01)
-
-              (web-mode-error-face :inherit error)
-              (web-mode-symbol-face :inherit font-lock-constant-face)
-              (web-mode-doctype-face :inherit font-lock-comment-face)
-              (web-mode-html-tag-face :inherit font-lock-function-name-face)
-              (web-mode-html-tag-bracket-face :foreground ,purple)
-              (web-mode-html-attr-name-face :inherit 
font-lock-variable-name-face)
-              (web-mode-current-element-highlight-face :inherit 
highlight-symbol-face)
-              (web-mode-current-column-highlight-face :inherit hl-line)
-
-              (pulse-highlight-face :background ,pink)
-              (pulse-highlight-start-face :background ,pink)
-
-              (eshell-prompt :foreground ,green :weight bold)
-              (eshell-ls-archive :foreground ,teal :weight bold)
-              (eshell-ls-backup :inherit font-lock-comment-face)
-              (eshell-ls-clutter :inherit font-lock-comment-face)
-              (eshell-ls-directory :foreground ,brown :weight bold)
-              (eshell-ls-executable :foreground ,red :weight bold)
-              (eshell-ls-unreadable :inherit font-lock-comment-face)
-              (eshell-ls-missing :inherit font-lock-warning-face)
-              (eshell-ls-product :inherit font-lock-doc-face)
-              (eshell-ls-special :foreground ,orange :weight bold)
-              (eshell-ls-symlink :foreground ,purple :weight bold)
-
-              (erc-action-face :inherit erc-default-face)
-              (erc-bold-face :weight bold)
-              (erc-current-nick-face :foreground ,blue :weight bold)
-              (erc-dangerous-host-face :inherit font-lock-warning-face)
-              (erc-default-face :foreground ,base03)
-              (erc-direct-msg-face :inherit erc-default)
-              (erc-error-face :inherit font-lock-warning-face)
-              (erc-fool-face :inherit erc-default)
-              (erc-highlight-face :inherit hover-highlight)
-              (erc-input-face :foreground ,yellow)
-              (erc-keyword-face :foreground ,blue :weight bold)
-              (erc-nick-default-face :foreground ,yellow :weight bold)
-              (erc-my-nick-face :foreground ,red :weight bold)
-              (erc-nick-msg-face :inherit erc-default)
-              (erc-notice-face :foreground ,green)
-              (erc-pal-face :foreground ,orange :weight bold)
-              (erc-prompt-face :foreground ,orange :background ,base00 :weight 
bold)
-              (erc-timestamp-face :foreground ,green)
-              (erc-underline-face :underline t))))
-
-    (custom-theme-set-variables theme-name
-
-                                `(evil-emacs-state-cursor '(,red bar))
-                                `(evil-insert-state-cursor '(,red hbar))
-                                `(evil-normal-state-cursor '(,yellow box))
-                                `(evil-visual-state-cursor '(,green box))
-                                `(pos-tip-foreground-color ,base02)
-                                `(pos-tip-background-color ,base00-1)
-
-                                `(highlight-symbol-foreground-color ,base03)
-                                `(highlight-symbol-colors '(,yellow
-                                                            ,green
-                                                            ,cyan
-                                                            ,blue
-                                                            ,purple
-                                                            ,orange))
-                                `(beacon-color ,flashing-color)
-                                `(highlight-tail-colors
-                                  '((,flashing-color . 0) (,base00 . 100)))
-
-                                `(tabbar-background-color ,base00-2)
-
-                                `(ansi-color-names-vector
-                                  [,base00 ,red-1 ,green ,yellow ,blue ,purple 
,cyan ,base03])
-                                `(ansi-term-color-vector
-                                  [unspecified ,base00 ,red-1 ,green ,yellow 
,blue ,purple ,cyan ,base03]))))
+  (apropospriate-with-color-variables variant
+    (custom-theme-set-faces
+     theme-name
+     `(default ((,class (:background ,base00 :foreground ,base03))))
+     `(bold ((,class (:weight bold))))
+     `(border ((,class (:background ,base02))))
+     `(cursor ((,class (:background ,pink-1 :inverse-video t))))
+     `(highlight ((,class (:background ,base00+1))))
+     `(hl-line ((,class (:background ,highlight-line-color))))
+     `(link ((,class (:foreground ,blue :underline t))))
+     `(link-visited ((,class (:inherit link :foreground ,purple))))
+     `(minibuffer-prompt ((,class (:foreground ,blue))))
+     `(region ((,class (:background ,base00+2))))
+     `(vhl/default-face ((,class (:background ,base00+1))))
+     `(trailing-whitespace ((,class (:background ,base00+1 :foreground 
,yellow))))
+     `(next-error ((,class (:background ,base01))))
+     `(secondary-selection ((,class (:background ,base00-1))))
+     `(header-line ((,class (:foreground ,purple :background nil))))
+     `(auto-dim-other-buffers-face ((,class (:background ,base00+1))))
+     `(fringe ((,class (:background ,base00+1 :foreground ,base02))))
+     `(linum ((,class (:inherit fringe :foreground ,base01))))
+     `(vertical-border ((,class (:foreground ,base00+3))))
+     `(widget-button ((,class (:underline t))))
+     `(widget-field ((,class (:background ,base02 :box (:line-width 1 :color 
,base03)))))
+     `(error ((,class (:foreground ,red :weight bold))))
+     `(warning ((,class (:foreground ,orange :weight bold))))
+     `(success ((,class (:foreground ,green :weight bold))))
+     `(ace-jump-face-background ((,class (:foreground ,base00+3))))
+     `(ace-jump-face-foreground ((,class (:foreground ,pink-1 :background nil 
:weight bold))))
+     `(ajb-face ((,class (:background ,base00+1))))
+     `(avy-lead-face ((,class (:inherit ace-jump-face-foreground))))
+     `(avy-lead-face-0 ((,class (:inherit ace-jump-face-foreground))))
+     `(avy-lead-face-1 ((,class (:inherit ace-jump-face-foreground))))
+     `(avy-lead-face-2 ((,class (:inherit ace-jump-face-foreground))))
+     `(avy-background-face ((,class (:inherit ace-jump-face-background))))
+     `(aw-leading-char-face ((,class (:inherit ace-jump-face-foreground))))
+     `(aw-background-face ((,class (:inherit ace-jump-face-background))))
+     `(parenthesis ((,class (:foreground ,base00+3))))
+     `(font-lock-comment-face ((,class (:foreground ,base01))))
+     `(font-lock-comment-delimiter-face ((,class (:foreground ,base01))))
+     `(font-lock-builtin-face ((,class (:foreground ,cyan))))
+     `(font-lock-doc-face ((,class (:foreground ,base02))))
+     `(font-lock-constant-face ((,class (:foreground ,indigo))))
+     `(font-lock-function-name-face ((,class (:foreground ,blue))))
+     `(font-lock-keyword-face ((,class (:foreground ,purple))))
+     `(font-lock-negation-char-face ((,class (:foreground ,red-1))))
+     `(font-lock-preprocessor-face ((,class (:foreground ,blue-1))))
+     `(font-lock-regexp-grouping-backslash ((,class (:foreground ,purple-1))))
+     `(font-lock-regexp-grouping-construct ((,class (:foreground ,purple-1))))
+     `(font-lock-string-face ((,class (:foreground ,green))))
+     `(font-lock-type-face ((,class (:foreground ,orange))))
+     `(font-lock-variable-name-face ((,class (:foreground ,teal))))
+     `(font-lock-warning-face ((,class (:foreground ,red))))
+     `(mode-line ((,class (:box (:line-width 4 :color ,light-emphasis :style 
nil) :background ,base00-2 :foreground ,base03))))
+     `(mode-line-inactive ((,class (:box (:line-width 4 :color ,base00+1 
:style nil) :background ,base00+1 :foreground ,base02))))
+     `(mode-line-buffer-id ((,class (:foreground unspecified :background 
nil))))
+     `(mode-line-emphasis ((,class (:foreground ,base02 :slant italic))))
+     `(mode-line-highlight ((,class (:foreground ,base02 :box nil :weight 
bold))))
+     `(powerline-active1 ((,class (:background ,base00))))
+     `(powerline-active2 ((,class (:background ,base00+1))))
+     `(powerline-inactive1 ((,class (:background ,base00+1))))
+     `(powerline-inactive2 ((,class (:background ,base00+1))))
+     `(alert-trivial-face ((,class (:inherit nil :foreground nil :background 
nil))))
+     `(anzu-mode-line ((,class (:foreground ,yellow))))
+     `(persp-selected-face ((,class (:foreground ,base03))))
+     `(mm-command-output ((,class (:foreground unspecified :background 
unspecified))))
+     `(spaceline-highlight-face ((,class (:background ,light-emphasis 
:foreground ,base03))))
+     `(spaceline-evil-normal ((,class (:background ,yellow :foreground 
,base00))))
+     `(spaceline-evil-insert ((,class (:background ,red :foreground ,base00))))
+     `(spaceline-evil-emacs ((,class (:background ,cyan-1 :foreground 
,base00))))
+     `(spaceline-evil-replace ((,class (:background ,brown :foreground 
,base00))))
+     `(spaceline-evil-visual ((,class (:background ,green :foreground 
,base00))))
+     `(spaceline-evil-motion ((,class (:background ,purple :foreground 
,base00))))
+     `(spaceline-unmodified ((,class (:background ,orange-1 :foreground 
,base00))))
+     `(spaceline-modified ((,class (:background ,cyan-1 :foreground ,base00))))
+     `(spaceline-read-only ((,class (:background ,purple :foreground 
,base00))))
+     `(match ((,class (:foreground ,yellow :background ,base00+1 
:inverse-video t :weight bold))))
+     `(isearch ((,class (:inherit match))))
+     `(query-replace ((,class (:inherit isearch))))
+     `(anzu-replace-to ((,class (:foreground ,yellow :background ,base00+1))))
+     `(lazy-highlight ((,class (:foreground ,yellow))))
+     `(isearch-lazy-highlight-face ((,class (:foreground ,yellow))))
+     `(isearch-fail ((,class (:inherit font-lock-warning-face))))
+     `(regex-tool-matched-face ((,class (:foreground nil :background nil 
:inherit match))))
+     `(ag-match-face ((,class (:inherit isearch-lazy-highlight-face))))
+     `(custom-state ((,class (:foreground ,green))))
+     `(visible-mark-active ((,class (:foreground unspecified :background 
,light-emphasis))))
+     `(visible-mark-face1 ((,class (:background ,light-emphasis-1))))
+     `(visible-mark-face2 ((,class (:background ,light-emphasis-2))))
+     `(ivy-current-match ((,class (:foreground unspecified :background 
,light-emphasis-1))))
+     `(ivy-confirm-face ((,class (:foregroud ,green))))
+     `(ivy-match-required-face ((,class (:foregroud ,red))))
+     `(ivy-remote ((,class (:foregroud ,cyan))))
+     `(swiper-minibuffer-match-face-1 ((,class (:background 
,light-emphasis-1))))
+     `(swiper-minibuffer-match-face-2 ((,class (:inherit match))))
+     `(swiper-minibuffer-match-face-3 ((,class (:background ,cyan))))
+     `(swiper-minibuffer-match-face-4 ((,class (:background ,pink-1))))
+     `(wgrep-face ((,class (:background ,base00+2))))
+     `(wgrep-file-face ((,class (:background ,base00+1))))
+     `(wgrep-delete-face ((,class (:foreground ,red))))
+     `(wgrep-reject-face ((,class (:foreground ,red))))
+     `(wgrep-done-face ((,class (:foreground ,green))))
+     `(guide-key/highlight-command-face ((,class (:foreground ,yellow))))
+     `(guide-key/key-face ((,class (:foreground ,pink-1))))
+     `(guide-key/prefix-command-face ((,class (:foreground ,cyan))))
+     `(which-key-key-face ((,class (:foreground ,pink-1))))
+     `(which-key-special-key-face ((,class (:inherit which-key-key-face 
:inverse-video nil))))
+     `(tabbar-default ((,class (:inherit default :foreground ,base02 
:background "black" :box (:line-width 4 :color ,base00 :style nil)))))
+     `(tabbar-button ((,class (:height 0.8 :box (:line-width 4 :color 
,base00-2 :style nil)))))
+     `(tabbar-unselected ((,class (:inherit tabbar-button :background 
,base00-2))))
+     `(tabbar-modified ((,class (:inherit tabbar-unselected))))
+     `(tabbar-selected ((,class (:inherit tabbar-button :box (:line-width 4 
:color ,base00 :style nil)))))
+     `(tabbar-separator ((,class (:inherit tabbar-selected))))
+     `(company-tooltip ((,class (:background ,base00-1 :foreground ,base02))))
+     `(company-tooltip-selection ((,class (:background ,base00-2 :foreground 
,base03))))
+     `(company-tooltip-common ((,class (:inherit company-tooltip))))
+     `(company-tooltip-common-selection ((,class (:inherit 
company-tooltip-selection))))
+     `(company-tooltip-search ((,class (:foreground ,yellow))))
+     `(company-echo-common ((,class (:inherit company-tooltip :foreground 
,yellow))))
+     `(company-scrollbar-bg ((,class (:background ,base00+1))))
+     `(company-scrollbar-fg ((,class (:background ,base00+3))))
+     `(company-tooltip-annotation ((,class (:inherit company-tooltip 
:foreground ,base01))))
+     `(company-preview ((,class (:background ,base00 :foreground ,base02))))
+     `(company-preview-common ((,class (:foreground ,base02))))
+     `(company-preview-search ((,class (:background ,base00))))
+     `(tooltip ((,class (:background ,base03 :foreground ,base00 :height 
0.9))))
+     `(popup-tip-face ((,class (:inherit tooltip))))
+     `(popup-face ((,class (:foreground ,base00+1 :background ,base03))))
+     `(popup-menu-selection-face ((,class (:foreground ,base03 :background 
,blue))))
+     `(popup-isearch-match ((,class (:foreground ,yellow :background nil))))
+     `(popup-scroll-bar-foreground-face ((,class (:inherit 
company-scrollbar-fg))))
+     `(popup-scroll-bar-background-face ((,class (:background ,base02))))
+     `(flymake-warnline ((,class (:underline ,orange :background ,base00+1))))
+     `(flymake-errline ((,class (:underline ,red :background ,base00+1))))
+     `(flycheck-error ((,class (:underline (:style wave :color ,red) :inherit 
unspecified))))
+     `(flycheck-info ((,class (:underline (:style wave :color ,green) :inherit 
unspecified))))
+     `(flycheck-warning ((,class (:underline (:style wave :color ,orange) 
:inherit unspecified))))
+     `(swoop-face-target-words ((,class (:foreground ,yellow))))
+     `(swoop-face-target-line ((,class (:background ,base01))))
+     `(swoop-face-line-buffer-name ((,class (:inherit header-line :foreground 
,base02))))
+     `(swoop-face-header-format-line ((,class (:inherit 
swoop-face-line-buffer-name :foreground ,purple))))
+     `(swoop-face-line-number ((,class (:foreground ,base02))))
+     `(helm-swoop-target-word-face ((,class (:foreground ,yellow))))
+     `(helm-swoop-target-line-face ((,class (:background ,base00+2))))
+     `(helm-swoop-target-line-block-face ((,class (:background ,base00+1))))
+     `(helm-swoop-line-number-face ((,class (:foreground ,base01))))
+     `(helm-match ((,class (:foreground ,yellow-1))))
+     `(helm-source-header ((,class (:family inherit :inherit header-line 
:foreground ,purple))))
+     `(helm-visible-mark ((,class (:background ,green))))
+     `(helm-header ((,class (:inherit header-line))))
+     `(helm-candidate-number ((,class (:background unspecified))))
+     `(helm-selection ((,class (:background ,base00+2))))
+     `(helm-selection-line ((,class (:inherit helm-selection))))
+     `(helm-separator ((,class (:foreground ,base01))))
+     `(helm-action ((,class (:underline nil))))
+     `(helm-prefarg ((,class (:foreground ,green))))
+     `(helm-buffer-saved-out ((,class (:foreground ,red))))
+     `(helm-buffer-not-saved ((,class (:foreground ,red))))
+     `(helm-buffer-size ((,class (:foreground ,base02))))
+     `(helm-buffer-process ((,class (:foreground ,base02))))
+     `(helm-buffer-directory ((,class (:foreground ,brown))))
+     `(helm-M-x-key ((,class (:foreground ,base02))))
+     `(helm-ff-prefix ((,class (:foreground ,yellow))))
+     `(helm-ff-executable ((,class (:foreground ,green))))
+     `(helm-ff-directory ((,class (:inherit helm-buffer-directory))))
+     `(helm-ff-symlink ((,class (:foreground ,brown))))
+     `(helm-ff-invalid-symlink ((,class (:inherit helm-ff-symlink :underline 
(:style wave :color ,red)))))
+     `(helm-grep-match ((,class (:inherit match))))
+     `(helm-grep-file ((,class (:foreground ,base01))))
+     `(helm-grep-lineno ((,class (:foreground ,base02))))
+     `(helm-grep-running ((,class (:inherit compilation-mode-line-run))))
+     `(helm-grep-finish ((,class (:inherit success))))
+     `(helm-visible-mark ((,class (:inverse-video t))))
+     `(helm-ls-git-added-modified-face ((,class (:foreground ,cyan))))
+     `(helm-ls-git-conflict-face ((,class (:foreground ,purple-1))))
+     `(helm-ls-git-deleted-and-staged-face ((,class (:foreground ,base02))))
+     `(helm-ls-git-deleted-not-staged-face ((,class (:foreground ,orange))))
+     `(helm-ls-git-modified-and-staged-face ((,class (:foreground ,orange-1))))
+     `(helm-ls-git-modified-not-staged-face ((,class (:foreground ,orange-1))))
+     `(helm-ls-git-renamed-modified-face ((,class (:foreground ,orange-1))))
+     `(helm-ls-git-untracked-face ((,class (:foreground ,blue))))
+     `(show-paren-match ((,class (:background unspecified :underline (:style 
line :color ,pink)))))
+     `(show-paren-mismatch ((,class (:background unspecified :foreground ,red 
:inverse-video t :underline (:style line :color ,red)))))
+     `(highlight-symbol-face ((,class (:foreground unspecified :background 
unspecified :underline (:style line :color ,base02)))))
+     `(sp-show-pair-match-face ((,class (:inherit show-paren-match))))
+     `(sp-show-pair-mismatch-face ((,class (:inherit show-paren-mismatch))))
+     `(rainbow-delimiters-depth-1-face ((,class (:foreground ,purple-1))))
+     `(rainbow-delimiters-depth-2-face ((,class (:foreground ,indigo-1))))
+     `(rainbow-delimiters-depth-3-face ((,class (:foreground ,cyan-1))))
+     `(rainbow-delimiters-depth-4-face ((,class (:foreground ,blue-1))))
+     `(rainbow-delimiters-depth-5-face ((,class (:foreground ,teal-1))))
+     `(rainbow-delimiters-depth-6-face ((,class (:foreground ,pink-1))))
+     `(rainbow-delimiters-depth-7-face ((,class (:foreground ,purple))))
+     `(rainbow-delimiters-depth-8-face ((,class (:foreground ,indigo))))
+     `(rainbow-delimiters-depth-9-face ((,class (:foreground ,cyan))))
+     `(rainbow-delimiters-depth-10-face ((,class (:foreground ,blue))))
+     `(rainbow-delimiters-depth-11-face ((,class (:foreground ,teal))))
+     `(rainbow-delimiters-depth-12-face ((,class (:foreground ,pink))))
+     `(rainbow-delimiters-mismatched-face ((,class (:foreground ,red))))
+     `(rainbow-delimiters-unmatched-face ((,class (:foreground ,red))))
+     `(highlight-blocks-depth-1-face ((,class (:background ,base00-1))))
+     `(highlight-blocks-depth-2-face ((,class (:background ,base00-2))))
+     `(highlight-blocks-depth-3-face ((,class (:background ,base00-3))))
+     `(highlight-blocks-depth-4-face ((,class (:background ,base00-3))))
+     `(highlight-blocks-depth-5-face ((,class (:background ,base00-3))))
+     `(highlight-blocks-depth-6-face ((,class (:background ,base00-3))))
+     `(highlight-blocks-depth-7-face ((,class (:background ,base00-3))))
+     `(highlight-blocks-depth-8-face ((,class (:background ,base00-3))))
+     `(highlight-blocks-depth-9-face ((,class (:background ,base00-3))))
+     `(ido-subdir ((,class (:foreground ,brown :weight bold))))
+     `(ido-first-match ((,class (:foreground ,orange :weight bold))))
+     `(ido-only-match ((,class (:inherit ido-first-match))))
+     `(ido-indicator ((,class (:foreground ,red :background ,base00+1))))
+     `(ido-virtual ((,class (:foreground ,cyan))))
+     `(ido-vertical-match-face ((,class (:foreground unspecified :underline 
(:style line :color ,yellow)))))
+     `(flx-highlight-face ((,class (:foreground ,yellow))))
+     `(diff-added ((,class (:foreground ,green))))
+     `(diff-changed ((,class (:foreground ,blue))))
+     `(diff-removed ((,class (:foreground ,red))))
+     `(diff-header ((,class (:background ,base00+1))))
+     `(diff-file-header ((,class (:foreground ,base01))))
+     `(diff-hunk-header ((,class (:foreground ,base01))))
+     `(ediff-even-diff-A ((,class (:foreground nil :background nil 
:inverse-video t))))
+     `(ediff-even-diff-B ((,class (:foreground nil :background nil 
:inverse-video t))))
+     `(ediff-odd-diff-A ((,class ( :foreground ,base03 :background nil 
:inverse-video t))))
+     `(ediff-odd-diff-B ((,class ( :foreground ,base03 :background nil 
:inverse-video t))))
+     `(git-gutter:added ((,class (:foreground ,base01))))
+     `(git-gutter:deleted ((,class (:foreground ,base01))))
+     `(git-gutter:modified ((,class (:foreground ,base01))))
+     `(diff-hl-insert ((,class (:foreground ,green :background ,base00+1))))
+     `(diff-hl-unknown ((,class (:foreground ,orange-1 :background 
,base00+1))))
+     `(diff-hl-delete ((,class (:foreground ,red-1 :background ,base00+1))))
+     `(diff-hl-change ((,class (:foreground ,blue-1 :background ,base00+1))))
+     `(eldoc-highlight-function-argument ((,class (:foreground ,green :weight 
bold))))
+     `(undo-tree-visualizer-default-face ((,class (:foreground ,base03))))
+     `(undo-tree-visualizer-current-face ((,class (:foreground ,green :weight 
bold))))
+     `(undo-tree-visualizer-active-branch-face ((,class (:foreground ,red))))
+     `(undo-tree-visualizer-register-face ((,class (:foreground ,yellow))))
+     `(dired-directory ((,class (:inherit ido-subdir))))
+     `(dired-header ((,class (:inherit header-line))))
+     `(diredp-compressed-file-suffix ((,class (:foreground ,blue))))
+     `(diredp-dir-heading ((,class (:inherit dired-header))))
+     `(diredp-dir-priv ((,class (:foreground ,cyan :background nil))))
+     `(diredp-exec-priv ((,class (:foreground ,blue :background nil))))
+     `(diredp-executable-tag ((,class (:foreground ,red :background nil))))
+     `(diredp-file-name ((,class (:foreground ,orange))))
+     `(diredp-file-suffix ((,class (:foreground ,green))))
+     `(diredp-flag-mark-line ((,class (:background nil :inherit highlight))))
+     `(diredp-ignored-file-name ((,class (:foreground ,base03))))
+     `(diredp-link-priv ((,class (:background nil :foreground ,purple))))
+     `(diredp-mode-line-flagged ((,class (:foreground ,red))))
+     `(diredp-mode-line-marked ((,class (:foreground ,green))))
+     `(diredp-no-priv ((,class (:background nil))))
+     `(diredp-number ((,class (:foreground ,orange-1))))
+     `(diredp-other-priv ((,class (:background nil :foreground ,purple))))
+     `(diredp-rare-priv ((,class (:foreground ,red :background nil))))
+     `(diredp-read-priv ((,class (:foreground ,green :background nil))))
+     `(diredp-symlink ((,class (:foreground ,purple))))
+     `(diredp-write-priv ((,class (:foreground ,yellow :background nil))))
+     `(magit-process-ok ((,class (:foreground ,green))))
+     `(magit-process-ng ((,class (:foreground ,red))))
+     `(magit-tag ((,class (:foreground ,cyan-1))))
+     `(magit-log-author ((,class (:foreground ,base02))))
+     `(magit-log-date ((,class (:foreground ,base02))))
+     `(magit-log-graph ((,class (:foreground ,base02))))
+     `(magit-log-head-label-head ((,class (:box nil :background ,base00+1 
:foreground ,green-1))))
+     `(magit-log-head-label-remote ((,class (:box nil :background ,base00+1 
:foreground ,green-1))))
+     `(magit-log-head-label-local ((,class (:box nil :background ,base00+1 
:foreground ,green-1))))
+     `(magit-log-head-label-tags ((,class (:box nil :background ,base00+1 
:foreground ,green-1))))
+     `(magit-log-head-label-patches ((,class (:box nil :background ,base00+1 
:foreground ,green-1))))
+     `(magit-hash ((,class (:foreground ,cyan))))
+     `(magit-branch ((,class (:background ,base00+1 :foreground ,green-1))))
+     `(magit-branch-local ((,class (:foreground ,green-1))))
+     `(magit-branch-remote ((,class (:foreground ,green-1))))
+     `(magit-branch-label ((,class (:foreground ,green-1))))
+     `(magit-branch-current ((,class (:foreground ,green-1))))
+     `(magit-head ((,class (:foreground ,indigo))))
+     `(magit-section-highlight ((,class (:inherit highlight))))
+     `(magit-section-heading ((,class (:foreground ,purple :weight bold))))
+     `(magit-dimmed ((,class (:background ,base00-2))))
+     `(magit-refname ((,class (:foreground ,orange))))
+     `(magit-diff-added ((,class (:foreground ,green :background 
unspecified))))
+     `(magit-diff-removed ((,class (:foreground ,red :background 
unspecified))))
+     `(magit-diff-context ((,class (:foreground unspecified :background 
unspecified))))
+     `(magit-diff-added-highlight ((,class (:foreground ,green :background 
,base00-1))))
+     `(magit-diff-removed-highlight ((,class (:foreground ,red :background 
,base00-1))))
+     `(magit-diff-context-highlight ((,class (:foreground unspecified 
:background ,base00-1))))
+     `(magit-diffstat-added ((,class (:foreground ,green :background 
unspecified))))
+     `(magit-diffstat-removed ((,class (:foreground ,red :background 
unspecified))))
+     `(magit-cherry-unmatched ((,class (:foreground ,cyan))))
+     `(magit-cherry-equivalent ((,class (:foreground ,purple))))
+     `(magit-blame-heading ((,class (:foreground unspecified :background 
unspecified))))
+     `(magit-diff-hunk-heading ((,class (:foreground ,base01))))
+     `(magit-diff-hunk-heading-highlight ((,class (:inherit 
magit-diff-hunk-heading :background ,base00-1))))
+     `(magit-diff-hunk-heading-selection ((,class (:foregroud unspecified))))
+     `(magit-diff-lines-heading ((,class (:background unspecified))))
+     `(magit-popup-argument ((,class (:foreground ,base02))))
+     `(magit-popup-disabled-argument ((,class (:foreground ,base01))))
+     `(magit-item-highlight ((,class (:background ,highlight-line-color))))
+     `(git-commit-summary ((,class (:foreground ,base03))))
+     `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,orange))))
+     `(ediff-current-diff-A ((,class (:foreground ,base03 :background 
,red-1))))
+     `(ediff-current-diff-Ancestor ((,class (:foreground ,base03 :background 
,red-1))))
+     `(ediff-current-diff-B ((,class (:foreground ,base03 :background 
,green-1))))
+     `(ediff-current-diff-C ((,class (:foreground ,base03 :background 
,blue-1))))
+     `(ediff-even-diff-A ((,class (:background ,base00+2))))
+     `(ediff-even-diff-Ancestor ((,class (:background ,base00+2))))
+     `(ediff-even-diff-B ((,class (:background ,base00+2))))
+     `(ediff-even-diff-C ((,class (:background ,base00+2))))
+     `(ediff-fine-diff-A ((,class (:foreground ,base03 :background ,red-1 
:weight bold))))
+     `(ediff-fine-diff-Ancestor ((,class (:foreground ,base03 :background 
,red-1 :weight bold))))
+     `(ediff-fine-diff-B ((,class (:foreground ,base03 :background ,green-1 
:weight bold))))
+     `(ediff-fine-diff-C ((,class (:foreground ,base03 :background ,blue-1 
:weight bold ))))
+     `(ediff-odd-diff-A ((,class (:background ,base01))))
+     `(ediff-odd-diff-Ancestor ((,class (:background ,base01))))
+     `(ediff-odd-diff-B ((,class (:background ,base01))))
+     `(ediff-odd-diff-C ((,class (:background ,base01))))
+     `(compilation-info ((,class (:foreground ,base02 :underline t))))
+     `(compilation-column-number ((,class (:foreground ,base02))))
+     `(compilation-line-number ((,class (:foreground ,base02))))
+     `(compilation-message-face ((,class (:foreground ,blue))))
+     `(compilation-mode-line-exit ((,class (:inherit nil :foreground 
unspecified :background unspecified))))
+     `(compilation-mode-line-fail ((,class (:inherit nil :foreground 
unspecified :background unspecified))))
+     `(compilation-mode-line-run ((,class (:inherit nil :foreground 
unspecified :background unspecified))))
+     `(org-date ((,class (:foreground ,purple))))
+     `(org-done ((,class (:foreground ,green))))
+     `(org-checkbox ((,class (:foreground ,purple))))
+     `(org-agenda-structure ((,class (:foreground ,purple))))
+     `(org-agenda-date ((,class (:foreground ,blue :underline nil))))
+     `(org-agenda-done ((,class (:foreground ,green))))
+     `(org-agenda-dimmed-todo-face ((,class (:foreground ,base03))))
+     `(org-code ((,class (:foreground ,orange-1))))
+     `(org-column ((,class (:background ,base00+1))))
+     `(org-column-title ((,class (:background ,base00 :weight bold :underline 
t))))
+     `(org-document-info ((,class (:foreground ,cyan))))
+     `(org-document-info-keyword ((,class (:foreground ,green))))
+     `(org-document-title ((,class (:weight bold :foreground ,orange :height 
1.44))))
+     `(org-ellipsis ((,class (:foreground ,base03))))
+     `(org-footnote ((,class (:foreground ,cyan))))
+     `(org-formula ((,class (:foreground ,red))))
+     `(org-hide ((,class (:foreground ,base02))))
+     `(org-link ((,class (:foreground ,blue))))
+     `(org-scheduled ((,class (:foreground ,green))))
+     `(org-scheduled-previously ((,class (:foreground ,orange))))
+     `(org-scheduled-today ((,class (:foreground ,green))))
+     `(org-special-keyword ((,class (:foreground ,orange))))
+     `(org-table ((,class (:foreground ,purple))))
+     `(org-todo ((,class (:foreground ,red))))
+     `(org-upcoming-deadline ((,class (:foreground ,orange))))
+     `(org-warning ((,class (:weight bold :foreground ,red))))
+     `(org-block ((,class (:foreground ,orange :background ,base00+1))))
+     `(org-meta-line ((,class (:inherit font-lock-comment-face))))
+     `(org-block-end-line ((,class (:inherit font-lock-comment-face))))
+     `(org-block-end-line ((,class (:inherit font-lock-comment-face))))
+     `(org-block-background ((,class (:background ,base00+1))))
+     `(markdown-url-face ((,class (:inherit link))))
+     `(markdown-link-face ((,class (:foreground ,blue :underline t))))
+     `(js2-warning ((,class (:inherit flycheck-warning))))
+     `(js2-error ((,class (:foreground nil :inherit flycheck-error))))
+     `(js2-external-variable ((,class (:foreground ,orange))))
+     `(js2-function-param ((,class (:foreground ,indigo))))
+     `(js2-instance-member ((,class (:foreground ,blue))))
+     `(js2-private-function-call ((,class (:foreground ,pink))))
+     `(js3-warning-face ((,class (:inherit js2-warning))))
+     `(js3-error-face ((,class (:inherit js2-error))))
+     `(js3-external-variable-face ((,class (:inherit js2-external-variable))))
+     `(js3-function-param-face ((,class (:inherit js2-function-param))))
+     `(js3-instance-member-face ((,class (:inherit js2-instance-member))))
+     `(js3-private-function-call-face ((,class (:inherit 
js2-private-function-call))))
+     `(js3-jsdoc-tag-face ((,class (:foreground ,orange))))
+     `(js3-jsdoc-type-face ((,class (:foreground ,cyan))))
+     `(js3-jsdoc-value-face ((,class (:foreground ,orange-1))))
+     `(js3-jsdoc-html-tag-name-face ((,class (:foreground ,blue))))
+     `(js3-jsdoc-html-tag-delimiter-face ((,class (:foreground ,green))))
+     `(erb-face ((,class (:background ,base00+1 :foreground ,base03))))
+     `(erb-delim-face ((,class (:background ,base00+1 :foreground ,red))))
+     `(erb-exec-face ((,class (:background ,base00+1 :foreground ,base02))))
+     `(erb-exec-delim-face ((,class (:background ,base00+1 :foreground ,red))))
+     `(erb-out-face ((,class (:background ,base00+1 :foreground ,base03))))
+     `(erb-out-delim-face ((,class (:background ,base00+1 :foreground ,red))))
+     `(erb-comment-face ((,class (:background ,base00+1 :foreground ,base02))))
+     `(erb-comment-delim-face ((,class (:background ,base00+1 :foreground 
,base01))))
+     `(web-mode-error-face ((,class (:inherit error))))
+     `(web-mode-symbol-face ((,class (:inherit font-lock-constant-face))))
+     `(web-mode-doctype-face ((,class (:inherit font-lock-comment-face))))
+     `(web-mode-html-tag-face ((,class (:inherit 
font-lock-function-name-face))))
+     `(web-mode-html-tag-bracket-face ((,class (:foreground ,purple))))
+     `(web-mode-html-attr-name-face ((,class (:inherit 
font-lock-variable-name-face))))
+     `(web-mode-current-element-highlight-face ((,class (:inherit 
highlight-symbol-face))))
+     `(web-mode-current-column-highlight-face ((,class (:inherit hl-line))))
+     `(pulse-highlight-face ((,class (:background ,pink))))
+     `(pulse-highlight-start-face ((,class (:background ,pink))))
+     `(eshell-prompt ((,class (:foreground ,green :weight bold))))
+     `(eshell-ls-archive ((,class (:foreground ,teal :weight bold))))
+     `(eshell-ls-backup ((,class (:inherit font-lock-comment-face))))
+     `(eshell-ls-clutter ((,class (:inherit font-lock-comment-face))))
+     `(eshell-ls-directory ((,class (:foreground ,brown :weight bold))))
+     `(eshell-ls-executable ((,class (:foreground ,red :weight bold))))
+     `(eshell-ls-unreadable ((,class (:inherit font-lock-comment-face))))
+     `(eshell-ls-missing ((,class (:inherit font-lock-warning-face))))
+     `(eshell-ls-product ((,class (:inherit font-lock-doc-face))))
+     `(eshell-ls-special ((,class (:foreground ,orange :weight bold))))
+     `(eshell-ls-symlink ((,class (:foreground ,purple :weight bold))))
+     `(erc-action-face ((,class (:inherit erc-default-face))))
+     `(erc-bold-face ((,class (:weight bold))))
+     `(erc-current-nick-face ((,class (:foreground ,blue :weight bold))))
+     `(erc-dangerous-host-face ((,class (:inherit font-lock-warning-face))))
+     `(erc-default-face ((,class (:foreground ,base03))))
+     `(erc-direct-msg-face ((,class (:inherit erc-default))))
+     `(erc-error-face ((,class (:inherit font-lock-warning-face))))
+     `(erc-fool-face ((,class (:inherit erc-default))))
+     `(erc-highlight-face ((,class (:inherit hover-highlight))))
+     `(erc-input-face ((,class (:foreground ,yellow))))
+     `(erc-keyword-face ((,class (:foreground ,blue :weight bold))))
+     `(erc-nick-default-face ((,class (:foreground ,yellow :weight bold))))
+     `(erc-my-nick-face ((,class (:foreground ,red :weight bold))))
+     `(erc-nick-msg-face ((,class (:inherit erc-default))))
+     `(erc-notice-face ((,class (:foreground ,green))))
+     `(erc-pal-face ((,class (:foreground ,orange :weight bold))))
+     `(erc-prompt-face ((,class (:foreground ,orange :background ,base00 
:weight bold))))
+     `(erc-timestamp-face ((,class (:foreground ,green))))
+     `(erc-underline-face ((,class (:underline t)))))
+
+    (custom-theme-set-variables
+     theme-name
+     `(evil-emacs-state-cursor '(,red bar))
+     `(evil-insert-state-cursor '(,red hbar))
+     `(evil-normal-state-cursor '(,yellow box))
+     `(evil-visual-state-cursor '(,green box))
+     `(pos-tip-foreground-color ,base02)
+     `(pos-tip-background-color ,base00-1)
+
+     `(highlight-symbol-foreground-color ,base03)
+     `(highlight-symbol-colors '(,yellow
+                                 ,green
+                                 ,cyan
+                                 ,blue
+                                 ,purple
+                                 ,orange))
+     `(beacon-color ,flashing-color)
+     `(highlight-tail-colors
+       '((,flashing-color . 0) (,base00 . 100)))
+
+     `(tabbar-background-color ,base00-2)
+
+     `(ansi-color-names-vector
+       [,base00 ,red-1 ,green ,yellow ,blue ,purple ,cyan ,base03])
+     `(ansi-term-color-vector
+       [unspecified ,base00 ,red-1 ,green ,yellow ,blue ,purple ,cyan 
,base03]))))
 
 ;;;###autoload
 (and load-file-name



reply via email to

[Prev in Thread] Current Thread [Next in Thread]