diff --git a/.tmux.conf b/.tmux.conf
index d76cd75..2aec515 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -32,6 +32,29 @@ set -g mouse on
 # Disable auto renames
 set-option -g allow-rename off
 
+# Display
+set -g base-index 1			# Start window numbering at 1
+setw -g pane-base-index 1	# Start pane numbering at 1
+
+set -g renumber-windows on	# Renumber windows on close
+
+# Pane Controls
+bind -r > swap-pane -D # Next pane
+bind -r < swap-pane -U # Prev Pan
+bind -n M-> swap-pane -D # Next pane
+bind -n M-< swap-pane -U # Next pane
+
+# Window Controls
+unbind n
+unbind p
+bind -r C-h previous-window # select previous window
+bind -r C-l next-window     # select next window
+bind Tab last-window        # move to last active window
+
+# Buffers
+bind b list-buffers  # list paste buffers
+bind p paste-buffer  # paste from the top paste buffer
+bind P choose-buffer
 
 # Popup Session
 #bind -n M-g display-popup -E "tmux new-session -A -s scratch"