diff --git a/init.el b/init.el
index 54a4943..5f75be2 100644
--- a/init.el
+++ b/init.el
@@ -69,8 +69,6 @@
 
 (require 'man-completion)
 
-(when (file-exists-p (file-name-concat custom-theme-directory "custom-wombat-theme.el"))
-  (load-theme 'custom-wombat t))
 
 (when (file-exists-p custom-file)
   (load custom-file))
@@ -84,3 +82,6 @@
 (scroll-bar-mode 0)
 (tool-bar-mode 0)
 (tooltip-mode 0)
+
+(load-theme 'wombat)
+(load-theme 'badger t)
diff --git a/themes/badger-theme.el b/themes/badger-theme.el
new file mode 100644
index 0000000..41102ed
--- /dev/null
+++ b/themes/badger-theme.el
@@ -0,0 +1,12 @@
+(require-theme 'wombat-theme)
+
+(deftheme badger)
+
+(custom-theme-set-faces
+ 'badger
+ `(fringe ((t (:foreground ,(face-foreground 'default) :background ,(face-background 'default)))))
+ '(elisp-shorthand-font-lock-face ((t (:foreground "dark cyan"))))
+ '(line-number-current-line ((t (:background "gray"))))
+ '(highlight-indentation-face ((t (:background "gray20")))))
+
+(provide-theme 'badger)
diff --git a/themes/custom-wombat-theme.el b/themes/custom-wombat-theme.el
deleted file mode 100644
index a205f18..0000000
--- a/themes/custom-wombat-theme.el
+++ /dev/null
@@ -1,120 +0,0 @@
-;;; wombat-theme.el --- Custom face theme for Emacs  -*- lexical-binding:t -*-
-
-;; Copyright (C) 2011-2021 Free Software Foundation, Inc.
-
-;; Author: Kristoffer Grönlund <krig@koru.se>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(deftheme custom-wombat
-  "Medium-contrast faces with a dark gray background.
-Adapted, with permission, from a Vim color scheme by Lars H. Nielsen.
-Basic, Font Lock, Isearch, Gnus, Message, and Ansi-Color faces
-are included.")
-
-(let ((class '((class color) (min-colors 89))))
-  (custom-theme-set-faces
-   'custom-wombat
-   `(default ((,class (:background "#242424" :foreground "#f6f3e8"))))
-   `(cursor ((,class (:background "#656565"))))
-   ;; Highlighting faces
-   `(fringe ((,class (:background "#242424" :foreground "#f6f3e8"))))
-   `(highlight ((,class (:background "#454545" :foreground "#ffffff"
-			 :underline t))))
-   `(region ((,class (:background "#444444"))))
-   `(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8"))))
-   `(isearch ((,class (:background "#343434" :foreground "#857b6f"))))
-   `(lazy-highlight ((,class (:background "#384048" :foreground "#a0a8b0"))))
-   ;; Mode line faces
-   `(mode-line ((,class (:background "#444444" :foreground "#f6f3e8"))))
-   `(mode-line-inactive ((,class (:background "#444444" :foreground "#857b6f"))))
-   ;; Escape and prompt faces
-   `(minibuffer-prompt ((,class (:foreground "#e5786d"))))
-   `(escape-glyph ((,class (:foreground "#ddaa6f" :weight bold))))
-   `(homoglyph ((,class (:foreground "#ddaa6f" :weight bold))))
-   ;; Font lock faces
-   `(font-lock-builtin-face ((,class (:foreground "#e5786d"))))
-   `(font-lock-comment-face ((,class (:foreground "#99968b"))))
-   `(font-lock-constant-face ((,class (:foreground "#e5786d"))))
-   `(font-lock-function-name-face ((,class (:foreground "#cae682"))))
-   `(font-lock-keyword-face ((,class (:foreground "#8ac6f2" :weight bold))))
-   `(font-lock-string-face ((,class (:foreground "#95e454"))))
-   `(font-lock-type-face ((,class (:foreground "#92a65e" :weight bold))))
-   `(font-lock-variable-name-face ((,class (:foreground "#cae682"))))
-   `(font-lock-warning-face ((,class (:foreground "#ccaa8f"))))
-   ;; Help faces
-   `(help-key-binding ((,class (:background "#333333" :foreground "#f6f3e8"))))
-   ;; Button and link faces
-   `(link ((,class (:foreground "#8ac6f2" :underline t))))
-   `(link-visited ((,class (:foreground "#e5786d" :underline t))))
-   `(button ((,class (:background "#333333" :foreground "#f6f3e8"))))
-   `(header-line ((,class (:background "#303030" :foreground "#e7f6da"))))
-   ;; Gnus faces
-   `(gnus-group-news-1 ((,class (:weight bold :foreground "#95e454"))))
-   `(gnus-group-news-1-low ((,class (:foreground "#95e454"))))
-   `(gnus-group-news-2 ((,class (:weight bold :foreground "#cae682"))))
-   `(gnus-group-news-2-low ((,class (:foreground "#cae682"))))
-   `(gnus-group-news-3 ((,class (:weight bold :foreground "#ccaa8f"))))
-   `(gnus-group-news-3-low ((,class (:foreground "#ccaa8f"))))
-   `(gnus-group-news-4 ((,class (:weight bold :foreground "#99968b"))))
-   `(gnus-group-news-4-low ((,class (:foreground "#99968b"))))
-   `(gnus-group-news-5 ((,class (:weight bold :foreground "#cae682"))))
-   `(gnus-group-news-5-low ((,class (:foreground "#cae682"))))
-   `(gnus-group-news-low ((,class (:foreground "#99968b"))))
-   `(gnus-group-mail-1 ((,class (:weight bold :foreground "#95e454"))))
-   `(gnus-group-mail-1-low ((,class (:foreground "#95e454"))))
-   `(gnus-group-mail-2 ((,class (:weight bold :foreground "#cae682"))))
-   `(gnus-group-mail-2-low ((,class (:foreground "#cae682"))))
-   `(gnus-group-mail-3 ((,class (:weight bold :foreground "#ccaa8f"))))
-   `(gnus-group-mail-3-low ((,class (:foreground "#ccaa8f"))))
-   `(gnus-group-mail-low ((,class (:foreground "#99968b"))))
-   `(gnus-header-content ((,class (:foreground "#8ac6f2"))))
-   `(gnus-header-from ((,class (:weight bold :foreground "#95e454"))))
-   `(gnus-header-subject ((,class (:foreground "#cae682"))))
-   `(gnus-header-name ((,class (:foreground "#8ac6f2"))))
-   `(gnus-header-newsgroups ((,class (:foreground "#cae682"))))
-   ;; Message faces
-   `(message-header-name ((,class (:foreground "#8ac6f2" :weight bold))))
-   `(message-header-cc ((,class (:foreground "#95e454"))))
-   `(message-header-other ((,class (:foreground "#95e454"))))
-   `(message-header-subject ((,class (:foreground "#cae682"))))
-   `(message-header-to ((,class (:foreground "#cae682"))))
-   `(message-cited-text ((,class (:foreground "#99968b"))))
-   `(message-separator ((,class (:foreground "#e5786d" :weight bold))))
-   ;; ANSI colors
-   `(ansi-color-black ((,class (:background "#242424" :foreground "#242424"))))
-   `(ansi-color-red ((,class (:background "#b85149" :foreground "#b85149"))))
-   `(ansi-color-green ((,class (:background "#92a65e" :foreground "#92a65e"))))
-   `(ansi-color-yellow ((,class (:background "#ccaa8f" :foreground "#ccaa8f"))))
-   `(ansi-color-blue ((,class (:background "#5b98c2" :foreground "#5b98c2"))))
-   `(ansi-color-magenta ((,class (:background "#64619a" :foreground "#64619a"))))
-   `(ansi-color-cyan ((,class (:background "#3f9f9e" :foreground "#3f9f9e"))))
-   `(ansi-color-white ((,class (:background "#f6f3e8" :foreground "#f6f3e8"))))
-   `(ansi-color-bright-black ((,class (:background "#444444" :foreground "#444444"))))
-   `(ansi-color-bright-red ((,class (:background "#e5786d" :foreground "#e5786d"))))
-   `(ansi-color-bright-green ((,class (:background "#95e454" :foreground "#95e454"))))
-   `(ansi-color-bright-yellow ((,class (:background "#edc4a3" :foreground "#edc4a3"))))
-   `(ansi-color-bright-blue ((,class (:background "#8ac6f2" :foreground "#8ac6f2"))))
-   `(ansi-color-bright-magenta ((,class (:background "#a6a1de" :foreground "#a6a1de"))))
-   `(ansi-color-bright-cyan ((,class (:background "#70cecc" :foreground "#70cecc"))))
-   `(ansi-color-bright-white ((,class (:background "#ffffff" :foreground "#ffffff"))))))
-
-(when (require 'highlight-indentation nil t)
-  (set-face-attribute 'highlight-indentation-face nil :background "#303030"))
-
-(provide-theme 'custom-wombat)
diff --git a/themes/github-dim-theme.el b/themes/github-dim-theme.el
deleted file mode 100644
index c3b2a3e..0000000
--- a/themes/github-dim-theme.el
+++ /dev/null
@@ -1,102 +0,0 @@
-(deftheme github-dim)
-
-(defvar github-dim-colors (list (cons 'foreground "#adbac7")
-                                (cons 'background "#22272e")
-                                (cons 'comment "#768390")
-                                (cons 'constant "#6cb6ff")
-                                (cons 'function "#dcbdfb")
-                                (cons 'keyword "#f47067")
-                                (cons 'string  "#96d0ff")
-                                (cons 'variable "#f69d50")))
-
-(let ((class '((class color) (min-colors 89)))
-      (colors github-dim-colors))
-  (custom-theme-set-faces
-   'github-dim
-   `(default ((,class (:background ,(cdr (assoc 'background colors)) :foreground ,(cdr (assoc 'foreground colors))))))
-   `(cursor ((,class (:background ,(cdr (assoc 'foreground colors))))))
-   ;; Highlighting faces
-   `(fringe ((,class (:background ,(cdr (assoc 'background colors)) :foreground ,(cdr (assoc 'foreground colors))))))
-   `(highlight ((,class (:background "#454545" :foreground "#ffffff"
-			 :underline t))))
-   `(region ((,class (:background "#444444"))))
-   `(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8"))))
-   `(isearch ((,class (:background "#343434" :foreground "#857b6f"))))
-   `(lazy-highlight ((,class (:background "#384048" :foreground "#a0a8b0"))))
-   ;; Mode line faces
-   `(mode-line ((,class (:background "#444444" :foreground "#f6f3e8"))))
-   `(mode-line-inactive ((,class (:background "#444444" :foreground "#857b6f"))))
-   ;; Escape and prompt faces
-   `(minibuffer-prompt ((,class (:foreground "#e5786d"))))
-   `(escape-glyph ((,class (:foreground "#ddaa6f" :weight bold))))
-   `(homoglyph ((,class (:foreground "#ddaa6f" :weight bold))))
-   ;; Font lock faces
-   `(font-lock-builtin-face ((,class (:foreground ,(cdr (assoc 'keyword colors))))))
-   `(font-lock-comment-face ((,class (:foreground ,(cdr (assoc 'comment colors))))))
-   `(font-lock-constant-face ((,class (:foreground ,(cdr (assoc 'constant colors))))))
-   `(font-lock-function-name-face ((,class (:foreground ,(cdr (assoc 'function colors))))))
-   `(font-lock-keyword-face ((,class (:foreground ,(cdr (assoc 'keyword colors)) :weight bold))))
-   `(font-lock-string-face ((,class (:foreground ,(cdr (assoc 'string colors))))))
-   `(font-lock-type-face ((,class (:foreground ,(cdr (assoc 'function colors)) :weight bold))))
-   `(font-lock-variable-name-face ((,class (:foreground ,(cdr (assoc 'variable colors))))))
-   `(font-lock-warning-face ((,class (:foreground "#ccaa8f"))))
-   ;; Help faces
-   `(help-key-binding ((,class (:background "#333333" :foreground "#f6f3e8"))))
-   ;; Button and link faces
-   `(link ((,class (:foreground "#8ac6f2" :underline t))))
-   `(link-visited ((,class (:foreground "#e5786d" :underline t))))
-   `(button ((,class (:background "#333333" :foreground "#f6f3e8"))))
-   `(header-line ((,class (:background "#303030" :foreground "#e7f6da"))))
-   ;; Gnus faces
-   `(gnus-group-news-1 ((,class (:weight bold :foreground "#95e454"))))
-   `(gnus-group-news-1-low ((,class (:foreground "#95e454"))))
-   `(gnus-group-news-2 ((,class (:weight bold :foreground "#cae682"))))
-   `(gnus-group-news-2-low ((,class (:foreground "#cae682"))))
-   `(gnus-group-news-3 ((,class (:weight bold :foreground "#ccaa8f"))))
-   `(gnus-group-news-3-low ((,class (:foreground "#ccaa8f"))))
-   `(gnus-group-news-4 ((,class (:weight bold :foreground "#99968b"))))
-   `(gnus-group-news-4-low ((,class (:foreground "#99968b"))))
-   `(gnus-group-news-5 ((,class (:weight bold :foreground "#cae682"))))
-   `(gnus-group-news-5-low ((,class (:foreground "#cae682"))))
-   `(gnus-group-news-low ((,class (:foreground "#99968b"))))
-   `(gnus-group-mail-1 ((,class (:weight bold :foreground "#95e454"))))
-   `(gnus-group-mail-1-low ((,class (:foreground "#95e454"))))
-   `(gnus-group-mail-2 ((,class (:weight bold :foreground "#cae682"))))
-   `(gnus-group-mail-2-low ((,class (:foreground "#cae682"))))
-   `(gnus-group-mail-3 ((,class (:weight bold :foreground "#ccaa8f"))))
-   `(gnus-group-mail-3-low ((,class (:foreground "#ccaa8f"))))
-   `(gnus-group-mail-low ((,class (:foreground "#99968b"))))
-   `(gnus-header-content ((,class (:foreground "#8ac6f2"))))
-   `(gnus-header-from ((,class (:weight bold :foreground "#95e454"))))
-   `(gnus-header-subject ((,class (:foreground "#cae682"))))
-   `(gnus-header-name ((,class (:foreground "#8ac6f2"))))
-   `(gnus-header-newsgroups ((,class (:foreground "#cae682"))))
-   ;; Message faces
-   `(message-header-name ((,class (:foreground "#8ac6f2" :weight bold))))
-   `(message-header-cc ((,class (:foreground "#95e454"))))
-   `(message-header-other ((,class (:foreground "#95e454"))))
-   `(message-header-subject ((,class (:foreground "#cae682"))))
-   `(message-header-to ((,class (:foreground "#cae682"))))
-   `(message-cited-text ((,class (:foreground "#99968b"))))
-   `(message-separator ((,class (:foreground "#e5786d" :weight bold))))
-   ;; ANSI colors
-   `(ansi-color-black ((,class (:background "#242424" :foreground "#242424"))))
-   `(ansi-color-red ((,class (:background "#b85149" :foreground "#b85149"))))
-   `(ansi-color-green ((,class (:background "#92a65e" :foreground "#92a65e"))))
-   `(ansi-color-yellow ((,class (:background "#ccaa8f" :foreground "#ccaa8f"))))
-   `(ansi-color-blue ((,class (:background "#5b98c2" :foreground "#5b98c2"))))
-   `(ansi-color-magenta ((,class (:background "#64619a" :foreground "#64619a"))))
-   `(ansi-color-cyan ((,class (:background "#3f9f9e" :foreground "#3f9f9e"))))
-   `(ansi-color-white ((,class (:background "#f6f3e8" :foreground "#f6f3e8"))))
-   `(ansi-color-bright-black ((,class (:background "#444444" :foreground "#444444"))))
-   `(ansi-color-bright-red ((,class (:background "#e5786d" :foreground "#e5786d"))))
-   `(ansi-color-bright-green ((,class (:background "#95e454" :foreground "#95e454"))))
-   `(ansi-color-bright-yellow ((,class (:background "#edc4a3" :foreground "#edc4a3"))))
-   `(ansi-color-bright-blue ((,class (:background "#8ac6f2" :foreground "#8ac6f2"))))
-   `(ansi-color-bright-magenta ((,class (:background "#a6a1de" :foreground "#a6a1de"))))
-   `(ansi-color-bright-cyan ((,class (:background "#70cecc" :foreground "#70cecc"))))
-   `(ansi-color-bright-white ((,class (:background "#ffffff" :foreground "#ffffff"))))))
-
-(provide-theme 'github-dim)
-
-;;; wombat-theme.el ends here