diff --git a/minimal.vimrc.vim b/minimal.vimrc.vim
index a4c8114..b28bfb9 100644
--- a/minimal.vimrc.vim
+++ b/minimal.vimrc.vim
@@ -187,7 +187,7 @@
   endif
 
   let g:airline#extensions#tabline#enabled = 1
-  let g:airline_theme='molokai'
+  let g:airline_theme='deus'
 
   let g:rainbow_active = 1 "0 if you want to enable it later via :RainbowToggle
 
diff --git a/user.tmux.conf b/user.tmux.conf
index 4b0fc9b..4aca0ad 100644
--- a/user.tmux.conf
+++ b/user.tmux.conf
@@ -2,34 +2,47 @@
 # TMUX Configuration file
 #
 # General settings {{{
-  set -g prefix C-a
-  unbind-key C-b
-  bind-key C-a send-prefix
+    set -g default-terminal "tmux-256color"
+    set -g prefix C-a
+    unbind-key C-b
+    bind-key C-a send-prefix
 
-  set -g mouse on
-  bind r source-file ~/.tmux.conf
-  set -g status-position top
-  # set -g status-windows-justify middle
-# }}}
+    set -g mouse on
+    bind r source-file ~/.tmux.conf
+    set -g status-position top
+    # set -g status-windows-justify middle
+
+    # Colors
+    set -g window-style 'bg=colour236'
+    set -g window-active-style 'bg=black'
 
 # Package management {{{
-# List of plugins
-  set -g @plugin 'tmux-plugins/tpm'
-  set -g @plugin 'tmux-plugins/tmux-sensible'
+#     List of plugins
+    set -g @plugin 'tmux-plugins/tpm'
+    set -g @plugin 'tmux-plugins/tmux-sensible'
 
-  # Other examples:
-  # set -g @plugin 'github_username/plugin_name'
-  # set -g @plugin 'git@github.com/user/plugin'
-  # set -g @plugin 'git@bitbucket.com/user/plugin'
+    # Other examples:
+    # set -g @plugin 'github_username/plugin_name'
+    # set -g @plugin 'git@github.com/user/plugin'
+    # set -g @plugin 'git@bitbucket.com/user/plugin'
 
-  set -g @plugin 'arcticicestudio/nord-tmux'
-  set -g @plugin 'tmux-plugins/tmux-resurrect'
-  set -g @plugin 'jimeh/tmux-themepack'
-  set -g @themepack 'powerline/default/gray'
+    set -g @plugin 'arcticicestudio/nord-tmux'
+    set -g @plugin 'tmux-plugins/tmux-resurrect'
+    set -g @plugin 'jimeh/tmux-themepack'
+    set -g @themepack 'powerline/default/gray'
+#     }}}
+# }}}
+
+# Keyboard shortcuts {{{
+    # Navigation
+    bind -n M-h select-pane -L
+    bind -n M-j select-pane -D
+    bind -n M-k select-pane -U
+    bind -n M-l select-pane -R
 # }}}
 
 # Footer {{{
-  # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-  run '~/.tmux/plugins/tpm/tpm'
+    # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+    run '~/.tmux/plugins/tpm/tpm'
 # }}}
 # vim: foldenable foldmethod=marker