diff --git a/.emacs.d/functions.el b/.emacs.d/functions.el
index c3e393d..00a458a 100644
--- a/.emacs.d/functions.el
+++ b/.emacs.d/functions.el
@@ -110,23 +110,6 @@ Currently adds | & ! . + = - / % * , < > ? : ->"
 
 (defun x-init ()
   "Initialization only for X"
-  (require 'lcars-theme)
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ;;                       THEME SETTINGS                       ;;
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  (lcars-theme-set-faces
-   'lcars
-
-   ;; markdown-mode
-   '(markdown-link-face (:inherit 'link))
-   '(markdown-header-face-1 (:inherit 'org-level-1))
-   '(markdown-header-face-2 (:inherit 'org-level-2))
-   '(markdown-header-face-3 (:inherit 'org-level-3))
-   '(markdown-header-face-4 (:inherit 'org-level-4))
-   '(markdown-header-face-5 (:inherit 'org-level-5))
-   '(markdown-header-face-6 (:inherit 'org-level-6)))
-
-  (add-hook 'emacs-startup-hook 'fullscreen)
   (setq linum-format " %d"))
 
 (defun cli-init ()
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 62cd22e..37b01e9 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,6 +1,20 @@
 ;; -*- mode: Emacs-Lisp; -*-
 (load "~/.emacs.d/ryuslash-load-path")
 (load "~/.emacs.d/functions")
+;;; Theme
+(require 'naquadah-theme)
+(eval-after-load 'naquadah-theme
+  (naquadah-theme-set-faces
+   'naquadah
+
+   ;; markdown-mode
+   '(markdown-link-face (:inherit 'link))
+   '(markdown-header-face-1 (:inherit 'org-level-1))
+   '(markdown-header-face-2 (:inherit 'org-level-2))
+   '(markdown-header-face-3 (:inherit 'org-level-3))
+   '(markdown-header-face-4 (:inherit 'org-level-4))
+   '(markdown-header-face-5 (:inherit 'org-level-5))
+   '(markdown-header-face-6 (:inherit 'org-level-6))))
 
 ;;; Autopair
 (require 'autopair)
@@ -199,9 +213,9 @@
  `((".*" ,temporary-file-directory t)))
 
 (setq default-frame-alist               ; default frame settings
-      (append '((font . "DejaVu Sans Mono-10:antialias=true"))))
+      (append '((font . "DejaVu Sans Mono-11:antialias=true"))))
 (setq initial-frame-alist               ; initial frame settings
-      (append '((font . "DejaVu Sans Mono-10:antialias=true"))))
+      (append '((font . "DejaVu Sans Mono-11:antialias=true"))))
 
 (if window-system
     (x-init)
diff --git a/.emacs.d/ryuslash-load-path.el b/.emacs.d/ryuslash-load-path.el
index 298c9e9..771772b 100644
--- a/.emacs.d/ryuslash-load-path.el
+++ b/.emacs.d/ryuslash-load-path.el
@@ -6,5 +6,6 @@
 (add-to-list 'load-path "~/.emacs.d/elisp/rainbow")
 (add-to-list 'load-path "~/.emacs.d/elisp/rainbow-delimiters")
 (add-to-list 'load-path "~/.emacs.d/elisp/zencoding")
+(add-to-list 'load-path "~/.emacs.d/naquadah-theme")
 
 (provide 'ryuslash-load-path)