diff --git a/.gitmodules b/.gitmodules
index 08084abd..27368516 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,9 @@
-[submodule ".oh-my-zsh"]
-	path = .oh-my-zsh
-	url = git://github.com/robbyrussell/oh-my-zsh.git
 [submodule "tools/icdiff.git"]
 	path = tools/icdiff.git
 	url = https://github.com/jeffkaufman/icdiff.git
 [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
 [submodule ".vim/bundle/Vundle.vim"]
 	path = .vim/bundle/Vundle.vim
 	url = https://github.com/VundleVim/Vundle.vim.git
diff --git a/.oh-my-zsh b/.oh-my-zsh
deleted file mode 160000
index cff228e3..00000000
--- a/.oh-my-zsh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cff228e342a797b6ac0da7edb431f5f66de79ae4
diff --git a/.oh-my-zsh-plugins/zsh-syntax-highlighting b/.oh-my-zsh-plugins/zsh-syntax-highlighting
deleted file mode 160000
index 3dc57419..00000000
--- a/.oh-my-zsh-plugins/zsh-syntax-highlighting
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3dc574190071ef59054f6d693132410b37aa3ae4
diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index c5bb9f70..e62135ca 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -38,8 +38,6 @@ ln -vfs "$DIR/.tmux.conf" ~/.
 rm -f "~/.zshrc"
 ln -vfs "$DIR/.zshrc" ~/.
 ln -vfs "$DIR/.setenv" ~/.
-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" ~/.
 ln -vfs "$DIR/.conkyrc" ~/.