diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6b40461
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "omz/plugins/zsh-syntax-highlighting"]
+	path = omz/plugins/zsh-syntax-highlighting
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
diff --git a/omz/plugins/zsh-syntax-highlighting b/omz/plugins/zsh-syntax-highlighting
new file mode 160000
index 0000000..82cf252
--- /dev/null
+++ b/omz/plugins/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 82cf2527fc13fefee6e87f99171c1b368f0abdb9
diff --git a/shell/zshrc b/shell/zshrc
index ecc7a2c..2d52ff3 100644
--- a/shell/zshrc
+++ b/shell/zshrc
@@ -75,7 +75,8 @@ plugins=(git \
     fancy-ctrl-z \
     emoji \
     aws \
-    jsontools)
+    jsontools \
+    zsh-syntax-highlighting) # zsh-syntax-highlighting must remain the last plugin
 
 # Load oh-my-zsh
 source $ZSH/oh-my-zsh.sh