diff --git a/.config/shell/profile b/.config/shell/profile
index 8273596..8521f4c 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -12,20 +12,22 @@ export VISUAL=code
 # Misc vars
 export CHROME_EXECUTABLE=chromium # For Flutter
 
+# Set XDG directories:
+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}"
+
 # Clean home:
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export ANDROID_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/Android/Sdk"
-export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
-export KREW_ROOT="${XDG_DATA_HOME:-$HOME/.local/share}/krew"
-export FLUTTER_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/flutter"
-export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
-export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history"
-export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc"
-export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
-export NVM_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/nvm"
-export NUGET_PACKAGES="${XDG_DATA_HOME:-$HOME/.local/share}/nuget"
+export ANDROID_HOME="$XDG_DATA_HOME/Android/Sdk"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export KREW_ROOT="$XDG_DATA_HOME/krew"
+export FLUTTER_HOME="$XDG_DATA_HOME/flutter"
+export GOPATH="$XDG_DATA_HOME/go"
+export HISTFILE="$XDG_DATA_HOME/history"
+export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+export NVM_DIR="$XDG_CONFIG_HOME/nvm"
+export NUGET_PACKAGES="$XDG_DATA_HOME/nuget"
 
 # Color man pages:
 export LESS=-r
@@ -113,5 +115,5 @@ prepend_path_with_entries "${prepend_paths[@]}"
 append_path_with_entries "${append_paths[@]}"
 
 # Add the profile-extras file yourself if you wish to override anything:
-PROFILE_EXTRAS="${XDG_CONFIG_HOME:-$HOME/.config}/shell/profile-extras"
+PROFILE_EXTRAS="$XDG_CONFIG_HOME/shell/profile-extras"
 [ -f "$PROFILE_EXTRAS" ] && . "$PROFILE_EXTRAS"