diff --git a/.gitmodules b/.gitmodules
index ea5847d7..326a2a06 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -559,7 +559,7 @@
 	url = https://github.com/ShaneWilton/sublime-smali
 [submodule "vendor/grammars/language-jsoniq"]
 	path = vendor/grammars/language-jsoniq
-	url = http://github.com/wcandillon/language-jsoniq
+	url = https://github.com/wcandillon/language-jsoniq
 [submodule "vendor/grammars/atom-fsharp"]
 	path = vendor/grammars/atom-fsharp
 	url = https://github.com/fsprojects/atom-fsharp
@@ -669,8 +669,8 @@
 	path = vendor/grammars/pig-latin
 	url = https://github.com/goblindegook/sublime-text-pig-latin
 [submodule "vendor/grammars/sourcepawn"]
-path = vendor/grammars/sourcepawn
-url = https://github.com/austinwagner/sublime-sourcepawn
+	path = vendor/grammars/sourcepawn
+	url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/gdscript"]
 	path = vendor/grammars/gdscript
 	url = https://github.com/beefsack/GDScript-sublime
diff --git a/grammars.yml b/grammars.yml
index 916e3156..caa14213 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -8,9 +8,9 @@ vendor/grammars/Agda.tmbundle:
 - source.agda
 vendor/grammars/Alloy.tmbundle:
 - source.alloy
-vendor/grammars/AutoHotkey/:
+vendor/grammars/AutoHotkey:
 - source.ahk
-vendor/grammars/BrightScript.tmbundle/:
+vendor/grammars/BrightScript.tmbundle:
 - source.brightauthorproject
 - source.brightscript
 vendor/grammars/ColdFusion:
@@ -20,13 +20,13 @@ vendor/grammars/ColdFusion:
 - text.html.cfm
 vendor/grammars/Docker.tmbundle:
 - source.dockerfile
-vendor/grammars/Elm/:
+vendor/grammars/Elm:
 - source.elm
 - text.html.mediawiki.elm-build-output
 - text.html.mediawiki.elm-documentation
 vendor/grammars/FreeMarker.tmbundle:
 - text.html.ftl
-vendor/grammars/G-Code/:
+vendor/grammars/G-Code:
 - source.LS
 - source.MCPOST
 - source.MOD
@@ -39,7 +39,7 @@ vendor/grammars/IDL-Syntax:
 vendor/grammars/Isabelle.tmbundle:
 - source.isabelle.root
 - source.isabelle.theory
-vendor/grammars/JSyntax/:
+vendor/grammars/JSyntax:
 - source.j
 vendor/grammars/Julia.tmbundle:
 - source.julia
@@ -50,7 +50,7 @@ vendor/grammars/LiveScript.tmbundle:
 vendor/grammars/MagicPython:
 - source.python
 - source.regexp.python
-vendor/grammars/Modelica/:
+vendor/grammars/Modelica:
 - source.modelica
 vendor/grammars/NSIS:
 - source.nsis
@@ -60,7 +60,7 @@ vendor/grammars/NimLime:
 - source.nimcfg
 vendor/grammars/PHP-Twig.tmbundle:
 - text.html.twig
-vendor/grammars/PogoScript.tmbundle/:
+vendor/grammars/PogoScript.tmbundle:
 - source.pogoscript
 vendor/grammars/RDoc.tmbundle:
 - text.rdoc
@@ -75,10 +75,10 @@ vendor/grammars/Scalate.tmbundle:
 - text.html.ssp
 vendor/grammars/Slash.tmbundle:
 - text.html.slash
-vendor/grammars/Stata.tmbundle/:
+vendor/grammars/Stata.tmbundle:
 - source.mata
 - source.stata
-vendor/grammars/Stylus/:
+vendor/grammars/Stylus:
 - source.stylus
 vendor/grammars/Sublime-Coq:
 - source.coq
@@ -88,7 +88,7 @@ vendor/grammars/Sublime-Lasso:
 - file.lasso
 vendor/grammars/Sublime-Loom:
 - source.loomscript
-vendor/grammars/Sublime-Modula-2/:
+vendor/grammars/Sublime-Modula-2:
 - source.modula2
 vendor/grammars/Sublime-Nit:
 - source.nit
@@ -107,22 +107,22 @@ vendor/grammars/Sublime-VimL:
 - source.viml
 vendor/grammars/SublimeBrainfuck:
 - source.bf
-vendor/grammars/SublimeClarion/:
+vendor/grammars/SublimeClarion:
 - source.clarion
-vendor/grammars/SublimeGDB/:
+vendor/grammars/SublimeGDB:
 - source.disasm
 - source.gdb
 - source.gdb.session
 - source.gdbregs
-vendor/grammars/SublimePapyrus/:
+vendor/grammars/SublimePapyrus:
 - source.papyrus.skyrim
-vendor/grammars/SublimePuppet/:
+vendor/grammars/SublimePuppet:
 - source.puppet
 vendor/grammars/SublimeXtend:
 - source.xtend
 vendor/grammars/TLA:
 - source.tla
