diff --git a/.zshenv b/.zshenv
new file mode 100644
index 0000000..b045795
--- /dev/null
+++ b/.zshenv
@@ -0,0 +1,5 @@
+# Disable global autocomplete
+skip_global_compinit=1
+
+# Set ZFS Directory
+ZDOTDIR=~/.config/zsh
diff --git a/.zshrc b/.zshrc
index c721fd1..9a3dd59 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,6 +1,3 @@
-# Config folder
-export ZSH=$HOME/.config/zsh
-
 # History
 export HISTFILE=$XDG_CACHE_HOME/zsh/.zsh_history
 export HISTSIZE=10000
@@ -15,10 +12,12 @@ export SSH_AUTH_SOCK=/home/lumen/.bitwarden-ssh-agent.sock
 export EDITOR="nvim"
 export VISUAL="nvim"
 
+# Disable Global autocomplete
+export skip_global_compinit=1
+
 # Autocomplete
-autoload -U compinit; compinit
-source $ZSH/modules/completion.zsh
+source $ZDOTDIR/modules/completion.zsh
 
 # Prompt
-fpath=($ZSH/modules $fpath)
+fpath=($ZDOTDIR/modules $fpath)
 autoload -Uz prompt_init; prompt_init
diff --git a/modules/completion.zsh b/modules/completion.zsh
index 0a3d3ef..9dd4b2f 100644
--- a/modules/completion.zsh
+++ b/modules/completion.zsh
@@ -21,7 +21,7 @@ bindkey -M menuselect '^xh' accept-and-hold                # Hold
 bindkey -M menuselect '^xn' accept-and-infer-next-history  # Next
 bindkey -M menuselect '^xu' undo                           # Undo
 
-autoload -U compinit; compinit
+autoload -U compinit; compinit -d $XDG_CACHE_HOME/zsh/.zcompdump
 _comp_options+=(globdots) # With hidden files
 
 # Only work with the Zsh function vman