diff --git a/.gitconfig b/.config/git/config
similarity index 100%
rename from .gitconfig
rename to .config/git/config
diff --git a/.config/qtile/autostart.sh b/.config/qtile/autostart.sh
index 501848d..f2767e2 100755
--- a/.config/qtile/autostart.sh
+++ b/.config/qtile/autostart.sh
@@ -13,7 +13,7 @@
 dunst &
 
 # Display background image
-feh --bg-scale ~/.config/wall.png
+feh --bg-scale --no-fehbg ~/.config/wall.png
 
 # Start conky
 conky &
diff --git a/.zshrc b/.config/zsh/.zshrc
similarity index 94%
rename from .zshrc
rename to .config/zsh/.zshrc
index 9089b5a..613e813 100644
--- a/.zshrc
+++ b/.config/zsh/.zshrc
@@ -7,9 +7,15 @@ ZSH_THEME="robbyrussell"
 export ZSH="$HOME/.oh-my-zsh"
 source $ZSH/oh-my-zsh.sh
 
+# Load cargo env
+. "$CARGO_HOME/env"
+
 # Set cursor to beam shape
 echo -ne '\e[5 q'
 
+# ZSH Specific
+compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION
+
 export HISTORY_IGNORE="ce"
 
 ### zinit plugins - start
@@ -75,7 +81,7 @@ alias btw="neofetch"
 
 # This loads nvm
 source $HOME/.fast-nvm.sh
-source $HOME/.nvm/bash_completion
+source $NVM_DIR/bash_completion
 
 # Check if is integrated terminal emulator
 if [ "$EMULATOR" = "code" ]; then
diff --git a/.fast-nvm.sh b/.fast-nvm.sh
index df7e679..8c603c9 100644
--- a/.fast-nvm.sh
+++ b/.fast-nvm.sh
@@ -5,9 +5,9 @@ list_nvmrc_recursive() {
     if [ "$DIR" != "/" ]; then list_nvmrc_recursive "$PARENT_DIR"; fi;
 }
 
-export PATH="$HOME/.nvm/versions/node/$(/bin/cat $HOME/.nvm/alias/default)/bin:$PATH"
+export PATH="$NVM_DIR/versions/node/$(/bin/cat $NVM_DIR/alias/default)/bin:$PATH"
 nvm() {
-    . $HOME/.nvm/nvm.sh; nvm "$@"
+    . $NVM_DIR/nvm.sh; nvm "$@"
 }
 
 DEFAULT=$(list_nvmrc_recursive .)
diff --git a/.profile b/.profile
index b081239..f300bb7 100644
--- a/.profile
+++ b/.profile
@@ -1,6 +1,27 @@
 #!/bin/sh
 
-# Start ssh-agent
+### SET PATHS ###
+
+# XDG Defaults
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_STATE_HOME="$HOME/.local/state"
+export XDG_CACHE_HOME="$HOME/.cache"
+
+# Other applications
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+export DVDCSS_CACHE="$XDG_DATA_HOME"/dvdcss
+export MYPY_CACHE_DIR="$XDG_CACHE_HOME"/mypy
+export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
+export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
+export NVM_DIR="$XDG_DATA_HOME"/nvm
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+export SQLITE_HISTORY=$XDG_DATA_HOME/sqlite_history
+export ZDOTDIR=$HOME/.config/zsh
+
+### Start ssh-agent ###
 eval `ssh-agent -s` > /dev/null
 
 ### Default programs ###
@@ -10,7 +31,7 @@ export MANPAGER="sh -c 'col -bx | bat -l man --paging always -p'"
 export TERMINAL="alacritty"
 export BROWSER="firefox"
 export VIDEO="mpv"
-export IMAGE="sxiv"
+export IMAGE="nsxiv"
 
 ### PATH exports ###
 # $1 = path to export
@@ -33,6 +54,10 @@ try_export_path $HOME/.cargo/bin
 # Fzf options
 export FZF_DEFAULT_OPTS="--reverse --cycle --margin 0,1"
 
+export GOPATH="$HOME/.go"
+export GOPATH="$GOPATH:$HOME/Projects/thirdparty/go"
+export GOPATH="$GOPATH:$HOME/Projects/go"
+
 # Android Studio
 export JAVA_HOME=/usr/lib/jvm/default
 export ANDROID_HOME=$HOME/Android/Sdk