diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 1be56f40..f0fbeeb5 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -78,28 +78,6 @@ bind C-c new-window -c '#{pane_current_path}';
 bind v split-window -h -c '#{pane_current_path}';
 bind s split-window -v -c '#{pane_current_path}';
 
-# Smart pane switching with awareness of Vim splits.
-# See: https://github.com/christoomey/vim-tmux-navigator
-is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
-    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?|fzf)(diff)?$'"
-bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h'  'select-pane -L'
-bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j'  'select-pane -D'
-bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k'  'select-pane -U'
-bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l'  'select-pane -R'
-bind-key -n 'C-\' if-shell "$is_vim" 'send-keys C-\\'  'select-pane -l'
-
-bind-key -T copy-mode-vi 'C-h' select-pane -L
-bind-key -T copy-mode-vi 'C-j' select-pane -D
-bind-key -T copy-mode-vi 'C-k' select-pane -U
-bind-key -T copy-mode-vi 'C-l' select-pane -R
-bind-key -T copy-mode-vi 'C-\' select-pane -l
-
-bind -r < resize-pane -L 3
-bind -r > resize-pane -R 3
-bind -r - resize-pane -D 3
-bind -r + resize-pane -U 3
-bind -r = resize-pane -U 3
-
 ## fzf-git
 
 # C-b will always switch to the prefix table, so use g for branches
@@ -114,5 +92,7 @@ if-shell "[[ -e ~/.config/tmux/tmux.conf.local ]]" "source-file ~/.config/tmux/t
 
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-pain-control'
+set -g @plugin 'christoomey/vim-tmux-navigator'
 
 run '~/.config/tmux/plugins/tpm/tpm'