diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 23ece69..9de1c11 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -1,6 +1,8 @@
 set -g default-terminal "tmux-256color"
 set -ag terminal-overrides ",$TERM:RGB"
 set -sg escape-time 0
+setw -g mode-keys vi
+set -g mouse on
 
 #binds
 bind-key 'x' kill-pane
@@ -10,8 +12,6 @@ bind-key 'k' switch-client -n
 bind-key 'l' next-window
 bind-key 'n' new-window
 bind-key 'c' kill-window
-# Smart pane switching with awareness of Vim splits.
-# See: https://github.com/christoomey/vim-tmux-navigator
 
 # decide whether we're in a Vim process
 is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
@@ -26,27 +26,29 @@ bind-key 'i' if-shell "$is_vim" 'send-keys F7' 'select-pane -U'
 unbind o
 bind-key 'o' if-shell "$is_vim" 'send-keys F8' 'select-pane -R'
 
-tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
+#copy mode
+bind -T copy-mode-vi v send -X begin-selection
+bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip"
+bind P paste-buffer
+bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip"
 
-bind-key -T copy-mode-vi 'y' select-pane -L
-bind-key -T copy-mode-vi 'u' select-pane -D
-bind-key -T copy-mode-vi 'i' select-pane -U
-bind-key -T copy-mode-vi 'o' select-pane -R
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'catppuccin/tmux'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
+
+#Plugin settings
 set -g @catppuccin_flavour 'frappe'
 set -g @catppuccin_window_tabs_enabled on
-
-#THIS IS GOD MOD FOR TMUX
-set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @resurrect-strategy-nvim 'session'
 set -g @resurrect-capture-pane-contents 'on'
-set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @continuum-restore 'on'
 set -g @continuum-save-interval '10'
 set -g @continuum-boot 'on'
+
+
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'
diff --git a/.xinitrc b/.xinitrc
index 004acd2..c2cf276 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -34,6 +34,7 @@ fi
 setxkbmap -layout us,pt
 setxkbmap -option grp:win_space_toggle
 setxkbmap -option caps:escape
+xset r rate 300 50
 xrandr --output DP-0 --primary --left-of HDMI-0
 dunst &
 /home/afonso/.local/bin/xmonad