diff --git a/config/zsh/.zprofile b/config/zsh/.zprofile
index 8c8d3b7..59b431d 100644
--- a/config/zsh/.zprofile
+++ b/config/zsh/.zprofile
@@ -1,3 +1,7 @@
+export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
+
 export LANG="en_US.UTF-8"
 export LANGUAGE="en_US"
 export LC_ALL="en_US.UTF-8"
diff --git a/home/.zshenv b/home/.zshenv
index 5b74a51..a5b851f 100644
--- a/home/.zshenv
+++ b/home/.zshenv
@@ -1,8 +1,3 @@
-# Keep things organized.
-export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
-export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
-
-# Everything else will be configured from within $ZDOTDIR.
-export ZDOTDIR="${ZDOTDIR:-$XDG_CONFIG_HOME/zsh}"
+# Just find $ZDOTDIR here, everythng will be configured there.
+export ZDOTDIR="${ZDOTDIR:-${XDG_CONFIG_HOME:-$HOME/.config}/zsh}"