diff --git a/shell/+tmux/.tmux.conf b/shell/+tmux/.tmux.conf
index 97e3e22c..85f54081 100644
--- a/shell/+tmux/.tmux.conf
+++ b/shell/+tmux/.tmux.conf
@@ -3,7 +3,6 @@
 set -g default-terminal screen-256color
 set -g default-shell $SHELL
 set -g default-command $SHELL
-set -s quiet on
 set -s focus-events on
 # increase scrollback buffer size
 set -g history-limit 10000
@@ -143,25 +142,6 @@ bind q kill-session
 bind Q kill-server
 
 
-# -- LIST CHOICE -------------------------
-
-bind -t vi-choice h tree-collapse
-bind -t vi-choice l tree-expand
-run -b 'tmux bind -t vi-choice K start-of-list 2> /dev/null'
-run -b 'tmux bind -t vi-choice J end-of-list 2> /dev/null'
-bind -t vi-choice H tree-collapse-all
-bind -t vi-choice L tree-expand-all
-bind -t vi-choice Escape cancel
-
-
-# -- EDIT MODE ---------------------------
-
-bind -ct vi-edit H start-of-line
-bind -ct vi-edit L end-of-line
-bind -ct vi-edit q cancel
-bind -ct vi-edit Escape cancel
-
-
 # -- COPY MODE ---------------------------
 
 bind Enter copy-mode # enter copy mode
@@ -169,12 +149,12 @@ bind b list-buffers  # list paster buffers
 bind p paste-buffer  # paste from the top pate buffer
 bind P choose-buffer # choose which buffer to paste from
 
-bind -t vi-copy v begin-selection
-bind -t vi-copy C-v rectangle-toggle
-bind -t vi-copy y copy-selection
-bind -t vi-copy Escape cancel
-bind -t vi-copy H start-of-line
-bind -t vi-copy L end-of-line
+bind -T copy-mode-vi v send -X begin-selection
+bind -T copy-mode-vi C-v send -X rectangle-toggle
+bind -T copy-mode-vi y send -X copy-selection
+bind -T copy-mode-vi Escape send -X cancel
+bind -T copy-mode-vi H send -X start-of-line
+bind -T copy-mode-vi L send -X end-of-line
 
 
 # -- THEME -------------------------------