diff --git a/zsh/functions/init-env-default-xdg-vars b/zsh/functions/init-env-default-xdg-vars
index 65cf75b..1dd6bfe 100644
--- a/zsh/functions/init-env-default-xdg-vars
+++ b/zsh/functions/init-env-default-xdg-vars
@@ -17,10 +17,10 @@ function init-env-default-xdg-vars
     export \
         XDG_BIN_HOME=${XDG_BIN_HOME:-$HOME/.local/bin} \
         XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache} \
-        XDG_CONFIG_HOME=${XDG_CACHE_HOME:-$HOME/.config} \
+        XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config} \
         XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share} \
-        XDG_STATE_HOME=${XDG_DATA_HOME:-$HOME/.local/state} \
-        XDG_RUNTIME_DIR=${XDG_DATA_HOME:-$HOME/.local/var}
+        XDG_STATE_HOME=${XDG_STATE_HOME:-$HOME/.local/state} \
+        XDG_RUNTIME_DIR=${XDG_RUNTIME_HOME:-$HOME/.local/var}
 
     # User directories
     export \