diff --git a/.gitmodules b/.gitmodules
index f45edd4d..fa4fd377 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,7 +12,7 @@
 	url = https://github.com/Drako/SublimeBrainfuck
 [submodule "vendor/grammars/awk-sublime"]
 	path = vendor/grammars/awk-sublime
-	url = https://github.com/JohnNilsson/awk-sublime
+	url = https://github.com/github-linguist/awk-sublime
 [submodule "vendor/grammars/Sublime-SQF-Language"]
 	path = vendor/grammars/Sublime-SQF-Language
 	url = https://github.com/JonBons/Sublime-SQF-Language
@@ -30,7 +30,7 @@
 	url = https://github.com/SublimeText/ColdFusion
 [submodule "vendor/grammars/NSIS"]
 	path = vendor/grammars/NSIS
-	url = https://github.com/SublimeText/NSIS
+	url = https://github.com/github-linguist/NSIS
 [submodule "vendor/grammars/NimLime"]
 	path = vendor/grammars/NimLime
 	url = https://github.com/Varriount/NimLime
@@ -667,7 +667,7 @@
 	url = https://github.com/goblindegook/sublime-text-pig-latin
 [submodule "vendor/grammars/sourcepawn"]
 	path = vendor/grammars/sourcepawn
-	url = https://github.com/austinwagner/sublime-sourcepawn
+	url = https://github.com/github-linguist/sublime-sourcepawn
 [submodule "vendor/grammars/gdscript"]
 	path = vendor/grammars/gdscript
 	url = https://github.com/beefsack/GDScript-sublime
diff --git a/vendor/grammars/NSIS b/vendor/grammars/NSIS
index 171bb32a..696d06cb 160000
--- a/vendor/grammars/NSIS
+++ b/vendor/grammars/NSIS
@@ -1 +1 @@
-Subproject commit 171bb32ae1bade20f933675b046a101f26970123
+Subproject commit 696d06cb2bd0dfc619c989c746e4b43eea689161
diff --git a/vendor/grammars/awk-sublime b/vendor/grammars/awk-sublime
index 792d9215..72b487a1 160000
--- a/vendor/grammars/awk-sublime
+++ b/vendor/grammars/awk-sublime
@@ -1 +1 @@
-Subproject commit 792d9215315758c505a44a325b910bedc87bd10b
+Subproject commit 72b487a1046d86b8a195b38fa18802d2abe30370
diff --git a/vendor/grammars/sourcepawn b/vendor/grammars/sourcepawn
index 294d3ba0..d5e1022a 160000
--- a/vendor/grammars/sourcepawn
+++ b/vendor/grammars/sourcepawn
@@ -1 +1 @@
-Subproject commit 294d3ba0972f0456d9d3f554dcd8f97b51aa4d40
+Subproject commit d5e1022a4e09cdba32b416e682a2c31c72240733