diff --git a/.common.sh b/.common.sh
index b253c350..18b6032d 100644
--- a/.common.sh
+++ b/.common.sh
@@ -24,5 +24,3 @@ cache() {
     fi
     source $cache
 }
-
-source "$DOTFILES/aliases"
diff --git a/zsh/completions/_brew b/zsh/completions/_brew
old mode 100644
new mode 100755
diff --git a/zsh/functions/_lsarchive b/zsh/completions/_lsarchive
similarity index 100%
rename from zsh/functions/_lsarchive
rename to zsh/completions/_lsarchive
diff --git a/zsh/functions/_unarchive b/zsh/completions/_unarchive
similarity index 100%
rename from zsh/functions/_unarchive
rename to zsh/completions/_unarchive
diff --git a/zshenv b/zshenv
index 7caca755..6900986a 100644
--- a/zshenv
+++ b/zshenv
@@ -27,8 +27,7 @@ path=(
 )
 
 fpath=(
-  ~/.zsh/completions
-  "$DOTFILES/zsh/functions"
+  ~/.zsh/{functions,completions}
   $fpath
 )
 
diff --git a/zshrc b/zshrc
index a1222a65..fb93d68e 100644
--- a/zshrc
+++ b/zshrc
@@ -6,6 +6,7 @@ if [ ! -d ~/.zgen ]; then
     exit 1
 fi
 
+TMUXIFIER="$HOME/.tmuxifier"
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 ZGEN_AUTOLOAD_COMPINIT=true
 [[ "${USER}" == "root" ]] && ZGEN_AUTOLOAD_COMPINIT=false
@@ -27,6 +28,13 @@ if ! zgen saved; then
     zgen save
 fi
 
+source ~/.zsh/config
+if is-interactive; then
+    source ~/.zsh/keybinds
+    source ~/.zsh/prompt
+    source ~/.zsh/completion
+fi
+
 cache rbenv init - --no-rehash
 cache pyenv init - --no-rehash
 if is-interactive; then
@@ -34,12 +42,6 @@ if is-interactive; then
     cache tmuxifier init -
 fi
 
-source ~/.zsh/config
-if is-interactive; then
-    source ~/.zsh/keybinds
-    source ~/.zsh/prompt
-    source ~/.zsh/completion
-fi
 source ~/.zsh/aliases
 
 # Done!