diff --git a/.tmux.conf b/.tmux.conf
index 11665b9..d436fb2 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,6 +1,3 @@
-# status bar
-set-option -g status-utf8 on
-
 # https://github.com/seebi/tmux-colors-solarized/blob/master/tmuxcolors-256.conf
 set-option -g status-bg colour235 #base02
 set-option -g status-fg colour136 #yellow
@@ -67,8 +64,8 @@ set-window-option -g window-status-current-bg green
 
 # Vi copypaste mode
 set-window-option -g mode-keys vi
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
+bind-key -T copy-mode-vi 'v' send -X begin-selection
+bind-key -T copy-mode-vi 'y' send -X copy-selection
 
 # hjkl pane traversal
 bind h select-pane -L
diff --git a/.vim b/.vim
index ed4da1e..9183de7 160000
--- a/.vim
+++ b/.vim
@@ -1 +1 @@
-Subproject commit ed4da1ed45fe33ccff122c835d5034ea0bcc142c
+Subproject commit 9183de7bc55a4c81c2fbae4695437a9bc5568c50
diff --git a/.zsh/config.sh b/.zsh/config.sh
index 65d1c3b..7e4e0fb 100644
--- a/.zsh/config.sh
+++ b/.zsh/config.sh
@@ -48,4 +48,4 @@ source ${HOME}/.zsh/config-git.zsh
 [ -e ${HOME}/.zsh/local-config.zsh ] && source ${HOME}/.zsh/local-config.zsh
 
 ## Clean PATH from duplicates
-PATH=$(python -c 'import os; out=[]; [out.append(i) for i in os.environ["PATH"].split(":") if not out.count(i)]; print ":".join(out)')
+PATH=$(${HOME}/bin/path-dedup.py)
diff --git a/bin/vault-gpg b/bin/vault-gpg
index e383445..c6ba7b5 100755
--- a/bin/vault-gpg
+++ b/bin/vault-gpg
@@ -15,7 +15,7 @@ if [ -z "${PWD}" ]; then
   exit 2
 fi
 
-HEXPWD=$(python -c "print '${PWD}'.encode('hex')")
+HEXPWD=$(python3 -c "import binascii; print(binascii.hexlify(bytearray('${PWD}', 'utf-8')))")
 
 # Get keygrip of secret key
 for KEYGRIP in $(gpg2 --with-keygrip -k ${KEY} | grep Keygrip | cut -d '=' -f 2 | xargs); do