diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index 02173f88..da8eb138 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -1,10 +1,5 @@
 typeset -U PATH path
 
-# Other XDG paths
-export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"}
-export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"}
-export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"}
-
 # Disable files
 export LESSHISTFILE=-
 
@@ -24,10 +19,18 @@ export WM="awesome"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_STATE_HOME="$HOME/.local/share"
+
 export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc"
 export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
 export HISTFILE="${XDG_CONFIG_HOME:-$HOME/.config}/zsh/history"
 export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
+export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg"
+export CUDA_CACHE_PATH="{$XDG_CACHE_HOME}/nv"
+export GOPATH="{$XDG_DATA_HOME:-$HOME/.local/share}/go"
+export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc"
+export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="{$XDG_CONFIG_HOME:-$HOME/.config}/java"
+
 
 # Other program settings
 export MOZ_USE_XINPUT2="1"		# Mozilla smooth scrolling/touchpads.
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 22a81026..783f7138 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -140,6 +140,7 @@ alias py='python'
 alias rm='rm -vI'
 alias v='nvim'
 alias weather='curl wttr.in/'
+alias wget=wget --hsts-file="{$XDG_DATA_HOME:-$HOME/.local/share}/wget-hsts"
 alias ww='nvim ~/vimwiki/index.wiki'
 alias zzz='doas zzz'