diff --git a/.gitmodules b/.gitmodules
index 868dee59..f4962482 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -47,3 +47,6 @@
 [submodule "tools/subuser"]
 	path = tools/subuser
 	url = https://github.com/subuser-security/subuser
+[submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"]
+	path = .oh-my-zsh-plugins/zsh-syntax-highlighting
+	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
diff --git a/.oh-my-zsh-plugins/zsh-syntax-highlighting b/.oh-my-zsh-plugins/zsh-syntax-highlighting
new file mode 160000
index 00000000..3dc57419
--- /dev/null
+++ b/.oh-my-zsh-plugins/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 3dc574190071ef59054f6d693132410b37aa3ae4
diff --git a/.zshrc b/.zshrc
index 3e2d7069..ee10eacf 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,10 +1,9 @@
 ZSH=$HOME/.oh-my-zsh
 
 ZSH_THEME="agnoster"
-
 COMPLETION_WAITING_DOTS="true"
 
-plugins=(vi-mode svn git python history-substring-search)
+plugins=(vi-mode svn git python zsh-syntax-highlighting history-substring-search)
 
 source $ZSH/oh-my-zsh.sh
 
diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index 52baa2c7..e5efb320 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -21,6 +21,7 @@ ln -vfs "$DIR/.tmux.conf" ~/.
 rm -f "~/.zshrc"
 ln -vfs "$DIR/.zshrc" ~/.
 ln -vfs "$DIR/.oh-my-zsh" ~/.
+ln -vfs "$DIR/.oh-my-zsh-plugins/zsh-syntax-highlighting" ~/.oh-my-zsh/custom/plugins/
 ln -vfs "$DIR/.Slic3r" ~/.
 ln -vfs "$DIR/.ghci" ~/.
 mkdir -p ~/.kde/share/config/