diff --git a/.config/zsh/plugins/zsh-autosuggestions b/.config/zsh/plugins/zsh-autosuggestions
new file mode 160000
index 0000000..0e810e5
--- /dev/null
+++ b/.config/zsh/plugins/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit 0e810e5afa27acbd074398eefbe28d13005dbc15
diff --git a/.config/zsh/plugins/zsh-syntax-highlighting b/.config/zsh/plugins/zsh-syntax-highlighting
new file mode 160000
index 0000000..5eb677b
--- /dev/null
+++ b/.config/zsh/plugins/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 5eb677bb0fa9a3e60f0eff031dc13926e093df92
diff --git a/.gitmodules b/.gitmodules
index 7bbda60..484c01e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule ".config/zsh/plugins/zsh-git-prompt"]
 	path = .config/zsh/plugins/zsh-git-prompt
 	url = https://github.com/zsh-git-prompt/zsh-git-prompt.git
+[submodule ".config/zsh/plugins/zsh-syntax-highlighting"]
+	path = .config/zsh/plugins/zsh-syntax-highlighting
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule ".config/zsh/plugins/zsh-autosuggestions"]
+	path = .config/zsh/plugins/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions
diff --git a/.zshrc b/.zshrc
index 5b730e7..10ca3c3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -9,15 +9,8 @@ if [[ $(uname) == "Darwin" ]]; then
   export ANDROID_SDK_ROOT=/Users/$USER/Library/Android/sdk
   alias date=gdate;
   eval "$(rbenv init - zsh)"
-  
-  source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-  source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-
 else
   export PATH="${PATH}:${HOME}/.local/bin:/usr/local/sbin:${HOME}/.local/share/gem/ruby/2.0.0/bin:/usr/local/bin"
-
-  source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh 
-  source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
 fi
 
 # Config
@@ -27,6 +20,8 @@ export EDITOR=nvim
 
 # Plugins
 source "$CONFIGDIR/zsh/plugins/zsh-git-prompt/zshrc.sh"
+source "$CONFIGDIR/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
+source "$CONFIGDIR/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"
 
 # Use NVIM
 alias vim=nvim