diff --git a/tmux.conf b/config/tmux/tmux.conf
similarity index 82%
rename from tmux.conf
rename to config/tmux/tmux.conf
index 2dc14de..fe1f641 100644
--- a/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -6,9 +6,9 @@ set -g prefix C-a
 unbind C-b
 
 # More responsive with sending commands
-set -sg escape-time 1
+set -sg escape-time 0
 
-set-option -g history-limit 10000
+set-option -g history-limit 50000
 
 # Start counting at 0, easier for keyboard shortcuts
 set -g base-index 1
@@ -30,6 +30,7 @@ set-option -g mouse on
 #                                    Colors
 ################################################################################
 set -g default-terminal "screen-256color"
+set -g terminal-overrides ",xterm-256color:Tc"
 
 set -g status-fg white
 set -g status-bg black
@@ -51,15 +52,15 @@ bind-key -T copy-mode-vi 'y' send -X copy-selection
 #bind-key -T copy-mode-vi MouseDragEnd1Pane send -X copy-pipe-and-cancel "xclip -in -selection clipboard"
 
 # macOS
-bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "pbcopy"
-bind-key -T copy-mode-vi MouseDragEnd1Pane send -X copy-pipe-and-cancel "pbcopy"
+#bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "pbcopy"
+#bind-key -T copy-mode-vi MouseDragEnd1Pane send -X copy-pipe-and-cancel "pbcopy"
 
 # Make switch session shortcut repeatable
 bind -r ( switch-client -p
 bind -r ) switch-client -n
 
 # Reload config with prefix r
-bind r source-file ~/.tmux.conf \; display "Reloaded"
+bind r source-file $XDG_CONFIG_HOME/tmux/tmux.conf \; display "Reloaded"
 
 # Send prefix to the terminal
 bind C-a send-prefix
@@ -82,3 +83,9 @@ bind -r L resize-pane -R 5
 
 bind -r C-h select-window -t :-
 bind -r C-l select-window -t :+
+
+set-environment -g TMUX_PLUGIN_MANAGER_PATH $XDG_CONFIG_HOME/tmux/plugins
+
+set -g @plugin 'tmux-plugins/tmux-yank'
+
+run $XDG_CONFIG_HOME/tmux/plugins/tpm/tpm