diff --git a/dot_zshrc b/dot_zshrc
index 3f318b2..febb360 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -63,7 +63,7 @@ fi
 
 # User configuration
 
-export GOPATH=~/go
+export GOPATH=~/.local/share/go
 export PATH=~/bin:~/.cargo/bin:$GOPATH/bin:$PATH
 #export MANPAGER="bat -p -l manpage"
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
@@ -96,7 +96,7 @@ export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 GPG_TTY=$(tty)
 export GPG_TTY
 
-for cf in ~/.config/zsh/* ; do
+for cf in ~/.config/zsh/*.zsh ; do
 	source $cf
 done