diff --git a/bootstrap.el b/bootstrap.el
index 461b8ef5b..90488cca3 100644
--- a/bootstrap.el
+++ b/bootstrap.el
@@ -6,7 +6,8 @@
 
 ;; Global constants
 (eval-and-compile
-  (defconst narf-default-theme 'wombat)
+  (defconst narf-default-theme  'wombat)
+  (defconst narf-terminal-theme 'wombat)
   (defconst narf-default-font  nil)
 
   (defconst narf-emacs-dir     (expand-file-name "." user-emacs-directory))
@@ -72,7 +73,7 @@
 
     ;; Local settings
     (load "~/.emacs.local.el" t t)
-    (setq narf-current-theme narf-default-theme
+    (setq narf-current-theme (if (display-graphic-p) narf-default-theme narf-terminal-theme)
           narf-current-font  narf-default-font)
     ;; Here we a'go!
     (mapc 'require packages)
diff --git a/init.el b/init.el
index d5893145e..25ff7d343 100644
--- a/init.el
+++ b/init.el
@@ -43,8 +43,9 @@
 (load (concat user-emacs-directory "bootstrap.el"))
 ;;
 
-(defconst narf-default-theme 'narf-dark)
-(defconst narf-default-font (font-spec :family "Hack" :size 12))
+(defconst narf-default-theme  'narf-one)
+(defconst narf-terminal-theme 'narf-dark)
+(defconst narf-default-font (font-spec :family "Fira Mono" :size 12))
 
 (narf `(core ; core/core.el