diff --git a/.tmux.conf b/.tmux.conf
index 15ee661..d17f634 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,12 +1,22 @@
 # Force colors for e.g. prompt
 set-option -g default-terminal "screen-256color"
 
-# Mirror prefix+(Up|Down|Left|Right) to prefix prefix+(i|k|j|l) for switching panes
-bind-key -r i select-pane -U
-bind-key -r k select-pane -D
-bind-key -r j select-pane -L
+# Enumerate windows from 1
+set -g base-index 1
+
+# Lower escape-time in vim
+# see https://github.com/neovim/neovim/wiki/FAQ#esc-in-tmux-or-gnu-screen-is-delayed
+set -sg escape-time 0
+
+# vim keys for switching between panes
+bind-key -r k select-pane -U
+bind-key -r j select-pane -D
+bind-key -r h select-pane -L
 bind-key -r l select-pane -R
 
+# vim mode keys in copy-mode
+set-window-option -g mode-keys vi
+
 # Faster repeat time
 set-option -g repeat-time 300