-vendor/grammars/TXL/:
+vendor/grammars/TXL:
 - source.txl
 vendor/grammars/Textmate-Gosu-Bundle:
 - source.gosu.2
@@ -151,20 +151,20 @@ vendor/grammars/antlr.tmbundle:
 vendor/grammars/apache.tmbundle:
 - source.apache-config
 - source.apache-config.mod_perl
-vendor/grammars/api-blueprint-sublime-plugin/:
+vendor/grammars/api-blueprint-sublime-plugin:
 - text.html.markdown.source.gfm.apib
 - text.html.markdown.source.gfm.mson
 vendor/grammars/applescript.tmbundle:
 - source.applescript
-vendor/grammars/asciidoc.tmbundle/:
+vendor/grammars/asciidoc.tmbundle:
 - text.html.asciidoc
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
-vendor/grammars/assembly/:
+vendor/grammars/assembly:
 - objdump.x86asm
 - source.x86asm
-vendor/grammars/atom-fsharp/:
+vendor/grammars/atom-fsharp:
 - source.fsharp
 - source.fsharp.fsi
 - source.fsharp.fsl
@@ -174,16 +174,16 @@ vendor/grammars/atom-language-1c-bsl:
 - source.sdbl
 vendor/grammars/atom-language-clean:
 - source.clean
-vendor/grammars/atom-language-purescript/:
+vendor/grammars/atom-language-purescript:
 - source.purescript
 vendor/grammars/atom-language-srt:
 - text.srt
-vendor/grammars/atom-language-stan/:
+vendor/grammars/atom-language-stan:
 - source.stan
 vendor/grammars/atom-salt:
 - source.python.salt
 - source.yaml.salt
-vendor/grammars/atomic-dreams/:
+vendor/grammars/atomic-dreams:
 - source.dm
 - source.dmf
 vendor/grammars/ats:
@@ -194,7 +194,7 @@ vendor/grammars/bison.tmbundle:
 - source.bison
 vendor/grammars/blitzmax:
 - source.blitzmax
-vendor/grammars/boo/:
+vendor/grammars/boo:
 - source.boo
 vendor/grammars/bro-sublime:
 - source.bro
@@ -219,7 +219,7 @@ vendor/grammars/cool-tmbundle:
 vendor/grammars/cpp-qt.tmbundle:
 - source.c++.qt
 - source.qmake
-vendor/grammars/creole/:
+vendor/grammars/creole:
 - text.html.creole
 vendor/grammars/css.tmbundle:
 - source.css
@@ -245,7 +245,7 @@ vendor/grammars/dylan.tmbundle:
 - source.makegen
 vendor/grammars/ebundles/Bundles/MSDOS batch file.tmbundle:
 - source.dosbatch
-vendor/grammars/ec.tmbundle/:
+vendor/grammars/ec.tmbundle:
 - source.c.ec
 vendor/grammars/eiffel.tmbundle:
 - source.eiffel
@@ -270,9 +270,9 @@ vendor/grammars/forth:
 vendor/grammars/fortran.tmbundle:
 - source.fortran
 - source.fortran.modern
-vendor/grammars/gap-tmbundle/:
+vendor/grammars/gap-tmbundle:
 - source.gap
-vendor/grammars/gdscript/:
+vendor/grammars/gdscript:
 - source.gdscript
 vendor/grammars/gettext.tmbundle:
 - source.po
@@ -300,7 +300,7 @@ vendor/grammars/idl.tmbundle:
 - source.idl
 - source.idl-dlm
 - text.idl-idldoc
-vendor/grammars/idris/:
+vendor/grammars/idris:
 - source.idris
 vendor/grammars/ini.tmbundle:
 - source.ini
@@ -332,12 +332,12 @@ vendor/grammars/language-apl:
 - source.apl
 vendor/grammars/language-asn1:
 - source.asn
-vendor/grammars/language-babel/:
+vendor/grammars/language-babel:
 - source.js.jsx
 - source.regexp.babel
-vendor/grammars/language-blade/:
+vendor/grammars/language-blade:
 - text.html.php.blade
-vendor/grammars/language-click/:
+vendor/grammars/language-click:
 - source.click
 vendor/grammars/language-clojure:
 - source.clojure
@@ -379,10 +379,10 @@ vendor/grammars/language-javascript:
 - source.js
 - source.js.regexp
 - source.js.regexp.replacement
-vendor/grammars/language-jsoniq/:
+vendor/grammars/language-jsoniq:
 - source.jq
 - source.xq
-vendor/grammars/language-less/:
+vendor/grammars/language-less:
 - source.css.less
 vendor/grammars/language-maxscript:
 - source.maxscript
@@ -418,7 +418,7 @@ vendor/grammars/language-xbase:
 - source.harbour
 vendor/grammars/language-yaml:
 - source.yaml
-vendor/grammars/language-yang/:
+vendor/grammars/language-yang:
 - source.yang
 vendor/grammars/latex.tmbundle:
 - text.bibtex
