diff --git a/.gitmodules b/.gitmodules
index 7c226940..a0d875c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -244,9 +244,6 @@
 [submodule "vendor/grammars/abap.tmbundle"]
 	path = vendor/grammars/abap.tmbundle
 	url = https://github.com/pvl/abap.tmbundle
-[submodule "vendor/grammars/Scalate.tmbundle"]
-	path = vendor/grammars/Scalate.tmbundle
-	url = https://github.com/scalate/Scalate.tmbundle
 [submodule "vendor/grammars/mercury-tmlanguage"]
 	path = vendor/grammars/mercury-tmlanguage
 	url = https://github.com/sebgod/mercury-tmlanguage
@@ -526,3 +523,6 @@
 [submodule "vendor/grammars/atom-salt"]
 	path = vendor/grammars/atom-salt
 	url = https://github.com/saltstack/atom-salt
+[submodule "vendor/grammars/Scalate.tmbundle"]
+	path = vendor/grammars/Scalate.tmbundle
+	url = https://github.com/scalate/Scalate.tmbundle
diff --git a/grammars.yml b/grammars.yml
index 953e83b9..a3b1f62d 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -42,12 +42,6 @@ vendor/grammars/Julia.tmbundle:
 - source.julia
 vendor/grammars/LiveScript.tmbundle:
 - source.livescript
-https://github.com/pferruggiaro/sublime-tea:
-- source.tea
-https://github.com/puppet-textmate-bundle/puppet-textmate-bundle:
-- source.puppet
-https://github.com/pvl/abap.tmbundle:
-- source.abap
 vendor/grammars/NSIS:
 - source.nsis
 vendor/grammars/NimLime:
@@ -58,14 +52,11 @@ vendor/grammars/PHP-Twig.tmbundle:
 - text.html.twig
 vendor/grammars/RDoc.tmbundle:
 - text.rdoc
-https://github.com/saltstack/atom-salt:
-- source.python.salt
-- source.yaml.salt
-https://github.com/scalate/Scalate.tmbundle:
-- source.scaml
-- text.html.ssp
 vendor/grammars/SCSS.tmbundle:
 - source.scss
+vendor/grammars/Scalate.tmbundle/:
+- source.scaml
+- text.html.ssp
 vendor/grammars/Slash.tmbundle:
 - text.html.slash
 vendor/grammars/Stata.tmbundle:
@@ -124,6 +115,9 @@ vendor/grammars/asp.tmbundle:
 vendor/grammars/assembly.tmbundle:
 - objdump.x86asm
 - source.x86asm
+vendor/grammars/atom-salt:
+- source.python.salt
+- source.yaml.salt
 vendor/grammars/autoitv3-tmbundle:
 - source.autoit.3
 vendor/grammars/awk-sublime: