diff --git a/tmux/.mac_config b/tmux/.mac_config
index 8a62422..00bd77a 100644
--- a/tmux/.mac_config
+++ b/tmux/.mac_config
@@ -1,4 +1,4 @@
 set-option -g default-shell /bin/zsh
-bind -Tcopy-mode-vi y send -X copy-pipe "pbcopy" \; display-message "copied to system clipboard"
-bind C-p run "tmux set-buffer \"$pbpaste\"; tmux paste-buffer"
-bind C-y run "tmux save-buffer - | pbcopy"
+#bind -Tcopy-mode-vi y send -X copy-pipe "pbcopy" \; display-message "copied to system clipboard"
+#bind C-p run "tmux set-buffer \"$pbpaste\"; tmux paste-buffer"
+#bind C-y run "tmux save-buffer - | pbcopy"
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 7a5efe1..aa98381 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -39,9 +39,10 @@ set -g mouse on
 
 # Vi copypaste mode
 set-window-option -g mode-keys vi
-bind-key -Tcopy-mode-vi 'v' send -X begin-selection
-bind-key -Tcopy-mode-vi 'y' send -X copy-selection
-bind -Tcopy-mode-vi y send -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c" \; display-message "copied to system clipboard"
+set -g @yank_action 'copy-pipe'
+#bind-key -Tcopy-mode-vi 'v' send -X begin-selection
+#bind-key -Tcopy-mode-vi 'y' send -X copy-selection
+#bind -Tcopy-mode-vi y send -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c" \; display-message "copied to system clipboard"
 
 # Smart pane switching with awareness of vim splits
 # See: https://github.com/christoomey/vim-tmux-navigator
@@ -55,9 +56,9 @@ bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
 bind-key C-x send-keys C-x
 bind-key C-o send-keys C-o
 
-# Copying
+# Copying - Most of this is done in tmux-yank!
 # move x clipboard into tmux paste buffer
-bind C-p run "tmux set-buffer \"$(xclip -o)\"; tmux paste-buffer"
+#bind C-p run "tmux set-buffer \"$(xclip -o)\"; tmux paste-buffer"
 # move tmux copy buffer into x clipboard
 set-option -s set-clipboard on
 
@@ -65,6 +66,8 @@ if '[ `uname` == Darwin ]' \
     'source-file ~/.tmux/.mac_config'
 source-file ~/.tmux/.tmux_config_powerline
 
+set-option -g set-titles on
+
 
 # Escape timeout for nvim
 set -sg escape-time 10
@@ -73,7 +76,7 @@ set -sg escape-time 10
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
 #set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'tmux-plugins/tmux-sidebar'
+#set -g @plugin 'tmux-plugins/tmux-sidebar'
 set -g @plugin 'tmux-plugins/tmux-open'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'jimeh/tmux-themepack'
@@ -85,4 +88,4 @@ set -g @themepack 'powerline/double/blue'
 # set -g @plugin 'git@bitbucket.com/user/plugin'
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run '~/.tmux/plugins/tpm/tpm' # >> /tmp/tpm_out 2>&1 >> /tmp/tpm_out'
+run '~/.tmux/plugins/tpm/tpm || true' # 2>&1 >> /tmp/tpm_out'
diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm
index 26d9ace..b699a7e 160000
--- a/tmux/plugins/tpm
+++ b/tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 26d9ace1b47f4591b2afdf333442a498311b6ace
+Subproject commit b699a7e01c253ffb7818b02d62bce24190ec1019
diff --git a/tmux/sidebar/directory_widths.txt b/tmux/sidebar/directory_widths.txt
deleted file mode 100644
index ac720ab..0000000
--- a/tmux/sidebar/directory_widths.txt
+++ /dev/null
@@ -1 +0,0 @@
-/Users/fabian/Masterarbeit/thesis	40