diff --git a/init.el b/init.el
index c392560..3c54dff 100644
--- a/init.el
+++ b/init.el
@@ -59,9 +59,9 @@ by Prelude.")
 (setq custom-file (concat prelude-personal-dir "custom.el"))
 
 ;; the core stuff
-(require 'prelude-ui)
 (require 'prelude-packages)
 (require 'prelude-el-get)
+(require 'prelude-ui)
 (require 'prelude-core)
 (require 'prelude-editor)
 (require 'prelude-global-keybindings)
diff --git a/modules/prelude-packages.el b/modules/prelude-packages.el
index 511230b..c040b25 100644
--- a/modules/prelude-packages.el
+++ b/modules/prelude-packages.el
@@ -44,8 +44,8 @@
 ;; TODO find a way to get inf-ruby 2.2.2 into Marmalade
 (defvar prelude-packages
   '(auctex clojure-mode coffee-mode deft gist haml-mode
-                 haskell-mode markdown-mode paredit projectile
-                 python sass-mode scss-mode yaml-mode yari)
+           haskell-mode markdown-mode paredit projectile
+           python sass-mode scss-mode solarized-theme yaml-mode yari zenburn-theme)
   "A list of packages to ensure are installed at launch.")
 
 (dolist (p prelude-packages)
diff --git a/themes/.gitkeep b/themes/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/themes/solarized-dark-theme.el b/themes/solarized-dark-theme.el
deleted file mode 100644
index 90a1f14..0000000
--- a/themes/solarized-dark-theme.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(require 'solarized-core)
-
-(deftheme solarized-dark "The dark variant of the Solarized colour theme")
-
-(create-solarized-theme 'dark)
-
-(provide-theme 'solarized-dark)
diff --git a/themes/solarized-light-theme.el b/themes/solarized-light-theme.el
deleted file mode 100644
index dde0a83..0000000
--- a/themes/solarized-light-theme.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(require 'solarized-core)
-
-(deftheme solarized-light "The light variant of the Solarized colour theme")
-
-(create-solarized-theme 'light)
-
-(provide-theme 'solarized-light)
diff --git a/themes/zenburn-theme.el b/themes/zenburn-theme.el
deleted file mode 100644
index 5395d28..0000000
--- a/themes/zenburn-theme.el
+++ /dev/null
@@ -1,474 +0,0 @@
-;;; zenburn-theme.el --- A low contrast color theme for Emacs.
-
-;; Copyright (C) 2011 Bozhidar Batsov
-
-;; Author: Bozhidar Batsov <bozhidar.batsov@gmail.com>
-;; URL: http://github.com/bbatsov/zenburn-emacs
-;; Version: 0.1
-
-;; 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
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; A port of the popular Vim theme Zenburn for Emacs 24, built on top of
-;; the new built-in theme support in Emacs 24. There exists one other version of the
-;; theme by Daniel Brockman. My version was originally based on it,
-;; but it was in such a disarray, that I decided to rewrite it from
-;; scratch in a more maintainable manner (hopefully).
-;;
-;;; Installation:
-;;
-;;   Drop the theme in a folder that is on `custom-theme-load-path'
-;; and enjoy!
-;;
-;; Don't forget that the theme requires Emacs 24.
-;;
-;;; Bugs
-;;
-;; None that I'm aware of.
-;;
-;;; Credits
-;;
-;; Jani Nurminen created the original theme for vim on such this port
-;; is based.
-;;
-;;; Code
-(deftheme zenburn "The Zenburn color theme")
-
-(let ((class '((class color) (min-colors 89)))
-      ;; Zenburn palette
-      ;; colors with +x are lighter, colors with -x are darker
-      (zenburn-fg "#dcdccc")
-      (zenburn-fg-1 "#656555")
-      (zenburn-bg-1 "#2b2b2b")
-      (zenburn-bg-05 "#383838")
-      (zenburn-bg "#3f3f3f")
-      (zenburn-bg+1 "#4f4f4f")
-      (zenburn-bg+2 "#5f5f5f")
-      (zenburn-red+1 "#dca3a3")
-      (zenburn-red "#cc9393")
-      (zenburn-red-1 "#bc8383")
-      (zenburn-red-2 "#ac7373")
-      (zenburn-red-3 "#9c6363")
-      (zenburn-red-4 "#8c5353")
-      (zenburn-orange "#dfaf8f")
-      (zenburn-yellow "#f0dfaf")
-      (zenburn-yellow-1 "#e0cf9f")
-      (zenburn-yellow-2 "#d0bf8f")
-      (zenburn-green-1 "#5f7f5f")
-      (zenburn-green "#7f9f7f")
-      (zenburn-green+1 "#8fb28f")
-      (zenburn-green+2 "#9fc59f")
-      (zenburn-green+3 "#afd8af")
-      (zenburn-green+4 "#bfebbf")
-      (zenburn-cyan "#93e0e3")
-      (zenburn-blue+1 "#94bff3")
-      (zenburn-blue "#8cd0d3")
-      (zenburn-blue-1 "#7cb8bb")
-      (zenburn-blue-2 "#6ca0a3")
-      (zenburn-blue-3 "#5c888b")
-      (zenburn-blue-4 "#4c7073")
-      (zenburn-blue-5 "#366060")
-      (zenburn-magenta "#dc8cc3"))
-  (custom-theme-set-faces
-   'zenburn
-   '(button ((t (:underline t))))
-   `(link ((,class (:foreground ,zenburn-yellow :underline t :weight bold))))
-   `(link-visited ((,class (:foreground ,zenburn-yellow-2 :underline t :weight normal))))
-
-   ;;; define some reusable zenburn faces that we can inherit from afterwards
-   `(zenburn-strong-1-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(zenburn-strong-2-face ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(zenburn-warning-face ((,class (:foreground ,zenburn-yellow-1 :weight bold :underline t))))
-   `(zenburn-error-face ((,class (:foreground ,zenburn-red-1 :weight bold :underline t))))
-
-   ;;; basic coloring
-   `(default ((,class (:foreground ,zenburn-fg :background ,zenburn-bg))))
-   `(cursor ((,class (:foreground ,zenburn-fg))))
-   `(escape-glyph-face ((,class (:foreground ,zenburn-red))))
-   `(fringe ((,class (:foreground ,zenburn-fg :background ,zenburn-bg+1))))
-   `(header-line ((,class (:foreground ,zenburn-yellow
-                                       :background ,zenburn-bg-1
-                                       :box (:line-width -1 :style released-button)))))
-   `(highlight ((,class (:background ,zenburn-bg-05))))
-
-   ;;; compilation
-   `(compilation-column-face ((,class (:foreground ,zenburn-yellow))))
-   `(compilation-enter-directory-face ((,class (:foreground ,zenburn-green))))
-   `(compilation-error-face ((,class (:foreground ,zenburn-red-1 :weight bold :underline t))))
-   `(compilation-face ((,class (:foreground ,zenburn-fg))))
-   `(compilation-info-face ((,class (:foreground ,zenburn-blue))))
-   `(compilation-info ((,class (:foreground ,zenburn-green+4 :underline t))))
-   `(compilation-leave-directory-face ((,class (:foreground ,zenburn-green))))
-   `(compilation-line-face ((,class (:foreground ,zenburn-yellow))))
-   `(compilation-line-number ((,class (:foreground ,zenburn-yellow))))
-   `(compilation-message-face ((,class (:foreground ,zenburn-blue))))
-   `(compilation-warning-face ((,class (:foreground ,zenburn-yellow-1 :weight bold :underline t))))
-
-   ;;; grep
-   `(grep-context-face ((,class (:foreground ,zenburn-fg))))
-   `(grep-error-face ((,class (:foreground ,zenburn-red-1 :weight bold :underline t))))
-   `(grep-hit-face ((,class (:foreground ,zenburn-blue))))
-   `(grep-match-face ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(match ((,class (:background ,zenburn-bg-1 :foreground ,zenburn-orange :weight bold))))
-
-   ;; faces used by isearch
-   `(isearch ((,class (:foreground ,zenburn-yellow :background ,zenburn-bg-1))))
-   `(isearch-fail ((,class (:foreground ,zenburn-fg :background ,zenburn-red-4))))
-   `(lazy-highlight ((,class (:foreground ,zenburn-yellow :background ,zenburn-bg+2))))
-
-   `(menu ((,class (:foreground ,zenburn-fg :background ,zenburn-bg))))
-   `(minibuffer-prompt ((,class (:foreground ,zenburn-yellow))))
-   `(mode-line
-     ((,class (:foreground ,zenburn-green+1
-                           :background ,zenburn-bg-1
-                           :box (:line-width -1 :style released-button)))))
-   `(mode-line-buffer-id ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(mode-line-inactive
-     ((,class (:foreground ,zenburn-green-1
-                           :background ,zenburn-bg-05
-                           :box (:line-width -1 :style released-button)))))
-   `(region ((,class (:background ,zenburn-bg-1))))
-   `(secondary-selection ((,class (:background ,zenburn-bg+2))))
-   `(trailing-whitespace ((,class (:background ,zenburn-red))))
-   `(vertical-border ((,class (:foreground ,zenburn-fg))))
-
-   ;;; font lock
-   `(font-lock-builtin-face ((,class (:foreground ,zenburn-blue))))
-   `(font-lock-comment-face ((,class (:foreground ,zenburn-green))))
-   `(font-lock-comment-delimiter-face ((,class (:foreground ,zenburn-green))))
-   `(font-lock-constant-face ((,class (:foreground ,zenburn-green+4))))
-   `(font-lock-doc-face ((,class (:foreground ,zenburn-green+1))))
-   `(font-lock-doc-string-face ((,class (:foreground ,zenburn-blue+1))))
-   `(font-lock-function-name-face ((,class (:foreground ,zenburn-blue))))
-   `(font-lock-keyword-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(font-lock-negation-char-face ((,class (:foreground ,zenburn-fg))))
-   `(font-lock-preprocessor-face ((,class (:foreground ,zenburn-blue))))
-   `(font-lock-string-face ((,class (:foreground ,zenburn-red))))
-   `(font-lock-type-face ((,class (:foreground ,zenburn-blue))))
-   `(font-lock-variable-name-face ((,class (:foreground ,zenburn-orange))))
-   `(font-lock-warning-face ((,class (:foreground ,zenburn-yellow-1 :weight bold :underline t))))
-
-   `(c-annotation-face ((,class (:inherit font-lock-constant-face))))
-
-   ;;; external
-
-   ;; diff
-   `(diff-added ((,class (:foreground ,zenburn-green+4))))
-   `(diff-changed ((,class (:foreground ,zenburn-yellow))))
-   `(diff-removed ((,class (:foreground ,zenburn-red))))
-   `(diff-header ((,class (:background ,zenburn-bg+1))))
-   `(diff-file-header
-     ((,class (:background ,zenburn-bg+2 :foreground ,zenburn-fg :bold t))))
-
-   ;; eshell
-   `(eshell-prompt ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(eshell-ls-archive ((,class (:foreground ,zenburn-red-1 :weight bold))))
-   `(eshell-ls-backup ((,class (:inherit font-lock-comment))))
-   `(eshell-ls-clutter ((,class (:inherit font-lock-comment))))
-   `(eshell-ls-directory ((,class (:foreground ,zenburn-blue+1 :weight bold))))
-   `(eshell-ls-executable ((,class (:foreground ,zenburn-red+1 :weight bold))))
-   `(eshell-ls-unreadable ((,class (:foreground ,zenburn-fg))))
-   `(eshell-ls-missing ((,class (:inherit font-lock-warning))))
-   `(eshell-ls-product ((,class (:inherit font-lock-doc))))
-   `(eshell-ls-special ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(eshell-ls-symlink ((,class (:foreground ,zenburn-cyan :weight bold))))
-
-   ;; flymake
-   `(flymake-errline ((,class (:foreground ,zenburn-red-1 :weight bold :underline t))))
-   `(flymake-warnline ((,class (:foreground ,zenburn-yellow-1 :weight bold :underline t))))
-
-   ;; flyspell
-   `(flyspell-duplicate ((,class (:foreground ,zenburn-yellow-1 :weight bold :underline t))))
-   `(flyspell-incorrect ((,class (:foreground ,zenburn-red-1 :weight bold :underline t))))
-
-   ;; erc
-   `(erc-action-face ((,class (:inherit erc-default-face))))
-   `(erc-bold-face ((,class (:weight bold))))
-   `(erc-current-nick-face ((,class (:foreground ,zenburn-blue :weight bold))))
-   `(erc-dangerous-host-face ((,class (:inherit font-lock-warning))))
-   `(erc-default-face ((,class (:foreground ,zenburn-fg))))
-   `(erc-direct-msg-face ((,class (:inherit erc-default))))
-   `(erc-error-face ((,class (:inherit font-lock-warning))))
-   `(erc-fool-face ((,class (:inherit erc-default))))
-   `(erc-highlight-face ((,class (:inherit hover-highlight))))
-   `(erc-input-face ((,class (:foreground ,zenburn-yellow))))
-   `(erc-keyword-face ((,class (:foreground ,zenburn-blue :weight bold))))
-   `(erc-nick-default-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(erc-my-nick-face ((,class (:foreground ,zenburn-red :weigth bold))))
-   `(erc-nick-msg-face ((,class (:inherit erc-default))))
-   `(erc-notice-face ((,class (:foreground ,zenburn-green))))
-   `(erc-pal-face ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(erc-prompt-face ((,class (:foreground ,zenburn-orange :background ,zenburn-bg :weight bold))))
-   `(erc-timestamp-face ((,class (:foreground ,zenburn-green+1))))
-   `(erc-underline-face ((t (:underline t))))
-
-   ;; gnus
-   `(gnus-group-mail-1-face ((,class (:bold t :inherit gnus-group-mail-1-empty))))
-   `(gnus-group-mail-1-empty-face ((,class (:inherit gnus-group-news-1-empty))))
-   `(gnus-group-mail-2-face ((,class (:bold t :inherit gnus-group-mail-2-empty))))
-   `(gnus-group-mail-2-empty-face ((,class (:inherit gnus-group-news-2-empty))))
-   `(gnus-group-mail-3-face ((,class (:bold t :inherit gnus-group-mail-3-empty))))
-   `(gnus-group-mail-3-empty-face ((,class (:inherit gnus-group-news-3-empty))))
-   `(gnus-group-mail-4-face ((,class (:bold t :inherit gnus-group-mail-4-empty))))
-   `(gnus-group-mail-4-empty-face ((,class (:inherit gnus-group-news-4-empty))))
-   `(gnus-group-mail-5-face ((,class (:bold t :inherit gnus-group-mail-5-empty))))
-   `(gnus-group-mail-5-empty-face ((,class (:inherit gnus-group-news-5-empty))))
-   `(gnus-group-mail-6-face ((,class (:bold t :inherit gnus-group-mail-6-empty))))
-   `(gnus-group-mail-6-empty-face ((,class (:inherit gnus-group-news-6-empty))))
-   `(gnus-group-mail-low-face ((,class (:bold t :inherit gnus-group-mail-low-empty))))
-   `(gnus-group-mail-low-empty-face ((,class (:inherit gnus-group-news-low-empty))))
-   `(gnus-group-news-1-face ((,class (:bold t :inherit gnus-group-news-1-empty))))
-   `(gnus-group-news-2-face ((,class (:bold t :inherit gnus-group-news-2-empty))))
-   `(gnus-group-news-3-face ((,class (:bold t :inherit gnus-group-news-3-empty))))
-   `(gnus-group-news-4-face ((,class (:bold t :inherit gnus-group-news-4-empty))))
-   `(gnus-group-news-5-face ((,class (:bold t :inherit gnus-group-news-5-empty))))
-   `(gnus-group-news-6-face ((,class (:bold t :inherit gnus-group-news-6-empty))))
-   `(gnus-group-news-low-face ((,class (:bold t :inherit gnus-group-news-low-empty))))
-   `(gnus-header-content-face ((,class (:inherit message-header-other))))
-   `(gnus-header-from-face ((,class (:inherit message-header-from))))
-   `(gnus-header-name-face ((,class (:inherit message-header-name))))
-   `(gnus-header-newsgroups-face ((,class (:inherit message-header-other))))
-   `(gnus-header-subject-face ((,class (:inherit message-header-subject))))
-   `(gnus-summary-cancelled-face ((,class (:foreground ,zenburn-orange))))
-   `(gnus-summary-high-ancient-face ((,class (:foreground ,zenburn-blue))))
-   `(gnus-summary-high-read-face ((,class (:foreground ,zenburn-green :weight bold))))
-   `(gnus-summary-high-ticked-face ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(gnus-summary-high-unread-face ((,class (:foreground ,zenburn-fg :weight bold))))
-   `(gnus-summary-low-ancient-face ((,class (:foreground ,zenburn-blue))))
-   `(gnus-summary-low-read-face ((t (:foreground ,zenburn-green))))
-   `(gnus-summary-low-ticked-face ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(gnus-summary-low-unread-face ((,class (:foreground ,zenburn-fg))))
-   `(gnus-summary-normal-ancient-face ((,class (:foreground ,zenburn-blue))))
-   `(gnus-summary-normal-read-face ((,class (:foreground ,zenburn-green))))
-   `(gnus-summary-normal-ticked-face ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(gnus-summary-normal-unread-face ((,class (:foreground ,zenburn-fg))))
-   `(gnus-summary-selected-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(gnus-cite-1-face ((,class (:foreground ,zenburn-blue))))
-   `(gnus-cite-10-face ((,class (:foreground ,zenburn-yellow-1))))
-   `(gnus-cite-11-face ((,class (:foreground ,zenburn-yellow))))
-   `(gnus-cite-2-face ((,class (:foreground ,zenburn-blue-1))))
-   `(gnus-cite-3-face ((,class (:foreground ,zenburn-blue-2))))
-   `(gnus-cite-4-face ((,class (:foreground ,zenburn-green+2))))
-   `(gnus-cite-5-face ((,class (:foreground ,zenburn-green+1))))
-   `(gnus-cite-6-face ((,class (:foreground ,zenburn-green))))
-   `(gnus-cite-7-face ((,class (:foreground ,zenburn-red))))
-   `(gnus-cite-8-face ((,class (:foreground ,zenburn-red-1))))
-   `(gnus-cite-9-face ((,class (:foreground ,zenburn-red-2))))
-   `(gnus-group-news-1-empty-face ((,class (:foreground ,zenburn-yellow))))
-   `(gnus-group-news-2-empty-face ((,class (:foreground ,zenburn-green+3))))
-   `(gnus-group-news-3-empty-face ((,class (:foreground ,zenburn-green+1))))
-   `(gnus-group-news-4-empty-face ((,class (:foreground ,zenburn-blue-2))))
-   `(gnus-group-news-5-empty-face ((,class (:foreground ,zenburn-blue-3))))
-   `(gnus-group-news-6-empty-face ((,class (:foreground ,zenburn-bg+2))))
-   `(gnus-group-news-low-empty-face ((,class (:foreground ,zenburn-bg+2))))
-   `(gnus-signature-face ((,class (:foreground ,zenburn-yellow))))
-   `(gnus-x-face ((,class (:background ,zenburn-fg :foreground ,zenburn-bg))))
-
-   ;; hl-line-mode
-   `(hl-line-face ((,class (:background ,zenburn-bg-1))))
-
-   ;; ido-mode
-   `(ido-first-match ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(ido-only-match ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(ido-subdir ((,class (:foreground ,zenburn-yellow))))
-
-   ;; linum-mode
-   `(linum ((,class (:foreground ,zenburn-fg-1 :background ,zenburn-bg-1))))
-
-   ;; magit
-   `(magit-section-title ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(magit-branch ((,class (:foreground ,zenburn-orange :weight bold))))
-
-   ;; message-mode
-   `(message-cited-text-face ((,class (:inherit font-lock-comment))))
-   `(message-header-name-face ((,class (:foreground ,zenburn-green+1))))
-   `(message-header-other-face ((,class (:foreground ,zenburn-green))))
-   `(message-header-to-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(message-header-from-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(message-header-cc-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(message-header-newsgroups-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(message-header-subject-face ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(message-header-xheader-face ((,class (:foreground ,zenburn-green))))
-   `(message-mml-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(message-separator-face ((,class (:inherit font-lock-comment))))
-
-   ;; mew
-   `(mew-face-header-subject ((,class (:foreground ,zenburn-orange))))
-   `(mew-face-header-from ((,class (:foreground ,zenburn-yellow))))
-   `(mew-face-header-date ((,class (:foreground ,zenburn-green))))
-   `(mew-face-header-to ((,class (:foreground ,zenburn-red))))
-   `(mew-face-header-key ((,class (:foreground ,zenburn-green))))
-   `(mew-face-header-private ((,class (:foreground ,zenburn-green))))
-   `(mew-face-header-important ((,class (:foreground ,zenburn-blue))))
-   `(mew-face-header-marginal ((,class (:foreground ,zenburn-fg :weight bold))))
-   `(mew-face-header-warning ((,class (:foreground ,zenburn-red))))
-   `(mew-face-header-xmew ((,class (:foreground ,zenburn-green))))
-   `(mew-face-header-xmew-bad ((,class (:foreground ,zenburn-red))))
-   `(mew-face-body-url ((,class (:foreground ,zenburn-orange))))
-   `(mew-face-body-comment ((,class (:foreground ,zenburn-fg :slant italic))))
-   `(mew-face-body-cite1 ((,class (:foreground ,zenburn-green))))
-   `(mew-face-body-cite2 ((,class (:foreground ,zenburn-blue))))
-   `(mew-face-body-cite3 ((,class (:foreground ,zenburn-orange))))
-   `(mew-face-body-cite4 ((,class (:foreground ,zenburn-yellow))))
-   `(mew-face-body-cite5 ((,class (:foreground ,zenburn-red))))
-   `(mew-face-mark-review ((,class (:foreground ,zenburn-blue))))
-   `(mew-face-mark-escape ((,class (:foreground ,zenburn-green))))
-   `(mew-face-mark-delete ((,class (:foreground ,zenburn-red))))
-   `(mew-face-mark-unlink ((,class (:foreground ,zenburn-yellow))))
-   `(mew-face-mark-refile ((,class (:foreground ,zenburn-green))))
-   `(mew-face-mark-unread ((,class (:foreground ,zenburn-red-2))))
-   `(mew-face-eof-message ((,class (:foreground ,zenburn-green))))
-   `(mew-face-eof-part ((,class (:foreground ,zenburn-yellow))))
-
-   ;; nav
-   `(nav-face-heading ((,class (:foreground ,zenburn-yellow))))
-   `(nav-face-button-num ((,class (:foreground ,zenburn-cyan))))
-   `(nav-face-dir ((,class (:foreground ,zenburn-green))))
-   `(nav-face-hdir ((,class (:foreground ,zenburn-red))))
-   `(nav-face-file ((,class (:foreground ,zenburn-fg))))
-   `(nav-face-hfile ((,class (:foreground ,zenburn-red-4))))
-
-   ;; org-mode
-   `(org-agenda-date-today
-     ((,class (:foreground "white" :slant italic :weight bold))) t)
-   `(org-agenda-structure
-     ((,class (:inherit font-lock-comment-face))))
-   `(org-archived ((,class (:foreground ,zenburn-fg :weight bold))))
-   `(org-checkbox ((,class (:background ,zenburn-bg+2 :foreground "white"
-                                   :box (:line-width 1 :style released-button)))))
-   `(org-date ((,class (:foreground ,zenburn-blue :underline t))))
-   `(org-deadline-announce ((,class (:foreground ,zenburn-red-1))))
-   `(org-done ((,class (:bold t :weight bold :foreground ,zenburn-green+3))))
-   `(org-formula ((,class (:foreground ,zenburn-yellow-2))))
-   `(org-headline-done ((,class (:foreground ,zenburn-green+3))))
-   `(org-hide ((,class (:foreground ,zenburn-bg-1))))
-   `(org-level-1 ((,class (:foreground ,zenburn-orange))))
-   `(org-level-2 ((,class (:foreground ,zenburn-green+1))))
-   `(org-level-3 ((,class (:foreground ,zenburn-blue-1))))
-   `(org-level-4 ((,class (:foreground ,zenburn-yellow-2))))
-   `(org-level-5 ((,class (:foreground ,zenburn-cyan))))
-   `(org-level-6 ((,class (:foreground ,zenburn-green-1))))
-   `(org-level-7 ((,class (:foreground ,zenburn-red-4))))
-   `(org-level-8 ((,class (:foreground ,zenburn-blue-4))))
-   `(org-link ((,class (:foreground ,zenburn-yellow-2 :underline t))))
-   `(org-scheduled ((,class (:foreground ,zenburn-green+4))))
-   `(org-scheduled-previously ((,class (:foreground ,zenburn-red-4))))
-   `(org-scheduled-today ((,class (:foreground ,zenburn-blue+1))))
-   `(org-special-keyword ((,class (:foreground ,zenburn-yellow-1))))
-   `(org-table ((,class (:foreground ,zenburn-green+2))))
-   `(org-tag ((,class (:bold t :weight bold))))
-   `(org-time-grid ((,class (:foreground ,zenburn-orange))))
-   `(org-todo ((,class (:bold t :foreground ,zenburn-red :weight bold))))
-   `(org-upcoming-deadline ((,class (:inherit font-lock-keyword-face))))
-   `(org-warning ((,class (:bold t :foreground ,zenburn-red :weight bold))))
-
-   ;; outline
-   `(outline-8 ((,class (:inherit default))))
-   `(outline-7 ((,class (:inherit outline-8 :height 1.0))))
-   `(outline-6 ((,class (:inherit outline-7 :height 1.0))))
-   `(outline-5 ((,class (:inherit outline-6 :height 1.0))))
-   `(outline-4 ((,class (:inherit outline-5 :height 1.0))))
-   `(outline-3 ((,class (:inherit outline-4 :height 1.0))))
-   `(outline-2 ((,class (:inherit outline-3 :height 1.0))))
-   `(outline-1 ((,class (:inherit outline-2 :height 1.0))))
-
-   ;; rainbow-delimiters
-   `(rainbow-delimiters-depth-1-face ((,class (:foreground ,zenburn-cyan))))
-   `(rainbow-delimiters-depth-2-face ((,class (:foreground ,zenburn-yellow))))
-   `(rainbow-delimiters-depth-3-face ((,class (:foreground ,zenburn-blue+1))))
-   `(rainbow-delimiters-depth-4-face ((,class (:foreground ,zenburn-red+1))))
-   `(rainbow-delimiters-depth-5-face ((,class (:foreground ,zenburn-orange))))
-   `(rainbow-delimiters-depth-6-face ((,class (:foreground ,zenburn-blue-1))))
-   `(rainbow-delimiters-depth-7-face ((,class (:foreground ,zenburn-green+4))))
-   `(rainbow-delimiters-depth-8-face ((,class (:foreground ,zenburn-red-3))))
-   `(rainbow-delimiters-depth-9-face ((,class (:foreground ,zenburn-yellow-2))))
-   `(rainbow-delimiters-depth-10-face ((,class (:foreground ,zenburn-green+2))))
-   `(rainbow-delimiters-depth-11-face ((,class (:foreground ,zenburn-blue+1))))
-   `(rainbow-delimiters-depth-12-face ((,class (:foreground ,zenburn-red-4))))
-
-   ;; rpm-mode
-   `(rpm-spec-dir-face ((,class (:foreground ,zenburn-green))))
-   `(rpm-spec-doc-face ((,class (:foreground ,zenburn-green))))
-   `(rpm-spec-ghost-face ((,class (:foreground ,zenburn-red))))
-   `(rpm-spec-macro-face ((,class (:foreground ,zenburn-yellow))))
-   `(rpm-spec-obsolete-tag-face ((,class (:foreground ,zenburn-red))))
-   `(rpm-spec-package-face ((,class (:foreground ,zenburn-red))))
-   `(rpm-spec-section-face ((,class (:foreground ,zenburn-yellow))))
-   `(rpm-spec-tag-face ((,class (:foreground ,zenburn-blue))))
-   `(rpm-spec-var-face ((,class (:foreground ,zenburn-red))))
-
-   ;; show-paren
-   `(show-paren-mismatch ((,class (:foreground ,zenburn-red-3 :background ,zenburn-bg :weight bold))))
-   `(show-paren-match ((,class (:foreground ,zenburn-blue-1 :background ,zenburn-bg :weight bold))))
-
-   ;; SLIME
-   `(slime-repl-inputed-output-face ((,class (:foreground ,zenburn-red))))
-
-   ;; whitespace-mode
-   `(whitespace-space ((,class (:background ,zenburn-bg :foreground ,zenburn-bg+1))))
-   `(whitespace-hspace ((,class (:background ,zenburn-bg :foreground ,zenburn-bg+1))))
-   `(whitespace-tab ((,class (:background ,zenburn-bg :foreground ,zenburn-red))))
-   `(whitespace-newline ((,class (:foreground ,zenburn-bg+1))))
-   `(whitespace-trailing ((,class (:foreground ,zenburn-red :background ,zenburn-bg))))
-   `(whitespace-line ((,class (:background ,zenburn-bg-05 :foreground ,zenburn-magenta))))
-   `(whitespace-space-before-tab ((,class (:background ,zenburn-orange :foreground ,zenburn-orange))))
-   `(whitespace-indentation ((,class (:background ,zenburn-yellow, :foreground ,zenburn-red))))
-   `(whitespace-empty ((,class (:background ,zenburn-yellow :foreground ,zenburn-red))))
-   `(whitespace-space-after-tab ((,class (:background ,zenburn-yellow :foreground ,zenburn-red))))
-
-   ;; wanderlust
-   `(wl-highlight-folder-few-face ((,class (:foreground ,zenburn-red-2))))
-   `(wl-highlight-folder-many-face ((,class (:foreground ,zenburn-red-1))))
-   `(wl-highlight-folder-path-face ((,class (:foreground ,zenburn-orange))))
-   `(wl-highlight-folder-unread-face ((,class (:foreground ,zenburn-blue))))
-   `(wl-highlight-folder-zero-face ((,class (:foreground ,zenburn-fg))))
-   `(wl-highlight-folder-unknown-face ((,class (:foreground ,zenburn-blue))))
-   `(wl-highlight-message-citation-header ((,class (:foreground ,zenburn-red-1))))
-   `(wl-highlight-message-cited-text-1 ((,class (:foreground ,zenburn-red))))
-   `(wl-highlight-message-cited-text-2 ((,class (:foreground ,zenburn-green+2))))
-   `(wl-highlight-message-cited-text-3 ((,class (:foreground ,zenburn-blue))))
-   `(wl-highlight-message-cited-text-4 ((,class (:foreground ,zenburn-blue+1))))
-   `(wl-highlight-message-header-contents-face ((,class (:foreground ,zenburn-green))))
-   `(wl-highlight-message-headers-face ((,class (:foreground ,zenburn-red+1))))
-   `(wl-highlight-message-important-header-contents ((,class (:foreground ,zenburn-green+2))))
-   `(wl-highlight-message-header-contents ((,class (:foreground ,zenburn-green+1))))
-   `(wl-highlight-message-important-header-contents2 ((,class (:foreground ,zenburn-green+2))))
-   `(wl-highlight-message-signature ((,class (:foreground ,zenburn-green))))
-   `(wl-highlight-message-unimportant-header-contents ((,class (:foreground ,zenburn-fg))))
-   `(wl-highlight-summary-answered-face ((,class (:foreground ,zenburn-blue))))
-   `(wl-highlight-summary-disposed-face ((,class (:foreground ,zenburn-fg
-                                                         :slant italic))))
-   `(wl-highlight-summary-new-face ((,class (:foreground ,zenburn-blue))))
-   `(wl-highlight-summary-normal-face ((,class (:foreground ,zenburn-fg))))
-   `(wl-highlight-summary-thread-top-face ((,class (:foreground ,zenburn-yellow))))
-   `(wl-highlight-thread-indent-face ((,class (:foreground ,zenburn-magenta))))
-   `(wl-highlight-summary-refiled-face ((,class (:foreground ,zenburn-fg))))
-   `(wl-highlight-summary-displaying-face ((,class (:underline t :weight bold))))
-   
-   ;; which-func-mode
-   `(which-func ((,class (:foreground ,zenburn-green+1))))))
-
-(custom-theme-set-variables
- 'zenburn
- '(ansi-color-names-vector [zenburn-bg zenburn-red zenburn-green zenburn-yellow
-                                       zenburn-blue zenburn-magenta zenburn-cyan zenburn-fg]))
-
-(provide-theme 'zenburn)
-
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
-
-;;; zenburn-theme.el ends here.
diff --git a/vendor/solarized-core.el b/vendor/solarized-core.el
deleted file mode 100644
index 5e23525..0000000
--- a/vendor/solarized-core.el
+++ /dev/null
@@ -1,459 +0,0 @@
-;;; solarized-core.el --- Solarized for Emacs.
-
-;; Copyright (C) 2011 Bozhidar Batsov
-
-;; Author: Bozhidar Batsov <bozhidar.batsov@gmail.com>
-;; URL: http://github.com/bbatsov/solarized-emacs
-;; Version: 0.1
-
-;; 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
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; A port of Solarized to Emacs.
-;;
-;;; Installation:
-;;
-;;   Drop the `colarized-core.el` somewhere in your `load-path` and
-;; the two themes in a folder that is on `custom-theme-load-path'
-;; and enjoy!
-;;
-;; Don't forget that the theme requires Emacs 24.
-;;
-;;; Bugs
-;;
-;; None that I'm aware of.
-;;
-;;; Credits
-;;
-;; Ethan Schoonover created the original theme for vim on such this port
-;; is based.
-;;
-;;; Code
-
-(defun create-solarized-theme (variant)
-  (let* ((class '((class color) (min-colors 89)))
-         ;; Solarized palette
-         (base03    "#002b36")
-         (base02    "#073642")
-         ;; emphasized content
-         (base01    "#586e75")
-         ;; primary content
-         (base00    "#657b83")
-         (base0     "#839496")
-         ;; comments
-         (base1     "#93a1a1")
-         ;; background highlight light
-         (base2     "#eee8d5")
-         ;; background light
-         (base3     "#fdf6e3")
-         (yellow    "#b58900")
-         (orange    "#cb4b16")
-         (red       "#dc322f")
-         (magenta   "#d33682")
-         (violet    "#6c71c4")
-         (blue      "#268bd2")
-         (cyan      "#2aa198")
-         (green     "#859900")
-
-         (solarized-fg (if (eq variant 'light) base00 base0))
-         (solarized-bg (if (eq variant 'light) base3 base03))
-         (solarized-hl (if (eq variant 'light) base2 base02))
-         (solarized-emph (if (eq variant 'light) base01 base1))
-         (solarized-comments (if (eq variant 'light) base1 base01)))
-    (custom-theme-set-faces
-     (if (eq variant 'light) 'solarized-light 'solarized-dark)
-     '(button ((t (:underline t))))
-     `(link ((,class (:foreground ,yellow :underline t :weight bold))))
-     `(link-visited ((,class (:foreground ,yellow :underline t :weight normal))))
-
-     ;; basic coloring
-     `(default ((,class (:foreground ,solarized-fg :background ,solarized-bg))))
-     `(cursor ((,class (:foreground ,solarized-bg :background ,solarized-fg :inverse-video t))))
-     `(escape-glyph-face ((,class (:foreground ,red))))
-     `(fringe ((,class (:foreground ,solarized-fg :background ,solarized-hl))))
-     `(header-line ((,class (:foreground ,yellow
-                                         :background ,solarized-hl
-                                         :box (:line-width -1 :style released-button)))))
-     `(highlight ((,class (:background ,solarized-hl))))
-
-     ;; compilation
-     `(compilation-column-face ((,class (:foreground ,yellow))))
-     `(compilation-enter-directory-face ((,class (:foreground ,green))))
-     `(compilation-error-face ((,class (:foreground ,red :weight bold :underline t))))
-     `(compilation-face ((,class (:foreground ,solarized-fg))))
-     `(compilation-info-face ((,class (:foreground ,blue))))
-     `(compilation-info ((,class (:foreground ,green :underline t))))
-     `(compilation-leave-directory-face ((,class (:foreground ,green))))
-     `(compilation-line-face ((,class (:foreground ,yellow))))
-     `(compilation-line-number ((,class (:foreground ,yellow))))
-     `(compilation-message-face ((,class (:foreground ,blue))))
-     `(compilation-warning-face ((,class (:foreground ,yellow :weight bold :underline t))))
-
-     ;; grep
-     `(grep-context-face ((,class (:foreground ,solarized-fg))))
-     `(grep-error-face ((,class (:foreground ,red :weight bold :underline t))))
-     `(grep-hit-face ((,class (:foreground ,blue))))
-     `(grep-match-face ((,class (:foreground ,orange :weight bold))))
-     `(match ((,class (:background ,solarized-hl :foreground ,orange :weight bold))))
-
-     ;; faces used by isearch
-     `(isearch ((,class (:foreground ,yellow :background ,solarized-hl))))
-     `(isearch-fail ((,class (:foreground ,solarized-fg :background ,red))))
-     `(lazy-highlight ((,class (:foreground ,yellow :background ,solarized-hl))))
-
-     `(menu ((,class (:foreground ,solarized-fg :background ,solarized-bg))))
-     `(minibuffer-prompt ((,class (:foreground ,solarized-emph))))
-     `(mode-line
-       ((,class (:foreground ,solarized-fg
-                             :background ,solarized-hl
-                             :box (:line-width -1 :style released-button)))))
-     `(mode-line-buffer-id ((,class (:foreground ,solarized-emph :weight bold))))
-     `(mode-line-inactive
-       ((,class (:foreground ,solarized-fg
-                             :background ,solarized-bg
-                             :box (:line-width -1 :style released-button)))))
-     `(region ((,class (:background ,solarized-hl))))
-     `(secondary-selection ((,class (:background ,solarized-bg))))
-     `(trailing-whitespace ((,class (:background ,red))))
-     `(vertical-border ((,class (:foreground ,solarized-fg))))
-
-     ;; font lock
-     `(font-lock-builtin-face ((,class (:foreground ,blue))))
-     `(font-lock-comment-face ((,class (:foreground ,solarized-comments))))
-     `(font-lock-comment-delimiter-face ((,class (:foreground ,solarized-comments))))
-     `(font-lock-constant-face ((,class (:foreground ,blue))))
-     `(font-lock-doc-face ((,class (:foreground ,green))))
-     `(font-lock-doc-string-face ((,class (:foreground ,blue))))
-     `(font-lock-function-name-face ((,class (:foreground ,blue))))
-     `(font-lock-keyword-face ((,class (:foreground ,green :weight bold))))
-     `(font-lock-negation-char-face ((,class (:foreground ,solarized-fg))))
-     `(font-lock-preprocessor-face ((,class (:foreground ,blue))))
-     `(font-lock-string-face ((,class (:foreground ,cyan))))
-     `(font-lock-type-face ((,class (:foreground ,yellow))))
-     `(font-lock-variable-name-face ((,class (:foreground ,blue))))
-     `(font-lock-warning-face ((,class (:foreground ,yellow :weight bold :underline t))))
-
-     `(c-annotation-face ((,class (:inherit font-lock-constant-face))))
-
-     ;;; external
-
-     ;; diff
-     `(diff-added ((,class (:foreground ,green))))
-     `(diff-changed ((,class (:foreground ,yellow))))
-     `(diff-removed ((,class (:foreground ,red))))
-     `(diff-header ((,class (:background ,solarized-bg))))
-     `(diff-file-header
-       ((,class (:background ,solarized-bg :foreground ,solarized-fg :bold t))))
-
-     ;; eshell
-     `(eshell-prompt ((,class (:foreground ,yellow :weight bold))))
-     `(eshell-ls-archive ((,class (:foreground ,red :weight bold))))
-     `(eshell-ls-backup ((,class (:inherit font-lock-comment))))
-     `(eshell-ls-clutter ((,class (:inherit font-lock-comment))))
-     `(eshell-ls-directory ((,class (:foreground ,blue :weight bold))))
-     `(eshell-ls-executable ((,class (:foreground ,red :weight bold))))
-     `(eshell-ls-unreadable ((,class (:foreground ,solarized-fg))))
-     `(eshell-ls-missing ((,class (:inherit font-lock-warning))))
-     `(eshell-ls-product ((,class (:inherit font-lock-doc))))
-     `(eshell-ls-special ((,class (:foreground ,yellow :weight bold))))
-     `(eshell-ls-symlink ((,class (:foreground ,cyan :weight bold))))
-
-     ;; flymake
-     `(flymake-errline ((,class (:foreground ,red :weight bold :underline t))))
-     `(flymake-warnline ((,class (:foreground ,yellow :weight bold :underline t))))
-
-     ;; flyspell
-     `(flyspell-duplicate ((,class (:foreground ,yellow :weight bold :underline t))))
-     `(flyspell-incorrect ((,class (:foreground ,red :weight bold :underline t))))
-
-     ;; erc
-     `(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))))
-     `(erc-default-face ((,class (:foreground ,solarized-fg))))
-     `(erc-direct-msg-face ((,class (:inherit erc-default))))
-     `(erc-error-face ((,class (:inherit font-lock-warning))))
-     `(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 :weigth 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 ,solarized-bg :weight bold))))
-     `(erc-timestamp-face ((,class (:foreground ,green))))
-     `(erc-underline-face ((t (:underline t))))
-
-     ;; gnus
-     `(gnus-group-mail-1-face ((,class (:bold t :inherit gnus-group-mail-1-empty))))
-     `(gnus-group-mail-1-empty-face ((,class (:inherit gnus-group-news-1-empty))))
-     `(gnus-group-mail-2-face ((,class (:bold t :inherit gnus-group-mail-2-empty))))
-     `(gnus-group-mail-2-empty-face ((,class (:inherit gnus-group-news-2-empty))))
-     `(gnus-group-mail-3-face ((,class (:bold t :inherit gnus-group-mail-3-empty))))
-     `(gnus-group-mail-3-empty-face ((,class (:inherit gnus-group-news-3-empty))))
-     `(gnus-group-mail-4-face ((,class (:bold t :inherit gnus-group-mail-4-empty))))
-     `(gnus-group-mail-4-empty-face ((,class (:inherit gnus-group-news-4-empty))))
-     `(gnus-group-mail-5-face ((,class (:bold t :inherit gnus-group-mail-5-empty))))
-     `(gnus-group-mail-5-empty-face ((,class (:inherit gnus-group-news-5-empty))))
-     `(gnus-group-mail-6-face ((,class (:bold t :inherit gnus-group-mail-6-empty))))
-     `(gnus-group-mail-6-empty-face ((,class (:inherit gnus-group-news-6-empty))))
-     `(gnus-group-mail-low-face ((,class (:bold t :inherit gnus-group-mail-low-empty))))
-     `(gnus-group-mail-low-empty-face ((,class (:inherit gnus-group-news-low-empty))))
-     `(gnus-group-news-1-face ((,class (:bold t :inherit gnus-group-news-1-empty))))
-     `(gnus-group-news-2-face ((,class (:bold t :inherit gnus-group-news-2-empty))))
-     `(gnus-group-news-3-face ((,class (:bold t :inherit gnus-group-news-3-empty))))
-     `(gnus-group-news-4-face ((,class (:bold t :inherit gnus-group-news-4-empty))))
-     `(gnus-group-news-5-face ((,class (:bold t :inherit gnus-group-news-5-empty))))
-     `(gnus-group-news-6-face ((,class (:bold t :inherit gnus-group-news-6-empty))))
-     `(gnus-group-news-low-face ((,class (:bold t :inherit gnus-group-news-low-empty))))
-     `(gnus-header-content-face ((,class (:inherit message-header-other))))
-     `(gnus-header-from-face ((,class (:inherit message-header-from))))
-     `(gnus-header-name-face ((,class (:inherit message-header-name))))
-     `(gnus-header-newsgroups-face ((,class (:inherit message-header-other))))
-     `(gnus-header-subject-face ((,class (:inherit message-header-subject))))
-     `(gnus-summary-cancelled-face ((,class (:foreground ,orange))))
-     `(gnus-summary-high-ancient-face ((,class (:foreground ,blue))))
-     `(gnus-summary-high-read-face ((,class (:foreground ,green :weight bold))))
-     `(gnus-summary-high-ticked-face ((,class (:foreground ,orange :weight bold))))
-     `(gnus-summary-high-unread-face ((,class (:foreground ,solarized-fg :weight bold))))
-     `(gnus-summary-low-ancient-face ((,class (:foreground ,blue))))
-     `(gnus-summary-low-read-face ((t (:foreground ,green))))
-     `(gnus-summary-low-ticked-face ((,class (:foreground ,orange :weight bold))))
-     `(gnus-summary-low-unread-face ((,class (:foreground ,solarized-fg))))
-     `(gnus-summary-normal-ancient-face ((,class (:foreground ,blue))))
-     `(gnus-summary-normal-read-face ((,class (:foreground ,green))))
-     `(gnus-summary-normal-ticked-face ((,class (:foreground ,orange :weight bold))))
-     `(gnus-summary-normal-unread-face ((,class (:foreground ,solarized-fg))))
-     `(gnus-summary-selected-face ((,class (:foreground ,yellow :weight bold))))
-     `(gnus-cite-1-face ((,class (:foreground ,blue))))
-     `(gnus-cite-10-face ((,class (:foreground ,yellow))))
-     `(gnus-cite-11-face ((,class (:foreground ,yellow))))
-     `(gnus-cite-2-face ((,class (:foreground ,blue))))
-     `(gnus-cite-3-face ((,class (:foreground ,blue))))
-     `(gnus-cite-4-face ((,class (:foreground ,green))))
-     `(gnus-cite-5-face ((,class (:foreground ,green))))
-     `(gnus-cite-6-face ((,class (:foreground ,green))))
-     `(gnus-cite-7-face ((,class (:foreground ,red))))
-     `(gnus-cite-8-face ((,class (:foreground ,red))))
-     `(gnus-cite-9-face ((,class (:foreground ,red))))
-     `(gnus-group-news-1-empty-face ((,class (:foreground ,yellow))))
-     `(gnus-group-news-2-empty-face ((,class (:foreground ,green))))
-     `(gnus-group-news-3-empty-face ((,class (:foreground ,green))))
-     `(gnus-group-news-4-empty-face ((,class (:foreground ,blue))))
-     `(gnus-group-news-5-empty-face ((,class (:foreground ,blue))))
-     `(gnus-group-news-6-empty-face ((,class (:foreground ,solarized-bg))))
-     `(gnus-group-news-low-empty-face ((,class (:foreground ,solarized-bg))))
-     `(gnus-signature-face ((,class (:foreground ,yellow))))
-     `(gnus-x-face ((,class (:background ,solarized-fg :foreground ,solarized-bg))))
-
-     ;; hl-line-mode
-     `(hl-line-face ((,class (:background ,solarized-bg))))
-
-     ;; ido-mode
-     `(ido-first-match ((,class (:foreground ,yellow :weight bold))))
-     `(ido-only-match ((,class (:foreground ,orange :weight bold))))
-     `(ido-subdir ((,class (:foreground ,yellow))))
-
-     ;; linum-mode
-     `(linum ((,class (:foreground ,solarized-fg :background ,solarized-bg))))
-
-     ;; magit
-     `(magit-section-title ((,class (:foreground ,yellow :weight bold))))
-     `(magit-branch ((,class (:foreground ,orange :weight bold))))
-
-     ;; message-mode
-     `(message-cited-text-face ((,class (:inherit font-lock-comment))))
-     `(message-header-name-face ((,class (:foreground ,green))))
-     `(message-header-other-face ((,class (:foreground ,green))))
-     `(message-header-to-face ((,class (:foreground ,yellow :weight bold))))
-     `(message-header-from-face ((,class (:foreground ,yellow :weight bold))))
-     `(message-header-cc-face ((,class (:foreground ,yellow :weight bold))))
-     `(message-header-newsgroups-face ((,class (:foreground ,yellow :weight bold))))
-     `(message-header-subject-face ((,class (:foreground ,orange :weight bold))))
-     `(message-header-xheader-face ((,class (:foreground ,green))))
-     `(message-mml-face ((,class (:foreground ,yellow :weight bold))))
-     `(message-separator-face ((,class (:inherit font-lock-comment))))
-
-     ;; mew
-     `(mew-face-header-subject ((,class (:foreground ,orange))))
-     `(mew-face-header-from ((,class (:foreground ,yellow))))
-     `(mew-face-header-date ((,class (:foreground ,green))))
-     `(mew-face-header-to ((,class (:foreground ,red))))
-     `(mew-face-header-key ((,class (:foreground ,green))))
-     `(mew-face-header-private ((,class (:foreground ,green))))
-     `(mew-face-header-important ((,class (:foreground ,blue))))
-     `(mew-face-header-marginal ((,class (:foreground ,solarized-fg :weight bold))))
-     `(mew-face-header-warning ((,class (:foreground ,red))))
-     `(mew-face-header-xmew ((,class (:foreground ,green))))
-     `(mew-face-header-xmew-bad ((,class (:foreground ,red))))
-     `(mew-face-body-url ((,class (:foreground ,orange))))
-     `(mew-face-body-comment ((,class (:foreground ,solarized-fg :slant italic))))
-     `(mew-face-body-cite1 ((,class (:foreground ,green))))
-     `(mew-face-body-cite2 ((,class (:foreground ,blue))))
-     `(mew-face-body-cite3 ((,class (:foreground ,orange))))
-     `(mew-face-body-cite4 ((,class (:foreground ,yellow))))
-     `(mew-face-body-cite5 ((,class (:foreground ,red))))
-     `(mew-face-mark-review ((,class (:foreground ,blue))))
-     `(mew-face-mark-escape ((,class (:foreground ,green))))
-     `(mew-face-mark-delete ((,class (:foreground ,red))))
-     `(mew-face-mark-unlink ((,class (:foreground ,yellow))))
-     `(mew-face-mark-refile ((,class (:foreground ,green))))
-     `(mew-face-mark-unread ((,class (:foreground ,red))))
-     `(mew-face-eof-message ((,class (:foreground ,green))))
-     `(mew-face-eof-part ((,class (:foreground ,yellow))))
-
-     ;; nav
-     `(nav-face-heading ((,class (:foreground ,yellow))))
-     `(nav-face-button-num ((,class (:foreground ,cyan))))
-     `(nav-face-dir ((,class (:foreground ,green))))
-     `(nav-face-hdir ((,class (:foreground ,red))))
-     `(nav-face-file ((,class (:foreground ,solarized-fg))))
-     `(nav-face-hfile ((,class (:foreground ,red))))
-
-     ;; org-mode
-     `(org-agenda-date-today
-       ((,class (:foreground "white" :slant italic :weight bold))) t)
-     `(org-agenda-structure
-       ((,class (:inherit font-lock-comment-face))))
-     `(org-archived ((,class (:foreground ,solarized-fg :weight bold))))
-     `(org-checkbox ((,class (:background ,solarized-bg :foreground "white"
-                                          :box (:line-width 1 :style released-button)))))
-     `(org-date ((,class (:foreground ,blue :underline t))))
-     `(org-deadline-announce ((,class (:foreground ,red))))
-     `(org-done ((,class (:bold t :weight bold :foreground ,green))))
-     `(org-formula ((,class (:foreground ,yellow))))
-     `(org-headline-done ((,class (:foreground ,green))))
-     `(org-hide ((,class (:foreground ,solarized-bg))))
-     `(org-level-1 ((,class (:foreground ,orange))))
-     `(org-level-2 ((,class (:foreground ,green))))
-     `(org-level-3 ((,class (:foreground ,blue))))
-     `(org-level-4 ((,class (:foreground ,yellow))))
-     `(org-level-5 ((,class (:foreground ,cyan))))
-     `(org-level-6 ((,class (:foreground ,green))))
-     `(org-level-7 ((,class (:foreground ,red))))
-     `(org-level-8 ((,class (:foreground ,blue))))
-     `(org-link ((,class (:foreground ,yellow :underline t))))
-     `(org-scheduled ((,class (:foreground ,green))))
-     `(org-scheduled-previously ((,class (:foreground ,red))))
-     `(org-scheduled-today ((,class (:foreground ,blue))))
-     `(org-special-keyword ((,class (:foreground ,yellow))))
-     `(org-table ((,class (:foreground ,green))))
-     `(org-tag ((,class (:bold t :weight bold))))
-     `(org-time-grid ((,class (:foreground ,orange))))
-     `(org-todo ((,class (:bold t :foreground ,red :weight bold))))
-     `(org-upcoming-deadline ((,class (:inherit font-lock-keyword-face))))
-     `(org-warning ((,class (:bold t :foreground ,red :weight bold))))
-
-     ;; outline
-     `(outline-8 ((,class (:inherit default))))
-     `(outline-7 ((,class (:inherit outline-8 :height 1.0))))
-     `(outline-6 ((,class (:inherit outline-7 :height 1.0))))
-     `(outline-5 ((,class (:inherit outline-6 :height 1.0))))
-     `(outline-4 ((,class (:inherit outline-5 :height 1.0))))
-     `(outline-3 ((,class (:inherit outline-4 :height 1.0))))
-     `(outline-2 ((,class (:inherit outline-3 :height 1.0))))
-     `(outline-1 ((,class (:inherit outline-2 :height 1.0))))
-
-     ;; rainbow-delimiters
-     `(rainbow-delimiters-depth-1-face ((,class (:foreground ,cyan))))
-     `(rainbow-delimiters-depth-2-face ((,class (:foreground ,yellow))))
-     `(rainbow-delimiters-depth-3-face ((,class (:foreground ,blue))))
-     `(rainbow-delimiters-depth-4-face ((,class (:foreground ,red))))
-     `(rainbow-delimiters-depth-5-face ((,class (:foreground ,orange))))
-     `(rainbow-delimiters-depth-6-face ((,class (:foreground ,blue))))
-     `(rainbow-delimiters-depth-7-face ((,class (:foreground ,green))))
-     `(rainbow-delimiters-depth-8-face ((,class (:foreground ,red))))
-     `(rainbow-delimiters-depth-9-face ((,class (:foreground ,yellow))))
-     `(rainbow-delimiters-depth-10-face ((,class (:foreground ,green))))
-     `(rainbow-delimiters-depth-11-face ((,class (:foreground ,blue))))
-     `(rainbow-delimiters-depth-12-face ((,class (:foreground ,red))))
-
-     ;; rpm-mode
-     `(rpm-spec-dir-face ((,class (:foreground ,green))))
-     `(rpm-spec-doc-face ((,class (:foreground ,green))))
-     `(rpm-spec-ghost-face ((,class (:foreground ,red))))
-     `(rpm-spec-macro-face ((,class (:foreground ,yellow))))
-     `(rpm-spec-obsolete-tag-face ((,class (:foreground ,red))))
-     `(rpm-spec-package-face ((,class (:foreground ,red))))
-     `(rpm-spec-section-face ((,class (:foreground ,yellow))))
-     `(rpm-spec-tag-face ((,class (:foreground ,blue))))
-     `(rpm-spec-var-face ((,class (:foreground ,red))))
-
-     ;; show-paren
-     `(show-paren-mismatch ((,class (:foreground ,red :background ,solarized-bg :weight bold))))
-     `(show-paren-match ((,class (:foreground ,blue :background ,solarized-bg :weight bold))))
-
-     ;; SLIME
-     `(slime-repl-inputed-output-face ((,class (:foreground ,red))))
-
-     ;; whitespace-mode
-     `(whitespace-space ((,class (:background ,solarized-bg :foreground ,solarized-comments))))
-     `(whitespace-hspace ((,class (:background ,solarized-bg :foreground ,solarized-comments))))
-     `(whitespace-tab ((,class (:background ,solarized-bg :foreground ,red))))
-     `(whitespace-newline ((,class (:foreground ,solarized-comments))))
-     `(whitespace-trailing ((,class (:foreground ,red :background ,solarized-bg))))
-     `(whitespace-line ((,class (:background ,solarized-bg :foreground ,magenta))))
-     `(whitespace-space-before-tab ((,class (:background ,orange :foreground ,orange))))
-     `(whitespace-indentation ((,class (:background ,yellow, :foreground ,red))))
-     `(whitespace-empty ((,class (:background ,yellow :foreground ,red))))
-     `(whitespace-space-after-tab ((,class (:background ,yellow :foreground ,red))))
-
-     ;; wanderlust
-     `(wl-highlight-folder-few-face ((,class (:foreground ,red))))
-     `(wl-highlight-folder-many-face ((,class (:foreground ,red))))
-     `(wl-highlight-folder-path-face ((,class (:foreground ,orange))))
-     `(wl-highlight-folder-unread-face ((,class (:foreground ,blue))))
-     `(wl-highlight-folder-zero-face ((,class (:foreground ,solarized-fg))))
-     `(wl-highlight-folder-unknown-face ((,class (:foreground ,blue))))
-     `(wl-highlight-message-citation-header ((,class (:foreground ,red))))
-     `(wl-highlight-message-cited-text-1 ((,class (:foreground ,red))))
-     `(wl-highlight-message-cited-text-2 ((,class (:foreground ,green))))
-     `(wl-highlight-message-cited-text-3 ((,class (:foreground ,blue))))
-     `(wl-highlight-message-cited-text-4 ((,class (:foreground ,blue))))
-     `(wl-highlight-message-header-contents-face ((,class (:foreground ,green))))
-     `(wl-highlight-message-headers-face ((,class (:foreground ,red))))
-     `(wl-highlight-message-important-header-contents ((,class (:foreground ,green))))
-     `(wl-highlight-message-header-contents ((,class (:foreground ,green))))
-     `(wl-highlight-message-important-header-contents2 ((,class (:foreground ,green))))
-     `(wl-highlight-message-signature ((,class (:foreground ,green))))
-     `(wl-highlight-message-unimportant-header-contents ((,class (:foreground ,solarized-fg))))
-     `(wl-highlight-summary-answered-face ((,class (:foreground ,blue))))
-     `(wl-highlight-summary-disposed-face ((,class (:foreground ,solarized-fg
-                                                                :slant italic))))
-     `(wl-highlight-summary-new-face ((,class (:foreground ,blue))))
-     `(wl-highlight-summary-normal-face ((,class (:foreground ,solarized-fg))))
-     `(wl-highlight-summary-thread-top-face ((,class (:foreground ,yellow))))
-     `(wl-highlight-thread-indent-face ((,class (:foreground ,magenta))))
-     `(wl-highlight-summary-refiled-face ((,class (:foreground ,solarized-fg))))
-     `(wl-highlight-summary-displaying-face ((,class (:underline t :weight bold))))
-
-     ;; which-func-mode
-     `(which-func ((,class (:foreground ,green))))))
-
-  (custom-theme-set-variables
-   (if (eq variant 'light) 'solarized-light 'solarized-dark)
-   '(ansi-color-names-vector [solarized-bg red green yellow
-                                           blue magenta cyan solarized-fg])))
-
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
-
-(provide 'solarized-core)
-
-;;; solarized-core.el ends here.