diff --git a/.gitmodules b/.gitmodules
index f13e399..3388b90 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,9 @@
 [submodule "shell/bash/git-aware-prompt"]
 	path = shell/bash/git-aware-prompt
 	url = git@github.com:jimeh/git-aware-prompt.git
-[submodule "shell/zsh/zplug"]
-	path = shell/zsh/zplug
-	url = https://github.com/b4b4r07/zplug
 [submodule "tmux/plugins/tpm"]
 	path = tmux/plugins/tpm
 	url = https://github.com/tmux-plugins/tpm
+[submodule "shell/zsh/zplug"]
+	path = shell/zsh/zplug
+	url = https://github.com/zplug/zplug
diff --git a/shell/zsh/zplug b/shell/zsh/zplug
index 78cfe44..cd82438 160000
--- a/shell/zsh/zplug
+++ b/shell/zsh/zplug
@@ -1 +1 @@
-Subproject commit 78cfe440ec6018e9d9d02cbfe6f14d6784c32c84
+Subproject commit cd82438f89f3d17351bc78cdd424558552e3fb3c
diff --git a/shell/zsh/zplug-cache/.gitignore b/shell/zsh/zplug-cache/.gitignore
index a3805f8..aa5ea26 100644
--- a/shell/zsh/zplug-cache/.gitignore
+++ b/shell/zsh/zplug-cache/.gitignore
@@ -1,3 +1,2 @@
-.cache
+cache/*
 repos/*
-zcompdump*
diff --git a/shell/zsh/zplug-cache/.gitkeep b/shell/zsh/zplug-cache/cache/.gitkeep
similarity index 100%
rename from shell/zsh/zplug-cache/.gitkeep
rename to shell/zsh/zplug-cache/cache/.gitkeep
diff --git a/shell/zsh/zplug-cache/repos/.gitkeep b/shell/zsh/zplug-cache/repos/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/shell/zshrc.zsh b/shell/zshrc.zsh
index 0a8d89a..ae07aec 100644
--- a/shell/zshrc.zsh
+++ b/shell/zshrc.zsh
@@ -7,7 +7,9 @@ DISABLE_AUTO_TITLE="true"
 
 # Export path variables.
 DOTZSH="$DOTSHELL/zsh"
-ZPLUG_HOME="$DOTZSH/zplug-cache"
+ZPLUG_HOME="$DOTZSH/zplug"
+ZPLUG_CACHE_DIR="$DOTZSH/zplug-cache/cache"
+ZPLUG_REPOS="$DOTZSH/zplug-cache/repos"
 
 # Don't wrap these commands in a Bundler wrapper.
 UNBUNDLED_COMMANDS=(shotgun)
@@ -16,21 +18,22 @@ UNBUNDLED_COMMANDS=(shotgun)
 # zplug
 #
 
-source "$DOTZSH/zplug/zplug"
+source "$DOTZSH/zplug/init.zsh"
 alias zp="zplug"
 
+zplug "robbyrussell/oh-my-zsh", use:"lib/*.zsh", defer:0
+
 zplug "plugins/bundler", from:oh-my-zsh
 zplug "plugins/git", from:oh-my-zsh
 
-zplug "$DOTZSH/themes/plain", from:local
+zplug "aaronjamesyoung/aaron-zsh-theme", use:"aaron.zsh-theme", defer:3
+# zplug "$DOTZSH/themes/plain", from:local, use:"plain.zsh-theme", defer:3
 
-# zplug "junegunn/fzf", of:"shell/*.zsh"
 zplug "jimeh/zsh-peco-history"
-
-zplug "b4b4r07/enhancd", of:"init.sh"
+zplug "b4b4r07/enhancd", use:"init.sh"
 zplug "zsh-users/zsh-completions"
 zplug "zsh-users/zsh-autosuggestions"
-zplug "zsh-users/zsh-syntax-highlighting", nice:19
+zplug "zsh-users/zsh-syntax-highlighting", defer:3
 
 # Install plugins if there are plugins that have not been installed
 if ! zplug check --verbose; then
@@ -53,6 +56,8 @@ fi
 
 zplug load
 
+# source "$DOTZSH/themes/plain/plain.zsh-theme"
+
 #
 # Basic Z-Shell settings
 #
@@ -68,4 +73,4 @@ unsetopt share_history
 unsetopt correctall
 
 # Cause I hit emacs shorts too much.
-bindkey -s "\C-x\C-f" "cd "
+# bindkey -s "\C-x\C-f" "cd "