diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 517904d..3a747c1 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,4 +1,3 @@
-
 # Some tweaks to the status line
 set -g status-right "%H:%M"
 set -g window-status-current-style "underscore"
@@ -20,6 +19,9 @@ set -g bell-action none
 # Keep windows around after they exit
 set -g remain-on-exit on
 
+# Set indexes to start at 1, instead of 0.
+set -g base-index 1
+
 # Change the prefix key to C-a
 set -g prefix C-a
 unbind C-b
@@ -38,8 +40,20 @@ bind F set -w window-size
 bind m set monitor-activity
 bind y set synchronize-panes\; display 'synchronize-panes #{?synchronize-panes,on,off}'
 
-# split pane
-bind v splitw
+# Better split pane
+bind h splitw -h
+bind v splitw -v
+
+# Use Alt-arrow keys to navigate panes
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+# Use Shift-arrow keys to navigate windows.
+bind -n S-Left previous-window
+bind -n S-Right next-window
+
 
 # reload new changes
 #bind-key R source-file ~/.tmux.conf\; \display-message "sorce-file done"