diff --git a/.gitmodules b/.gitmodules
index ee195ba26..c3115aa6a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "plugins/zsh-syntax-highlighting"]
 	path = plugins/zsh-syntax-highlighting
-	url = git://github.com/nicoulaj/zsh-syntax-highlighting.git
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
 [submodule "plugins/zsh-history-substring-search"]
 	path = plugins/zsh-history-substring-search
-	url = git://github.com/sunaku/zsh-history-substring-search.git
+	url = https://github.com/zsh-users/zsh-history-substring-search.git
 [submodule "completions"]
 	path = completions
 	url = https://github.com/zsh-users/zsh-completions.git
diff --git a/plugins/autojump/_j b/plugins/autojump/_j
new file mode 100644
index 000000000..b094fd304
--- /dev/null
+++ b/plugins/autojump/_j
@@ -0,0 +1,23 @@
+#compdef j
+
+#Copyright Joel Schaerer 2008, 2009
+#This file is part of autojump
+
+#autojump is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 3 of the License, or
+#(at your option) any later version.
+#
+#autojump is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
+
+cur=${words[2, -1]}
+
+autojump --completion ${=cur[*]} | while read i; do 
+    compadd -U "$i"; 
+    done
diff --git a/plugins/syntax-highlighting b/plugins/syntax-highlighting
deleted file mode 160000
index 41e84a0d9..000000000
--- a/plugins/syntax-highlighting
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 41e84a0d9f05ceb2409214a6fb00db7494e5c606