diff --git a/.tmux.conf b/.tmux.conf
index 3da850bc15ac377fd1581fc45e13a63c575da800..be153faeb37c6f462f0c8c372a54e5d0ddd03328 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,5 +1,35 @@
-set-option -g default-shell /bin/zsh
+#set-option -g default-shell /bin/zsh
+set -g default-command /bin/zsh
+set -g default-shell /bin/zsh
+
 bind-key a set-window-option synchronize-panes
 bind-key X kill-session
 
-set -g mouse on
+# vi mode keys
+set-window-option -g mode-keys vi
+setw -g mode-keys vi
+
+# use CTRL+b instead of CTRL+a
+set-option -g mouse off
+set -g prefix C-a
+unbind C-b
+#panes start at 1, windows as well
+set -sg escape-time 1
+set -g base-index 1
+setw -g pane-base-index 1
+
+#movement in vim style
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+#resizing of windows in vim style
+bind -r H resize-pane -L 5
+bind -r J resize-pane -D 5
+bind -r K resize-pane -U 5
+bind -r L resize-pane -R 5
+
+#cycle through windows
+bind -r C-h select-window -t :-
+bind -r C-l select-window -t :+