diff --git a/environment.d/10-profile.conf b/environment.d/10-profile.conf
index 868b1b1..6f6fb95 100644
--- a/environment.d/10-profile.conf
+++ b/environment.d/10-profile.conf
@@ -9,28 +9,6 @@ XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 EDITOR="vim"
 VISUAL="vim"
 
-# Override paths for non-compliant programs
-# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
-
-ADOTDIR="$XDG_DATA_HOME/zsh/antigen"
-CARGO_HOME="$XDG_DATA_HOME/cargo"
-GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
-GOPATH="$XDG_DATA_HOME/go"
-ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
-NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
-#PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
-PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup"
-RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-TERMINFO="$XDG_DATA_HOME/terminfo"
-TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
-TS3_CONFIG_DIR="$XDG_CONFIG_HOME/teamspeak3"
-VIMDIR="$XDG_CONFIG_HOME/vim"
-VIMRC="$VIMDIR/vimrc"
-VIMINIT=":so $VIMRC"
-WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
-XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
-ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-
 PATH="${PATH}:/sbin:/usr/sbin:${XDG_CONFIG_HOME}/scripts:${GOPATH}/bin"
 
 # vim: ft=sh
diff --git a/environment.d/20-xdg-overrides.conf b/environment.d/20-xdg-overrides.conf
new file mode 100644
index 0000000..4623237
--- /dev/null
+++ b/environment.d/20-xdg-overrides.conf
@@ -0,0 +1,23 @@
+# Override paths for non-compliant programs
+# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
+
+ADOTDIR="$XDG_DATA_HOME/zsh/antigen"
+CARGO_HOME="$XDG_DATA_HOME/cargo"
+GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
+GOPATH="$XDG_DATA_HOME/go"
+ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
+NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
+#PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup"
+RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+TERMINFO="$XDG_DATA_HOME/terminfo"
+TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
+TS3_CONFIG_DIR="$XDG_CONFIG_HOME/teamspeak3"
+VIMDIR="$XDG_CONFIG_HOME/vim"
+VIMRC="$VIMDIR/vimrc"
+VIMINIT=":so $VIMRC"
+WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
+XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
+ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+
+# vim: ft=sh