diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index db9a67e..e1c0c9b 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -11,6 +11,9 @@ call plug#begin('~/.config/nvim/plugged')
 " Solarized theme
 Plug 'altercation/vim-colors-solarized'
 
+" Zenburn theme
+Plug 'zenburn'
+
 " Syntastic
 Plug 'scrooloose/syntastic'
 
@@ -87,14 +90,6 @@ Plug 'plasticboy/vim-markdown'
 " end plugin list
 call plug#end()
 
-" Solarized Dark
-set background=dark
-colorscheme solarized
-" let g:solarized_termcolors=256 " Better terminal colors
-
-" Toggle solarized scheme
-" call togglebg#map("<F5>")
-
 " Standard variables
 set expandtab                  " tabs to spaces
 set tabstop=2                  " spaces entered when tab key is pressed
@@ -175,7 +170,8 @@ let g:syntastic_javascript_jsxhint_exec = 'eslint'
 " Indent lines customizations
 
 " Color customizations
-" let g:indentLine_color_term=###
+colorscheme zenburn
+
 
 " Python-mode settings
 
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index 81e1065..152d17b 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -14,6 +14,9 @@ bind-key C-a send-prefix
 
 set -s escape-time 0
 
+# Force Tmux to use zsh at all times
+set-option -g default-shell /bin/zsh
+
 ###################################
 #                                 #
 #            Colors               #