diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 8144429..e4b1c0d 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,27 +1,24 @@
 set -g status-bg colour0
 set -g status-fg colour7
 
-bind-key C-j select-pane -D
-bind-key C-k select-pane -U
-bind-key C-h select-pane -L
-bind-key C-l select-pane -R
+set -sg escape-time 0
+
+bind-key -n M-j select-pane -D
+bind-key -n M-k select-pane -U
+bind-key -n M-h select-pane -L
+bind-key -n M-l select-pane -R
+bind-key -n M-J switch-client -n
+bind-key -n M-K switch-client -p
+bind-key -n M-H previous-window
+bind-key -n M-L next-window
 
-bind-key j switch-client -n
-bind-key k switch-client -p
-bind-key h previous-window
-bind-key l next-window
-bind-key t last-window
 bind-key T switch-client -l
 
-bind -n S-Left previous-window
-bind -n S-Right next-window
 bind -n C-S-Left swap-window -t -1
 bind -n C-S-Right swap-window -t 1
-bind -n S-Up switch-client -p
-bind -n S-Down switch-client -n
 
 set -g default-terminal "screen-256color"
-set -as terminal-features ",xterm-256color:RGB"
+set -as terminal-features ",*:RGB"
 
 set -g base-index 1
 setw -g base-index 1