diff --git a/.gitignore b/.gitignore
index 50c1d458..148af217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
 !.signature
 !.vimrc
 !.Xresources
+!.zsh
+!.zsh/**
 !.zshrc
 
 !README.md
diff --git a/.gitmodules b/.gitmodules
index 31ff9a9b..a4d7ccc4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "oh-my-zsh"]
 	path = .oh-my-zsh
 	url = https://github.com/hanez/oh-my-zsh.git
+
+[submodule "zsh-syntax-highlighting"]
+        path = .zsh/zsh-syntax-highlighting
+        url = git@github.com:zsh-users/zsh-syntax-highlighting.git
diff --git a/.zsh/zsh-syntax-highlighting b/.zsh/zsh-syntax-highlighting
new file mode 160000
index 00000000..3dc57419
--- /dev/null
+++ b/.zsh/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 3dc574190071ef59054f6d693132410b37aa3ae4
diff --git a/.zshrc b/.zshrc
index e2f12f38..38a3ef75 100644
--- a/.zshrc
+++ b/.zshrc
@@ -49,9 +49,14 @@ DISABLE_AUTO_UPDATE="true"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(colored-man zsh-syntax-highlighting)
+plugins=(colored-man)
 
 # User configuration
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)
+if [ -e ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]
+then
+source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fi
 
 # Extend my $PATH to $PATH/bin
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PATH:$HOME/bin