diff --git a/.tmux.conf b/.tmux.conf
index 4aa29e1..85a9e7d 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,11 +1,8 @@
 # Vim keys
 
 # dirty hack for old tmux which doesn't support -c option
-bind-key c new-window
-bind s split-window -v
-bind v split-window -h
 # save current path for >=tmux-1.9a
-bind-key c new-window -c "#{pane_current_path}"
+bind c new-window -c "#{pane_current_path}"
 bind s split-window -v -c "#{pane_current_path}"
 bind v split-window -h -c "#{pane_current_path}"
 
@@ -18,11 +15,14 @@ bind > resize-pane -R 10
 bind - resize-pane -D 10
 bind + resize-pane -U 10
 bind : command-prompt
+bind R respawn-window
+bind y swap-window -t -1\; select-window -t -1
+bind u swap-window -t +1\; select-window -t +1
+
 # vi-style controls for copy mode
 setw -g mode-keys vi
 set -g default-terminal "screen-256color"
 
-bind-key R respawn-window
 
 # create a session with a throw-away window
 # new true