diff --git a/.gitmodules b/.gitmodules
index 97b58ce..7436d34 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
 	path = plugins/zsh-history-substring-search
 	url = https://github.com/zsh-users/zsh-history-substring-search.git
     ignore = untracked
-[submodule "zsh-syntax-highlighting"]
-	path = plugins/zsh-syntax-highlighting
-	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
-    ignore = untracked
 [submodule "zsh-autosuggestions"]
 	path = plugins/zsh-autosuggestions
 	url = https://github.com/zsh-users/zsh-autosuggestions.git
@@ -18,3 +14,6 @@
 	path = plugins/fzf-tab
 	url = https://github.com/Aloxaf/fzf-tab.git
     ignore = dirty
+[submodule "fast-syntax-highlighting"]
+	path = plugins/fast-syntax-highlighting
+	url = https://github.com/zdharma-continuum/fast-syntax-highlighting.git
diff --git a/init.zsh b/init.zsh
index 396243f..7a3720d 100644
--- a/init.zsh
+++ b/init.zsh
@@ -288,7 +288,7 @@ source_user_file 'local'
 load_plugin zsh-completions
 
 # Syntax highlighting
-load_plugin zsh-syntax-highlighting
+load_plugin fast-syntax-highlighting
 
 # History substring search
 load_plugin zsh-history-substring-search
diff --git a/plugins/fast-syntax-highlighting b/plugins/fast-syntax-highlighting
new file mode 160000
index 0000000..cf318e0
--- /dev/null
+++ b/plugins/fast-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit cf318e06a9b7c9f2219d78f41b46fa6e06011fd9
diff --git a/plugins/zsh-syntax-highlighting b/plugins/zsh-syntax-highlighting
deleted file mode 160000
index e0165ea..0000000
--- a/plugins/zsh-syntax-highlighting
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e0165eaa730dd0fa321a6a6de74f092fe87630b0