Added tests and more documentation

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

8 files changed, 1156 insertions, 904 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000..692f78a
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,2 @@
+((emacs-lisp-mode . ((fill-column . 90)
+                     (indent-tabs-mode . nil))))
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 0000000..a9ce130
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,39 @@
+---
+name: Custom issue template
+about: General issues, both bugs and features.
+title: ''
+labels: ''
+assignees: mssola
+---
+
+### Description
+
+Check out the [contribution guidelines](../CONTRIBUTING.org) file for some
+considerations before submitting a new issue.
+
+### Steps to reproduce
+
+1. First I did this...
+2. Then that...
+3. And this happened!
+
+- **Expected behavior**: I expected this to happen!
+- **Actual behavior**: But this happened...
+
+### soria-theme version
+
+With a git commit SHA if possible.
+
+### GNU Emacs version
+
+Run `M-x emacs-version` to see it. Here's an example:
+
+```
+GNU Emacs 26.2 (build 1, x86_64-suse-linux-gnu, GTK+ Version 3.22.30)
+```
+
+### Operating system
+
+The operating system and the exact version you are using. If you are using
+Linux, it may be useful to know which distribution you are using and what did
+you do in order to install GNU Emacs.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..0b2266b
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+Provide a general description of the changes in your pull request. If this pull
+request fixes a known issue, please tag it as well (e.g.: `Fixes #1`).
+
+Before submitting a PR make sure the following things have been done (and denote
+this by checking the relevant checkboxes):
+
+- [ ] The commits are consistent with the [contribution guidelines](../CONTRIBUTING.org).
+- [ ] You've added tests (if possible) to cover your change(s).
+- [ ] All tests and style checkers are passing (`make`).
+- [ ] You've updated the [changelog](../CHANGELOG.org) (if adding/changing
+      user-visible functionality).
+- [ ] You've updated the [readme](../README.org) (if adding/changing
+      user-visible functionality).
+
+Thanks for contributing to soria!
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..cab1485
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+vendor/*
+soria-autoloads.el
+soria-autoloads.el~
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..7007671
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: nix
+sudo: true
+
+env:
+  - EMACS_CI=emacs-25-3
+  - EMACS_CI=emacs-26-3
+  - EMACS_CI=emacs-snapshot
+
+install:
+  - bash <(curl https://raw.githubusercontent.com/purcell/nix-emacs-ci/master/travis-install)
+  - sudo apt-get install golang
+  - go get -u github.com/vbatts/git-validation
+
+script:
+  - make ci
diff --git a/CONTRIBUTING.org b/CONTRIBUTING.org
new file mode 100644
index 0000000..ab276e6
--- /dev/null
+++ b/CONTRIBUTING.org
@@ -0,0 +1,80 @@
+#+STARTUP:showall
+
+* Contributing
+
+** Running tests
+
+There are a couple of dependencies in order to run tests. These dependencies
+will be picked up directly by the =vendor= make task. You can run it by
+performing:
+
+#+BEGIN_SRC bash
+$ make vendor
+#+END_SRC
+
+The =vendor= task is already called by other tasks such as =lint=. Thus, if you
+just want to run everything, just execute:
+
+#+BEGIN_SRC bash
+$ make
+#+END_SRC
+
+This will fetch the dependencies for you and run the style checkers and the
+tests, among other things. See the sections below to read more about them.
+
+*** Checking the style
+
+The [[https://github.com/gonewest818/elisp-lint][elisp-lint]] and [[https://github.com/purcell/package-lint][package-lint]] packages are being used for checking the
+style. You can run these checkers by performing:
+
+#+BEGIN_SRC bash
+$ make lint
+#+END_SRC
+
+*** Git validation
+
+In order to ensure that the git log is as maintainable as possible, the
+[[https://github.com/vbatts/git-validation][git-validation]] tool is used. You can install this tool by running:
+
+#+BEGIN_SRC bash
+$ go get -u github.com/vbatts/git-validation
+#+END_SRC
+
+If you already have this tool installed, then simply perform:
+
+#+BEGIN_SRC bash
+$ make git-validation
+#+END_SRC
+
+Note that if you don't have this tool installed the task will do nothing (it
+will just print a help message). This is done so when running the default make
+task this doesn't interrupt it.
+
+*** Load test
+
+In order to test that this theme can be actually loaded, run:
+
+#+BEGIN_SRC bash
+$ make load-test
+#+END_SRC
+
+** Issue reporting
+
+I'm using [[https://github.com/mssola/soria][Github]] in order to host the code. Thus, in order to report issues you
+can do it on its [[https://github.com/mssola/soria/issues][issue tracker]]. A couple of notes on reports:
+
+- Check that the issue has not already been reported or fixed in =master=.
+- Try to be concise and precise in your description of the problem.
+- Provide a step by step guide on how to reproduce this problem.
+- Provide the version you are using (the commit SHA, if possible), as well as
+  the version of the GNU Emacs you are using and the operating system.
+
+** Pull requests
+
+- Write a [[https://chris.beams.io/posts/git-commit/][good commit message]].
+- Make sure that tests are passing on your local machine (it will also be
+  checked by the CI system whenever you submit the pull request).
+- Update the [[./CHANGELOG.org][changelog]] (if relevant).
+- Open a pull request with *only* one subject and a clear title and
+  description. Refrain from submitting pull requests with tons of different
+  unrelated commits.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..36e2b1d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,76 @@
+TOP := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+LOAD_PATH = -L $(TOP) -L $(TOP)vendor
+PKG = soria
+
+ELS_ALL = $(wildcard *.el)
+ELS = $(filter-out $(PKG)-autoloads.el,$(ELS_ALL))
+
+EMACS ?= emacs
+BATCH = $(EMACS) --quick --batch $(LOAD_PATH)
+
+##
+# General
+
+.PHONY: all
+all: clean test
+
+.PHONY: version
+version:
+	@$(EMACS) --version
+
+.PHONY: clean
+clean:
+	@rm -rf $(TOP)vendor/* $(PKG)-autoloads.el*
+
+##
+# Test
+
+.PHONY: ci
+ci: version all
+
+.PHONY: test
+test: lint git-validation load-test
+
+# Maybe it would've been nicer to use Cask or something like that, but it
+# doesn't have too many dependencies so it should be fine for now.
+.PHONY: vendor
+vendor:
+	@mkdir -p $(TOP)vendor
+ifeq ("$(wildcard $(TOP)vendor/elisp-lint.el)","")
+	@echo "Downloading 'elisp-lint' into 'vendor' directory"
+	@wget -q -O $(TOP)vendor/elisp-lint.el https://raw.githubusercontent.com/gonewest818/elisp-lint/master/elisp-lint.el
+endif
+# Required by elisp-lint.el
+ifeq ("$(wildcard $(TOP)vendor/package-lint.el)","")
+	@echo "Downloading 'package-lint' into 'vendor' directory"
+	@wget -q -O $(TOP)vendor/package-lint.el https://raw.githubusercontent.com/purcell/package-lint/master/package-lint.el
+endif
+# Required by elisp-lint.el
+ifeq ("$(wildcard $(TOP)vendor/dash.el)","")
+	@echo "Downloading 'dash' into 'vendor' directory"
+	@wget -q -O vendor/dash.el https://raw.githubusercontent.com/magnars/dash.el/master/dash.el
+endif
+
+.PHONY: fix-stdlib-changes
+fix-stdlib-changes:
+# HACK: God knows why this file is needed, but an empty expression makes
+# package-lint shut up.
+	@mkdir -p vendor/data
+	@echo "()" > vendor/data/stdlib-changes
+
+.PHONY: lint
+lint: vendor fix-stdlib-changes
+	@$(BATCH) -l elisp-lint.el -f elisp-lint-files-batch $(ELS)
+
+.PHONY: git-validation
+git-validation:
+ifeq (, $(shell which git-validation 2> /dev/null))
+	@echo "You don't have 'git-validation' installed, consider installing it (see the CONTRIBUTING.org file)."
+else
+	@git-validation -q -range 7d38ca68163c..HEAD -travis-pr-only=false
+endif
+
+.PHONY: load-test
+load-test:
+	@$(BATCH) -nw --load soria-theme.el \
+		--eval "(progn (load-theme 'soria t) (message \"%s\" soria-theme-hide-helm-header))"
diff --git a/soria-theme.el b/soria-theme.el
index 1c7ead1..40d307a 100644
--- a/soria-theme.el
+++ b/soria-theme.el
@@ -1,4 +1,4 @@
-;;; soria-theme.el --- A xoria256 theme with some colors from openSUSE.
+;;; soria-theme.el --- A xoria256 theme with some colors from openSUSE
 
 ;; Copyright (C) 2016-2020 Miquel Sabaté Solà <mikisabate@gmail.com>
 ;;
@@ -17,7 +17,7 @@
 
 ;; Author: Miquel Sabaté Solà <mikisabate@gmail.com>
 ;; Version: 0.1
-;; Keywords: color theme
+;; Keywords: faces
 ;; URL: https://github.com/mssola/soria
 
 ;;; Commentary:
@@ -52,7 +52,7 @@
 The theme has to be reloaded after changing anything in this group."
   :group 'faces)
 
-(defcustom soria-hide-helm-header t
+(defcustom soria-theme-hide-helm-header t
   "Hide the Helm header."
   :type 'boolean
   :group 'soria)
@@ -63,1297 +63,1316 @@ The theme has to be reloaded after changing anything in this group."
 (set-face-attribute 'font-lock-number-face nil :inherit font-lock-constant-face)
 (setq font-lock-number-face 'font-lock-number-face)
 
-(defun add-font-lock-numbers ()
+(defun soria-theme-add-font-lock-numbers ()
   "Add to the list of keywords numeric formats.
 It adds to font-lock-number-face decimal, octal, hex and bin formats."
 
-  (defvar font-lock-number    "[0-9]+\\([eE][+-]?[0-9]*\\)?")
-  (defvar font-lock-hexnumber "0[xX][0-9a-fA-F]+")
-  (defvar font-lock-binnumber "0[bB][01]+")
+  (defvar soria-theme-font-lock-number    "[0-9]+\\([eE][+-]?[0-9]*\\)?")
+  (defvar soria-theme-font-lock-hexnumber "0[xX][0-9a-fA-F]+")
+  (defvar soria-theme-font-lock-binnumber "0[bB][01]+")
 
-  (font-lock-add-keywords nil (list
-    (list (concat "\\<\\(" font-lock-number "\\)\\>" )
-     0 font-lock-number-face)
-    (list (concat "\\<\\(" font-lock-hexnumber "\\)\\>" )
-     0 font-lock-number-face)
-    (list (concat "\\<\\(" font-lock-binnumber "\\)\\>" )
-     0 font-lock-number-face))))
+  (font-lock-add-keywords
+   nil
+   (list
+    (list (concat "\\<\\(" soria-theme-font-lock-number "\\)\\>" )
+          0 font-lock-number-face)
+    (list (concat "\\<\\(" soria-theme-font-lock-hexnumber "\\)\\>" )
+          0 font-lock-number-face)
+    (list (concat "\\<\\(" soria-theme-font-lock-binnumber "\\)\\>" )
+          0 font-lock-number-face))))
 
 ;; The color theme itself.
 
 (let*
-  ((class '((class color) (min-colors 89)))
-    (soria-purple       "#dfafdf")
-    (soria-darkpurple   "#875f87")
-    (soria-white        "#d0d0d0")
-    (soria-darkgray     "#1c1c1c")
-    (soria-brightgreen  "#81c13b")
-    (soria-green        "#b9dc92")
-    (soria-darkgreen    "#2f5361")
-    (soria-gray         "#808080")
-    (soria-linegray     "#3a3a3a")
-    (soria-statusgray   "#4e4e4e")
-    (soria-statusncgray "#b2b2b2")
-    (soria-black        "#000000")
-    (soria-whitest      "#eeeeee")
-    (soria-yellow       "#ffffaf")
-    (soria-orange       "#d7af87")
-    (soria-redpastel    "#d78787")
-    (soria-blue         "#87afd7"))
+    ((class '((class color) (min-colors 89)))
+     (soria-purple       "#dfafdf")
+     (soria-darkpurple   "#875f87")
+     (soria-white        "#d0d0d0")
+     (soria-darkgray     "#1c1c1c")
+     (soria-brightgreen  "#81c13b")
+     (soria-green        "#b9dc92")
+     (soria-darkgreen    "#2f5361")
+     (soria-gray         "#808080")
+     (soria-linegray     "#3a3a3a")
+     (soria-statusgray   "#4e4e4e")
+     (soria-statusncgray "#b2b2b2")
+     (soria-black        "#000000")
+     (soria-whitest      "#eeeeee")
+     (soria-yellow       "#ffffaf")
+     (soria-orange       "#d7af87")
+     (soria-redpastel    "#d78787")
+     (soria-blue         "#87afd7"))
 
   (custom-theme-set-faces
-    'soria
-    ;; General coloring.
-    `(default (
-      (((class color) (min-colors 256))
-       (:foreground ,soria-white
-        :background ,soria-darkgray))))
+   'soria
+   ;; General coloring.
+   `(default (
+              (((class color) (min-colors 256))
+               (:foreground ,soria-white
+                            :background ,soria-darkgray))))
 
-    `(mouse
-      ((,class (:foreground ,soria-darkgray
-                :background ,soria-white
-                :inverse-video t))))
+   `(mouse
+     ((,class (:foreground ,soria-darkgray
+                           :background ,soria-white
+                           :inverse-video t))))
 
-    `(cursor
-      ((,class (:foreground ,soria-darkgray
-                :background ,soria-white
-                :inverse-video t))))
+   `(cursor
+     ((,class (:foreground ,soria-darkgray
+                           :background ,soria-white
+                           :inverse-video t))))
 
-    `(shadow
-      ((,class (:foreground ,soria-gray))))
+   `(shadow
+     ((,class (:foreground ,soria-gray))))
 
-    `(link
-      ((,class (:foreground ,soria-blue
-                            :underline t
-                            :weight normal))))
+   `(link
+     ((,class (:foreground ,soria-blue
+                           :underline t
+                           :weight normal))))
 
-    `(match
-      ((,class (:background ,soria-orange
-                :foreground ,soria-darkgray
-                :weight bold))))
+   `(match
+     ((,class (:background ,soria-orange
+                           :foreground ,soria-darkgray
+                           :weight bold))))
 
-    `(link-visited
-      ((,class (:inherit link))))
+   `(link-visited
+     ((,class (:inherit link))))
 
-    `(minibuffer-prompt
-      ((,class (:foreground ,soria-white))))
+   `(minibuffer-prompt
+     ((,class (:foreground ,soria-white))))
 
-    `(escape-glyph
-      ((,class (:foreground ,soria-redpastel))))
+   `(escape-glyph
+     ((,class (:foreground ,soria-redpastel))))
 
-    `(escape-glyph-face
-      ((,class (:foreground ,soria-redpastel))))
+   `(escape-glyph-face
+     ((,class (:foreground ,soria-redpastel))))
 
-    `(error
-      ((,class (:foreground ,soria-white))))
+   `(error
+     ((,class (:foreground ,soria-white))))
 
-    `(warning
-      ((,class (:foreground ,soria-orange))))
+   `(warning
+     ((,class (:foreground ,soria-orange))))
 
-    `(success
-      ((,class (:foreground ,soria-blue))))
+   `(success
+     ((,class (:foreground ,soria-blue))))
 
-    `(highlight
-      ((,class (:background ,soria-darkpurple
-                :foreground ,soria-white))))
+   `(highlight
+     ((,class (:background ,soria-darkpurple
+                           :foreground ,soria-white))))
 
-    `(region
-      ((,class (:inherit highlight))))
+   `(region
+     ((,class (:inherit highlight))))
 
-    `(lazy-highlight
-      ((,class (:inherit highlight))))
+   `(lazy-highlight
+     ((,class (:inherit highlight))))
 
-    `(isearch
-      ((,class (:background ,soria-green
-                :foreground ,soria-black))))
+   `(isearch
+     ((,class (:background ,soria-green
+                           :foreground ,soria-black))))
 
-    `(trailing-whitespace
-      ((,class (:background ,soria-brightgreen))))
+   `(trailing-whitespace
+     ((,class (:background ,soria-brightgreen))))
 
-    `(hl-line
-      ((,class (:background ,soria-linegray))))
+   `(hl-line
+     ((,class (:background ,soria-linegray))))
 
-    `(linum-highlight-face
-      ((,class (:background ,soria-darkgray
-                :foreground ,soria-yellow))))
+   `(linum-highlight-face
+     ((,class (:background ,soria-darkgray
+                           :foreground ,soria-yellow))))
 
-    `(show-paren-match
-      ((,class (:background ,soria-brightgreen
-                :foreground ,soria-darkgreen))))
+   `(show-paren-match
+     ((,class (:background ,soria-brightgreen
+                           :foreground ,soria-darkgreen))))
 
-    `(vertical-border
-      ((,class (:foreground ,soria-statusgray))))
+   `(vertical-border
+     ((,class (:foreground ,soria-statusgray))))
 
-    ;; Font lock faces
+   ;; Font lock faces
 
-    `(font-lock-builtin-face
-      ((,class (:foreground ,soria-blue))))
+   `(font-lock-builtin-face
+     ((,class (:foreground ,soria-blue))))
 
-    `(font-lock-comment-face
-      ((,class (:foreground ,soria-gray))))
+   `(font-lock-comment-face
+     ((,class (:foreground ,soria-gray))))
 
-    `(font-lock-comment-delimiter-face
-      ((,class (:inherit font-lock-comment-face))))
+   `(font-lock-comment-delimiter-face
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(font-lock-doc-face
-      ((,class (:inherit font-lock-comment-face))))
+   `(font-lock-doc-face
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(font-lock-function-name-face
-      ((,class (:foreground ,soria-white))))
+   `(font-lock-function-name-face
+     ((,class (:foreground ,soria-white))))
 
-    `(font-lock-variable-name-face
-      ((,class (:foreground ,soria-white))))
+   `(font-lock-variable-name-face
+     ((,class (:foreground ,soria-white))))
 
-    `(font-lock-preprocessor-face
-      ((,class (:foreground ,soria-green))))
+   `(font-lock-preprocessor-face
+     ((,class (:foreground ,soria-green))))
 
-    `(font-lock-constant-face
-      ((,class (:foreground ,soria-yellow))))
+   `(font-lock-constant-face
+     ((,class (:foreground ,soria-yellow))))
 
-    `(font-lock-keyword-face
-      ((,class (:foreground ,soria-blue))))
+   `(font-lock-keyword-face
+     ((,class (:foreground ,soria-blue))))
 
-    `(font-lock-string-face
-      ((,class (:foreground ,soria-yellow))))
+   `(font-lock-string-face
+     ((,class (:foreground ,soria-yellow))))
 
-    `(font-lock-type-face
-      ((,class (:foreground ,soria-blue))))
+   `(font-lock-type-face
+     ((,class (:foreground ,soria-blue))))
 
-    `(font-lock-number-face
-      ((,class (:foreground ,soria-orange))))
+   `(font-lock-number-face
+     ((,class (:foreground ,soria-orange))))
 
-    `(font-lock-negation-char-face
-      ((,class (:inherit default))))
+   `(font-lock-negation-char-face
+     ((,class (:inherit default))))
 
-    `(font-lock-warning-face
-      ((,class (:foreground ,soria-green))))
+   `(font-lock-warning-face
+     ((,class (:foreground ,soria-green))))
 
-    ;; Search
+   ;; Search
 
-    `(isearch
-      ((,class (:inherit default))))
+   `(isearch
+     ((,class (:inherit default))))
 
-    `(isearch-fail
-      ((,class (:foreground ,soria-redpastel
-                :background ,soria-darkgray))))
+   `(isearch-fail
+     ((,class (:foreground ,soria-redpastel
+                           :background ,soria-darkgray))))
 
-    ;; Mode line faces
+   ;; Mode line faces
 
-    `(mode-line
-      ((,class
-        (:box (:line-width -1 :style released-button)
-         :background ,soria-statusgray
-         :foreground ,soria-white))))
+   `(mode-line
+     ((,class
+       (:box (:line-width -1 :style released-button)
+             :background ,soria-statusgray
+             :foreground ,soria-white))))
 
-    `(mode-line-inactive
-      ((,class
-        (:box (:line-width -1 :style released-button)
-         :background ,soria-linegray
-         :foreground ,soria-statusncgray))))
+   `(mode-line-inactive
+     ((,class
+       (:box (:line-width -1 :style released-button)
+             :background ,soria-linegray
+             :foreground ,soria-statusncgray))))
 
-    `(compilation-mode-line-fail
-      ((,class (:foreground ,soria-redpastel))))
+   `(compilation-mode-line-fail
+     ((,class (:foreground ,soria-redpastel))))
 
-    `(compilation-mode-line-run
-      ((,class (:foreground ,soria-yellow))))
+   `(compilation-mode-line-run
+     ((,class (:foreground ,soria-yellow))))
 
-    `(compilation-mode-line-exit
-      ((,class (:foreground ,soria-brightgreen))))
+   `(compilation-mode-line-exit
+     ((,class (:foreground ,soria-brightgreen))))
 
-    ;; Custom
+   ;; Custom
 
-    `(custom-face-tag
-      ((,class (:foreground ,soria-purple))))
+   `(custom-face-tag
+     ((,class (:foreground ,soria-purple))))
 
-    `(custom-variable-tag
-      ((,class (:inherit custom-face-tag))))
+   `(custom-variable-tag
+     ((,class (:inherit custom-face-tag))))
 
-    `(custom-comment-tag
-      ((,class (:foreground ,soria-yellow))))
+   `(custom-comment-tag
+     ((,class (:foreground ,soria-yellow))))
 
-    `(custom-group-tag
-      ((,class (:foreground ,soria-blue))))
+   `(custom-group-tag
+     ((,class (:foreground ,soria-blue))))
 
-    `(custom-group-tag-1
-      ((,class (:foreground ,soria-purple))))
+   `(custom-group-tag-1
+     ((,class (:foreground ,soria-purple))))
 
-    `(custom-state
-      ((,class (:foreground ,soria-yellow))))
+   `(custom-state
+     ((,class (:foreground ,soria-yellow))))
 
-    ;; Info
+   ;; Info
 
-    `(info-node
-      ((,class (:foreground ,soria-white
-                :background ,soria-darkgray))))
+   `(info-node
+     ((,class (:foreground ,soria-white
+                           :background ,soria-darkgray))))
 
-    `(info-title
-      ((,class (:foreground ,soria-white
-                :background ,soria-darkgray
-                :weight bold))))
+   `(info-title
+     ((,class (:foreground ,soria-white
+                           :background ,soria-darkgray
+                           :weight bold))))
 
-    `(info-title-2
-      ((,class (:foreground ,soria-white
-                :background ,soria-darkgray
-                :weight normal))))
+   `(info-title-2
+     ((,class (:foreground ,soria-white
+                           :background ,soria-darkgray
+                           :weight normal))))
 
-    `(info-title-3
-      ((,class (:foreground ,soria-white
-                :background ,soria-darkgray
-                :weight normal))))
+   `(info-title-3
+     ((,class (:foreground ,soria-white
+                           :background ,soria-darkgray
+                           :weight normal))))
 
-    `(info-title-4
-      ((,class (:foreground ,soria-white
-                :background ,soria-darkgray
-                :weight normal))))
+   `(info-title-4
+     ((,class (:foreground ,soria-white
+                           :background ,soria-darkgray
+                           :weight normal))))
 
-    `(info-menu-header
-      ((,class (:weight normal))))
+   `(info-menu-header
+     ((,class (:weight normal))))
 
-    `(info-menu-star
-      ((,class (:foreground ,soria-white
-                :background ,soria-darkgray
-                :weight normal))))
+   `(info-menu-star
+     ((,class (:foreground ,soria-white
+                           :background ,soria-darkgray
+                           :weight normal))))
 
-    ;; outline
-    `(outline-1
-      ((,class (:inherit org-level-1))))
+   ;; outline
+   `(outline-1
+     ((,class (:inherit org-level-1))))
 
-    `(outline-2
-      ((,class (:inherit org-level-2))))
+   `(outline-2
+     ((,class (:inherit org-level-2))))
 
-    `(outline-3
-      ((,class (:inherit org-level-3))))
+   `(outline-3
+     ((,class (:inherit org-level-3))))
 
-    `(outline-4
-      ((,class (:inherit org-level-4))))
+   `(outline-4
+     ((,class (:inherit org-level-4))))
 
-    `(outline-5
-      ((,class (:inherit org-level-5))))
+   `(outline-5
+     ((,class (:inherit org-level-5))))
 
-    `(outline-6
-        ((,class (:inherit org-level-6))))
+   `(outline-6
+     ((,class (:inherit org-level-6))))
 
-    `(outline-7
-      ((,class (:inherit org-level-7))))
+   `(outline-7
+     ((,class (:inherit org-level-7))))
 
-    `(outline-8
-      ((,class (:inherit org-level-8))))
+   `(outline-8
+     ((,class (:inherit org-level-8))))
 
-    ;; Helm
+   ;; Helm
 
-    `(helm-buffer-file
-      ((,class (:foreground ,soria-white))))
+   `(helm-buffer-file
+     ((,class (:foreground ,soria-white))))
 
-    `(helm-buffer-file
-      ((,class (:foreground ,soria-blue))))
+   `(helm-buffer-file
+     ((,class (:foreground ,soria-blue))))
 
-    `(helm-buffer-process
-      ((,class (:foreground ,soria-statusgray))))
+   `(helm-buffer-process
+     ((,class (:foreground ,soria-statusgray))))
 
-    `(helm-buffer-saved-out
-      ((,class (:foreground ,soria-white
-                :background ,soria-darkgray))))
+   `(helm-buffer-saved-out
+     ((,class (:foreground ,soria-white
+                           :background ,soria-darkgray))))
 
-    `(helm-buffer-size
-      ((,class (:background ,soria-statusgray))))
+   `(helm-buffer-size
+     ((,class (:background ,soria-statusgray))))
 
-    `(helm-candidate-number
-      ((,class (:background ,soria-statusgray
-                :foreground ,soria-white))))
+   `(helm-candidate-number
+     ((,class (:background ,soria-statusgray
+                           :foreground ,soria-white))))
 
-    `(helm-ff-directory
-      ((,class (:foreground ,soria-blue))))
+   `(helm-ff-directory
+     ((,class (:foreground ,soria-blue))))
 
-    `(helm-ff-dotted-directory
-      ((,class (:inherit helm-ff-directory))))
+   `(helm-ff-dotted-directory
+     ((,class (:inherit helm-ff-directory))))
 
-    `(helm-ff-symlink
-      ((,class (:foreground ,soria-brightgreen))))
+   `(helm-ff-symlink
+     ((,class (:foreground ,soria-brightgreen))))
 
-    `(helm-ff-dotted-symlink-directory
-      ((,class (:inherit helm-ff-symlink))))
+   `(helm-ff-dotted-symlink-directory
+     ((,class (:inherit helm-ff-symlink))))
 
-    `(helm-ff-executable
-      ((,class (:foreground ,soria-white))))
+   `(helm-ff-executable
+     ((,class (:foreground ,soria-white))))
 
-    `(helm-ff-file
-      ((,class (:foreground ,soria-white))))
+   `(helm-ff-file
+     ((,class (:foreground ,soria-white))))
 
-    `(helm-ff-invalid-symlink
-      ((,class (:foreground ,soria-white))))
+   `(helm-ff-invalid-symlink
+     ((,class (:foreground ,soria-white))))
 
-    `(helm-ff-prefix
-      ((,class (:foreground ,soria-white))))
+   `(helm-ff-prefix
+     ((,class (:foreground ,soria-white))))
 
-    `(helm-grep-finish
-      ((,class (:foreground ,soria-green))))
+   `(helm-grep-finish
+     ((,class (:foreground ,soria-green))))
 
-    `(helm-grep-lineno
-      ((,class (:foreground ,soria-orange))))
+   `(helm-grep-lineno
+     ((,class (:foreground ,soria-orange))))
 
-    `(helm-grep-match
-      ((,class (:foreground ,soria-white :inherit bold))))
+   `(helm-grep-match
+     ((,class (:foreground ,soria-white :inherit bold))))
 
-    `(helm-grep-running
-      ((,class (:foreground ,soria-redpastel))))
+   `(helm-grep-running
+     ((,class (:foreground ,soria-redpastel))))
 
-    `(helm-match
-      ((,class (:foreground ,soria-white :inherit bold))))
+   `(helm-match
+     ((,class (:foreground ,soria-white :inherit bold))))
 
-    `(helm-match-item
-      ((,class (:inherit helm-match))))
+   `(helm-match-item
+     ((,class (:inherit helm-match))))
 
-    `(helm-moccur-buffer
-      ((,class (:foreground ,soria-blue :underline nil))))
+   `(helm-moccur-buffer
+     ((,class (:foreground ,soria-blue :underline nil))))
 
-    `(helm-selection
-      ((,class (:background ,soria-linegray,
-                :underline nil))))
+   `(helm-selection
+     ((,class (:background ,soria-linegray,
+                           :underline nil))))
 
-    `(helm-selection-line
-      ((,class (:background ,soria-linegray
-                :foreground ,soria-white
-                :underline nil))))
+   `(helm-selection-line
+     ((,class (:background ,soria-linegray
+                           :foreground ,soria-white
+                           :underline nil))))
 
-    `(helm-M-x-key
-      ((,class (:foreground ,soria-orange
-                :underline nil))))
+   `(helm-M-x-key
+     ((,class (:foreground ,soria-orange
+                           :underline nil))))
 
-    `(helm-separator
-      ((,class (:foreground ,soria-gray))))
+   `(helm-separator
+     ((,class (:foreground ,soria-gray))))
 
-    ; The Helm header might be hidden if the user decides so (true by default).
-    (if soria-hide-helm-header
-      `(helm-source-header
-        ((,class (:background ,soria-darkgray
-                  :foreground ,soria-darkgray
-                  :underline nil))))
-      `(helm-source-header
-        ((,class (:background ,soria-linegray
-                  :foreground ,soria-white
-                  :underline nil)))))
+   ;; The Helm header might be hidden if the user decides so (true by default).
+   (if soria-theme-hide-helm-header
+       `(helm-source-header
+         ((,class (:background ,soria-darkgray
+                               :foreground ,soria-darkgray
+                               :underline nil))))
+     `(helm-source-header
+       ((,class (:background ,soria-linegray
+                             :foreground ,soria-white
+                             :underline nil)))))
 
-    ; ansi color names
-    (custom-theme-set-variables
+                                        ; ansi color names
+   (custom-theme-set-variables
     'soria
-    `(ansi-color-names-vector [,soria-darkgray ,soria-redpastel ,soria-green
-                               ,soria-yellow ,soria-blue ,soria-darkpurple
-                               ,soria-purple ,soria-white]))
-
-    ;; Flycheck
-
-    `(flycheck-error
-      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,soria-redpastel) :inherit unspecified))))
-
-    `(flycheck-warning
-      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,soria-orange) :inherit unspecified))))
-
-    `(flycheck-info
-      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,soria-blue) :inherit unspecified))))
-
-    `(flycheck-fringe-error
-      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,soria-redpastel) :inherit unspecified))))
-
-    `(flycheck-fringe-warning
-      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,soria-orange) :inherit unspecified))))
-
-    `(flycheck-fringe-info
-      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,soria-blue) :inherit unspecified))))
-
-    ;; Flyspell
-
-    `(flyspell-duplicate
-      ((,(append '((supports :underline (:style wave))) class)
-        (:underline (:style wave :color ,soria-orange) :inherit unspecified))))
-
-    `(flyspell-incorrect
-      ((,(append '((supports :underline (:style wave))) class)
-        (:underline (:style wave :color ,soria-redpastel) :inherit unspecified))))
-
-    ;; languagetool
-    `(langtool-errline
-      ((,(append '((supports :underline (:style wave))) class)
-       (:underline (:style wave :color ,soria-redpastel) :inherit unspecified))))
-
-    `(langtool-correction-face
-      ((,(append '((supports :underline (:style wave))) class)
+    `(ansi-color-names-vector
+      [,soria-darkgray ,soria-redpastel ,soria-green ,soria-yellow ,soria-blue
+                       ,soria-darkpurple ,soria-purple ,soria-white]))
+
+   ;; Flycheck
+
+   `(flycheck-error
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-redpastel)
+        :inherit unspecified))))
+
+   `(flycheck-warning
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-orange)
+        :inherit unspecified))))
+
+   `(flycheck-info
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-blue)
+        :inherit unspecified))))
+
+   `(flycheck-fringe-error
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-redpastel)
+        :inherit unspecified))))
+
+   `(flycheck-fringe-warning
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-orange)
+        :inherit unspecified))))
+
+   `(flycheck-fringe-info
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-blue)
+        :inherit unspecified))))
+
+   ;; Flyspell
+
+   `(flyspell-duplicate
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-orange)
+        :inherit unspecified))))
+
+   `(flyspell-incorrect
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-redpastel)
+        :inherit unspecified))))
+
+   ;; languagetool
+   `(langtool-errline
+     ((,(append '((supports :underline (:style wave))) class)
+       (:underline
+        (:style wave :color ,soria-redpastel)
+        :inherit unspecified))))
+
+   `(langtool-correction-face
+     ((,(append '((supports :underline (:style wave))) class)
        (:underline (:style wave :color ,soria-green) :inherit unspecified))))
 
-    ;; eldoc
+   ;; eldoc
 
-    `(eldoc-highlight-function-argument
-      ((,class (:foreground ,soria-green
-                :underline nil))))
+   `(eldoc-highlight-function-argument
+     ((,class (:foreground ,soria-green
+                           :underline nil))))
 
-    ;; Makefile
+   ;; Makefile
 
-    `(makefile-space
-      ((,class (:background ,soria-darkpurple))))
+   `(makefile-space
+     ((,class (:background ,soria-darkpurple))))
 
-    ;; eshell
+   ;; eshell
 
-    `(eshell-prompt
-      ((,class (:inherit default))))
+   `(eshell-prompt
+     ((,class (:inherit default))))
 
-    `(eshell-ls-archive
-      ((,class (:inherit default))))
+   `(eshell-ls-archive
+     ((,class (:inherit default))))
 
-    `(eshell-ls-backup
-      ((,class (:inherit default))))
+   `(eshell-ls-backup
+     ((,class (:inherit default))))
 
-    `(eshell-ls-clutter
-      ((,class (:inherit default))))
+   `(eshell-ls-clutter
+     ((,class (:inherit default))))
 
-    `(eshell-ls-unreadable
-      ((,class (:inherit default))))
+   `(eshell-ls-unreadable
+     ((,class (:inherit default))))
 
-    `(eshell-ls-product
-      ((,class (:inherit default))))
+   `(eshell-ls-product
+     ((,class (:inherit default))))
 
-    `(eshell-ls-special
-      ((,class (:inherit default))))
+   `(eshell-ls-special
+     ((,class (:inherit default))))
 
-    `(eshell-ls-directory
-      ((,class (:foreground ,soria-blue))))
+   `(eshell-ls-directory
+     ((,class (:foreground ,soria-blue))))
 
-    `(eshell-ls-executable
-      ((,class (:foreground ,soria-yellow))))
+   `(eshell-ls-executable
+     ((,class (:foreground ,soria-yellow))))
 
-    `(eshell-ls-missing
-      ((,class (:foreground ,soria-redpastel))))
+   `(eshell-ls-missing
+     ((,class (:foreground ,soria-redpastel))))
 
-    `(eshell-ls-symlink
-      ((,class (:foreground ,soria-darkpurple))))
+   `(eshell-ls-symlink
+     ((,class (:foreground ,soria-darkpurple))))
 
-    ;; rainbow-delimiters
+   ;; rainbow-delimiters
 
-    `(rainbow-delimiters-depth-1-face
-      ((,class (:foreground ,soria-brightgreen))))
+   `(rainbow-delimiters-depth-1-face
+     ((,class (:foreground ,soria-brightgreen))))
 
-    `(rainbow-delimiters-depth-2-face
-      ((,class (:foreground ,soria-redpastel))))
+   `(rainbow-delimiters-depth-2-face
+     ((,class (:foreground ,soria-redpastel))))
 
-    `(rainbow-delimiters-depth-3-face
-      ((,class (:foreground ,soria-orange))))
+   `(rainbow-delimiters-depth-3-face
+     ((,class (:foreground ,soria-orange))))
 
-    `(rainbow-delimiters-depth-4-face
-      ((,class (:foreground ,soria-blue))))
+   `(rainbow-delimiters-depth-4-face
+     ((,class (:foreground ,soria-blue))))
 
-    `(rainbow-delimiters-depth-5-face
-      ((,class (:foreground ,soria-white))))
+   `(rainbow-delimiters-depth-5-face
+     ((,class (:foreground ,soria-white))))
 
-    `(rainbow-delimiters-depth-6-face
-      ((,class (:foreground ,soria-white))))
+   `(rainbow-delimiters-depth-6-face
+     ((,class (:foreground ,soria-white))))
 
-    `(rainbow-delimiters-depth-7-face
-      ((,class (:foreground ,soria-white))))
+   `(rainbow-delimiters-depth-7-face
+     ((,class (:foreground ,soria-white))))
 
-    `(rainbow-delimiters-depth-8-face
-      ((,class (:foreground ,soria-white))))
+   `(rainbow-delimiters-depth-8-face
+     ((,class (:foreground ,soria-white))))
 
-    `(rainbow-delimiters-depth-9-face
-      ((,class (:foreground ,soria-white))))
+   `(rainbow-delimiters-depth-9-face
+     ((,class (:foreground ,soria-white))))
 
-    `(rainbow-delimiters-unmatched-face
-      ((,class (:foreground ,soria-purple :bold t))))
+   `(rainbow-delimiters-unmatched-face
+     ((,class (:foreground ,soria-purple :bold t))))
 
-    `(rainbow-delimiters-missmatched-face
-      ((,class (:foreground ,soria-purple :bold t))))
+   `(rainbow-delimiters-missmatched-face
+     ((,class (:foreground ,soria-purple :bold t))))
 
-    ;; Magit
+   ;; Magit
 
-    `(magit-diff-file-heading
-      ((,class (:foreground ,soria-white
-                :weight normal))))
+   `(magit-diff-file-heading
+     ((,class (:foreground ,soria-white
+                           :weight normal))))
 
-    `(magit-diff-file-heading-highlight
-      ((,class (:inherit magit-diff-file-heading))))
+   `(magit-diff-file-heading-highlight
+     ((,class (:inherit magit-diff-file-heading))))
 
-    `(magit-diff-file-heading-selection
-      ((,class (:foreground ,soria-white
-                :weight normal))))
+   `(magit-diff-file-heading-selection
+     ((,class (:foreground ,soria-white
+                           :weight normal))))
 
-    `(magit-diff-hunk-heading
-      ((,class (:foreground ,soria-white
-                :weight normal))))
+   `(magit-diff-hunk-heading
+     ((,class (:foreground ,soria-white
+                           :weight normal))))
 
-    `(magit-diff-hunk-heading-highlight
-      ((,class (:inherit magit-diff-hunk-heading))))
+   `(magit-diff-hunk-heading-highlight
+     ((,class (:inherit magit-diff-hunk-heading))))
 
-    `(magit-diff-hunk-heading-selection
-      ((,class (:foreground ,soria-white
-                :weight normal))))
+   `(magit-diff-hunk-heading-selection
+     ((,class (:foreground ,soria-white
+                           :weight normal))))
 
-    `(magit-diff-lines-heading
-      ((,class (:foreground ,soria-white
-                :weight normal))))
+   `(magit-diff-lines-heading
+     ((,class (:foreground ,soria-white
+                           :weight normal))))
 
-    `(magit-diff-lines-boundary
-      ((,class (:foreground ,soria-white
-                :weight normal))))
+   `(magit-diff-lines-boundary
+     ((,class (:foreground ,soria-white
+                           :weight normal))))
 
-    `(magit-diff-conflict-heading
-      ((,class (:foreground ,soria-redpastel
-                :weight normal))))
+   `(magit-diff-conflict-heading
+     ((,class (:foreground ,soria-redpastel
+                           :weight normal))))
 
-    `(magit-diff-added
-      ((,class (:foreground ,soria-green
-                :background ,soria-darkgray))))
+   `(magit-diff-added
+     ((,class (:foreground ,soria-green
+                           :background ,soria-darkgray))))
 
-    `(magit-diff-added-highlight
-      ((,class (:inherit magit-diff-added))))
+   `(magit-diff-added-highlight
+     ((,class (:inherit magit-diff-added))))
 
-    `(magit-diff-removed
-      ((,class (:foreground ,soria-redpastel
-                :background ,soria-darkgray))))
+   `(magit-diff-removed
+     ((,class (:foreground ,soria-redpastel
+                           :background ,soria-darkgray))))
 
-    `(magit-diff-removed-highlight
-      ((,class (:inherit magit-diff-removed))))
+   `(magit-diff-removed-highlight
+     ((,class (:inherit magit-diff-removed))))
 
-    `(magit-diff-our
-      ((,class (:foreground ,soria-blue
-                :weight normal))))
+   `(magit-diff-our
+     ((,class (:foreground ,soria-blue
+                           :weight normal))))
 
-    `(magit-diff-base
-      ((,class (:foreground ,soria-white
-                :weight normal))))
+   `(magit-diff-base
+     ((,class (:foreground ,soria-white
+                           :weight normal))))
 
-    `(magit-diff-their
-      ((,class (:foreground ,soria-orange
-                :weight normal))))
+   `(magit-diff-their
+     ((,class (:foreground ,soria-orange
+                           :weight normal))))
 
-    `(magit-diff-context
-      ((,class (:inherit font-lock-comment-face))))
+   `(magit-diff-context
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(magit-diff-our-highlight
-      ((,class (:inherit magit-diff-context))))
+   `(magit-diff-our-highlight
+     ((,class (:inherit magit-diff-context))))
 
-    `(magit-diff-our-highlight
-      ((,class (:inherit magit-diff-context))))
+   `(magit-diff-our-highlight
+     ((,class (:inherit magit-diff-context))))
 
-    `(magit-diff-their-highlight
-      ((,class (:inherit magit-diff-context))))
+   `(magit-diff-their-highlight
+     ((,class (:inherit magit-diff-context))))
 
-    `(magit-diff-context-highlight
-      ((,class (:inherit magit-diff-context))))
+   `(magit-diff-context-highlight
+     ((,class (:inherit magit-diff-context))))
 
-    `(magit-diffstat-added
-      ((,class (:foreground ,soria-green))))
+   `(magit-diffstat-added
+     ((,class (:foreground ,soria-green))))
 
-    `(magit-diffstat-removed
-      ((,class (:foreground ,soria-redpastel))))
+   `(magit-diffstat-removed
+     ((,class (:foreground ,soria-redpastel))))
 
-    `(magit-process-ok
-      ((,class (:inherit default))))
+   `(magit-process-ok
+     ((,class (:inherit default))))
 
-    `(magit-process-ng
-      ((,class (:foreground ,soria-redpastel
-                :weight normal))))
+   `(magit-process-ng
+     ((,class (:foreground ,soria-redpastel
+                           :weight normal))))
 
-    `(magit-rebase-hash
-      ((,class (:foreground ,soria-yellow
-                :weight normal))))
+   `(magit-rebase-hash
+     ((,class (:foreground ,soria-yellow
+                           :weight normal))))
 
-    `(magit-log-graph
-      ((,class (:inherit font-lock-comment-face))))
+   `(magit-log-graph
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(magit-log-author
-      ((,class (:foreground ,soria-blue))))
+   `(magit-log-author
+     ((,class (:foreground ,soria-blue))))
 
-    `(magit-log-date
-      ((,class (:inherit font-lock-comment-face))))
+   `(magit-log-date
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(magit-log-head-label-bisect-bad
-      ((,class (:foreground ,soria-redpastel
-                :background ,soria-darkgray
-                :box 1))))
+   `(magit-log-head-label-bisect-bad
+     ((,class (:foreground ,soria-redpastel
+                           :background ,soria-darkgray
+                           :box 1))))
 
-    `(magit-log-head-label-bisect-good
-      ((,class (:foreground ,soria-green
-                :background ,soria-darkgray
-                :box 1))))
+   `(magit-log-head-label-bisect-good
+     ((,class (:foreground ,soria-green
+                           :background ,soria-darkgray
+                           :box 1))))
 
-    `(magit-log-head-label-default
-      ((,class (:foreground ,soria-gray
-                :box 1))))
+   `(magit-log-head-label-default
+     ((,class (:foreground ,soria-gray
+                           :box 1))))
 
-    `(magit-log-head-label-local
-      ((,class (:foreground ,soria-darkpurple
-                :background ,soria-darkgray
-                :box 1))))
+   `(magit-log-head-label-local
+     ((,class (:foreground ,soria-darkpurple
+                           :background ,soria-darkgray
+                           :box 1))))
 
-    `(magit-log-head-label-patches
-      ((,class (:foreground ,soria-green
-                :background ,soria-darkgray
-                :box 1))))
+   `(magit-log-head-label-patches
+     ((,class (:foreground ,soria-green
+                           :background ,soria-darkgray
+                           :box 1))))
 
-    `(magit-log-head-label-remote
-      ((,class (:foreground ,soria-orange
-                :background ,soria-darkgray
-                :box 1))))
+   `(magit-log-head-label-remote
+     ((,class (:foreground ,soria-orange
+                           :background ,soria-darkgray
+                           :box 1))))
 
-    `(magit-log-head-label-tags
-      ((,class (:foreground ,soria-yellow
-                :background ,soria-darkgray
-                :box 1))))
+   `(magit-log-head-label-tags
+     ((,class (:foreground ,soria-yellow
+                           :background ,soria-darkgray
+                           :box 1))))
 
-    `(magit-log-sha1
-      ((,class (:foreground ,soria-yellow))))
+   `(magit-log-sha1
+     ((,class (:foreground ,soria-yellow))))
 
-    `(magit-bisect-good
-      ((,class (:inherit default))))
+   `(magit-bisect-good
+     ((,class (:inherit default))))
 
-    `(magit-bisect-skip
-      ((,class (:inherit default))))
+   `(magit-bisect-skip
+     ((,class (:inherit default))))
 
-    `(magit-bisect-bad
-      ((,class (:foreground ,soria-redpastel
-                :weight normal))))
+   `(magit-bisect-bad
+     ((,class (:foreground ,soria-redpastel
+                           :weight normal))))
 
-    `(magit-sequence-pick
-      ((,class (:inherit default))))
+   `(magit-sequence-pick
+     ((,class (:inherit default))))
 
-    `(magit-sequence-stop
-      ((,class (:foreground ,soria-green
-                :weight normal))))
+   `(magit-sequence-stop
+     ((,class (:foreground ,soria-green
+                           :weight normal))))
 
-    `(magit-sequence-part
-      ((,class (:foreground ,soria-orange
-                :weight normal))))
+   `(magit-sequence-part
+     ((,class (:foreground ,soria-orange
+                           :weight normal))))
 
-    `(magit-sequence-head
-      ((,class (:foreground ,soria-blue
-                :weight normal))))
+   `(magit-sequence-head
+     ((,class (:foreground ,soria-blue
+                           :weight normal))))
 
-    `(magit-sequence-drop
-      ((,class (:foreground ,soria-redpastel
-                :weight normal))))
+   `(magit-sequence-drop
+     ((,class (:foreground ,soria-redpastel
+                           :weight normal))))
 
-    `(magit-sequence-done
-      ((,class (:inherit magit-hash))))
+   `(magit-sequence-done
+     ((,class (:inherit magit-hash))))
 
-    `(magit-sequence-onto
-      ((,class (:inherit magit-sequence-done))))
+   `(magit-sequence-onto
+     ((,class (:inherit magit-sequence-done))))
 
-    `(magit-section-title
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(magit-section-title
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(magit-section-heading
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(magit-section-heading
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(magit-section-highlight
-      ((,class (:background ,soria-darkgray))))
+   `(magit-section-highlight
+     ((,class (:background ,soria-darkgray))))
 
-    `(magit-section-secondary-heading
-      ((,class (:background ,soria-darkgray))))
+   `(magit-section-secondary-heading
+     ((,class (:background ,soria-darkgray))))
 
-    `(magit-section-heading-selection
-      ((,class (:foreground ,soria-orange :weight normal))))
+   `(magit-section-heading-selection
+     ((,class (:foreground ,soria-orange :weight normal))))
 
-    `(magit-header-line
-      ((,class (:inherit magit-section-heading))))
+   `(magit-header-line
+     ((,class (:inherit magit-section-heading))))
 
-    `(magit-dimmed
-      ((,class (:inherit font-lock-comment-face))))
+   `(magit-dimmed
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(magit-hash
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(magit-hash
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(magit-tag
-      ((,class (:background ,soria-darkgray
-                :foreground ,soria-green))))
+   `(magit-tag
+     ((,class (:background ,soria-darkgray
+                           :foreground ,soria-green))))
 
-    `(magit-branch-remote
-      ((,class (:foreground ,soria-orange :weight normal))))
+   `(magit-branch-remote
+     ((,class (:foreground ,soria-orange :weight normal))))
 
-    `(magit-branch-local
-      ((,class (:foreground ,soria-purple :weight normal))))
+   `(magit-branch-local
+     ((,class (:foreground ,soria-purple :weight normal))))
 
-    `(magit-branch-current
-      ((,class (:foreground ,soria-purple :weight normal))))
+   `(magit-branch-current
+     ((,class (:foreground ,soria-purple :weight normal))))
 
-    `(magit-branch
-      ((,class (:foreground ,soria-orange :weight normal))))
+   `(magit-branch
+     ((,class (:foreground ,soria-orange :weight normal))))
 
-    `(magit-item-highlight
-      ((,class (:inherit default))))
+   `(magit-item-highlight
+     ((,class (:inherit default))))
 
-    `(magit-head
-      ((,class (:inherit branch-local))))
+   `(magit-head
+     ((,class (:inherit branch-local))))
 
-    `(magit-refname
-      ((,class (:inherit font-lock-comment-face))))
+   `(magit-refname
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(magit-refname-stash
-      ((,class (:inherit font-lock-comment-face))))
+   `(magit-refname-stash
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(magit-refname-wip
-      ((,class (:inherit font-lock-comment-face))))
+   `(magit-refname-wip
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(magit-signature-good
-      ((,class (:foreground ,soria-green
-                :weight normal))))
+   `(magit-signature-good
+     ((,class (:foreground ,soria-green
+                           :weight normal))))
 
-    `(magit-signature-bad
-      ((,class (:foreground ,soria-redpastel
-                :weight normal))))
+   `(magit-signature-bad
+     ((,class (:foreground ,soria-redpastel
+                           :weight normal))))
 
-    `(magit-signature-unstrusted
-      ((,class (:foreground ,soria-orange
-                :weight normal))))
+   `(magit-signature-unstrusted
+     ((,class (:foreground ,soria-orange
+                           :weight normal))))
 
-    `(magit-cherry-unmatched
-      ((,class (:foreground ,soria-blue
-                :weight normal))))
+   `(magit-cherry-unmatched
+     ((,class (:foreground ,soria-blue
+                           :weight normal))))
 
-    `(magit-cherry-equivalent
-      ((,class (:foreground ,soria-purple
-                :weight normal))))
+   `(magit-cherry-equivalent
+     ((,class (:foreground ,soria-purple
+                           :weight normal))))
 
-    `(magit-filename
-      ((,class (:foreground ,soria-white))))
+   `(magit-filename
+     ((,class (:foreground ,soria-white))))
 
-    `(magit-blame-heading
-      ((,class (:inherit font-lock-comment-face))))
+   `(magit-blame-heading
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(magit-blame-summary
-      ((,class (:inherit magit-blame-heading))))
+   `(magit-blame-summary
+     ((,class (:inherit magit-blame-heading))))
 
-    `(magit-blame-hash
-      ((,class (:inherit magit-blame-heading))))
+   `(magit-blame-hash
+     ((,class (:inherit magit-blame-heading))))
 
-    `(magit-blame-name
-      ((,class (:inherit magit-blame-heading))))
+   `(magit-blame-name
+     ((,class (:inherit magit-blame-heading))))
 
-    `(magit-blame-date
-      ((,class (:inherit magit-blame-heading))))
+   `(magit-blame-date
+     ((,class (:inherit magit-blame-heading))))
 
-    ;; git-timemachine
+   ;; git-timemachine
 
-    `(git-timemachine-commit
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(git-timemachine-commit
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(git-timemachine-minibuffer-detail-face
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(git-timemachine-minibuffer-detail-face
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(git-timemachine-minibuffer-author-face
-      ((,class (:foreground ,soria-blue :weight normal))))
+   `(git-timemachine-minibuffer-author-face
+     ((,class (:foreground ,soria-blue :weight normal))))
 
-    ;; diff
+   ;; diff
 
-    `(diff-added
-      ((,class (:foreground ,soria-green :background ,soria-darkgray))))
+   `(diff-added
+     ((,class (:foreground ,soria-green :background ,soria-darkgray))))
 
-    `(diff-changed
-      ((,class (:background ,soria-darkgray :foreground ,soria-darkpurple))))
+   `(diff-changed
+     ((,class (:background ,soria-darkgray :foreground ,soria-darkpurple))))
 
-    `(diff-removed
-      ((,class (:background ,soria-darkgray :foreground ,soria-redpastel))))
+   `(diff-removed
+     ((,class (:background ,soria-darkgray :foreground ,soria-redpastel))))
 
-    `(diff-header
-      ((,class (:background ,soria-darkgray :foreground ,soria-white))))
+   `(diff-header
+     ((,class (:background ,soria-darkgray :foreground ,soria-white))))
 
-    `(diff-file-header
-      ((,class (:background ,soria-darkgray :foreground ,soria-white))))
+   `(diff-file-header
+     ((,class (:background ,soria-darkgray :foreground ,soria-white))))
 
-    `(diff-refine-added
-      ((,class (:background ,soria-darkgreen :foreground ,soria-darkgray))))
+   `(diff-refine-added
+     ((,class (:background ,soria-darkgreen :foreground ,soria-darkgray))))
 
-    `(diff-refine-change
-      ((,class (:background ,soria-darkpurple :foreground ,soria-darkgray))))
+   `(diff-refine-change
+     ((,class (:background ,soria-darkpurple :foreground ,soria-darkgray))))
 
-    `(diff-refine-removed
-      ((,class (:background ,soria-redpastel :foreground ,soria-darkgray))))
+   `(diff-refine-removed
+     ((,class (:background ,soria-redpastel :foreground ,soria-darkgray))))
 
-    ;; diff-hl
+   ;; diff-hl
 
-    `(diff-hl-change
-      ((,class (:background ,soria-darkpurple :foreground ,soria-whitest))))
+   `(diff-hl-change
+     ((,class (:background ,soria-darkpurple :foreground ,soria-whitest))))
 
-    `(diff-hl-delete
-      ((,class (:background ,soria-redpastel :foreground ,soria-whitest))))
+   `(diff-hl-delete
+     ((,class (:background ,soria-redpastel :foreground ,soria-whitest))))
 
-    `(diff-hl-insert
-      ((,class (:background ,soria-darkgreen :foreground ,soria-whitest))))
+   `(diff-hl-insert
+     ((,class (:background ,soria-darkgreen :foreground ,soria-whitest))))
 
-    `(diff-hl-unknown
-      ((,class (:background ,soria-darkpurple :foreground ,soria-whitest))))
+   `(diff-hl-unknown
+     ((,class (:background ,soria-darkpurple :foreground ,soria-whitest))))
 
-    ;; sh-mode
+   ;; sh-mode
 
-    `(sh-heredoc
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(sh-heredoc
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(sh-quoted-exec
-      ((,class (:foreground ,soria-redpastel :weight normal))))
+   `(sh-quoted-exec
+     ((,class (:foreground ,soria-redpastel :weight normal))))
 
-    `(sh-escaped-newline
-      ((,class (:foreground ,soria-redpastel :weight normal))))
+   `(sh-escaped-newline
+     ((,class (:foreground ,soria-redpastel :weight normal))))
 
-    ;; message-mode
+   ;; message-mode
 
-    `(message-cited-text
-      ((,class (:foreground ,soria-gray :weight normal))))
+   `(message-cited-text
+     ((,class (:foreground ,soria-gray :weight normal))))
 
-    `(message-header-name
-      ((,class (:foreground ,soria-gray :weight normal))))
+   `(message-header-name
+     ((,class (:foreground ,soria-gray :weight normal))))
 
-    `(message-header-other
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(message-header-other
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(message-header-to
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(message-header-to
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(message-header-cc
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(message-header-cc
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(message-header-newsgroups
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(message-header-newsgroups
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(message-header-subject
-      ((,class (:foreground ,soria-blue :weight normal))))
+   `(message-header-subject
+     ((,class (:foreground ,soria-blue :weight normal))))
 
-    `(message-header-xheader
-      ((,class (:foreground ,soria-blue :weight normal))))
+   `(message-header-xheader
+     ((,class (:foreground ,soria-blue :weight normal))))
 
-    `(message-mml
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(message-mml
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(message-separator
-      ((,class (:foreground ,soria-gray :slant italic))))
+   `(message-separator
+     ((,class (:foreground ,soria-gray :slant italic))))
 
-    ;; Evil mode
+   ;; Evil mode
 
-    `(evil-ex-info
-      ((,class (:foreground ,soria-redpastel :inherit normal))))
+   `(evil-ex-info
+     ((,class (:foreground ,soria-redpastel :inherit normal))))
 
-    `(evil-ex-substitute-matches
-      ((,class (:foreground ,soria-redpastel :inherit normal))))
+   `(evil-ex-substitute-matches
+     ((,class (:foreground ,soria-redpastel :inherit normal))))
 
-    `(evil-ex-substitute-replacement
-      ((,class (:foreground ,soria-green :inherit normal))))
+   `(evil-ex-substitute-replacement
+     ((,class (:foreground ,soria-green :inherit normal))))
 
-    `(evil-search-highlight-persist-highlight-face
-      ((,class (:inherit region))))
+   `(evil-search-highlight-persist-highlight-face
+     ((,class (:inherit region))))
 
-    ;; mu4e
+   ;; mu4e
 
-    `(mu4e-cited-1-face
-      ((,class (:foreground ,soria-gray :slant italic :weight normal))))
+   `(mu4e-cited-1-face
+     ((,class (:foreground ,soria-gray :slant italic :weight normal))))
 
-    `(mu4e-cited-2-face
-      ((,class (:foreground ,soria-gray :slant italic :weight normal))))
+   `(mu4e-cited-2-face
+     ((,class (:foreground ,soria-gray :slant italic :weight normal))))
 
-    `(mu4e-cited-3-face
-      ((,class (:foreground ,soria-gray :slant italic :weight normal))))
+   `(mu4e-cited-3-face
+     ((,class (:foreground ,soria-gray :slant italic :weight normal))))
 
-    `(mu4e-cited-4-face
-      ((,class (:foreground ,soria-gray :slant italic :weight normal))))
+   `(mu4e-cited-4-face
+     ((,class (:foreground ,soria-gray :slant italic :weight normal))))
 
-    `(mu4e-cited-5-face
-      ((,class (:foreground ,soria-gray :slant italic :weight normal))))
+   `(mu4e-cited-5-face
+     ((,class (:foreground ,soria-gray :slant italic :weight normal))))
 
-    `(mu4e-cited-6-face
-      ((,class (:foreground ,soria-gray :slant italic :weight normal))))
+   `(mu4e-cited-6-face
+     ((,class (:foreground ,soria-gray :slant italic :weight normal))))
 
-    `(mu4e-cited-7-face
-      ((,class (:foreground ,soria-gray :slant italic :weight normal))))
+   `(mu4e-cited-7-face
+     ((,class (:foreground ,soria-gray :slant italic :weight normal))))
 
-    `(mu4e-flagged-face
-      ((,class (:foreground ,soria-darkpurple :weight normal))))
+   `(mu4e-flagged-face
+     ((,class (:foreground ,soria-darkpurple :weight normal))))
 
-    `(mu4e-view-url-number-face
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(mu4e-view-url-number-face
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(mu4e-warning-face
-      ((,class (:foreground ,soria-redpastel :slant normal :weight normal))))
+   `(mu4e-warning-face
+     ((,class (:foreground ,soria-redpastel :slant normal :weight normal))))
 
-    `(mu4e-highlight-face
-      ((,class (:inherit unspecified
-                         :foreground ,soria-blue
-                         :weight normal))))
+   `(mu4e-highlight-face
+     ((,class (:inherit unspecified
+                        :foreground ,soria-blue
+                        :weight normal))))
 
-    `(mu4e-header-highlight-face
-      ((,class (:inherit unspecified
-                         :foreground ,soria-white
-                         :background ,soria-statusgray
-                         :weight normal))))
+   `(mu4e-header-highlight-face
+     ((,class (:inherit unspecified
+                        :foreground ,soria-white
+                        :background ,soria-statusgray
+                        :weight normal))))
 
-    `(mu4e-draft-face
-      ((,class (:inherit font-lock-string-face))))
+   `(mu4e-draft-face
+     ((,class (:inherit font-lock-string-face))))
 
-    `(mu4e-footer-face
-      ((,class (:inherit font-lock-comment-face))))
+   `(mu4e-footer-face
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(mu4e-forwarded-face
-      ((,class (:inherit font-lock-builtin-face :weight normal))))
+   `(mu4e-forwarded-face
+     ((,class (:inherit font-lock-builtin-face :weight normal))))
 
-    `(mu4e-header-face
-      ((,class (:inherit font-lock-comment-face))))
+   `(mu4e-header-face
+     ((,class (:inherit font-lock-comment-face))))
 
-    `(mu4e-header-marks-face
-      ((,class (:inherit font-lock-preprocessor-face))))
+   `(mu4e-header-marks-face
+     ((,class (:inherit font-lock-preprocessor-face))))
 
-    `(mu4e-header-title-face
-      ((,class (:inherit font-lock-type-face))))
+   `(mu4e-header-title-face
+     ((,class (:inherit font-lock-type-face))))
 
-    `(mu4e-highlight-face
-      ((,class (:inherit font-lock-pseudo-keyword-face :weight normal))))
+   `(mu4e-highlight-face
+     ((,class (:inherit font-lock-pseudo-keyword-face :weight normal))))
 
-    `(mu4e-moved-face
-      ((,class (:inherit font-lock-comment-face :slant italic))))
+   `(mu4e-moved-face
+     ((,class (:inherit font-lock-comment-face :slant italic))))
 
-    `(mu4e-ok-face
-      ((,class (:inherit font-lock-comment-face :slant normal :weight normal))))
+   `(mu4e-ok-face
+     ((,class (:inherit font-lock-comment-face :slant normal :weight normal))))
 
-    `(mu4e-replied-face
-      ((,class (:inherit font-lock-builtin-face :weight normal))))
+   `(mu4e-replied-face
+     ((,class (:inherit font-lock-builtin-face :weight normal))))
 
-    `(mu4e-system-face
-      ((,class (:inherit font-lock-comment-face :slant italic))))
+   `(mu4e-system-face
+     ((,class (:inherit font-lock-comment-face :slant italic))))
 
-    `(mu4e-title-face
-      ((,class (:inherit custom-face-tag :weight normal))))
+   `(mu4e-title-face
+     ((,class (:inherit custom-face-tag :weight normal))))
 
-    `(mu4e-trashed-face
-      ((,class (:inherit font-lock-comment-face :strike-through t))))
+   `(mu4e-trashed-face
+     ((,class (:inherit font-lock-comment-face :strike-through t))))
 
-    `(mu4e-unread-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(mu4e-unread-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(mu4e-header-key-face
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(mu4e-header-key-face
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(mu4e-context-face
-      ((,class (:inherit mu4e-title-face :weight normal))))
+   `(mu4e-context-face
+     ((,class (:inherit mu4e-title-face :weight normal))))
 
-    `(mu4e-modeline-face
-      ((,class (:inherit font-lock-string-face :weight normal))))
+   `(mu4e-modeline-face
+     ((,class (:inherit font-lock-string-face :weight normal))))
 
-    `(mu4e-region-code
-      ((,class (:background  ,soria-darkgray))))
+   `(mu4e-region-code
+     ((,class (:background  ,soria-darkgray))))
 
-    `(mu4e-view-attach-number-face
-      ((,class (:inherit font-lock-variable-name-face :weight normal))))
+   `(mu4e-view-attach-number-face
+     ((,class (:inherit font-lock-variable-name-face :weight normal))))
 
-    `(mu4e-view-contact-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(mu4e-view-contact-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(mu4e-view-header-key-face
-      ((,class (:inherit message-header-name :weight normal))))
+   `(mu4e-view-header-key-face
+     ((,class (:inherit message-header-name :weight normal))))
 
-    `(mu4e-view-header-value-face
-      ((,class (:foreground ,soria-blue :weight normal :slant normal))))
+   `(mu4e-view-header-value-face
+     ((,class (:foreground ,soria-blue :weight normal :slant normal))))
 
-    `(mu4e-view-link-face
-      ((,class (:inherit link))))
+   `(mu4e-view-link-face
+     ((,class (:inherit link))))
 
-    `(mu4e-view-special-header-value-face
-      ((,class (:foreground ,soria-blue :weight normal :underline nil))))
+   `(mu4e-view-special-header-value-face
+     ((,class (:foreground ,soria-blue :weight normal :underline nil))))
 
-    ;; ERC
+   ;; ERC
 
-    `(erc-current-nick-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(erc-current-nick-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(erc-dangerous-host-face
-      ((,class (:foreground ,soria-redpastel :weight normal))))
+   `(erc-dangerous-host-face
+     ((,class (:foreground ,soria-redpastel :weight normal))))
 
-    `(erc-pal-face
-      ((,class (:foreground ,soria-purple :weight normal))))
+   `(erc-pal-face
+     ((,class (:foreground ,soria-purple :weight normal))))
 
-    `(erc-fool-face
-      ((,class (:foreground ,soria-gray :weight normal))))
+   `(erc-fool-face
+     ((,class (:foreground ,soria-gray :weight normal))))
 
-    `(erc-keyword-face
-      ((,class (:foreground ,soria-green :weight normal))))
+   `(erc-keyword-face
+     ((,class (:foreground ,soria-green :weight normal))))
 
-    `(erc-direct-msg-face
-      ((,class (:foreground ,soria-redpastel :weight normal))))
+   `(erc-direct-msg-face
+     ((,class (:foreground ,soria-redpastel :weight normal))))
 
-    `(erc-header-line-face
-      ((,class (:foreground ,soria-linegray :background ,soria-darkgray :weight normal))))
+   `(erc-header-line-face
+     ((,class (:foreground ,soria-linegray :background ,soria-darkgray :weight normal))))
 
-    `(erc-header-line
-      ((,class (:foreground ,soria-linegray :background ,soria-darkgray :weight normal))))
+   `(erc-header-line
+     ((,class (:foreground ,soria-linegray :background ,soria-darkgray :weight normal))))
 
-    `(erc-input-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(erc-input-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(erc-prompt-face
-      ((,class (:foreground ,soria-white :background ,soria-darkgray :weight normal))))
+   `(erc-prompt-face
+     ((,class (:foreground ,soria-white :background ,soria-darkgray :weight normal))))
 
-    `(erc-notice-face
-      ((,class (:foreground ,soria-gray :weight normal))))
+   `(erc-notice-face
+     ((,class (:foreground ,soria-gray :weight normal))))
 
-    `(erc-error-face
-      ((,class (:foreground ,soria-redpastel :weight normal))))
+   `(erc-error-face
+     ((,class (:foreground ,soria-redpastel :weight normal))))
 
-    `(erc-my-nick-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(erc-my-nick-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(erc-nick-default-face
-      ((,class (:weight normal))))
+   `(erc-nick-default-face
+     ((,class (:weight normal))))
 
-    `(erc-nick-msg-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(erc-nick-msg-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(erc-inverse-face
-      ((,class (:foreground ,soria-black :background ,soria-white :weight normal))))
+   `(erc-inverse-face
+     ((,class (:foreground ,soria-black :background ,soria-white :weight normal))))
 
-    `(erc-nick-prefix-face
-      ((,class (:inherit erc-nick-default-face))))
+   `(erc-nick-prefix-face
+     ((,class (:inherit erc-nick-default-face))))
 
-    `(erc-my-nick-prefix-face
-      ((,class (:inherit erc-nick-default-face))))
+   `(erc-my-nick-prefix-face
+     ((,class (:inherit erc-nick-default-face))))
 
-    `(erc-direct-msg-face
-      ((,class (:foreground ,soria-green :weight normal))))
+   `(erc-direct-msg-face
+     ((,class (:foreground ,soria-green :weight normal))))
 
-    `(erc-command-indicator-face
-      ((,class (:weight normal))))
+   `(erc-command-indicator-face
+     ((,class (:weight normal))))
 
-    `(erc-action-face
-      ((,class (:weight normal))))
+   `(erc-action-face
+     ((,class (:weight normal))))
 
-    `(fg:erc-color-face0
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(fg:erc-color-face0
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(fg:erc-color-face1
-      ((,class (:foreground ,soria-green :weight normal))))
+   `(fg:erc-color-face1
+     ((,class (:foreground ,soria-green :weight normal))))
 
-    `(fg:erc-color-face2
-      ((,class (:foreground ,soria-blue :weight normal))))
+   `(fg:erc-color-face2
+     ((,class (:foreground ,soria-blue :weight normal))))
 
-    `(fg:erc-color-face3
-      ((,class (:foreground ,soria-purple :weight normal))))
+   `(fg:erc-color-face3
+     ((,class (:foreground ,soria-purple :weight normal))))
 
-    `(fg:erc-color-face4
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(fg:erc-color-face4
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(fg:erc-color-face5
-      ((,class (:foreground ,soria-redpastel :weight normal))))
+   `(fg:erc-color-face5
+     ((,class (:foreground ,soria-redpastel :weight normal))))
 
-    `(fg:erc-color-face6
-      ((,class (:foreground ,soria-orange :weight normal))))
+   `(fg:erc-color-face6
+     ((,class (:foreground ,soria-orange :weight normal))))
 
-    `(fg:erc-color-face7
-      ((,class (:foreground ,soria-darkgreen :weight normal))))
+   `(fg:erc-color-face7
+     ((,class (:foreground ,soria-darkgreen :weight normal))))
 
-    `(fg:erc-color-face8
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(fg:erc-color-face8
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(fg:erc-color-face9
-      ((,class (:foreground ,soria-purple :weight normal))))
+   `(fg:erc-color-face9
+     ((,class (:foreground ,soria-purple :weight normal))))
 
-    `(fg:erc-color-face10
-      ((,class (:foreground ,soria-brightgreen :weight normal))))
+   `(fg:erc-color-face10
+     ((,class (:foreground ,soria-brightgreen :weight normal))))
 
-    `(fg:erc-color-face11
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(fg:erc-color-face11
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(fg:erc-color-face12
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(fg:erc-color-face12
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(fg:erc-color-face13
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(fg:erc-color-face13
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(fg:erc-color-face14
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(fg:erc-color-face14
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(fg:erc-color-face15
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(fg:erc-color-face15
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(bg:erc-color-face0
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face0
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face1
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face1
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face2
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face2
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face3
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face3
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face4
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face4
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face5
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face5
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face6
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face6
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face7
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face7
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face8
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face8
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face9
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face9
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face10
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face10
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face11
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face11
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face12
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face12
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face13
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face13
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face14
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face14
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(bg:erc-color-face15
-      ((,class (:background ,soria-darkgray :weight normal))))
+   `(bg:erc-color-face15
+     ((,class (:background ,soria-darkgray :weight normal))))
 
-    `(erc-timestamp-face
-      ((,class (:background ,soria-darkgray :foreground ,soria-gray :weight normal))))
+   `(erc-timestamp-face
+     ((,class (:background ,soria-darkgray :foreground ,soria-gray :weight normal))))
 
-    `(erc-button
-      ((,class (:weight normal))))
+   `(erc-button
+     ((,class (:weight normal))))
 
-    ;; circe
+   ;; circe
 
-    `(circe-highlight-all-nicks-face
-      ((,class (:foreground ,soria-green :weight normal))))
+   `(circe-highlight-all-nicks-face
+     ((,class (:foreground ,soria-green :weight normal))))
 
-    `(circe-prompt-face
-      ((,class (:background ,soria-black :foreground ,soria-white :weight normal))))
+   `(circe-prompt-face
+     ((,class (:background ,soria-black :foreground ,soria-white :weight normal))))
 
-    `(circe-server-face
-      ((,class (:foreground ,soria-blue :weight normal))))
+   `(circe-server-face
+     ((,class (:foreground ,soria-blue :weight normal))))
 
-    `(circe-fool-face
-      ((,class (:foreground ,soria-gray :weight normal))))
+   `(circe-fool-face
+     ((,class (:foreground ,soria-gray :weight normal))))
 
-    `(lui-track-bar
-      ((,class (:inherit default))))
+   `(lui-track-bar
+     ((,class (:inherit default))))
 
-    `(lui-irc-colors-fg-0-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(lui-irc-colors-fg-0-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(lui-irc-colors-fg-1-face
-      ((,class (:foreground ,soria-green :weight normal))))
+   `(lui-irc-colors-fg-1-face
+     ((,class (:foreground ,soria-green :weight normal))))
 
-    `(lui-irc-colors-fg-2-face
-      ((,class (:foreground ,soria-blue :weight normal))))
+   `(lui-irc-colors-fg-2-face
+     ((,class (:foreground ,soria-blue :weight normal))))
 
-    `(lui-irc-colors-fg-3-face
-      ((,class (:foreground ,soria-purple :weight normal))))
+   `(lui-irc-colors-fg-3-face
+     ((,class (:foreground ,soria-purple :weight normal))))
 
-    `(lui-irc-colors-fg-4-face
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(lui-irc-colors-fg-4-face
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(lui-irc-colors-fg-5-face
-      ((,class (:foreground ,soria-redpastel :weight normal))))
+   `(lui-irc-colors-fg-5-face
+     ((,class (:foreground ,soria-redpastel :weight normal))))
 
-    `(lui-irc-colors-fg-6-face
-      ((,class (:foreground ,soria-orange :weight normal))))
+   `(lui-irc-colors-fg-6-face
+     ((,class (:foreground ,soria-orange :weight normal))))
 
-    `(lui-irc-colors-fg-7-face
-      ((,class (:foreground ,soria-darkgreen :weight normal))))
+   `(lui-irc-colors-fg-7-face
+     ((,class (:foreground ,soria-darkgreen :weight normal))))
 
-    `(lui-irc-colors-fg-8-face
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(lui-irc-colors-fg-8-face
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(lui-irc-colors-fg-9-face
-      ((,class (:foreground ,soria-darkpurple :weight normal))))
+   `(lui-irc-colors-fg-9-face
+     ((,class (:foreground ,soria-darkpurple :weight normal))))
 
-    `(lui-irc-colors-fg-10-face
-      ((,class (:foreground ,soria-brightgreen :weight normal))))
+   `(lui-irc-colors-fg-10-face
+     ((,class (:foreground ,soria-brightgreen :weight normal))))
 
-    `(lui-irc-colors-fg-11-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(lui-irc-colors-fg-11-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(lui-irc-colors-fg-12-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(lui-irc-colors-fg-12-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(lui-irc-colors-fg-13-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(lui-irc-colors-fg-13-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(lui-irc-colors-fg-14-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(lui-irc-colors-fg-14-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(lui-irc-colors-fg-15-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(lui-irc-colors-fg-15-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(lui-irc-colors-fg-16-face
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(lui-irc-colors-fg-16-face
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    ;; org-mode
+   ;; org-mode
 
-    `(org-document-title
-      ((,class (:foreground ,soria-whitest :weight bold))))
+   `(org-document-title
+     ((,class (:foreground ,soria-whitest :weight bold))))
 
-    `(org-document-info
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(org-document-info
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(org-level-1
-      ((,class (:foreground ,soria-whitest :weight bold))))
+   `(org-level-1
+     ((,class (:foreground ,soria-whitest :weight bold))))
 
-    `(org-level-2
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(org-level-2
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(org-level-3
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(org-level-3
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(org-level-4
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(org-level-4
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(org-level-5
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(org-level-5
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(org-level-6
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(org-level-6
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(org-level-7
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(org-level-7
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(org-level-8
-      ((,class (:foreground ,soria-whitest :weight normal))))
+   `(org-level-8
+     ((,class (:foreground ,soria-whitest :weight normal))))
 
-    `(org-footnote
-      ((,class (:foreground ,soria-blue :weight normal :underline nil))))
+   `(org-footnote
+     ((,class (:foreground ,soria-blue :weight normal :underline nil))))
 
-    `(org-table
-      ((,class (:foreground ,soria-white :weight normal))))
+   `(org-table
+     ((,class (:foreground ,soria-white :weight normal))))
 
-    `(org-formula
-      ((,class (:foreground ,soria-yellow :weight normal))))
+   `(org-formula
+     ((,class (:foreground ,soria-yellow :weight normal))))
 
-    `(org-todo
-      ((,class (:foreground ,soria-redpastel :weight normal))))
+   `(org-todo
+     ((,class (:foreground ,soria-redpastel :weight normal))))
 
-    `(org-done
-      ((,class (:inherit success :weight normal))))
+   `(org-done
+     ((,class (:inherit success :weight normal))))
 
-    `(org-agenda-done
-      ((,class (:inherit org-done))))
+   `(org-agenda-done
+     ((,class (:inherit org-done))))
 
-    `(org-headline-done
-      ((,class (:inherit org-done))))
+   `(org-headline-done
+     ((,class (:inherit org-done))))
 
-    `(org-date
-      ((,class (:foreground ,soria-gray, :weight normal :underline nil))))
-    ))
+   `(org-date
+     ((,class (:foreground ,soria-gray, :weight normal :underline nil))))))
 
 ;; And finally hook the defined font locks and call provide-theme.
 
-(add-hook 'prog-mode-hook 'add-font-lock-numbers)
+(add-hook 'prog-mode-hook 'soria-theme-add-font-lock-numbers)
 
-(defun soria-purple-identifiers ()
+(defun soria-theme-purple-identifiers ()
   "Make function identifiers purple.
 This function might be used as a hook for modes that prefer having purple
 function identifiers instead of the default white.  This might seem hackish,
@@ -1366,6 +1385,9 @@ identifiers"
 
 (provide-theme 'soria)
 
+;; Make package-lint happy. This file is not meant to be used as a library.
+(provide 'soria-theme)
+
 ;; Local Variables:
 ;; no-byte-compile: t
 ;; End: