diff --git a/grammars.yml b/grammars.yml
index fc1d510f..49292343 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -26,13 +26,13 @@ https://github.com/AlanQuatermain/go-tmbundle:
 - source.go
 https://github.com/Anomareh/PHP-Twig.tmbundle:
 - text.html.twig
-https://github.com/Cirru/sublime-cirru/raw/master/Cirru.tmLanguage:
+https://github.com/Cirru/sublime-cirru:
 - source.cirru
 https://github.com/Cykey/Sublime-Logos:
 - source.logos
-https://github.com/Drako/SublimeBrainfuck/raw/master/Brainfuck.tmLanguage:
+https://github.com/Drako/SublimeBrainfuck:
 - source.bf
-https://github.com/JohnNilsson/awk-sublime/raw/master/AWK.tmLanguage:
+https://github.com/JohnNilsson/awk-sublime:
 - source.awk
 https://github.com/JonBons/Sublime-SQF-Language:
 - source.sqf
@@ -46,7 +46,7 @@ https://github.com/Red-Nova-Technologies/autoitv3-tmbundle:
 - source.autoit.3
 https://github.com/SalGnt/Sublime-VimL:
 - source.viml
-https://github.com/Shammah/boo-sublime/raw/master/Boo.tmLanguage:
+https://github.com/Shammah/boo-sublime:
 - source.boo
 https://github.com/SublimeText/ColdFusion:
 - source.cfscript
@@ -110,7 +110,7 @@ https://github.com/brandonwamboldt/sublime-nginx:
 - source.nginx
 https://github.com/bro/bro-sublime:
 - source.bro
-https://github.com/carsonoid/sublime_man_page_support/raw/master/man-groff.tmLanguage:
+https://github.com/carsonoid/sublime_man_page_support:
 - text.groff
 https://github.com/ccreutzig/sublime-MuPAD:
 - source.mupad
@@ -127,7 +127,7 @@ https://github.com/clemos/haxe-sublime-bundle:
 https://github.com/cucumber/cucumber-tmbundle:
 - source.ruby.rspec.cucumber.steps
 - text.gherkin.feature
-https://github.com/daaain/Handlebars/raw/master/Handlebars.tmLanguage:
+https://github.com/daaain/Handlebars:
 - text.html.handlebars
 https://github.com/davidpeckham/powershell.tmbundle:
 - source.powershell
@@ -140,7 +140,7 @@ https://github.com/elixir-lang/elixir-tmbundle:
 - text.html.elixir
 https://github.com/ericzou/ebundles/raw/master/Bundles/MSDOS%20batch%20file.tmbundle/Syntaxes/MSDOS%20batch%20file.tmLanguage:
 - source.dosbatch
-https://github.com/euler0/sublime-glsl/raw/master/GLSL.tmLanguage:
+https://github.com/euler0/sublime-glsl:
 - source.glsl
 https://github.com/fancy-lang/fancy-tmbundle:
 - source.fancy
@@ -148,27 +148,27 @@ https://github.com/fsharp/fsharpbinding:
 - source.fsharp
 https://github.com/gingerbeardman/monkey.tmbundle:
 - source.monkey
-https://github.com/guillermooo/dart-sublime-bundle/raw/master/Dart.tmLanguage:
+https://github.com/guillermooo/dart-sublime-bundle:
 - source.dart
-https://github.com/harrism/sublimetext-cuda-cpp/raw/master/cuda-c%2B%2B.tmLanguage:
+https://github.com/harrism/sublimetext-cuda-cpp:
 - source.cuda-c++
 https://github.com/hww3/pike-textmate:
 - source.pike
-https://github.com/jeancharles-roger/ceylon-sublimetext/raw/master/Ceylon.tmLanguage:
+https://github.com/jeancharles-roger/ceylon-sublimetext:
 - source.ceylon
 https://github.com/jfairbank/Sublime-Text-2-OpenEdge-ABL:
 - source.abl
 https://github.com/jhasse/sublime-rust:
 - source.rust
