diff --git a/.tmux.conf b/.config/tmux/tmux.conf
similarity index 98%
rename from .tmux.conf
rename to .config/tmux/tmux.conf
index 0f17440..e05471a 100644
--- a/.tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -73,4 +73,4 @@ set -g status-right "#{prefix_highlight} #[fg=colour235,bg=colour233]#[fg=col
 set -g @plugin 'jimeh/tmux-themepack'
 set -g @themepack 'powerline/default/blue'
 
-run -b '~/.tmux/plugins/tpm/tpm'
+run -b "${TMUX_PLUGIN_MANAGER_PATH}/tpm/tpm"
diff --git a/.config/zsh/5-install-tmux-plugin-manager b/.config/zsh/5-install-tmux-plugin-manager
index 7664455..f790f20 100644
--- a/.config/zsh/5-install-tmux-plugin-manager
+++ b/.config/zsh/5-install-tmux-plugin-manager
@@ -1,13 +1,20 @@
 # Clone tmux plugin manager if not existing
 if [[ -z "$TPM_PARENT_DIR" ]]; then
-  TPM_PARENT_DIR=$HOME
+  TPM_PARENT_DIR=${XDG_CONFIG_DIR:-$HOME/.config}/tmux
 fi
-if [[ ! -f $TPM_PARENT_DIR/.tmux/plugins/tpm/tpm ]]; then
+
+if [[ ! -f $TPM_PARENT_DIR/plugins/tpm/tpm ]]; then
   if [[ ! -d "$TPM_PARENT_DIR" ]]; then
     mkdir -p "$TPM_PARENT_DIR"
   fi
   pushd $TPM_PARENT_DIR
-  git clone https://github.com/tmux-plugins/tpm ./.tmux/plugins/tpm
+  git clone https://github.com/tmux-plugins/tpm plugins/tpm
   popd
 fi
+
+export TMUX_PLUGIN_MANAGER_PATH=$TPM_PARENT_DIR/plugins
+alias tmux="tmux -f ${TPM_PARENT_DIR}/tmux.conf"
+
 unset TPM_PARENT_DIR
+unset TPM_SUB_DIR
+
diff --git a/.profile b/.profile
index cc11a14..879c54b 100644
--- a/.profile
+++ b/.profile
@@ -1,4 +1,5 @@
 export XDG_CONFIG_DIR="$HOME/.config"
+export XDG_CONFIG_HOME=$XDG_CONFIG_DIR
 export XDG_CACHE_HOME="$HOME/.cache"
  
 
diff --git a/.zshrc b/.zshrc
index f8d63ad..c392c02 100644
--- a/.zshrc
+++ b/.zshrc
@@ -135,7 +135,7 @@ load_config_files $ZSH_CONFIG_DIR 3456789
 # if [ -n "$(/bin/ls $ZSH_CONFIG_DIR/)" ]; then
 #   GLOB=($ZSH_CONFIG_DIR/[:alpha:]*)
 #   for dotfile in $GLOB; do
-#     print_dbg "Phase 4, Alphabetic: $dotfile\n" #//DEBUG
+#     print_dbg "Alphabetic: $dotfile\n" #//DEBUG
 #     if [ -r "${dotfile}" ]; then
 #       source "${dotfile}"
 #     fi