diff --git a/create_symlinks.sh b/create_symlinks.sh
index d85f5ec..b4f5300 100755
--- a/create_symlinks.sh
+++ b/create_symlinks.sh
@@ -17,7 +17,7 @@ if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
 	mkdir -p $HOME/.local/share/gnupg
 	link_file gpg.conf .local/share/gnupg/gpg.conf ../../../
 fi
-which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf
+which tmux >/dev/null 2>&1 && link_file tmux .config/tmux ../
 which vim >/dev/null 2>&1 && link_file vim .config/vim ../
 which fish >/dev/null 2>&1 && link_file fish .config/fish ../
 which youtube-dl >/dev/null 2>&1 && link_file youtube-dl .config/youtube-dl ../
diff --git a/fish/functions/gpg-sftp.fish b/fish/functions/gpg-sftp.fish
index ded5ae5..8269343 100644
--- a/fish/functions/gpg-sftp.fish
+++ b/fish/functions/gpg-sftp.fish
@@ -1,4 +1,4 @@
-function gpg-sftp
+function gpg-sftp --wraps sftp
     set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     sftp $argv
 end
diff --git a/fish/functions/gpg-ssh-add.fish b/fish/functions/gpg-ssh-add.fish
index e27b4d2..275f979 100644
--- a/fish/functions/gpg-ssh-add.fish
+++ b/fish/functions/gpg-ssh-add.fish
@@ -1,4 +1,4 @@
-function gpg-ssh-add
+function gpg-ssh-add --wraps ssh-add
     set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     ssh-add $argv
 end
diff --git a/fish/functions/gpg-ssh.fish b/fish/functions/gpg-ssh.fish
index ab725e0..fb87a44 100644
--- a/fish/functions/gpg-ssh.fish
+++ b/fish/functions/gpg-ssh.fish
@@ -1,4 +1,4 @@
-function gpg-ssh
+function gpg-ssh --wraps ssh
     set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     ssh $argv
 end
diff --git a/fish/functions/tmux.fish b/fish/functions/tmux.fish
new file mode 100644
index 0000000..eec9527
--- /dev/null
+++ b/fish/functions/tmux.fish
@@ -0,0 +1,3 @@
+function tmux
+    command tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf $argv
+end
diff --git a/tmux.conf b/tmux/tmux.conf
similarity index 100%
rename from tmux.conf
rename to tmux/tmux.conf
diff --git a/zshrc b/zshrc
index a585a98..9472edd 100644
--- a/zshrc
+++ b/zshrc
@@ -191,6 +191,8 @@ make() {
 	esac
 }
 
+alias tmux="tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf"
+
 # pkgsrc does not like MAKEFLAGS including -j
 which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
 which pkg_rolling-replace &>/dev/null &&