-https://github.com/johanasplund/sublime-befunge/raw/master/Befunge-93.tmLanguage:
+https://github.com/johanasplund/sublime-befunge:
 - source.befunge
 https://github.com/joshaven/RDoc.tmbundle:
 - text.rdoc
-https://github.com/jpcamara/Textmate-Gosu-Bundle/raw/master/Gosu.tmbundle/Syntaxes/Gosu.tmLanguage:
+https://github.com/jpcamara/Textmate-Gosu-Bundle:
 - source.gosu.2
 https://github.com/kswedberg/jquery-tmbundle:
 - source.js.jquery
-https://github.com/laughedelic/sublime-idris/raw/master/Idris.tmLanguage:
+https://github.com/laughedelic/sublime-idris:
 - source.idris
 https://github.com/lavrton/sublime-better-typescript:
 - source.ts
@@ -196,13 +196,13 @@ https://github.com/mgalloy/idl.tmbundle:
 - text.idl-idldoc
 https://github.com/michaeledgar/protobuf-tmbundle:
 - source.protobuf
-https://github.com/mkolosick/Sublime-Coq/raw/master/Coq.tmLanguage:
+https://github.com/mkolosick/Sublime-Coq:
 - source.coq
 https://github.com/mokus0/Agda.tmbundle:
 - source.agda
 https://github.com/nanoant/Julia.tmbundle:
 - source.julia
-https://github.com/nanoant/assembly.tmbundle/raw/master/Syntaxes/objdump%20C%2B%2B.tmLanguage:
+https://github.com/nanoant/assembly.tmbundle:
 - objdump.x86asm
 https://github.com/nilium/ooc.tmbundle:
 - source.ooc
@@ -229,7 +229,7 @@ https://github.com/skozlovf/Sublime-QML:
 - source.qml
 https://github.com/slash-lang/Slash.tmbundle:
 - text.html.slash
-https://github.com/slavapestov/factor/raw/master/misc/Factor.tmbundle/Syntaxes/Factor.tmLanguage:
+https://github.com/slavapestov/factor:
 - source.factor
 https://github.com/slim-template/ruby-slim.tmbundle:
 - text.slim
@@ -410,7 +410,7 @@ https://github.com/textmate/xml.tmbundle:
 - text.xml.xsl
 https://github.com/tomas-stefano/smalltalk-tmbundle:
 - source.smalltalk
-https://github.com/vic/ioke-outdated/raw/master/share/TextMate/Ioke.tmbundle/Syntaxes/Ioke.tmLanguage:
+https://github.com/vic/ioke-outdated:
 - source.ioke
 https://github.com/vkostyukov/kotlin-sublime-package:
 - source.Kotlin
@@ -420,15 +420,15 @@ https://github.com/whitequark/llvm.tmbundle:
 - source.llvm
 https://github.com/wmertens/sublime-nix:
 - source.nix
-https://raw.githubusercontent.com/eregon/oz-tmbundle/master/Syntaxes/Oz.tmLanguage:
+https://github.com/eregon/oz-tmbundle/raw/master/Syntaxes/Oz.tmLanguage:
 - source.oz
-https://raw.githubusercontent.com/sebgod/mercury-tmlanguage/master/Mercury.tmLanguage:
+https://github.com/sebgod/mercury-tmlanguage:
 - source.mercury
-https://raw.githubusercontent.com/tenbits/sublime-mask/release/Syntaxes/mask.tmLanguage:
+https://github.com/tenbits/sublime-mask/raw/release/Syntaxes/mask.tmLanguage:
 - source.mask
 https://github.com/l15n/fish-tmbundle:
 - source.fish
-https://raw.githubusercontent.com/andik/IDL-Syntax/master/IDL.tmLanguage:
+https://github.com/andik/IDL-Syntax:
 - source.webidl
-https://raw.githubusercontent.com/atmarksharp/jasmin-sublime/master/Jasmin.tmLanguage:
+https://github.com/atmarksharp/jasmin-sublime:
 - source.jasmin