diff --git a/01mac.el b/01mac.el
index 84cf4be..085572e 100644
--- a/01mac.el
+++ b/01mac.el
@@ -97,7 +97,7 @@
 
 ; Enable line numbers and show cursors position
 (global-display-line-numbers-mode t)
-(column-number-mode 1)
+(column-number-mode t)
 
 ;; Turn off sounds
 (setq ring-bell-function 'ignore)
diff --git a/05prog-mode.el b/05prog-mode.el
index ea00a8f..5751b91 100644
--- a/05prog-mode.el
+++ b/05prog-mode.el
@@ -34,7 +34,7 @@
   :hook (((prog-mode text-mode) . rainbow-delimiters-mode))
   :init
              ;;; Match parenthasis (left-right)
-  (electric-pair-mode 1))
+  (electric-pair-mode t))
 
 ;;; Show hex (#aaa) colors as colors
 (use-package rainbow-mode
diff --git a/06company-yasnippet.el b/06company-yasnippet.el
index a96faf9..8632a93 100644
--- a/06company-yasnippet.el
+++ b/06company-yasnippet.el
@@ -27,8 +27,8 @@
   :requires company
   :defer t)
 
-(global-company-mode 1)
-(yas-global-mode 1)
+(global-company-mode t)
+(yas-global-mode t)
 
 (setq-default
  company-minimum-prefix-length 2   ; minimum prefix character number for auto complete.
diff --git a/08purpose.el b/08purpose.el
deleted file mode 100644
index b87a4f5..0000000
--- a/08purpose.el
+++ /dev/null
@@ -1,48 +0,0 @@
-;;; windows.el -- summary
-;;; Commentary:
-;;; Windows management things, mostly with purpose
-;;; Code:
-(require 'window-purpose)
-(purpose-mode t)
-
-;; Set everything to use code windows
-(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))
-(add-to-list 'purpose-user-regexp-purposes
-             '("git-rebase-todo\\(<.*>\\)?$" . code))
-
-
-;; Tools
-(add-to-list 'purpose-user-mode-purposes '(dired-mode . tools))
-(add-to-list 'purpose-user-mode-purposes '(process-list . tools))
-(add-to-list 'purpose-user-mode-purposes '(magit-mode . tools))
-(add-to-list 'purpose-user-mode-purposes '(help-mode . tools))
-(add-to-list 'purpose-user-mode-purposes '(term-mode . tools))
-(add-to-list 'purpose-user-mode-purposes '(compilation-mode . tools))
-(add-to-list 'purpose-user-mode-purposes '(etags-select-mode . tools))
-(add-to-list 'purpose-user-mode-purposes '(reb-mode . tools)) ;; Regexp builder
-(add-to-list 'purpose-user-regexp-purposes
-             '("Process List\\(<.*>\\)?$" . tools))
-
-(setq purpose-use-default-configuration nil)
-(purpose-compile-user-configuration)
-
-;; Functions for changing layout
-(defun purpose-big-screen ()
-  "Load coding_with_magit."
-  (interactive)
-  (purpose-load-window-layout "coding_with_magit"))
-
-(defun purpose-small-screen ()
-  "Load small_screen."
-  (interactive)
-  (purpose-load-window-layout "small_screen"))
-;;; windows.el ends here
-
-(global-set-key (kbd "<f8>") 'purpose-big-screen)
-(global-set-key (kbd "<f7>") 'purpose-small-screen)
diff --git a/init.el b/init.el
index 7763d0b..ce6c464 100644
--- a/init.el
+++ b/init.el
@@ -15,9 +15,6 @@
 ;; list the packages you want
 (setq package-list '(
                      use-package
-                     window-purpose ;; Make sure that windows are of grouped by
-                     ;; purpose.
-
                      visual-regexp ;; Regexp replacement with preview in
                      ;; current buffer.
 
@@ -53,32 +50,31 @@
 (require 'use-package)
 
 ;; Additional files
-(load "$HOME/.emacs.d/01mac.el")
-(load "$HOME/.emacs.d/02macros.el")
-(load "$HOME/.emacs.d/02ivy.el")
-(load "$HOME/.emacs.d/03hydra.el")
-(load "$HOME/.emacs.d/04magit.el")
-(load "$HOME/.emacs.d/05prog-mode.el")
-(load "$HOME/.emacs.d/06company-yasnippet.el")
-(load "$HOME/.emacs.d/06flycheck.el")
-(load "$HOME/.emacs.d/07projectile.el")
-(load "$HOME/.emacs.d/08purpose.el")
-(load "$HOME/.emacs.d/08ctags.el")
-(load "$HOME/.emacs.d/09ispell.el")
+(load "$HOME/.emacs.d/01mac.el" 'f 't)
+(load "$HOME/.emacs.d/02macros.el" 'f 't)
+(load "$HOME/.emacs.d/02ivy.el" 'f 't)
+(load "$HOME/.emacs.d/03hydra.el" 'f 't)
+(load "$HOME/.emacs.d/04magit.el" 'f 't)
+(load "$HOME/.emacs.d/05prog-mode.el" 'f 't)
+(load "$HOME/.emacs.d/06company-yasnippet.el" 'f 't)
+(load "$HOME/.emacs.d/06flycheck.el" 'f 't)
+(load "$HOME/.emacs.d/07projectile.el" 'f 't)
+(load "$HOME/.emacs.d/08ctags.el" 'f 't)
+(load "$HOME/.emacs.d/09ispell.el" 'f 't)
 
 ;; Themes
-(load "$HOME/.emacs.d/themes/themes.el")
+(load "$HOME/.emacs.d/themes/themes.el" 'f 't)
 
 ;; Actual supported languages
-(load "$HOME/.emacs.d/languages/elisp.el")
-(load "$HOME/.emacs.d/languages/ruby.el")
-(load "$HOME/.emacs.d/languages/web.el")
-(load "$HOME/.emacs.d/languages/elixir.el")
-(load "$HOME/.emacs.d/languages/erlang.el")
-(load "$HOME/.emacs.d/languages/sh.el")
-(load "$HOME/.emacs.d/languages/rust.el")
-(load "$HOME/.emacs.d/languages/clang.el")
-(load "$HOME/.emacs.d/languages/clojure.el")
+(load "$HOME/.emacs.d/languages/elisp.el" 'f 't)
+(load "$HOME/.emacs.d/languages/ruby.el" 'f 't)
+(load "$HOME/.emacs.d/languages/web.el" 'f 't)
+(load "$HOME/.emacs.d/languages/elixir.el" 'f 't)
+(load "$HOME/.emacs.d/languages/erlang.el" 'f 't)
+(load "$HOME/.emacs.d/languages/sh.el" 'f 't)
+(load "$HOME/.emacs.d/languages/rust.el" 'f 't)
+(load "$HOME/.emacs.d/languages/clang.el" 'f 't)
+(load "$HOME/.emacs.d/languages/clojure.el" 'f 't)
 
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
diff --git a/languages/elixir.el b/languages/elixir.el
index a03a6e1..181347b 100644
--- a/languages/elixir.el
+++ b/languages/elixir.el
@@ -1,6 +1,7 @@
 (use-package alchemist
   :requires (ruby-end-mode)
-  :ensure t)
+  :ensure t
+  :defer t)
 
 (defun activate-elixir-mode ()
   "All things Elixir."
@@ -14,9 +15,3 @@
 (add-hook 'elixir-mode-hook 'alchemist-mode)
 (add-hook 'alchemist-mode-hook 'activate-elixir-mode)
 (add-hook 'elixir-mode-hook 'ruby-end-mode)
-
-;; Eex Web mode
-(add-to-list 'auto-mode-alist '("\\.eex\\'" . web-mode))
-(setq web-mode-extra-auto-pairs
-      '(("eex"  . (("<%" "%>")))
-        ))
diff --git a/languages/ruby.el b/languages/ruby.el
index 8ab0949..c99c7e9 100644
--- a/languages/ruby.el
+++ b/languages/ruby.el
@@ -3,11 +3,7 @@
 (use-package enh-ruby-mode
   :requires (rspec-mode ruby-end-mode)
   :ensure t
-  :config
-  (add-hook 'enh-ruby-mode-hook 'rspec-mode)
-  (add-hook 'enh-ruby-mode-hook 'ruby-end-mode)
-  (eval-after-load 'rspec-mode
-    '(rspec-install-snippets)))
+  :defer t)
 
 (defun activate-ruby-mode ()
   "All things for ruby mode."
@@ -34,4 +30,8 @@
                       (projectile-project-root) (projectile-project-root))))
 
 (add-hook 'ruby-mode-hook 'enh-ruby-mode)
+(add-hook 'enh-ruby-mode-hook 'rspec-mode)
+(add-hook 'enh-ruby-mode-hook 'ruby-end-mode)
+(eval-after-load 'rspec-mode
+  '(rspec-install-snippets))
 (add-hook 'enh-ruby-mode-hook 'activate-ruby-mode)
diff --git a/layouts/coding_with_magit.window-layout b/layouts/coding_with_magit.window-layout
deleted file mode 100644
index 9a37a33..0000000
--- a/layouts/coding_with_magit.window-layout
+++ /dev/null
@@ -1 +0,0 @@
-(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
diff --git a/layouts/small_screen.window-layout b/layouts/small_screen.window-layout
deleted file mode 100644
index 11a91d2..0000000
--- a/layouts/small_screen.window-layout
+++ /dev/null
@@ -1 +0,0 @@
-(t (0 0 256 70) (nil (0 0 256 57) (:purpose code :purpose-dedicated t :width 0.5039370078740157 :height 0.8028169014084507 :edges (0.0 0.0 0.5039370078740157 0.8028169014084507)) (:purpose code :purpose-dedicated t :width 0.5039370078740157 :height 0.8028169014084507 :edges (0.5039370078740157 0.0 1.0078740157480315 0.8028169014084507))) (:purpose tools :purpose-dedicated t :width 1.0078740157480315 :height 0.18309859154929578 :edges (0.0 0.8028169014084507 1.0078740157480315 0.9859154929577465)))
diff --git a/refcard.pdf b/refcard.pdf
deleted file mode 100644
index cb152cf..0000000
Binary files a/refcard.pdf and /dev/null differ
diff --git a/themes/themes.el b/themes/themes.el
index 4928b8d..597c7aa 100644
--- a/themes/themes.el
+++ b/themes/themes.el
@@ -6,7 +6,7 @@
   (setq-default display-time-format "%H:%M") ;; time format to display on mode line
   (sml/setup))
 
-(load "$HOME/.emacs.d/themes/themes-base16-not-harmonic.el" t)
+(load "$HOME/.emacs.d/themes/themes-base16-not-harmonic.el" 'f 't)
 (load-theme 'base16-mexico-light t t)
 (load-theme 'manoj-dark t t)
 (load-theme 'base16-one-light t t)
@@ -23,7 +23,7 @@
       (sml/apply-theme 'respectful)
       (enable-theme 'base16-mocha))
   (progn
-    (enable-theme 'manoj-dark)))
+    (enable-theme 'planet)))
 
 ;; Set font face
 (set-font-size 16)