diff --git a/.gitmodules b/.gitmodules
index 6f90049..13ef699 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,7 +11,7 @@
 	path = shell/tmux/tmuxifier
 	url = git@github.com:jimeh/tmuxifier.git
 [submodule "shell/zsh/zsh-syntax-highlighting"]
-	path = shell/zsh/zsh-syntax-highlighting
+	path = shell/zsh/custom/plugins/zsh-syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
 [submodule "shell/bash/git-aware-prompt"]
 	path = shell/bash/git-aware-prompt
@@ -20,5 +20,5 @@
 	path = tmux/themes
 	url = git@github.com:jimeh/tmux-themepack.git
 [submodule "shell/zsh/zsh-autosuggestions"]
-	path = shell/zsh/zsh-autosuggestions
+	path = shell/zsh/custom/plugins/zsh-autosuggestions
 	url = git@github.com:tarruda/zsh-autosuggestions.git
diff --git a/shell/zsh/custom/plugins/zsh-autosuggestions b/shell/zsh/custom/plugins/zsh-autosuggestions
new file mode 160000
index 0000000..87facd9
--- /dev/null
+++ b/shell/zsh/custom/plugins/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit 87facd9b85630f288433aa0a20a963cffc612ee5
diff --git a/shell/zsh/custom/plugins/zsh-syntax-highlighting b/shell/zsh/custom/plugins/zsh-syntax-highlighting
new file mode 160000
index 0000000..31ac2b3
--- /dev/null
+++ b/shell/zsh/custom/plugins/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 31ac2b36a9156ef424e8ccee560ec31f97bd3eef
diff --git a/shell/zsh/oh-my-zsh b/shell/zsh/oh-my-zsh
index 5464fe3..bd6dbd1 160000
--- a/shell/zsh/oh-my-zsh
+++ b/shell/zsh/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 5464fe3e4ad02a33243f42bcd8c91a287bc26185
+Subproject commit bd6dbd1d9b1fc8a523aaf588492eb3ed4113b49d
diff --git a/shell/zsh/zsh-autosuggestions b/shell/zsh/zsh-autosuggestions
deleted file mode 160000
index 7dc9e0f..0000000
--- a/shell/zsh/zsh-autosuggestions
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7dc9e0f92631d03d289bdcf67530c84e72b18aa3
diff --git a/shell/zsh/zsh-syntax-highlighting b/shell/zsh/zsh-syntax-highlighting
deleted file mode 160000
index 683f483..0000000
--- a/shell/zsh/zsh-syntax-highlighting
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 683f4837a037e35e6a5236020e855fcd262ed48d
diff --git a/shell/zshrc.sh b/shell/zshrc.sh
index 59a3c3d..3b55ffc 100644
--- a/shell/zshrc.sh
+++ b/shell/zshrc.sh
@@ -50,6 +50,8 @@ plugins=( \
   ruby \
   thor \
   vagrant \
+  zsh-autosuggestions \
+  zsh-syntax-highlighting \
 )
 
 source "$ZSH/oh-my-zsh.sh"
@@ -72,29 +74,9 @@ unalias shotgun
 # Cause I hit emacs shorts too much
 bindkey -s "\C-x\C-f" "cd "
 
-
-#
-# Z-Shell Command Highlighting
-#
-
-# Highlighters
+# Configure zsh-syntax-highlighting
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 
-source "$DOTZSH/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
-
-
-#
-# Z-Shell Autosuggestions
-#
-
-source "$DOTZSH/zsh-autosuggestions/autosuggestions.zsh"
-
-# Enable autosuggestions automatically
-zle-line-init() {
-  zle autosuggest-start
-}
-zle -N zle-line-init
-
 # use ctrl+t to toggle autosuggestions(hopefully this wont be needed as
 # zsh-autosuggestions is designed to be unobtrusive)
 bindkey '^T' autosuggest-toggle