diff --git a/08purpose.el b/08purpose.el
index 371654b..b87a4f5 100644
--- a/08purpose.el
+++ b/08purpose.el
@@ -9,6 +9,7 @@
 (add-to-list 'purpose-user-mode-purposes '(fundamental-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(prog-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(diff-mode . code))
+(add-to-list 'purpose-user-mode-purposes '(yaml-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(magit-diff-mode . code))
 (add-to-list 'purpose-user-regexp-purposes
              '("COMMIT_EDITMSG\\(<.*>\\)?$" . code))
diff --git a/10themes.el b/10themes.el
index 3659d3b..d125971 100644
--- a/10themes.el
+++ b/10themes.el
@@ -3,13 +3,11 @@
 
 (setq-default sml/no-confirm-load-theme t)
 (setq-default display-time-format "%H:%M") ;; time format to display on mode line
-
 (sml/setup)
-(sml/apply-theme 'respectful)
 
 (load "~/.emacs.d/10themes-base16-not-harmonic.el")
 (load-theme 'base16-mexico-light t t)
-(load-theme 'flatui t t)
+(load-theme 'manoj-dark t t)
 
 (defun base16-mexico-light-custom ()
   "Additional configuration for Base16 theme."
@@ -25,10 +23,11 @@
 
 (if (display-graphic-p)
     (progn
+      (sml/apply-theme 'respectful)
       (enable-theme 'base16-not-harmonic)
       (base16-harmonic-custom))
   (progn
-    (enable-theme 'flatui)))
+    (enable-theme 'manoj-dark)))
 
 ;; Set font face
 (set-face-attribute 'default nil :font "Hasklig 15")
@@ -39,5 +38,5 @@
 
 ;; Set fringe colors to default, so it does not bother you.
 (set-face-attribute 'fringe nil
-                      :foreground (face-foreground 'default)
-:background (face-background 'default))
+                    :foreground (face-foreground 'default)
+                    :background (face-background 'default))
diff --git a/layouts/coding_with_magit.window-layout b/layouts/coding_with_magit.window-layout
index 5191b4a..9a37a33 100644
--- a/layouts/coding_with_magit.window-layout
+++ b/layouts/coding_with_magit.window-layout
@@ -1 +1 @@
-(nil (0 0 284 74) (t (0 0 143 74) (:purpose code :purpose-dedicated t :width 0.5070921985815603 :height 0.6133333333333333 :edges (0.0 0.0 0.5070921985815603 0.6133333333333333)) (:purpose tools :purpose-dedicated t :width 0.5070921985815603 :height 0.37333333333333335 :edges (0.0 0.6133333333333333 0.5070921985815603 0.9866666666666667))) (:purpose code :purpose-dedicated t :width 0.5 :height 0.9866666666666667 :edges (0.5070921985815603 0.0 1.0070921985815602 0.9866666666666667)))
\ No newline at end of file
+(nil (0 0 284 74) (t (0 0 145 74) (:purpose code :purpose-dedicated t :width 0.5141843971631206 :height 0.6133333333333333 :edges (0.0 0.0 0.5141843971631206 0.6133333333333333)) (:purpose tools :purpose-dedicated t :width 0.5141843971631206 :height 0.37333333333333335 :edges (0.0 0.6133333333333333 0.5141843971631206 0.9866666666666667))) (:purpose code :purpose-dedicated t :width 0.4929078014184397 :height 0.9866666666666667 :edges (0.5141843971631206 0.0 1.0070921985815602 0.9866666666666667)))
\ No newline at end of file