diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index e6ad544..7ec69cb 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -10,7 +10,7 @@ set -g default-terminal "xterm-256color"
 
 #Mouse/Scrollback Tweaks
 set -g history-limit 100000
-setw -g mode-keys vi
+#setw -g mode-keys vi
 set-option -g mouse on
 set -g xterm-keys on
 set-option -g pane-active-border-fg yellow
@@ -18,6 +18,18 @@ set-option -g pane-active-border-fg yellow
 #New Keybindings
 bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
 
+# split panes using | and -
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# switch panes using Alt-arrow without prefix
+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
+
 # For nested tmux'es
 bind a send-prefix
 
@@ -29,11 +41,13 @@ source "/usr/share/powerline/bindings/tmux/powerline.conf"
 set-option -g renumber-windows on
 setw -g monitor-activity on
 set -g visual-activity on
-#set -g status-justify centre
-#set -g status-utf8 on
 
-# start with window 1 (instead of 0)
+#Windows
 set -g base-index 1
-
-# start with pane 1
 set -g pane-base-index 1
+setw -g automatic-rename on
+set -g renumber-windows on
+set -g set-titles on
+set -g display-panes-time 800
+set -g display-time 1000
+set -g status-interval 10