diff --git a/.config/aliasrc b/.config/aliasrc
index 9425c1a9..1ee47516 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -38,3 +38,4 @@ alias \
 	magit="nvim -c MagitOnly" \
 	ref="shortcuts >/dev/null; source ${XDG_CONFIG_HOME:-$HOME/.config}/shortcutrc ; source ${XDG_CONFIG_HOME:-$HOME/.config}/zshnameddirrc" \
 	weath="less -S ${XDG_DATA_HOME:-$HOME/.local/share}/weatherreport" \
+	tmux="tmux -f ${XDG_CONFIG_HOME:-$HOME/.config}/tmux/tmux.conf"
diff --git a/.tmux.conf b/.config/tmux/tmux.conf
similarity index 100%
rename from .tmux.conf
rename to .config/tmux/tmux.conf
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 6da77515..955facd5 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -1,4 +1,2 @@
 XDG_DESKTOP_DIR="$HOME/"
 XDG_DOWNLOAD_DIR="$HOME/downloads"
-XDG_CONFIG_HOME="$HOME/.config"
-XDG_DATA_HOME="$HOME/.local/share"
diff --git a/.profile b/.profile
index 97e1cab5..e2b1a3c5 100644
--- a/.profile
+++ b/.profile
@@ -15,7 +15,8 @@ export STATUSBAR="polybar"
 eval "$(sed 's/^[^#].*/export &/g;t;d' ~/.config/user-dirs.dirs)"
 
 # ~/ Clean-up:
-export NOTMUCH_CONFIG="$HOME/.config/notmuch-config"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
 export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0"
 export LESSHISTFILE="-"
 export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc"
@@ -23,7 +24,6 @@ export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/inputrc"
 export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
 export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
-export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
 export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
 
 # Other program settings: