diff --git a/.gitignore b/.gitignore
index a6fafc2..b05b739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 auto-save-list
 projectile*
+projects
 !pkg/projectile.el
 backups
 elpa
diff --git a/init.el b/init.el
index e3534b1..a1262ea 100644
--- a/init.el
+++ b/init.el
@@ -67,7 +67,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(jenkinsfile-mode vue-mode dap-mode undo-tree helpful lsp-haskell dashboard fsharp-mode dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package))
+   '(apropospriate-theme jenkinsfile-mode vue-mode dap-mode undo-tree helpful lsp-haskell dashboard fsharp-mode dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package))
  '(safe-local-variable-values
    '((haskell-process-use-ghci . t)
      (haskell-indent-spaces . 4))))
diff --git a/languages/other.el b/languages/other.el
index a941717..a2fcc15 100644
--- a/languages/other.el
+++ b/languages/other.el
@@ -15,6 +15,7 @@
 (use-package terraform-mode :ensure t :defer t)
 (use-package ansible :ensure t :defer t)
 (use-package nginx-mode :ensure t :defer t)
+(use-package jenkinsfile-mode :ensure t :defer t)
 
 ;; Text files
 (use-package yaml-mode :ensure t :defer t)
diff --git a/themes/themes.el b/themes/themes.el
index 3ddb183..d39c9b9 100644
--- a/themes/themes.el
+++ b/themes/themes.el
@@ -10,9 +10,10 @@
   (setq-default display-time-format "%H:%M") ;; time format to display on mode line
   (sml/setup))
 
-(use-package base16-theme :ensure t)
+(use-package base16-theme :ensure t :defer t)
 (use-package flatui-theme :ensure t :defer t)
 (use-package planet-theme :ensure t :defer t)
+(use-package apropospriate-theme :ensure t :defer t)
 
 ;; Disable cursor blinking
 (blink-cursor-mode 0)
@@ -20,21 +21,22 @@
 ;; Light themes
 (load-theme 'base16-atelier-forest-light t t)
 (load-theme 'base16-harmonic-light t t)
-(load-theme 'base16-gruvbox-dark-hard t t)
+(load-theme 'apropospriate-light t t)
 
 ;; Dark themes
 (load-theme 'base16-solarflare t t)
 (load-theme 'base16-snazzy t t)
+(load-theme 'base16-gruvbox-dark-hard t t)
 
 (if (display-graphic-p)
     (progn
       (sml/apply-theme 'respectful)
       (enable-theme (nth
-                     (random 3)
-                     '(base16-snazzy base16-gruvbox-dark-hard base16-solarflare))))
+                     (random 2)
+                     '(apropospriate-light base16-harmonic-light))))
   (progn
     (defvar base16-theme-256-color-source "base16-shell")
-    (enable-theme 'base16-atelier-forest-light)))
+    (enable-theme 'apropospriate-light)))
 
 ;; Set font face
 ;;;;;;;;;;;;;;;;;;;;;; Font configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -49,7 +51,8 @@
   (interactive)
   ;; If display is set to emulate FullHD resultion or less, make the font
   ;; smaller.
-  (cond ((>= 1050 (x-display-pixel-height)) (set-font "Hack" 14))
+  (cond ((eq (x-display-list) nil)) ()
+        ((>= 1050 (x-display-pixel-height)) (set-font "Hack" 14))
         ((>= 1080 (x-display-pixel-height)) (set-font "Hack" 13))
         ((>= 1440 (x-display-pixel-height)) (set-font "Hack" 16))
         (t (set-font "Hack" 16))))