diff --git a/roles/tmux/files/.tmux.conf b/roles/tmux/files/.tmux.conf
index fa5f01e..83c4d3a 100644
--- a/roles/tmux/files/.tmux.conf
+++ b/roles/tmux/files/.tmux.conf
@@ -83,9 +83,12 @@ bind C-k send-keys 'C-k'
 # Enable mouse support.
 setw -g mouse on
 
+# Remove delay when switching Vim modes.
+set -sg escape-time 0
+
 # Plugins
-set -g @plugin "arcticicestudio/nord-tmux"
-set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'tmux-plugins/tpm'
 
 # Initialize TMUX plugin manager