Ready. Set. Go!

6 files changed, 1346 insertions, 0 deletions

diff --git a/emacs/local/handmade-theme.el b/emacs/local/handmade-theme.el
new file mode 100644
index 0000000..ad0ff76
--- /dev/null
+++ b/emacs/local/handmade-theme.el
@@ -0,0 +1,42 @@
+(unless (<= 24 emacs-major-version)
+  (error "handmade-theme requires Emacs 24 or later."))
+ 
+(deftheme handmade
+  "Dark theme based on Casey Muratori's handmade hero theme")
+ 
+(custom-theme-set-faces
+ 'handmade
+ `(default ((t (:foreground "burlywood3" :background "#202020"))))
+ `(cursor ((t (:background "#40FF40"))))
+ `(region ((t (:background "dark blue"))))
+ `(font-lock-builtin-face ((t (:foreground "burlywood3"))))
+ `(font-lock-comment-face ((t (:foreground "gray50"))))
+ ;; `(font-lock-constant-face ((t (:foreground "olive drab"))))
+ `(font-lock-doc-face ((t (:foreground "gray50"))))
+ `(font-lock-function-name-face ((t (:foreground "burlywood3"))))
+ `(font-lock-keyword-face ((t (:foreground "DarkGoldenrod3"))))
+ `(font-lock-string-face ((t (:foreground "olive drab"))))
+ `(font-lock-type-face ((t (:foreground "burlywood3"))))
+ `(font-lock-variable-name-face ((t (:foreground "burlywood3"))))
+ `(font-lock-constant-face ((t (:foreground "burlywood3"))))
+ `(mode-line ((t (:foreground "#181818" :background "orange2"))))
+ ;; diff
+ `(diff-header ((t (:background "gray35"))))
+ `(diff-file-header ((t (:background "gray35"))))
+ `(diff-hunk-header ((t (:background "gray35"))))
+ ;; dired
+ `(dired-directory ((t (:foreground "DarkGoldenrod3"))))
+ `(dired-symlink ((t (:foreground "cyan"))))
+ ;; vertico
+ `(vertico-current ((t (:background "navy"))))
+ ;; ido
+ `(ido-subdir ((t (:foreground "cyan"))))
+ ;; iedit
+ `(iedit-occurrence ((t (:background "navy")))))
+ 
+;;;###autoload
+(when load-file-name
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+ 
+(provide-theme 'handmade)
diff --git a/emacs/local/odin-mode.el b/emacs/local/odin-mode.el
new file mode 100644
index 0000000..f3c818a
--- /dev/null
+++ b/emacs/local/odin-mode.el
@@ -0,0 +1,310 @@
+;;; odin-mode.el --- A minor mode for odin
+
+;; Author: Ethan Morgan
+;; Keywords: odin, language, languages, mode
+;; Package-Requires: ((emacs "24.1"))
+;; Homepage: https://github.com/glassofethanol/odin-mode
+
+;; This file is NOT part of GNU Emacs.
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'rx)
+(require 'js)
+
+(defgroup odin nil
+  "Odin mode"
+  :group 'languages)
+
+;; `compilation-mode' configuration
+
+(eval-after-load 'compile
+ '(add-to-list 'compilation-error-regexp-alist '("^\\(.*?\\)(\\([0-9]+\\):\\([0-9]+\\).*" 1 2 3)))
+
+(defconst odin-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?\" "\"" table)
+    (modify-syntax-entry ?\\ "\\" table)
+
+    ;; additional symbols
+    (modify-syntax-entry ?' "\"" table)
+    (modify-syntax-entry ?` "\"" table)
+    (modify-syntax-entry ?: "." table)
+    (modify-syntax-entry ?+ "." table)
+    (modify-syntax-entry ?- "." table)
+    (modify-syntax-entry ?% "." table)
+    (modify-syntax-entry ?& "." table)
+    (modify-syntax-entry ?| "." table)
+    (modify-syntax-entry ?^ "." table)
+    (modify-syntax-entry ?! "." table)
+    (modify-syntax-entry ?$ "." table)
+    (modify-syntax-entry ?= "." table)
+    (modify-syntax-entry ?< "." table)
+    (modify-syntax-entry ?> "." table)
+    (modify-syntax-entry ?? "." table)
+
+    ;; Need this for #directive regexes to work correctly
+    (modify-syntax-entry ?#   "_" table)
+
+    ;; Modify some syntax entries to allow nested block comments
+    (modify-syntax-entry ?/ ". 124b" table)
+    (modify-syntax-entry ?* ". 23n" table)
+    (modify-syntax-entry ?\n "> b" table)
+    (modify-syntax-entry ?\^m "> b" table)
+
+    table))
+
+(defconst odin-builtins
+  '("len" "cap"
+    "typeid_of" "type_info_of"
+    "swizzle" "complex" "real" "imag" "quaternion" "conj"
+    "jmag" "kmag"
+    "min" "max" "abs" "clamp"
+    "expand_to_tuple"
+
+    "init_global_temporary_allocator"
+    "copy" "pop" "unordered_remove" "ordered_remove" "clear" "reserve"
+    "resize" "new" "new_clone" "free" "free_all" "delete" "make"
+    "clear_map" "reserve_map" "delete_key" "append_elem" "append_elems"
+    "append" "append_string" "clear_dynamic_array" "reserve_dynamic_array"
+    "resize_dynamic_array" "incl_elem" "incl_elems" "incl_bit_set"
+    "excl_elem" "excl_elems" "excl_bit_set" "incl" "excl" "card"
+    "assert" "panic" "unimplemented" "unreachable"))
+
+(defconst odin-keywords
+  '("import" "foreign" "package"
+    "where" "when" "if" "else" "for" "switch" "in" "notin" "do" "case"
+    "break" "continue" "fallthrough" "defer" "return" "proc"
+    "struct" "union" "enum" "bit_field" "bit_set" "map" "dynamic"
+    "auto_cast" "cast" "transmute" "distinct" "opaque"
+    "using" "inline" "no_inline"
+    "size_of" "align_of" "offset_of" "type_of"
+
+    "context"
+    ;; "_"
+
+    ;; Reserved
+    "macro" "const"))
+
+(defconst odin-constants
+  '("nil" "true" "false"
+    "ODIN_OS" "ODIN_ARCH" "ODIN_ENDIAN" "ODIN_VENDOR"
+    "ODIN_VERSION" "ODIN_ROOT" "ODIN_DEBUG"))
+
+(defconst odin-typenames
+  '("bool" "b8" "b16" "b32" "b64"
+
+    "int"  "i8" "i16" "i32" "i64"
+    "i16le" "i32le" "i64le"
+    "i16be" "i32be" "i64be"
+    "i128" "u128"
+    "i128le" "u128le"
+    "i128be" "u128be"
+
+    "uint" "u8" "u16" "u32" "u64"
+    "u16le" "u32le" "u64le"
+    "u16be" "u32be" "u64be"
+
+    "f32" "f64"
+    "complex64" "complex128"
+
+    "quaternion128" "quaternion256"
+
+    "rune"
+    "string" "cstring"
+
+    "uintptr" "rawptr"
+    "typeid" "any"
+    "byte"))
+
+(defconst odin-attributes
+  '("builtin"
+    "export"
+    "static"
+    "deferred_in" "deferred_none" "deferred_out"
+    "require_results"
+    "default_calling_convention" "link_name" "link_prefix"
+    "deprecated" "private" "thread_local"))
+
+
+(defconst odin-proc-directives
+  '("#force_inline"
+    "#force_no_inline"
+    "#type")
+  "Directives that can appear before a proc declaration")
+
+(defconst odin-directives
+  (append '("#align" "#packed"
+            "#any_int"
+            "#raw_union"
+            "#no_nil"
+            "#complete"
+            "#no_alias"
+            "#c_vararg"
+            "#assert"
+            "#file" "#line" "#location" "#procedure" "#caller_location"
+            "#load"
+            "#defined"
+            "#bounds_check" "#no_bounds_check"
+            "#partial") odin-proc-directives))
+
+(defun odin-wrap-word-rx (s)
+  (concat "\\<" s "\\>"))
+
+(defun odin-wrap-keyword-rx (s)
+  (concat "\\(?:\\S.\\_<\\|\\`\\)" s "\\_>"))
+
+(defun odin-wrap-directive-rx (s)
+  (concat "\\_<" s "\\>"))
+
+(defun odin-wrap-attribute-rx (s)
+  (concat "[[:space:]\n]*@[[:space:]\n]*(?[[:space:]\n]*" s "\\>"))
+
+(defun odin-keywords-rx (keywords)
+  "build keyword regexp"
+  (odin-wrap-keyword-rx (regexp-opt keywords t)))
+
+(defun odin-directives-rx (directives)
+  (odin-wrap-directive-rx (regexp-opt directives t)))
+
+(defun odin-attributes-rx (attributes)
+  (odin-wrap-attribute-rx (regexp-opt attributes t)))
+
+(defconst odin-identifier-rx "[[:word:][:multibyte:]_]+")
+(defconst odin-hat-type-rx (rx (group (and "^" (1+ (any word "." "_"))))))
+(defconst odin-dollar-type-rx (rx (group "$" (or (1+ (any word "_")) (opt "$")))))
+(defconst odin-number-rx
+  (rx (and
+       symbol-start
+       (or (and (+ digit) (opt (and (any "eE") (opt (any "-+")) (+ digit))))
+           (and "0" (any "xX") (+ hex-digit)))
+       (opt (and (any "_" "A-Z" "a-z") (* (any "_" "A-Z" "a-z" "0-9"))))
+       symbol-end)))
+(defconst odin-proc-rx (concat "\\(\\_<" odin-identifier-rx "\\_>\\)\\s *::\\s *\\(" (odin-directives-rx odin-proc-directives) "\\)?\\s *\\_<proc\\_>"))
+
+(defconst odin-type-rx (concat "\\_<\\(" odin-identifier-rx "\\)\\s *::\\s *\\(?:struct\\|enum\\|union\\|distinct\\)\\s *\\_>"))
+
+
+(defconst odin-font-lock-defaults
+  `(
+    ;; Types
+    (,odin-hat-type-rx 1 font-lock-type-face)
+    (,odin-dollar-type-rx 1 font-lock-type-face)
+    (,(odin-keywords-rx odin-typenames) 1 font-lock-type-face)
+    (,odin-type-rx 1 font-lock-type-face)
+
+    ;; Hash directives
+    (,(odin-directives-rx odin-directives) 1 font-lock-preprocessor-face)
+
+    ;; At directives
+    (,(odin-attributes-rx odin-attributes) 1 font-lock-preprocessor-face)
+
+    ;; Keywords
+    (,(odin-keywords-rx odin-keywords) 1 font-lock-keyword-face)
+
+    ;; single quote characters
+    ("'\\(\\\\.\\|[^']\\)'" . font-lock-constant-face)
+
+    ;; Variables
+    (,(odin-keywords-rx odin-builtins) 1 font-lock-builtin-face)
+
+    ;; Constants
+    (,(odin-keywords-rx odin-constants) 1 font-lock-constant-face)
+
+    ;; Strings
+    ;; ("\\\".*\\\"" . font-lock-string-face)
+
+    ;; Numbers
+    (,(odin-wrap-word-rx odin-number-rx) . font-lock-constant-face)
+
+    ;; Procedures
+    (,odin-proc-rx 1 font-lock-function-name-face)
+
+    ("---" . font-lock-constant-face)
+    ("\\.\\.<" . font-lock-constant-face)
+    ("\\.\\." . font-lock-constant-face)
+    ))
+
+;; add setq-local for older emacs versions
+(unless (fboundp 'setq-local)
+  (defmacro setq-local (var val)
+    `(set (make-local-variable ',var) ,val)))
+
+(defconst odin--defun-rx "\(.*\).*\{")
+
+(defmacro odin-paren-level ()
+  `(car (syntax-ppss)))
+
+(defun odin-line-is-defun ()
+  "return t if current line begins a procedure"
+  (interactive)
+  (save-excursion
+    (beginning-of-line)
+    (let (found)
+      (while (and (not (eolp)) (not found))
+        (if (looking-at odin--defun-rx)
+            (setq found t)
+          (forward-char 1)))
+      found)))
+
+(defun odin-beginning-of-defun (&optional count)
+  "Go to line on which current function starts."
+  (interactive)
+  (let ((orig-level (odin-paren-level)))
+    (while (and
+            (not (odin-line-is-defun))
+            (not (bobp))
+            (> orig-level 0))
+      (setq orig-level (odin-paren-level))
+      (while (>= (odin-paren-level) orig-level)
+        (skip-chars-backward "^{")
+        (backward-char))))
+  (if (odin-line-is-defun)
+      (beginning-of-line)))
+
+(defun odin-end-of-defun ()
+  "Go to line on which current function ends."
+  (interactive)
+  (let ((orig-level (odin-paren-level)))
+    (when (> orig-level 0)
+      (odin-beginning-of-defun)
+      (end-of-line)
+      (setq orig-level (odin-paren-level))
+      (skip-chars-forward "^}")
+      (while (>= (odin-paren-level) orig-level)
+        (skip-chars-forward "^}")
+        (forward-char)))))
+
+(defalias 'odin-parent-mode
+ (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
+
+;;;###autoload
+(define-derived-mode odin-mode odin-parent-mode "Odin"
+  :syntax-table odin-mode-syntax-table
+  :group 'odin
+  (setq bidi-paragraph-direction 'left-to-right)
+  (setq-local require-final-newline mode-require-final-newline)
+  (setq-local parse-sexp-ignore-comments t)
+  (setq-local comment-start-skip "\\(//+\\|/\\*+\\)\\s *")
+  (setq-local comment-start "//")
+  (setq-local comment-end "")
+  (setq-local indent-line-function 'js-indent-line)
+  (setq-local font-lock-defaults '(odin-font-lock-defaults))
+  (setq-local beginning-of-defun-function 'odin-beginning-of-defun)
+  (setq-local end-of-defun-function 'odin-end-of-defun)
+  (setq-local electric-indent-chars
+              (append "{}():;," electric-indent-chars))
+  (setq imenu-generic-expression
+        `(("type" ,(concat "^" odin-type-rx) 1)
+          ("proc" ,(concat "^" odin-proc-rx) 1)))
+
+  (font-lock-ensure))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.odin\\'" . odin-mode))
+
+(provide 'odin-mode)
+
+
+;;; odin-mode.el ends here
diff --git a/emacs/local/simple-light-theme.el b/emacs/local/simple-light-theme.el
new file mode 100644
index 0000000..9822ed2
--- /dev/null
+++ b/emacs/local/simple-light-theme.el
@@ -0,0 +1,50 @@
+(deftheme simple-light
+  "minimalistic theme for simplicity.
+
+   Follows the philosphy of there should only be 3 main colours.
+   1 for code, 1 for comments, and 1 for strings.
+   These rules guarantee a theme will be simple and usable.")
+ 
+(custom-theme-set-faces
+ 'simple-light
+ `(default ((t (:foreground "gray10" :background "gray90"))))
+ `(cursor ((t (:background "black"))))
+ `(region ((t (:background "gray65"))))
+ `(highlight ((t (:background "gray80"))))
+ `(font-lock-builtin-face ((t (:foreground "gray10"))))
+ `(font-lock-comment-face ((t (:foreground "gray50"))))
+ `(font-lock-doc-face ((t (:foreground "forest green"))))
+ `(font-lock-function-name-face ((t (:foreground "gray10"))))
+ `(font-lock-keyword-face ((t (:foreground "gray10"))))
+ `(font-lock-string-face ((t (:foreground "forest green"))))
+ `(font-lock-type-face ((t (:foreground "gray10"))))
+ `(font-lock-variable-name-face ((t (:foreground "gray10"))))
+ `(font-lock-constant-face ((t (:foreground "gray10"))))
+ `(mode-line ((t (:background "gray75"))))
+ `(error ((t (:foreground "firebrick"))))
+ ;; org
+ `(org-table ((t (:background "gray80" :foreground "gray10"))))
+ `(org-block ((t (:background "gray80" :foreground "gray10"))))
+ `(org-document-title ((t (:foreground "gray10"))))
+ `(org-hide ((t (:foreground "gray90"))))
+ `(org-document-info ((t (:foreground "gray10"))))
+ ;; eshell
+ `(eshell-prompt ((t (:foreground "firebrick"))))
+ `(eshell-ls-symlink ((t (:foreground "dark cyan"))))
+ `(eshell-ls-directory ((t (:foreground "royal blue"))))
+ ;; dired
+ `(dired-directory ((t (:foreground "blue"))))
+ `(dired-symlink ((t (:foreground "dark cyan"))))
+ ;; vertico
+ `(vertico-current ((t (:background "gray65"))))
+ ;; ido
+ `(ido-subdir ((t (:foreground "dark cyan"))))
+ ;; iedit
+ `(iedit-occurrence ((t (:background "navy")))))
+ 
+;;;###autoload
+(when load-file-name
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+ 
+(provide-theme 'simple-light)
diff --git a/emacs/local/solarized-definitions.el b/emacs/local/solarized-definitions.el
new file mode 100644
index 0000000..7a7f4f9
--- /dev/null
+++ b/emacs/local/solarized-definitions.el
@@ -0,0 +1,829 @@
+;;; solarized-definitions.el --- Solarized theme color assignments -*- lexical-binding: t -*-
+
+(eval-when-compile
+  (unless (require 'cl-lib nil t)
+    (require 'cl)
+    (defalias 'cl-case 'case)))
+
+(defconst solarized-description
+  "Color theme by Ethan Schoonover, created 2011-03-24.
+Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized.")
+
+(defgroup solarized nil
+  "Customizations for the Solarized theme."
+  :group 'faces
+  :prefix "solarized-")
+
+(defcustom solarized-termcolors 16
+  "The number of colors to use on 256-color terminals.
+This is set to 16 by default, meaning that Solarized will attempt to use the
+standard 16 colors of your terminal emulator. You will need to set those colors
+to the correct Solarized values either manually or by importing one of the many
+colorschemes available for popular terminal emulators and Xdefaults."
+  :type '(choice (const 16) (const 256))
+  :group 'solarized)
+
+(defcustom solarized-degrade nil
+  "Use only 256 colors on graphic displays.
+For test purposes only; when in GUI mode, forces Solarized to use the 256
+degraded color mode to test the approximate color values for accuracy."
+  :type 'boolean
+  :group 'solarized)
+
+(defcustom solarized-diff-mode 'normal
+  "Sets the level of highlighting to use in diff-like modes."
+  :type '(choice (const high) (const normal) (const low))
+  :group 'solarized)
+
+(defcustom solarized-bold nil
+  "Stops Solarized from displaying bold when nil."
+  :type 'boolean
+  :group 'solarized)
+
+(defcustom solarized-underline nil
+  "Stops Solarized from displaying underlines when nil."
+  :type 'boolean
+  :group 'solarized)
+
+(defcustom solarized-italic nil
+  "Stops Solarized from displaying italics when nil."
+  :type 'boolean
+  :group 'solarized)
+
+(defcustom solarized-contrast 'normal
+  "Adjust the contrast level of Solarized.
+Stick with normal! It's been carefully tested. Setting this option to high or
+low does use the same Solarized palette but simply shifts some values up or down
+in order to expand or compress the tonal range displayed."
+  :type '(choice (const high) (const normal) (const low))
+  :group 'solarized)
+
+(defcustom solarized-broken-srgb
+  (if (and (eq system-type 'darwin) (eq window-system 'ns))
+      (not (and (boundp 'ns-use-srgb-colorspace)
+                ns-use-srgb-colorspace))
+    nil)
+  "Whether sRGB is broken on your system.
+If you are on a Mac and have either Emacs prior to 24.4 or Mac OS prior to 10.7
+this should be t (the default is usually correct). Solarized works around this
+issue by using with alternative colors. However, these colors are not totally
+portable, so you may be able to edit the “Gen RGB” column in
+solarized-definitions.el to improve them further."
+  :type 'boolean
+  :group 'solarized)
+
+;; FIXME: The Generic RGB colors will actually vary from device to device, but
+;;        hopefully these are closer to the intended colors than the sRGB values
+;;        that Emacs seems to dislike
+(defvar solarized-colors           ; ANSI(Solarized terminal)
+  ;; name     sRGB      Gen RGB   256       16              8
+  '((base03  "#002b36" "#042028" "#1c1c1c" "brightblack"   "black")
+    (base02  "#073642" "#0a2832" "#262626" "black"         "black")
+    (base01  "#586e75" "#465a61" "#585858" "brightgreen"   "green")
+    (base00  "#657b83" "#52676f" "#626262" "brightyellow"  "yellow")
+    (base0   "#839496" "#708183" "#808080" "brightblue"    "blue")
+    (base1   "#93a1a1" "#81908f" "#8a8a8a" "brightcyan"    "cyan")
+    (base2   "#eee8d5" "#e9e2cb" "#e4e4e4" "white"         "white")
+    (base3   "#fdf6e3" "#fcf4dc" "#ffffd7" "brightwhite"   "white")
+    (yellow  "#b58900" "#a57705" "#af8700" "yellow"        "yellow")
+    (orange  "#cb4b16" "#bd3612" "#d75f00" "brightred"     "red")
+    (red     "#dc322f" "#c60007" "#d70000" "red"           "red")
+    (magenta "#d33682" "#c61b6e" "#af005f" "magenta"       "magenta")
+    (violet  "#6c71c4" "#5859b7" "#5f5faf" "brightmagenta" "magenta")
+    (blue    "#268bd2" "#2075c7" "#0087ff" "blue"          "blue")
+    (cyan    "#2aa198" "#259185" "#00afaf" "cyan"          "cyan")
+    (green   "#859900" "#728a05" "#5f8700" "green"         "green"))
+  "This is a table of all the colors used by the Solarized color theme.
+Each column is a different set, one of which will be chosen based on term
+capabilities, etc.")
+
+(defun solarized--current-colors (light)
+  "Attempt to mimic the Vim version’s color configuration.
+If LIGHT is non-nil, invert the base faces."
+  (let ((current-colors
+         (cons
+          (cons 'back (copy-sequence (cdr (assoc 'base03 solarized-colors))))
+          (mapcar #'copy-sequence (copy-sequence solarized-colors)))))
+    (if light
+        (setf (cdr (assoc 'base03 current-colors)) (cdr (assoc 'base3 solarized-colors))
+              (cdr (assoc 'base02 current-colors)) (cdr (assoc 'base2 solarized-colors))
+              (cdr (assoc 'base01 current-colors)) (cdr (assoc 'base1 solarized-colors))
+              (cdr (assoc 'base00 current-colors)) (cdr (assoc 'base0 solarized-colors))
+              (cdr (assoc 'base0 current-colors)) (cdr (assoc 'base00 solarized-colors))
+              (cdr (assoc 'base1 current-colors)) (cdr (assoc 'base01 solarized-colors))
+              (cdr (assoc 'base2 current-colors)) (cdr (assoc 'base02 solarized-colors))
+              (cdr (assoc 'base3 current-colors)) (cdr (assoc 'base03 solarized-colors))
+              (cdr (assoc 'back current-colors)) (cdr (assoc 'base03 current-colors))))
+    (cond ((eq 'high solarized-contrast)
+           (setf (cdr (assoc 'base01 current-colors)) (cdr (assoc 'base00 current-colors))
+                 (cdr (assoc 'base00 current-colors)) (cdr (assoc 'base0 current-colors))
+                 (cdr (assoc 'base0 current-colors)) (cdr (assoc 'base1 current-colors))
+                 (cdr (assoc 'base1 current-colors)) (cdr (assoc 'base2 current-colors))
+                 (cdr (assoc 'base2 current-colors)) (cdr (assoc 'base3 current-colors))
+                 (cdr (assoc 'back current-colors)) (cdr (assoc 'back current-colors))))
+          ((eq 'low solarized-contrast)
+           (setf (cdr (assoc 'back current-colors)) (cdr (assoc 'base02 current-colors)))))
+    current-colors))
+
+(defun solarized-face-for-index (facespec index &optional light)
+  "Replace the Solarized symbols in FACESPEC with the colors in column INDEX.
+The colors are looked up in ‘solarized-colors’, and base colors are inverted if
+LIGHT is non-nil."
+  (let ((new-fontspec (copy-sequence facespec)))
+    (dolist (property '(:foreground :background :color))
+      (let ((color-name (plist-get new-fontspec property)))
+        (when (and color-name (symbolp color-name))
+          (plist-put new-fontspec
+                     property
+                     ;; NOTE: We try to turn an 8-color term into a 10-color term by not
+                     ;;       using default background and foreground colors, expecting the
+                     ;;       user to have the right colors set for them.
+                     (unless (and (= index 5)
+                                  (or (and (eq property :background)
+                                           (eq color-name 'back))
+                                      (and (eq property :foreground)
+                                           (member color-name '(base0 base1)))))
+                       (nth index
+                            (assoc color-name
+                                   (solarized--current-colors light))))))))
+    (when (consp (plist-get new-fontspec :box))
+      (plist-put new-fontspec
+                 :box
+                 (solarized-face-for-index (plist-get new-fontspec :box)
+                                           index
+                                           light)))
+    (when (consp (plist-get new-fontspec :underline))
+      (plist-put new-fontspec
+                 :underline
+                 (solarized-face-for-index (plist-get new-fontspec :underline)
+                                           index
+                                           light)))
+    new-fontspec))
+
+(defun dark-and-light (display plist index)
+  "Return a list of faces, distinguishing between dark and light if necessary."
+  (let ((dark (solarized-face-for-index plist index))
+        (light (solarized-face-for-index plist index t)))
+    (if (equal dark light)
+        (list (list display dark))
+      (list (list (cons '(background dark) display) dark)
+            (list (cons '(background light) display) light)))))
+
+(defun 8-and-16 (plist)
+  "Return a list of faces, distinguishing between dark and light if necessary."
+  (let ((eight (dark-and-light '() plist 5))
+        (sixteen (dark-and-light '() plist 4)))
+    (append
+     (unless (equal eight sixteen)
+       (mapcar (lambda (spec)
+                 (setf (car spec)
+                       (append '((type tty) (min-colors 16)) (car spec)))
+                 spec)
+               sixteen))
+     (mapcar (lambda (spec)
+               (setf (car spec)
+                     (append '((type tty) (min-colors 8)) (car spec)))
+               spec)
+             eight))))
+
+(defun create-face-spec (name facespec)
+  "Generate a full face-spec for face NAME from the Solarized FACESPEC.
+This generates the spec across a variety of displays from the FACESPEC, which
+contains Solarized symbols."
+  `(,name (,@(dark-and-light '((type graphic))
+                             facespec
+                             (cond (solarized-degrade     3)
+                                   (solarized-broken-srgb 2)
+                                   (t                     1)))
+           ;; only produce 256-color term-specific settings if ‘solarized-termcolors’ is 256
+           ,@(when (= solarized-termcolors 256)
+               (dark-and-light '((type tty) (min-colors 256)) facespec 3))
+           ,@(8-and-16 facespec))))
+
+(defun solarized-color-definitions ()
+  "Produces the set of face-specs for all faces defined by this theme."
+  (let ((bold        (if solarized-bold 'bold        'unspecified))
+        (bright-bold (if solarized-bold 'unspecified 'bold))
+        (underline   (if solarized-underline t 'unspecified))
+        (opt-under   (if (eq solarized-contrast 'low) t 'unspecified))
+        (italic      (if solarized-italic 'italic 'unspecified)))
+    (let ((bg-back   '(:background back))
+          (bg-base03 '(:background base03))
+          (bg-base02 '(:background base02))
+          (bg-base01 '(:background base01))
+          (bg-base00 '(:background base00))
+          (bg-base0 '(:background base0))
+          (bg-base1 '(:background base1))
+          (bg-base2 '(:background base2))
+          (bg-base3 '(:background base3))
+          (bg-green '(:background green))
+          (bg-yellow '(:background yellow))
+          (bg-orange '(:background orange))
+          (bg-red '(:background red))
+          (bg-magenta '(:background magenta))
+          (bg-violet '(:background violet))
+          (bg-blue '(:background blue))
+          (bg-cyan '(:background cyan))
+
+          (fg-base03 '(:foreground base03))
+          (fg-base02 '(:foreground base02))
+          (fg-base01 '(:foreground base01))
+          (fg-base00 '(:foreground base00))
+          (fg-base0 '(:foreground base0))
+          (fg-base1 '(:foreground base1))
+          (fg-base2 '(:foreground base2))
+          (fg-base3 '(:foreground base3))
+          (fg-green '(:foreground green))
+          (fg-yellow '(:foreground yellow))
+          (fg-orange '(:foreground orange))
+          (fg-red '(:foreground red))
+          (fg-magenta '(:foreground magenta))
+          (fg-violet '(:foreground violet))
+          (fg-blue '(:foreground blue))
+          (fg-cyan '(:foreground cyan))
+
+          (fmt-none   `())
+          (fmt-bold   `(:weight ,bold))
+          (fmt-bldi   `(:weight ,bold :slant ,italic))
+          (fmt-undr   `(                             :underline ,underline))
+          (fmt-undb   `(:weight ,bold                :underline ,underline))
+          (fmt-undi   `(              :slant ,italic :underline ,underline))
+          (fmt-uopt   `(                             :underline ,opt-under))
+          (fmt-curl-red    '(                        :underline (:color red :style wave)))
+          (fmt-curl-violet '(                        :underline (:color violet :style wave)))
+          (fmt-curl-cyan   '(                        :underline (:color cyan :style wave)))
+          (fmt-curl-yellow '(                        :underline (:color yellow :style wave)))
+          (fmt-ital   `(              :slant ,italic))
+          ;; FIXME: not quite the same
+          (fmt-stnd   `(                                                   :inverse-video t))
+          (fmt-revr   `(                                                   :inverse-video t))
+          (fmt-revb   `(:weight ,bold                                      :inverse-video t))
+          (fmt-revbb  `(:weight ,bright-bold                               :inverse-video t))
+          (fmt-revbbu `(:weight ,bright-bold         :underline ,underline :inverse-video t)))
+      (mapcar (lambda (face) (apply 'create-face-spec face))
+              `(;; basic
+                (default (,@fg-base0 ,@bg-back))   ; Normal
+                (cursor (,@fg-base03 ,@bg-base0))  ; Cursor
+                (shadow (,@fg-base01))
+                (link (,@fmt-undr ,@fg-violet))    ; Underlined
+                (link-visited (,@fmt-undr ,@fg-magenta))
+                (match (,@fmt-revr ,@fg-yellow))   ; Search
+                (error (,@fmt-revr ,@fg-red))      ; ErrorMsg
+                (warning (,@fmt-bold ,@fg-red))    ; WarningMsg
+                (success (,@fg-blue))              ; MoreMsg
+                (escape-glyph (,@fg-red))
+                (fringe (,@fg-base01 ,@bg-base02))
+                (linum (,@fg-base01 ,@bg-base02))
+                (header-line (,@fg-base0 ,@bg-base02 ,@fmt-revbb)) ; Pmenu
+                (highlight (,@bg-base02))
+                (hl-line (:underline ,opt-under ,@bg-base02)) ; CursorLine
+                (isearch (,@fmt-stnd ,@fg-orange ,@bg-back)) ; IncSearch
+                (isearch-fail (:inherit error)) ; ErrorMsg
+                (lazy-highlight (:inherit match)) ; Search
+                (menu (,@fg-base0 ,@bg-base02))
+                (minibuffer-prompt (,@fmt-bold ,@fg-cyan)) ; Question
+                (mode-line ; StatusLine
+                 (,@fg-base1 ,@bg-base02 ,@fmt-revbb :box nil))
+                (mode-line-inactive    ; StatusLineNC
+                 (,@fg-base00 ,@bg-base02 ,@fmt-revbb :box nil))
+                (mode-line-buffer-id (,@fmt-bold :inherit mode-line))
+                (mode-line-buffer-id-inactive (,@fmt-bold :inherit mode-line-inactive))
+                (region (,@fg-base01 ,@bg-base03 ,@fmt-revbb)) ; Visual
+                (secondary-selection (,@bg-base02))
+                (shadow (,@fg-base01))
+                (trailing-whitespace (,@fmt-revr ,@fg-red))
+                (vertical-border (,@fg-base0))
+                ;; comint
+                (comint-highlight-prompt (,@fg-blue))
+                ;; compilation
+                (compilation-info (,@fmt-bold ,@fg-green))
+                (compilation-warning (,@fmt-bold ,@fg-orange))
+                ;; custom
+                (custom-button
+                 (,@fg-base1 ,@bg-base02 :box (:line-width 2 :style released-button)))
+                (custom-button-mouse
+                 (,@fmt-revr ,@fg-base1 ,@bg-base02 :inherit custom-button))
+                (custom-button-pressed
+                 (,@fmt-revr ,@fg-base1 ,@bg-base02
+                             :box (:line-width 2 :style pressed-button)
+                             :inherit custom-button-mouse))
+                (custom-changed (,@fmt-revr ,@fg-blue ,@bg-base3))
+                (custom-comment (,@fg-base1 ,@bg-base02))
+                (custom-comment-tag (,@fg-base1 ,@bg-base02))
+                (custom-documentation (:inherit default))
+                (custom-group-tag (,@fg-base1))
+                (custom-group-tag-1 (,@fmt-bold ,@fg-base1))
+                (custom-invalid (,@fmt-revr ,@fg-red ,@bg-back))
+                (custom-link (,@fg-violet))
+                (custom-state (,@fg-green))
+                (custom-variable-tag (,@fg-base1))
+                ;; diff - DiffAdd, DiffChange, DiffDelete, and DiffText
+                ,@(cl-case solarized-diff-mode
+                    (high
+                     `((diff-added (,@fmt-revr ,@fg-green))
+                       (diff-changed (,@fmt-revr ,@fg-yellow))
+                       (diff-removed (,@fmt-revr ,@fg-red))
+                       (diff-refine-changed (,@fmt-revr ,@fg-blue ,@bg-back))))
+                    (low
+                     `((diff-added (,@fmt-undr ,@fg-green))
+                       (diff-changed (,@fmt-undr ,@fg-yellow))
+                       (diff-removed (,@fmt-bold ,@fg-red))
+                       (diff-refine-changed (,@fmt-undr ,@fg-blue ,@bg-back))))
+                    (normal
+                     (if window-system
+                         `((diff-added (,@fmt-bold ,@fg-green ,@bg-base02))
+                           (diff-changed (,@fmt-bold ,@fg-yellow ,@bg-base02))
+                           (diff-removed (,@fmt-bold ,@fg-red ,@bg-base02))
+                           (diff-refine-changed (,@fmt-bold ,@fg-blue ,@bg-base02)))
+                       `((diff-added (,@fg-green ,@bg-base02))
+                         (diff-changed (,@fg-yellow ,@bg-base02))
+                         (diff-removed (,@fg-red ,@bg-base02))
+                         (diff-refine-changed (,@fg-blue ,@bg-base02))))))
+                (diff-refine-added (:inherit diff-added ,@fmt-revr))
+                (diff-refine-removed (:inherit diff-removed ,@fmt-revr))
+                (diff-file-header (:inherit default ,@fg-blue))
+                (diff-hunk-header (:inherit default))
+                (diff-header (,@fg-base1 ,@bg-back))
+                ;; IDO
+                (ido-only-match (,@fg-green))
+                (ido-subdir (,@fg-blue))
+                (ido-first-match (,@fmt-bold ,@fg-green))
+                ;; emacs-wiki
+                (emacs-wiki-bad-link-face (,@fmt-undr ,@fg-red))
+                (emacs-wiki-link-face (,@fmt-undr ,@fg-blue))
+                (emacs-wiki-verbatim-face (,@fmt-undr ,@fg-base00))
+                ;; eshell
+                (eshell-ls-archive (,@fg-magenta))
+                (eshell-ls-backup (,@fg-yellow))
+                (eshell-ls-clutter (,@fg-orange))
+                (eshell-ls-directory (,@fg-blue)) ; Directory
+                (eshell-ls-executable (,@fg-green))
+                (eshell-ls-missing (,@fg-red))
+                (eshell-ls-product (,@fg-yellow))
+                (eshell-ls-readonly (,@fg-base1))
+                (eshell-ls-special (,@fg-violet))
+                (eshell-ls-symlink (,@fg-cyan))
+                (eshell-ls-unreadable (,@fg-base00))
+                (eshell-prompt (,@fmt-bold ,@fg-green))
+                ;; font-lock
+                (font-lock-builtin-face (,@fmt-none ,@fg-green)) ; Statement
+                (font-lock-comment-face (,@fmt-ital ,@fg-base01)) ; Comment
+                (font-lock-constant-face (,@fmt-none ,@fg-cyan)) ; Constant
+                (font-lock-function-name-face ; Identifier
+                 (,@fmt-none ,@fg-blue))
+                (font-lock-keyword-face (,@fmt-none ,@fg-green)) ; Statement
+                (font-lock-string-face (,@fmt-none ,@fg-cyan)) ; Constant
+                (font-lock-type-face (,@fmt-none ,@fg-yellow)) ; Type
+                (font-lock-variable-name-face ; Identifier
+                 (,@fmt-none ,@fg-blue))
+                (font-lock-warning-face (,@fmt-bold ,@fg-red)) ; Error
+                (font-lock-doc-face (,@fmt-ital ,@fg-base01)) ; Comment
+                (font-lock-doc-string-face ; Comment (XEmacs-only)
+                 (,@fmt-ital ,@fg-base01))
+                (font-lock-color-constant-face (,@fmt-none ,@fg-green))
+                (font-lock-comment-delimiter-face ; Comment
+                 (,@fmt-ital ,@fg-base01))
+                (font-lock-preprocessor-face (,@fmt-none ,@fg-orange)) ; PreProc
+                (font-lock-reference-face (,@fmt-none ,@fg-cyan))
+                (font-lock-negation-char-face (,@fmt-none ,@fg-red))
+                (font-lock-other-type-face (,@fmt-ital ,@fg-blue))
+                (font-lock-regexp-grouping-construct (,@fmt-none ,@fg-orange))
+                (font-lock-special-keyword-face (,@fmt-none ,@fg-red)) ; Special
+                (font-lock-exit-face (,@fmt-none ,@fg-red))
+                (font-lock-other-emphasized-face (,@fmt-bldi ,@fg-violet))
+                (font-lock-regexp-grouping-backslash (,@fmt-none ,@fg-yellow))
+                ;; info
+                (info-xref (:inherit link))
+                (info-xref-visited (:inherit link-visited))
+                ;; org
+                (org-block-background (,@bg-base02))
+                (org-hide (,@fg-base03))
+                (org-todo (,@fmt-bold ,@fg-base03 ,@bg-red))
+                (org-done (,@fmt-bold ,@fg-green))
+                (org-todo-kwd-face (,@fmt-bold ,@fg-base03 ,@bg-red))
+                (org-done-kwd-face (,@fmt-bold ,@fg-green))
+                (org-project-kwd-face (,@fg-violet ,@bg-base03))
+                (org-waiting-kwd-face (,@fg-orange ,@bg-base03))
+                (org-someday-kwd-face (,@fg-blue ,@bg-base03))
+                (org-started-kwd-face (,@fg-yellow ,@bg-base03))
+                (org-cancelled-kwd-face (,@fg-green ,@bg-base03))
+                (org-delegated-kwd-face (,@fg-cyan ,@bg-base03))
+                (org-default (:inherit default))
+                (org-level-1 (:inherit outline-1))
+                (org-level-2 (:inherit outline-2))
+                (org-level-3 (:inherit outline-3))
+                (org-level-4 (:inherit outline-4))
+                (org-level-5 (:inherit outline-5))
+                (org-level-6 (:inherit outline-6))
+                (org-level-7 (:inherit outline-7))
+                (org-level-8 (:inherit outline-8))
+                (org-special-keyword (,@fmt-ital ,@fg-base01))
+                (org-drawer (,@fmt-bold ,@fg-blue))
+                (org-column (,@fmt-revr ,@fg-cyan))
+                (org-column-title (,@fmt-bold ,@fmt-revr))
+                (org-warning (,@fmt-bold ,@fg-red))
+                (org-archived (,@fg-base01))
+                (org-link (,@fmt-undr ,@fg-violet))
+                (org-footnote (,@fmt-undr ,@fg-violet))
+                (org-ellipses (,@fg-yellow :strike-through t) )
+                (org-target (,@fmt-undr))
+                (org-date (,@fmt-undr ,@fg-violet))
+                (org-date-selected (,@fmt-revr ,@fg-red))
+                (org-sexp-date (,@fmt-undr ,@fg-violet))
+                (org-tag (,@fmt-bold))
+                (org-list-dt (,@fmt-bold))
+                (org-agenda-done (,@fg-green))
+                (org-headline-done (,@fg-base01))
+                (org-priority (,@fmt-ital ,@fg-base01))
+                (org-checkbox (,@fmt-bold))
+                (org-table (,@fg-cyan))
+                (org-formula (:weight bold :slant italic ,@fg-red))
+                (org-code (,@fg-base01))
+                (org-document-title (,@fmt-bold ,@fg-cyan))
+                (org-document-info (,@fg-cyan))
+                (org-document-info-keyword (,@fg-base01))
+                (org-block (,@fg-base01))
+                (org-verbatim (,@fmt-undr ,@fg-base01))
+                (org-clock-overlay (,@fmt-revr ,@bg-cyan ,@fg-base03))
+                (org-agenda-structure (,@fmt-bold ,@fg-blue))
+                (org-scheduled (:weight bold :slant italic ,@fg-green))
+                (org-scheduled-today (:weight bold :slant italic ,@fg-green))
+                (org-agenda-dimmed-todo-face (,@fg-base00))
+                (org-scheduled-previously (,@fmt-bold ,@fg-red))
+                (org-upcoming-deadline (,@fmt-bold ,@fg-red))
+                (org-agenda-restriction-lock (,@fmt-revr ,@fg-base03 ,@bg-cyan))
+                (org-time-grid (,@fg-yellow))
+                (org-latex-and-related(,@fg-orange))
+                ;; table
+                (table-cell (,@fmt-none ,@fg-base0 ,@bg-back))
+                ;; outline - pandocBlockQuoteLeader[1–6]
+                (outline-1 (,@fg-blue))
+                (outline-2 (,@fg-cyan))
+                (outline-3 (,@fg-yellow))
+                (outline-4 (,@fg-red))
+                (outline-5 (,@fg-base0))
+                (outline-6 (,@fg-base01))
+                (outline-7 (,@fg-orange))
+                (outline-8 (,@fg-violet))
+                ;; show-paren - MatchParen
+                (show-paren-match (,@fmt-bold ,@fg-cyan ,@bg-base02))
+                (show-paren-mismatch (,@fmt-bold ,@fg-red ,@bg-base01))
+                ;; speedbar
+                ;; (speedbar-button-face (,@fmt-none ,@fg-base1))
+                (speedbar-button-face
+                 (,@fg-base1 ,@bg-base02
+                             :box (:line-width 2 :style released-button)))
+                (speedbar-directory-face (,@fmt-none ,@fg-blue))
+                (speedbar-file-face (,@fmt-none ,@fg-green))
+                ;; (speedbar-highlight-face (,@bg-base02))
+                (speedbar-highlight-face
+                 (,@fmt-revr ,@fg-base1 ,@bg-base02
+                             :inherit speedbar-button-face))
+                ;; (speedbar-selected-face (,@fmt-undr ,@fg-yellow))
+                (speedbar-selected-face (,@fmt-none ,@bg-base02 ,@fg-green))
+                (speedbar-separator-face (,@fmt-stnd))
+                (speedbar-tag-face (,@fmt-none ,@fg-blue))
+                ;; widgets
+                (widget-field
+                 (,@fg-base1 ,@bg-base02 :box (:line-width 1 :color base2)
+                             :inherit default))
+                (widget-single-line-field (:inherit widget-field))
+                ;; extra modules
+                ;; -------------
+                ;; alert
+                (alert-urgent (,@fg-red))
+                (alert-high (,@fg-orange))
+                (alert-moderate (,@fg-yellow))
+                (alert-normal (,@fg-green))
+                (alert-low (,@fg-blue))
+                (alert-trivial (,@fg-violet))
+                ;; col-highlight -- Highlight the current column.
+                ;; http://www.emacswiki.org/emacs/col-highlight.el
+                (col-highlight (,@bg-base02))
+                ;; ace-jump-mode
+                (ace-jump-face-background (,@fmt-none ,@fg-base01))
+                (ace-jump-face-foreground (,@fmt-bold ,@fg-red))
+                ;; bm visual bookmarks
+                (bm-face ((t (,@bg-orange ,@fg-base03))))
+                (bm-fringe-face ((t (,@bg-orange ,@fg-base03))))
+                (bm-fringe-persistent-face ((t (,@bg-blue ,@fg-base03))))
+                (bm-persistent-face ((t (,@bg-blue ,@fg-base03))))
+                ;; Flymake
+                (flymake-errline (,@fmt-bold ,@fg-red)) ; Error
+                (flymake-warnline (,@fmt-bold ,@fg-red))
+                ;; column-marker
+                (column-marker-1 (,@bg-base01))
+                (column-marker-2 (,@bg-cyan))
+                (column-marker-3 (,@bg-violet))
+                ;; jabber
+                (jabber-activity-face (,@fmt-bold ,@fg-red))
+                (jabber-activity-personal-face (,@fmt-bold ,@fg-blue))
+                (jabber-chat-error (,@fmt-bold ,@fg-red))
+                (jabber-chat-prompt-foreign (,@fmt-bold ,@fg-red))
+                (jabber-chat-prompt-local (,@fmt-bold ,@fg-blue))
+                (jabber-chat-prompt-system (,@fmt-bold ,@fg-green))
+                (jabber-chat-text-foreign (,@fg-base1))
+                (jabber-chat-text-local (,@fg-base0))
+                (jabber-chat-rare-time-face (,@fmt-undr ,@fg-green))
+                (jabber-roster-user-away (,@fmt-ital ,@fg-green))
+                (jabber-roster-user-chatty (,@fmt-bold ,@fg-orange))
+                (jabber-roster-user-dnd (,@fmt-ital ,@fg-red))
+                (jabber-roster-user-error
+                 (:weight light :slant italic ,@fg-red))
+                (jabber-roster-user-offline (,@fg-base01))
+                (jabber-roster-user-online (,@fmt-bold ,@fg-blue))
+                (jabber-roster-user-xa (,@fmt-ital ,@fg-magenta))
+                ;; git-gutter
+                (git-gutter:modified (,@fg-violet))
+                (git-gutter:added (,@fg-green))
+                (git-gutter:deleted (,@fg-red))
+                ;; gnus - these are mostly taken from mutt, not VIM
+                (gnus-cite-1 (:inherit outline-1))
+                (gnus-cite-2 (:inherit outline-2))
+                (gnus-cite-3 (:inherit outline-3))
+                (gnus-cite-4 (:inherit outline-4))
+                (gnus-cite-5 (:inherit outline-5))
+                (gnus-cite-6 (:inherit outline-6))
+                (gnus-cite-7 (:inherit outline-7))
+                (gnus-cite-8 (:inherit outline-8))
+                (gnus-cite-9 (,@fg-green))
+                (gnus-cite-10 (,@fg-magenta))
+                (gnus-cite-11 (,@fg-base02))
+                (gnus-group-mail-1 (,@fmt-bold ,@fg-base3))
+                (gnus-group-mail-1-empty (,@fg-base3))
+                (gnus-group-mail-2 (,@fmt-bold ,@fg-base2))
+                (gnus-group-mail-2-empty (,@fg-base2))
+                (gnus-group-mail-3 (,@fmt-bold ,@fg-magenta))
+                (gnus-group-mail-3-empty (,@fg-magenta))
+                (gnus-group-mail-low (,@fmt-bold ,@fg-base00))
+                (gnus-group-mail-low-empty (,@fg-base00))
+                (gnus-group-news-1 (,@fmt-bold ,@fg-base1))
+                (gnus-group-news-1-empty (,@fg-base1))
+                (gnus-group-news-2 (,@fmt-bold ,@fg-blue))
+                (gnus-group-news-2-empty (,@fg-blue))
+                (gnus-group-news-low (,@fmt-bold ,@fg-violet))
+                (gnus-group-news-low-empty (,@fg-violet))
+                (gnus-emphasis-highlight-words ; highlight
+                 (,@fmt-none ,fg-yellow))
+                (gnus-header-content (,@fmt-none ,@fg-base01)) ; hdrdefault
+                (gnus-header-from (,@fmt-none ,@fg-base00)) ; header ^From
+                (gnus-header-name (,@fmt-none ,@fg-base01)) ; hdrdefault
+                (gnus-header-newsgroups (,@fmt-none ,@fg-base02)) ; hdrdefault
+                (gnus-header-subject (,@fmt-none ,@fg-blue)) ; header ^Subject
+                (gnus-server-agent (,@fmt-bold ,@fg-base3))
+                (gnus-server-closed (,@fmt-ital ,@fg-base1))
+                (gnus-server-denied (,@fmt-bold ,@fg-base2))
+                (gnus-server-offline (,@fmt-bold ,@fg-green))
+                (gnus-server-opened (,@fmt-bold ,@fg-cyan))
+                (gnus-signature (,@fmt-none ,@fg-base01)) ; signature
+                (gnus-splash (,@fg-base2))
+                (gnus-summary-cancelled ; deleted messages
+                 (,@fmt-none ,@fg-red))
+                (gnus-summary-high-ancient
+                 (,@fmt-bold :inherit gnus-summary-normal-ancient))
+                (gnus-summary-high-read
+                 (,@fmt-bold :inherit gnus-summary-normal-read))
+                (gnus-summary-high-ticked
+                 (,@fmt-bold :inherit gnus-summary-normal-ticked))
+                (gnus-summary-high-undownloaded
+                 (,@fmt-bold :inherit gnus-summary-normal-undownloaded))
+                (gnus-summary-high-unread
+                 (,@fmt-bold :inherit gnus-summary-normal-unread))
+                (gnus-summary-low-ancient
+                 (,@fmt-ital :inherit gnus-summary-normal-ancient))
+                (gnus-summary-low-read
+                 (,@fmt-ital :inherit gnus-summary-normal-ancient))
+                (gnus-summary-low-unread
+                 (,@fmt-ital :inherit gnus-summary-normal-unread))
+                (gnus-summary-low-ticked
+                 (,@fmt-ital :inherit gnus-summary-normal-ancient))
+                (gnus-summary-low-undownloaded
+                 (,@fmt-ital :inherit gnus-summary-normal-ancient))
+                (gnus-summary-normal-ancient ; old messages
+                 (,@fmt-none ,@fg-blue))
+                (gnus-summary-normal-read ; read messages
+                 (,@fmt-none ,@fg-base01))
+                (gnus-summary-normal-ticked (,@fmt-none ,@fg-red)) ; flagged
+                (gnus-summary-normal-undownloaded (,@fmt-none ,@fg-base2))
+                (gnus-summary-normal-unread ; unread messages
+                 (,@fmt-none ,@fg-blue))
+                (gnus-summary-selected ; indicator
+                 (,@fmt-none ,@fg-base03 ,@bg-yellow))
+                ;;helm
+                (helm-apt-deinstalled (,@fg-base01))
+                (helm-apt-installed (,@fg-green))
+                (helm-bookmark-addressbook (,@fg-blue))
+                (helm-bookmark-directory (:inherit helm-ff-directory))
+                (helm-bookmark-file (:inherit helm-ff-file))
+                (helm-bookmark-gnus (,@fg-cyan))
+                (helm-bookmark-info (,@fg-green))
+                (helm-bookmark-man (,@fg-violet))
+                (helm-bookmark-w3m (,@fg-yellow))
+                (helm-bookmarks-su (,@fg-orange))
+                (helm-buffer-not-saved (,@fg-orange))
+                (helm-buffer-process (,@fg-magenta))
+                (helm-buffer-saved-out (,@fmt-revr ,@fg-red ,@bg-back))
+                (helm-buffer-size (,@fg-base01))
+                (helm-candidate-number (,@fmt-bold ,@bg-base02 ,@fg-base1))
+                (helm-emms-playlist (,@fmt-none ,@fg-base01))
+                (helm-etags+-highlight-face (:inherit highlight))
+                (helm-ff-directory (,@bg-back ,@fg-blue))
+                (helm-ff-executable (,@fmt-bold ,@fg-green))
+                (helm-ff-file (:inherit default))
+                (helm-ff-invalid-symlink (,@bg-base02 ,@fg-red))
+                (helm-ff-prefix (,@fmt-revr ,@fg-yellow))
+                (helm-ff-symlink (,@fmt-bold ,@fg-cyan))
+                (helm-gentoo-match (:inherit helm-match))
+                (helm-grep-cmd-line (:inherit diff-added))
+                (helm-grep-file (,@fmt-undr ,@fg-cyan))
+                (helm-grep-finish (,@fg-green))
+                (helm-grep-lineno (,@fg-orange))
+                (helm-grep-match (:inherit helm-match))
+                (helm-grep-running (,@fg-red))
+                (helm-helper (:inherit helm-header))
+                (helm-history-deleted (:inherit helm-ff-invalid-symlink))
+                (helm-history-remote (,@fg-red))
+                (helm-lisp-completion-info (,@fg-base0))
+                (helm-lisp-show-completion (,@fmt-bold ,@fg-yellow ,@bg-base02))
+                (helm-ls-git-added-copied-face (,@fg-green))
+                (helm-ls-git-conflict-face (,@fmt-bold ,@fg-red))
+                (helm-ls-git-deleted-and-staged-face (,@fmt-ital ,@fg-base01))
+                (helm-ls-git-deleted-not-staged-face (,@fmt-bold ,@fg-green))
+                (helm-ls-git-modified-and-staged-face (,@fmt-ital ,@fg-base01))
+                (helm-ls-git-modified-not-staged-face (,@fmt-ital ,@fg-base01))
+                (helm-ls-git-renamed-modified-face (,@fg-green))
+                (helm-ls-git-untracked-face (,@fg-red))
+                (helm-M-x-key (,@fmt-none ,@fg-orange))
+                (helm-match (:inherit match))
+                (helm-moccur-buffer (,@fmt-undr ,@fg-cyan))
+                (helm-selection (:inherit region))
+                (helm-selection-line (:inherit secondary-selection))
+                (helm-separator (,@fg-red))
+                (helm-source-header (:inherit helm-header))
+                (helm-time-zone-current (,@fg-green))
+                (helm-time-zone-home (,@fg-red))
+                (helm-visible-mark (,@fmt-bold ,@bg-back ,@fg-magenta))
+                (helm-w3m-bookmarks (:inherit helm-bookmark-w3m))
+                ;; markdown
+                (markdown-bold-face (:inherit bold))
+                (markdown-header-delimiter-face (:inherit shadow))
+                (markdown-header-face (:inherit outline-1))
+                (markdown-header-face-1 (:inherit outline-1))
+                (markdown-header-face-2 (:inherit outline-2))
+                (markdown-header-face-3 (:inherit outline-3))
+                (markdown-header-face-4 (:inherit outline-4))
+                (markdown-header-face-5 (:inherit outline-5))
+                (markdown-header-face-6 (:inherit outline-6))
+                (markdown-header-rule-face (:inherit shadow))
+                (markdown-italic-face (:inherit italic))
+                (markdown-link-face (:inherit shadow))
+                (markdown-link-title-face (:inherit link))
+                (markdown-url-face (:inherit link))
+                ;; Message
+                (message-mml (,@fg-blue))
+                (message-cited-text (,@fg-base2))
+                (message-separator (,@fg-base3))
+                (message-header-xheader (,@fg-violet))
+                (message-header-name (,@fg-cyan))
+                (message-header-other (,@fg-red))
+                (message-header-newsgroups (,@fmt-bldi ,@fg-yellow))
+                (message-header-subject (,@fg-base00))
+                (message-header-cc (,@fmt-bold ,@fg-green))
+                (message-header-to (,@fmt-bold ,@fg-base1))
+                ;; minimap
+                (minimap-active-region-background (,@bg-base02))
+                (minimap-semantic-function-face (,bg-base3))
+                (minimap-semantic-type-face (,bg-base3))
+                (minimap-semantic-variable-face (,bg-base3))
+                ;; parenface
+                (parenface-bracket-face (:inherit shadow))
+                (parenface-curly-face (:inherit shadow))
+                (parenface-paren-face (:inherit shadow))
+                ;; paren-face
+                (parenthesis (:inherit shadow))
+                ;; rainbow-delimiters
+                (rainbow-delimiters-depth-1-face (:inherit outline-1))
+                (rainbow-delimiters-depth-2-face (:inherit outline-2))
+                (rainbow-delimiters-depth-3-face (:inherit outline-3))
+                (rainbow-delimiters-depth-4-face (:inherit outline-4))
+                (rainbow-delimiters-depth-5-face (:inherit outline-5))
+                (rainbow-delimiters-depth-6-face (:inherit outline-6))
+                (rainbow-delimiters-depth-7-face (:inherit outline-7))
+                (rainbow-delimiters-depth-8-face (:inherit outline-8))
+                (rainbow-delimiters-depth-9-face (,@fg-green))
+                ;; powerline
+                (powerline-active1 (,@fg-base00 :inherit mode-line))
+                (powerline-active2 (,@fg-base0 :inherit mode-line))
+                (powerline-inactive1 (,@fg-base02 ,@bg-base1 :inherit mode-line-inactive))
+                (powerline-inactive2 (,@fg-base01 :inherit mode-line-inactive))
+                ;; slime
+                (slime-error-face (,@fmt-revr ,@fg-red)) ; ErrorMsg
+                (slime-note-face (,@fg-yellow))
+                (slime-repl-inputted-output-face (,@fg-red))
+                (slime-repl-output-mouseover-face (:box (:color base3)))
+                (slime-style-warning-face (,@fmt-bold ,@fg-orange))
+                (slime-warning-face (,@fmt-bold ,@fg-red)) ; WarningMsg
+                ;; smartparens
+                (sp-pair-overlay-face (,@bg-base02))
+                (sp-wrap-overlay-face (,@bg-base02))
+                (sp-wrap-tag-overlay-face (,@bg-base02))
+                (sp-show-pair-match-face (,@fg-magenta ,@bg-back))
+                (sp-show-pair-mismatch-face (,@bg-red ,@fg-base02))
+                ;; whitespace
+                (whitespace-empty (,@fg-red))
+                (whitespace-hspace (,@fg-orange))
+                (whitespace-indentation (,@fg-base02))
+                (whitespace-space (,@fg-base02))
+                (whitespace-space-after-tab (,@fg-cyan))
+                (whitespace-space-before-tab (,@fmt-bold ,@fg-red))
+                (whitespace-tab (,@fg-base02))
+                (whitespace-trailing (,@fmt-bold ,@fg-red ,@bg-base02))
+                (whitespace-highlight-face (,@fg-red ,@bg-blue))
+                (whitespace-line (,@fg-magenta))
+                (whitespace-newline (:inherit shadow :slant normal))
+                ;; writegood
+                (writegood-weasels-face (,@fmt-curl-cyan ,@fg-cyan))
+                (writegood-passive-voice-face (,@fg-magenta))
+                (writegood-duplicates-face (:inherit error))
+                ;; rcirc
+                (rcirc-my-nick (,@fg-blue))
+                (rcirc-nick-in-message (,@fg-orange))
+                (rcirc-other-nick (,@fg-green))
+                (rcirc-prompt (,@fg-yellow))
+                (rcirc-bright-nick (,@fg-magenta))
+                (rcirc-server (,@fg-base1))
+                (rcirc-timestamp (,@fg-base01))
+                ;;font-latex
+                (font-latex-warning-face (,@fg-red))
+                (font-latex-sectioning-5-face (,@fg-violet))
+                ;;flyspell
+                (flyspell-incorrect (,@fmt-curl-red)) ; SpellBad
+                (flyspell-duplicate (,@fmt-curl-yellow))
+                ;; rst-mode
+                (rst-level-1 (:inherit outline-1))
+                (rst-level-2 (:inherit outline-2))
+                (rst-level-3 (:inherit outline-3))
+                (rst-level-4 (:inherit outline-4))
+                (rst-level-5 (:inherit outline-5))
+                (rst-level-6 (:inherit outline-6))
+                ;;ansi-color
+                (ansi-color-cyan (,@fg-cyan ,@bg-cyan))
+                (ansi-color-blue (,@fg-blue ,@bg-blue))
+                (ansi-color-magenta (,@fg-magenta ,@bg-magenta))
+                (ansi-color-red (,@fg-red ,@bg-red))
+                (ansi-color-yellow (,@fg-yellow ,@bg-yellow))
+                (ansi-color-green (,@fg-green ,@bg-green))
+                (ansi-color-black (,@fg-base02 ,@bg-base02))
+                (ansi-color-white (,@fg-base2 ,@bg-base2))
+                (ansi-color-bright-cyan (,@fg-base1 ,@bg-base1))
+                (ansi-color-bright-blue (,@fg-base0 ,@bg-base0))
+                (ansi-color-bright-magenta (,@fg-violet ,@bg-violet))
+                (ansi-color-bright-red (,@fg-orange ,@bg-orange))
+                (ansi-color-bright-yellow (,@fg-base00 ,@bg-base00))
+                (ansi-color-bright-green (,@fg-base01 ,@bg-base01))
+                (ansi-color-bright-black (,@fg-base03 ,@bg-base03))
+                (ansi-color-bright-white (,@fg-base3 ,@bg-base3))
+                ;; company
+                (company-tooltip (,@fg-base00 ,@bg-base02))
+                (company-tooltip-selection (,@fg-green ,@bg-base02))
+                (company-tooltip-mouse (,@fg-base1 ,@bg-base02))
+                (company-tooltip-common (,@fg-blue ,@bg-base02 ,@fmt-undr))
+                (company-tooltip-common-selection (,@fg-green ,@bg-base02 ,@fmt-undr))
+                (company-tooltip-annotation (,@fg-yellow ,@bg-base02))
+                (company-scrollbar-fg (,@bg-base0))
+                (company-scrollbar-bg (,@bg-base02))
+                (company-preview (,@bg-green))
+                (company-preview-common (,@fg-base01 ,@bg-base02))
+                (company-template-field (,@fg-base03 ,@bg-yellow))
+                ;; hydra
+                (hydra-face-red (,@fmt-bold ,@fg-red))
+                (hydra-face-blue (,@fmt-bold ,@fg-blue))
+                (hydra-face-amaranth (,@fmt-bold ,@fg-orange))
+                (hydra-face-pink (,@fmt-bold ,@fg-magenta))
+                (hydra-face-teal (,@fmt-bold ,@fg-cyan))
+                ;; guide-key
+                (guide-key/prefix-command-face (,@fg-blue))
+                (guide-key/highlight-command-face (,@fg-orange))
+                (guide-key/key-face (,@fg-green))
+                ;; magit
+                (magit-log-sha1 (,@fg-red))
+                (magit-branch (,@fg-yellow))
+                (magit-tag (,@fg-green))
+                (magit-log-author (,@fg-cyan))
+                (magit-log-head-label-remote (,@fg-green))
+                (magit-log-head-label-tags (,@fg-orange))
+                (magit-log-head-label-local (,@fg-yellow))
+                (magit-log-head-label-head (,@fg-violet))
+                (magit-process-ok (,@fg-green :inherit magit-section-title))
+                (magit-process-ng (,@fg-red :inherit magit-section-title))
+                ;; undo-tree
+                (undo-tree-visualizer-current-face (,@fg-orange))
+                (undo-tree-visualizer-default-face (:inherit shadow))
+                (undo-tree-visualizer-active-branch-face (:inherit default))
+                (undo-tree-visualizer-unmodified-face (,@fg-cyan))
+                (undo-tree-visualizer-register-face (,@fg-yellow))
+                ;; haskell
+                (haskell-keyword-face (,@fg-cyan)))))))
+
+(provide 'solarized-definitions)
+;;; solarized-definitions.el ends here
diff --git a/emacs/local/solarized-theme.el b/emacs/local/solarized-theme.el
new file mode 100644
index 0000000..ce77f65
--- /dev/null
+++ b/emacs/local/solarized-theme.el
@@ -0,0 +1,50 @@
+;; solarized-theme.el --- Solarized custom theme  -*- lexical-binding: t; -*-
+
+(require 'solarized-definitions
+         (locate-file "solarized-definitions.el" custom-theme-load-path
+                      '("c" "")))
+
+(deftheme solarized solarized-description)
+
+(apply #'custom-theme-set-faces 'solarized (solarized-color-definitions))
+
+(custom-theme-set-variables
+ 'solarized
+ ;; This is obsolete, but something might still be referencing it.
+ `(ansi-color-names-vector
+   ,(apply #'vector
+           (mapcar (lambda (color-name)
+                     (nth 1 (assoc color-name solarized-colors)))
+                   '(base02 red green yellow blue magenta cyan base2)))))
+
+(cl-defun solarized-update-background-mode
+    (appearance &optional (frames (frame-list)))
+  "Set the APPEARANCE of all frames to either 'light or 'dark.
+This is not specific to Solarized – it will update the appearance of any theme
+that observes the background characteristic."
+  (setq frame-background-mode appearance)
+  (mapc #'frame-set-background-mode frames)
+  ;; Supposedly #'frame-set-background-mode updates the faces, but it doesn’t
+  ;; seem to actually., so re-enable all the themes.
+  (mapc #'enable-theme (reverse custom-enabled-themes))
+  ;; For some reason, ‘enable-theme’ (or maybe ‘solarized’?) is resetting the
+  ;; ‘frame-background-mode’, so reset it here.
+  (setq frame-background-mode appearance))
+
+(defun solarized-toggle-background-mode ()
+  "Toggle between light and dark background modes.
+This is not specific to Solarized – it will update the appearance of any theme
+that observes the background characteristic."
+  (interactive)
+  (let ((new-mode (pcase frame-background-mode
+                    ('dark 'light)
+                    (_ 'dark))))
+    (solarized-update-background-mode new-mode)))
+
+;;;###autoload
+(when load-file-name
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+
+(provide-theme 'solarized)
+;;; solarized-theme.el ends here
diff --git a/emacs/local/toxi-theme.el b/emacs/local/toxi-theme.el
new file mode 100644
index 0000000..be7d90a
--- /dev/null
+++ b/emacs/local/toxi-theme.el
@@ -0,0 +1,65 @@
+(unless (<= 24 emacs-major-version)
+  (error "toxi-theme requires Emacs 24 or later."))
+ 
+(deftheme toxi
+  "toxi's dark color theme - forked to my liking")
+ 
+(custom-theme-set-faces
+ 'toxi
+ ;; frame
+ `(default ((t (:foreground "#a4ffd8" :background "#0b1210"))))
+ `(cursor ((t (:foreground "white"))))
+ `(hl-line ((t (:background "#272822"))))
+ `(minibuffer-prompt ((t (:foreground "#14bccc" :bold t))))
+ `(modeline ((t (:background "#465253" :foreground "#ffffff"))))
+ `(modeline-inactive ((t (:background "#162223" :foreground "#355e6b"))))
+ `(region ((t (:background "#441ea4"))))
+ `(show-paren-match-face ((t (:background "#ffff00"))))
+ ;; main
+ `(font-lock-builtin-face ((t (:foreground "#00ffff"))))
+ `(font-lock-comment-face ((t (:foreground "#7d7d7d"))))
+ `(font-lock-constant-face ((t (:foreground "#f2ee81"))))
+ `(font-lock-doc-string-face ((t (:foreground "#40be67"))))
+ `(font-lock-function-name-face ((t (:foreground "#a4ffd8"))))
+ `(font-lock-keyword-face ((t (:foreground "#ffff00"))))
+ `(font-lock-string-face ((t (:foreground "#50de77"))))
+ `(font-lock-type-face ((t (:foreground "#a4ffd8"))))
+ `(font-lock-variable-name-face ((t (:foreground "#a4ffd8"))))
+ `(font-lock-warning-face ((t (:bold t :foreground "#ff0055"))))
+ ;; dired
+ `(dired-directory ((t (:bold t :foreground "#ffff00"))))
+ `(dired-symlink ((t (:bold t :foreground "#00ffff"))))
+ ;; rainbow-delimiters
+ `(rainbow-delimiters-depth-1-face ((t (:foreground "#990000"))))
+ `(rainbow-delimiters-depth-2-face ((t (:foreground "#383838"))))
+ `(rainbow-delimiters-depth-3-face ((t (:foreground "#505050"))))
+ `(rainbow-delimiters-depth-4-face ((t (:foreground "#6c6c6c"))))
+ `(rainbow-delimiters-depth-5-face ((t (:foreground "#888888"))))
+ `(rainbow-delimiters-depth-6-face ((t (:foreground "#a7a7a7"))))
+ `(rainbow-delimiters-depth-7-face ((t (:foreground "#c4c4c4"))))
+ `(rainbow-delimiters-depth-8-face ((t (:foreground "#e1e1e1"))))
+ `(rainbow-delimiters-depth-9-face ((t (:foreground "#ffffff"))))
+ ;; ido
+ `(ido-first-match ((t (:foreground "#ffff00"))))
+ `(ido-only-match ((t (:foreground "#00ff00"))))
+ `(ido-subdir ((t (:foreground "#00ffff"))))
+ ;; iedit
+ `(iedit-occurrence ((t (:background "#441ea4"))))
+ ;; whitespace
+ `(whitespace-space ((t (:foreground "#595959"))))
+ ;; yasnippet
+ `(yas/field-highlight-face ((t (:background "#383830"))))
+ ;; vertico
+ `(vertico-current ((t (:background "#441ea4"))))
+ ;; org
+ `(org-hide ((t (:foreground "#0b1210"))))
+ `(org-block ((t (:background "#1b2220"))))
+ `(org-link ((t (:foreground "#56cff2" :underline t)))))
+ 
+;;;###autoload
+(when load-file-name
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+ 
+(provide-theme 'toxi)
+