diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index a870ffe..1b97123 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -12,10 +12,30 @@ bind-key -n M-K switch-client -p
 bind-key -n M-H previous-window
 bind-key -n M-L next-window
 
-bind-key T switch-client -l
+bind-key -n M-1 select-window -t 1
+bind-key -n M-2 select-window -t 2
+bind-key -n M-3 select-window -t 3
+bind-key -n M-4 select-window -t 4
+bind-key -n M-5 select-window -t 5
+bind-key -n M-6 select-window -t 6
+bind-key -n M-7 select-window -t 7
+bind-key -n M-8 select-window -t 8
+bind-key -n M-9 select-window -t 9
+bind-key -n M-0 select-window -t 10
 
-bind -n C-S-Left swap-window -t -1
-bind -n C-S-Right swap-window -t 1
+bind-key -n M-! swap-window -t 1
+bind-key -n M-@ swap-window -t 2
+bind-key -n M-# swap-window -t 3
+bind-key -n M-$ swap-window -t 4
+bind-key -n M-% swap-window -t 5
+bind-key -n M-^ swap-window -t 6
+bind-key -n M-& swap-window -t 7
+bind-key -n M-* swap-window -t 8
+bind-key -n M-( swap-window -t 9
+bind-key -n M-) swap-window -t 10
+
+bind-key S new-session
+bind-key T switch-client -l
 
 set -g default-terminal "screen-256color"
 set -as terminal-features ",*:RGB"