diff --git a/bootstrap.el b/bootstrap.el
index 6e5072917..658d4af8f 100644
--- a/bootstrap.el
+++ b/bootstrap.el
@@ -74,8 +74,9 @@
     ;; Load local settings, if available
     (when (file-exists-p "~/.emacs.local.el")
       (load "~/.emacs.local.el"))
-    (load-theme narf-theme t)
-    (setq narf-current-theme narf-theme)
+    (load-theme narf-default-theme t)
+    (setq narf-current-theme narf-default-theme
+          narf-current-font narf-default-font)
     (mapc 'require packages)
 
     (defun display-startup-echo-area-message ()
diff --git a/core/defuns/defuns-ui.el b/core/defuns/defuns-ui.el
index c8ae31543..18bdeaa47 100644
--- a/core/defuns/defuns-ui.el
+++ b/core/defuns/defuns-ui.el
@@ -19,7 +19,7 @@
 ;;;###autoload
 (defun narf/reset-theme ()
   (interactive)
-  (narf/load-theme (or narf-current-theme narf-theme)))
+  (narf/load-theme (or narf-current-theme narf-default-theme)))
 
 ;;;###autoload
 (defun narf/load-font (font)
diff --git a/init.el b/init.el
index dd0a4170c..d521a5af4 100644
--- a/init.el
+++ b/init.el
@@ -40,13 +40,12 @@
 ;;
 ;;; License: GPLv3
 
-(defconst narf-theme 'narf-dark)
-(defconst narf-default-font (font-spec :family "Hack" :size 12))
-
-;;
 (load (concat user-emacs-directory "bootstrap.el"))
 ;;
 
+(defvar narf-default-theme 'narf-dark)
+(defvar narf-default-font (font-spec :family "Hack" :size 12))
+
 (narf '(core ; core/core.el
 
         ;; The heart of NARF