diff --git a/.gitmodules b/.gitmodules
index 696629a..9fb0cc5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,9 @@
 [submodule "tmux/.tmux/plugins/tmux"]
 	path = tmux/.tmux/plugins/tmux
 	url = https://github.com/catppuccin/tmux.git
+[submodule "zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions"]
+	path = zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions.git
+[submodule "zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting"]
+	path = zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
diff --git a/zsh/.oh-my-zsh/custom/plugins/example/example.plugin.zsh b/zsh/.oh-my-zsh/custom/plugins/example/example.plugin.zsh
new file mode 100644
index 0000000..83611fe
--- /dev/null
+++ b/zsh/.oh-my-zsh/custom/plugins/example/example.plugin.zsh
@@ -0,0 +1,3 @@
+# Add your own custom plugins in the custom/plugins directory. Plugins placed
+# here will override ones with the same name in the main plugins directory.
+# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-plugins
diff --git a/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions b/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions
new file mode 160000
index 0000000..85919cd
--- /dev/null
+++ b/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit 85919cd1ffa7d2d5412f6d3fe437ebdbeeec4fc5
diff --git a/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
new file mode 160000
index 0000000..5eb677b
--- /dev/null
+++ b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 5eb677bb0fa9a3e60f0eff031dc13926e093df92
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4599c64..337ca2a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -79,8 +79,10 @@ plugins=(
   gitignore
   mise
   zoxide
+  zsh-autosuggestions
   zsh-interactive-cd
   zsh-navigation-tools
+  zsh-syntax-highlighting
 )
 
 source $ZSH/oh-my-zsh.sh
@@ -118,18 +120,3 @@ fpath=(~/.zsh $fpath)
 
 autoload run-help
 autoload -Uz compinit && compinit -u
-
-case $(uname -s) in
-    "Darwin")
-        export ZSH_HIGHLIGHT_DIR=/opt/homebrew/share/zsh-syntax-highlighting
-        export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters
-        ;;
-    "Linux")
-        export ZSH_HIGHLIGHT_DIR=/usr/share/zsh-syntax-highlighting
-        export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/usr/share/zsh-syntax-highlighting/highlighters
-        export ZSH_AUTOSUGGESTIONS_DIR=/usr/share/zsh-autosuggestions
-        ;;
-esac
-
-source "$ZSH_HIGHLIGHT_DIR/zsh-syntax-highlighting.zsh"
-source "$ZSH_AUTOSUGGESTIONS_DIR/zsh-autosuggestions.zsh"