diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..032abd7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+plugins/
+resurrect/
diff --git a/.tmux.conf b/.tmux.conf
index b650e6f..c50604d 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -134,7 +134,8 @@ run -b 'tmux bind -T copy-mode-vi v send -X begin-selection 2> /dev/null || true
 run -b 'tmux bind -t vi-copy C-v rectangle-toggle 2> /dev/null || true'
 run -b 'tmux bind -T copy-mode-vi C-v send -X rectangle-toggle 2> /dev/null || true'
 run -b 'tmux bind -t vi-copy y copy-selection 2> /dev/null || true'
-run -b 'tmux bind -T copy-mode-vi y send -X copy-selection-and-cancel 2> /dev/null || true'
+#run -b 'tmux bind -T copy-mode-vi y send -X copy-selection-and-cancel 2> /dev/null || true'a
+run -b 'tmux bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -in -selection clipboard" 2> /dev/null || true'
 run -b 'tmux bind -t vi-copy Escape cancel 2> /dev/null || true'
 run -b 'tmux bind -T copy-mode-vi Escape send -X cancel 2> /dev/null || true'
 run -b 'tmux bind -t vi-copy H start-of-line 2> /dev/null || true'
@@ -1150,3 +1151,16 @@ run 'cut -c3- ~/.tmux.conf | sh -s _apply_configuration'
 # }
 #
 # "$@"
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+
+# Other examples:
+# set -g @plugin 'git@github.com/user/plugin'
+# set -g @plugin 'git@bitbucket.com/user/plugin'
+set -g @plugin 'tnory56/tmux-logging'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
+set -g history-limit 50000
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'
+
diff --git a/.tmux.conf.local b/.tmux.conf.local
index d68c789..c5227e5 100644
--- a/.tmux.conf.local
+++ b/.tmux.conf.local
@@ -281,7 +281,7 @@ tmux_conf_copy_to_os_clipboard=false
 # force Vi mode
 #   really you should export VISUAL or EDITOR environment variable, see manual
 #set -g status-keys vi
-#set -g mode-keys vi
+set -g mode-keys vi
 
 # replace C-b by C-a instead of using both prefixes
 # set -gu prefix2
diff --git a/README.md b/README.md
index a82ea00..48fab49 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,8 @@ existing `~/.tmux.conf` first)
 
 ```
 $ cd
-$ git clone https://github.com/gpakosz/.tmux.git
+$ git clone https://github.com/tnory56/.tmux.git
+$ git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
 $ ln -s -f .tmux/.tmux.conf
 $ cp .tmux/.tmux.conf.local .
 ```