@@ -452,11 +452,11 @@ vendor/grammars/matlab.tmbundle:
 - source.octave
 vendor/grammars/maven.tmbundle:
 - text.xml.pom
-vendor/grammars/mediawiki.tmbundle/:
+vendor/grammars/mediawiki.tmbundle:
 - text.html.mediawiki
 vendor/grammars/mercury-tmlanguage:
 - source.mercury
-vendor/grammars/monkey/:
+vendor/grammars/monkey:
 - source.monkey
 vendor/grammars/moonscript-tmbundle:
 - source.moonscript
@@ -490,9 +490,9 @@ vendor/grammars/parrot:
 - source.parrot.pir
 vendor/grammars/pascal.tmbundle:
 - source.pascal
-vendor/grammars/pawn-sublime-language/:
+vendor/grammars/pawn-sublime-language:
 - source.pawn
-vendor/grammars/perl.tmbundle/:
+vendor/grammars/perl.tmbundle:
 - source.perl
 - source.perl.6
 vendor/grammars/perl6fe:
@@ -503,7 +503,7 @@ vendor/grammars/php-smarty.tmbundle:
 - text.html.smarty
 vendor/grammars/php.tmbundle:
 - text.html.php
-vendor/grammars/pig-latin/:
+vendor/grammars/pig-latin:
 - source.pig_latin
 vendor/grammars/pike-textmate:
 - source.pike
@@ -542,11 +542,11 @@ vendor/grammars/scilab.tmbundle:
 - source.scilab
 vendor/grammars/secondlife-lsl:
 - source.lsl
-vendor/grammars/smali-sublime/smali.tmLanguage:
+vendor/grammars/smali-sublime:
 - source.smali
 vendor/grammars/smalltalk-tmbundle:
 - source.smalltalk
-vendor/grammars/sourcepawn/:
+vendor/grammars/sourcepawn:
 - source.sp
 vendor/grammars/sql.tmbundle:
 - source.sql
@@ -557,9 +557,9 @@ vendor/grammars/standard-ml.tmbundle:
 - source.ml
 vendor/grammars/sublime-MuPAD:
 - source.mupad
-vendor/grammars/sublime-aspectj/:
+vendor/grammars/sublime-aspectj:
 - source.aspectj
-vendor/grammars/sublime-autoit/:
+vendor/grammars/sublime-autoit:
 - source.autoit
 vendor/grammars/sublime-befunge:
 - source.befunge
@@ -567,12 +567,12 @@ vendor/grammars/sublime-bsv:
 - source.bsv
 vendor/grammars/sublime-cirru:
 - source.cirru
-vendor/grammars/sublime-clips/:
+vendor/grammars/sublime-clips:
 - source.clips
 vendor/grammars/sublime-glsl:
 - source.essl
 - source.glsl
-vendor/grammars/sublime-golo/:
+vendor/grammars/sublime-golo:
 - source.golo
 vendor/grammars/sublime-mask:
 - source.mask
@@ -581,27 +581,27 @@ vendor/grammars/sublime-netlinx:
 - source.netlinx.erb
 vendor/grammars/sublime-nginx:
 - source.nginx
-vendor/grammars/sublime-opal/:
+vendor/grammars/sublime-opal:
 - source.opal
 - source.opalsysdefs
 vendor/grammars/sublime-pony:
 - source.pony
-vendor/grammars/sublime-rexx/:
+vendor/grammars/sublime-rexx:
 - source.rexx
 vendor/grammars/sublime-robot-plugin:
 - text.robot
 vendor/grammars/sublime-rust:
 - source.rust
-vendor/grammars/sublime-spintools/:
+vendor/grammars/sublime-spintools:
 - source.regexp.spin
 - source.spin
 vendor/grammars/sublime-tea:
 - source.tea
 vendor/grammars/sublime-terra:
 - source.terra
-vendor/grammars/sublime-text-ox/:
+vendor/grammars/sublime-text-ox:
 - source.ox
-vendor/grammars/sublime-typescript/:
+vendor/grammars/sublime-typescript:
 - source.ts
 - source.tsx
 - text.error-list
@@ -613,9 +613,9 @@ vendor/grammars/sublime_cobol:
 - source.cobol
 - source.jcl
 - source.opencobol
-vendor/grammars/sublimeassembly/:
+vendor/grammars/sublimeassembly:
 - source.assembly
-vendor/grammars/sublimeprolog/:
+vendor/grammars/sublimeprolog:
 - source.prolog
 - source.prolog.eclipse
 vendor/grammars/sublimetext-cuda-cpp:
@@ -638,7 +638,7 @@ vendor/grammars/vhdl:
 - source.vhdl
 vendor/grammars/vue-syntax-highlight:
 - text.html.vue
-vendor/grammars/xc.tmbundle/:
+vendor/grammars/xc.tmbundle:
 - source.xc
 vendor/grammars/xml.tmbundle:
 - text.xml