diff --git a/emacs b/emacs
index 6f4e54b..358ef87 100644
--- a/emacs
+++ b/emacs
@@ -25,7 +25,7 @@
  '(hl-paren-colors (quote ("#ecf0f1" "#ecf0f1" "#c0392b")))
  '(package-selected-packages
    (quote
-    (multi-term groovy-mode flycheck-rust racer column-enforce-mode column-marker web-mode helm-themes less-css-mode jade-mode zenburn-theme monokai-theme smart-mode-line-powerline-theme smart-mode-line mode-icons airline-themes atom-one-dark-theme neotree ant rainbow-delimiters rust-mode scala-mode haskell-mode yasnippet yaml-mode ujelly-theme rvm ruby-end rinari noctilux-theme markdown-mode jira indent-guide helm-projectile helm-ag haml-mode flycheck flatui-theme exec-path-from-shell evil-terminal-cursor-changer evil-nerd-commenter evil-magit evil-leader dumb-jump dockerfile-mode diff-hl base16-theme avk-emacs-themes alchemist aggressive-indent ag)))
+    (rainbow-mode json-reformat multi-term groovy-mode flycheck-rust racer column-enforce-mode column-marker web-mode helm-themes less-css-mode jade-mode zenburn-theme monokai-theme smart-mode-line-powerline-theme smart-mode-line mode-icons airline-themes atom-one-dark-theme neotree ant rainbow-delimiters rust-mode scala-mode haskell-mode yasnippet yaml-mode ujelly-theme rvm ruby-end rinari noctilux-theme markdown-mode jira indent-guide helm-projectile helm-ag haml-mode flycheck flatui-theme exec-path-from-shell evil-terminal-cursor-changer evil-nerd-commenter evil-magit evil-leader dumb-jump dockerfile-mode diff-hl base16-theme avk-emacs-themes alchemist aggressive-indent ag)))
  '(safe-local-variable-values (quote ((encoding . utf-8))))
  '(sml/active-background-color "#34495e")
  '(sml/active-foreground-color "#ecf0f1")
diff --git a/themes.el b/themes.el
index 52cebf7..a323bbe 100644
--- a/themes.el
+++ b/themes.el
@@ -32,13 +32,20 @@
 ;; (load-theme 'dichromacy t t)
 (load-theme 'base16-harmonic-dark t t)
 
+(defun base16-harmonic-custom ()
+  "Additional configuration for Base 16 theme."
+  (set-face-attribute 'linum nil :font "Hasklig 14"
+                      :slant 'normal
+                      :background "#0b1c2c")
+  (set-face-attribute 'mode-line nil :font "Hasklig 13"
+                      :background "#2c3a47")
+  (set-face-attribute 'fringe nil :background "#2c3a47"))
+
 (require 'helm-themes)
 (if (display-graphic-p)
     (progn
       (enable-theme 'base16-harmonic-dark)
-      (set-face-attribute 'linum nil :font "Hasklig 14"
-                    :slant 'normal
-                    :background "#0b1c2c"))
+      (base16-harmonic-custom))
   (progn
     (enable-theme 'flatui)))
 
@@ -46,7 +53,6 @@
 
 ;; Set font face
 (set-face-attribute 'default nil :font "Hasklig 13")
-(set-face-attribute 'mode-line nil :font "Hasklig 13")
 (set-face-attribute 'helm-selection nil :font "Hasklig 13")
 (set-face-attribute 'helm-header nil :font "Hasklig 15")