diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 5f9d011..ed13919 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -141,27 +141,6 @@ MODE1 is enabled and vice-versa."
   "Set the `disabled' property for each item in FUNCTIONS to nil."
   (mapc #'(lambda (f) (put f 'disabled nil)) functions))
 
-(let (setp)
-  (defun oni:set-theme (frame)
-    "Try to set the theme for the current (first) frame."
-    (ignore frame)
-    (unless setp
-      (load-theme 'yoshi t)
-      (require 'svg-mode-line-themes)
-      (smt/enable)
-      (require 'oni-smt)
-      (smt/set-theme 'oni-smt)
-      (set-face-attribute 'mode-line nil :box nil)
-      (set-face-attribute 'mode-line-inactive nil :box nil))))
-
-(if (daemonp)
-    (add-hook 'after-make-frame-functions
-              (lambda (frame)
-                (cl-letf (((symbol-function 'display-graphic-p)
-                           (lambda (&optional _) t)))
-                  (oni:set-theme frame))))
-  (oni:eval-after-init (oni:set-theme nil)))
-
 (defun oni:show-buffer-position ()
   "Show the position in the current buffer."
   (interactive)
@@ -774,6 +753,11 @@ If no direction is given, don't split."
 (oni:add-hooks 'text-mode-hook
   #'auto-fill-mode #'flyspell-mode 'oni:make-readable)
 
+;; Load my theme
+(if (daemonp)
+    (add-hook 'after-make-frame-functions 'oni:set-theme-graphically)
+ (add-hook 'emacs-startup-hook 'oni:set-theme))
+
 ;;;; Keybindings
 
 (global-set-key (kbd "'") 'oni:self-insert-dwim)
diff --git a/emacs/.emacs.d/site-lisp/oni-theme.el b/emacs/.emacs.d/site-lisp/oni-theme.el
new file mode 100644
index 0000000..8d77920
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-theme.el
@@ -0,0 +1,50 @@
+;;; oni-theme.el --- Extra commands and functions for themes  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords:
+
+;; This program 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.
+
+;; This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Here are some extra commands and functions to work with themes.
+
+;;; Code:
+
+(require 'svg-mode-line-themes)
+(require 'oni-smt)
+
+(defvar oni:theme-set-p nil)
+
+;;;###autoload
+(defun oni:set-theme (&optional frame)
+  "Try to set the theme for the current (first) frame."
+  (ignore frame)
+  (unless oni:theme-set-p
+    (load-theme 'yoshi t)
+    (smt/enable)
+    (smt/set-theme 'oni-smt)
+    (set-face-attribute 'mode-line nil :box nil)
+    (set-face-attribute 'mode-line-inactive nil :box nil)
+    (setq oni:theme-set-p t)))
+
+(defun oni:set-theme-graphically (frame)
+  (cl-letf (((symbol-function 'display-graphic-p)
+             (lambda (&optional _) t)))
+    (oni:set-theme frame)))
+
+(provide 'oni-theme)
+;;; oni-theme.el ends here