diff --git a/.gitmodules b/.gitmodules
index cac62a7d..62a3e51d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,32 +1,32 @@
 [submodule "assets/syntaxes/Elixir"]
-	path = assets/syntaxes/Elixir
+	path = assets/syntaxes/02_Extra/Elixir
 	url = https://github.com/princemaple/elixir-sublime-syntax/
 [submodule "assets/syntaxes/Packages"]
-	path = assets/syntaxes/Packages
+	path = assets/syntaxes/01_Packages
 	url = https://github.com/sublimehq/Packages/
 [submodule "assets/syntaxes/TOML"]
-	path = assets/syntaxes/TOML
+	path = assets/syntaxes/02_Extra/TOML
 	url = https://github.com/jasonwilliams/sublime_toml_highlighting
 [submodule "assets/syntaxes/Julia"]
-	path = assets/syntaxes/Julia
+	path = assets/syntaxes/02_Extra/Julia
 	url = https://github.com/JuliaEditorSupport/Julia-sublime
 [submodule "assets/themes/sublime-monokai-extended"]
 	path = assets/themes/sublime-monokai-extended
 	url = https://github.com/jonschlinkert/sublime-monokai-extended
 [submodule "assets/syntaxes/Docker"]
-	path = assets/syntaxes/Docker
+	path = assets/syntaxes/02_Extra/Docker
 	url = https://github.com/asbjornenge/Docker.tmbundle
 [submodule "assets/syntaxes/VimL"]
-	path = assets/syntaxes/VimL
+	path = assets/syntaxes/02_Extra/VimL
 	url = https://github.com/SalGnt/Sublime-VimL
 [submodule "assets/syntaxes/INI"]
-	path = assets/syntaxes/INI
+	path = assets/syntaxes/02_Extra/INI
 	url = https://github.com/clintberry/sublime-text-2-ini
 [submodule "assets/syntaxes/CMake"]
-	path = assets/syntaxes/CMake
+	path = assets/syntaxes/02_Extra/CMake
 	url = https://github.com/zyxar/Sublime-CMakeLists
 [submodule "assets/syntaxes/LESS"]
-	path = assets/syntaxes/LESS
+	path = assets/syntaxes/02_Extra/LESS
 	url = https://github.com/danro/LESS-sublime
 [submodule "assets/themes/DarkNeon"]
 	path = assets/themes/DarkNeon
@@ -41,127 +41,127 @@
 	path = assets/themes/TwoDark
 	url = https://github.com/erremauro/TwoDark
 [submodule "assets/syntaxes/AWK"]
-	path = assets/syntaxes/AWK
+	path = assets/syntaxes/02_Extra/AWK
 	url = https://github.com/JohnNilsson/awk-sublime
 [submodule "assets/syntaxes/Nix"]
-	path = assets/syntaxes/Nix
+	path = assets/syntaxes/02_Extra/Nix
 	url = https://github.com/wmertens/sublime-nix
 [submodule "assets/themes/zenburn"]
 	path = assets/themes/zenburn
 	url = https://github.com/colinta/zenburn.git
 [submodule "assets/syntaxes/Kotlin"]
-	path = assets/syntaxes/Kotlin
+	path = assets/syntaxes/02_Extra/Kotlin
 	url = https://github.com/vkostyukov/kotlin-sublime-package
 [submodule "assets/syntaxes/Elm"]
-	path = assets/syntaxes/Elm
+	path = assets/syntaxes/02_Extra/Elm
 	url = https://github.com/elm-community/SublimeElmLanguageSupport
 [submodule "assets/syntaxes/TypeScript"]
-	path = assets/syntaxes/TypeScript
+	path = assets/syntaxes/02_Extra/TypeScript
 	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
 [submodule "assets/syntaxes/Puppet"]
-	path = assets/syntaxes/Puppet
+	path = assets/syntaxes/02_Extra/Puppet
 	url = https://github.com/russCloak/SublimePuppet
 [submodule "assets/syntaxes/CSV"]
-	path = assets/syntaxes/CSV
+	path = assets/syntaxes/02_Extra/CSV
 	url = https://github.com/wadetb/Sublime-Text-Advanced-CSV
 [submodule "assets/themes/onehalf"]
 	path = assets/themes/onehalf
 	url = https://github.com/sonph/onehalf
 [submodule "assets/syntaxes/JavaScript (Babel)"]
-	path = assets/syntaxes/JavaScript (Babel)
+	path = assets/syntaxes/02_Extra/JavaScript (Babel)
 	url = https://github.com/babel/babel-sublime
 [submodule "assets/syntaxes/Cabal"]
-	path = assets/syntaxes/Cabal
+	path = assets/syntaxes/02_Extra/Cabal
 	url = https://github.com/SublimeHaskell/SublimeHaskell
 [submodule "assets/syntaxes/Dart"]
-	path = assets/syntaxes/Dart
+	path = assets/syntaxes/02_Extra/Dart
 	url = https://github.com/guillermooo/dart-sublime-bundle
 [submodule "assets/syntaxes/FSharp"]
-	path = assets/syntaxes/FSharp
+	path = assets/syntaxes/02_Extra/FSharp
 	url = https://github.com/hoest/sublimetext-fsharp
 [submodule "assets/syntaxes/PureScript"]
-	path = assets/syntaxes/PureScript
+	path = assets/syntaxes/02_Extra/PureScript
 	url = https://github.com/tellnobody1/sublime-purescript-syntax
 [submodule "assets/syntaxes/Swift"]
-	path = assets/syntaxes/Swift
+	path = assets/syntaxes/02_Extra/Swift
 	url = https://github.com/quiqueg/Swift-Sublime-Package
 [submodule "assets/syntaxes/Crystal"]
-	path = assets/syntaxes/Crystal
+	path = assets/syntaxes/02_Extra/Crystal
 	url = https://github.com/crystal-lang-tools/sublime-crystal.git
 [submodule "assets/syntaxes/PowerShell"]
-	path = assets/syntaxes/PowerShell
+	path = assets/syntaxes/02_Extra/PowerShell
 	url = https://github.com/PowerShell/EditorSyntax
 [submodule "assets/syntaxes/Robot"]
-	path = assets/syntaxes/Robot
+	path = assets/syntaxes/02_Extra/Robot
 	url = https://github.com/andriyko/sublime-robot-framework-assistant.git
 [submodule "assets/themes/sublime-snazzy"]
 	path = assets/themes/sublime-snazzy
 	url = https://github.com/greggb/sublime-snazzy
 [submodule "assets/syntaxes/AsciiDoc"]
-	path = assets/syntaxes/AsciiDoc
+	path = assets/syntaxes/02_Extra/AsciiDoc
 	url = https://github.com/SublimeText/AsciiDoc.git
 [submodule "assets/syntaxes/Assembly (ARM)"]
-	path = assets/syntaxes/Assembly (ARM)
+	path = assets/syntaxes/02_Extra/Assembly (ARM)
 	url = https://github.com/tvi/Sublime-ARM-Assembly
 [submodule "assets/syntaxes/syslog-syntax"]
-	path = assets/syntaxes/Syslog
+	path = assets/syntaxes/02_Extra/Syslog
 	url = https://github.com/caos21/syslog-syntax.git
 	branch = master
 [submodule "assets/syntaxes/protobuf-syntax-highlighting"]
-	path = assets/syntaxes/Protobuf
+	path = assets/syntaxes/02_Extra/Protobuf
 	url = https://github.com/VcamX/protobuf-syntax-highlighting.git
 	branch = master
 [submodule "assets/syntaxes/Terraform"]
-	path = assets/syntaxes/Terraform
+	path = assets/syntaxes/02_Extra/Terraform
 	url = https://github.com/alexlouden/Terraform.tmLanguage.git
 [submodule "assets/syntaxes/Jsonnet"]
-	path = assets/syntaxes/Jsonnet
+	path = assets/syntaxes/02_Extra/Jsonnet
 	url = https://github.com/gburiola/sublime-jsonnet-syntax.git
 [submodule "assets/syntaxes/varlink"]
-	path = assets/syntaxes/varlink
+	path = assets/syntaxes/02_Extra/varlink
 	url = https://github.com/varlink/syntax-highlight-varlink.git
 [submodule "assets/syntaxes/sublime-fish"]
-	path = assets/syntaxes/Fish
+	path = assets/syntaxes/02_Extra/Fish
 	url = https://github.com/Phidica/sublime-fish.git
 [submodule "assets/syntaxes/Org mode"]
-	path = assets/syntaxes/Org mode
+	path = assets/syntaxes/02_Extra/Org mode
 	url = https://github.com/jezcope/Org.tmbundle.git
 [submodule "assets/syntaxes/requirementstxt"]
-	path = assets/syntaxes/requirementstxt
+	path = assets/syntaxes/02_Extra/requirementstxt
 	url = https://github.com/wuub/requirementstxt
 [submodule "assets/syntaxes/DotENV"]
-	path = assets/syntaxes/DotENV
+	path = assets/syntaxes/02_Extra/DotENV
 	url = https://github.com/zaynali53/DotENV
 [submodule "assets/syntaxes/hosts"]
-	path = assets/syntaxes/hosts
+	path = assets/syntaxes/02_Extra/hosts
 	url = https://github.com/brandonwamboldt/sublime-hosts
 [submodule "assets/syntaxes/ssh-config"]
-	path = assets/syntaxes/ssh-config
+	path = assets/syntaxes/02_Extra/ssh-config
 	url = https://github.com/robballou/sublimetext-sshconfig.git
 [submodule "assets/syntaxes/GraphQL"]
-	path = assets/syntaxes/GraphQL
+	path = assets/syntaxes/02_Extra/GraphQL
 	url = https://github.com/dncrews/GraphQL-SublimeText3.git
 [submodule "assets/syntaxes/Verilog"]
-	path = assets/syntaxes/Verilog
+	path = assets/syntaxes/02_Extra/Verilog
 	url = https://github.com/pro711/sublime-verilog
 [submodule "assets/syntaxes/SCSS_Sass"]
-	path = assets/syntaxes/SCSS_Sass
+	path = assets/syntaxes/02_Extra/SCSS_Sass
 	url = https://github.com/braver/SublimeSass
 [submodule "assets/syntaxes/Strace"]
-	path = assets/syntaxes/Strace
+	path = assets/syntaxes/02_Extra/Strace
 	url = https://github.com/djuretic/SublimeStrace
 [submodule "assets/syntaxes/Jinja2"]
-	path = assets/syntaxes/Jinja2
+	path = assets/syntaxes/02_Extra/Jinja2
 	url = https://github.com/Martin819/sublime-jinja2
 [submodule "assets/syntaxes/SLS"]
-	path = assets/syntaxes/SLS
+	path = assets/syntaxes/02_Extra/SLS
 	url = https://github.com/saltstack/sublime-text
 	branch = master
 [submodule "assets/themes/dracula-sublime"]
 	path = assets/themes/dracula-sublime
 	url = https://github.com/dracula/sublime.git
 [submodule "assets/syntaxes/HTML (Twig)"]
-	path = assets/syntaxes/HTML (Twig)
+	path = assets/syntaxes/02_Extra/HTML (Twig)
 	url = https://github.com/Anomareh/PHP-Twig.tmbundle.git
 [submodule "assets/themes/Nord-sublime"]
 	path = assets/themes/Nord-sublime
@@ -170,9 +170,9 @@
 	path = assets/themes/solarized-sublime
 	url = https://github.com/paulcpederson/solarized-sublime.git
 [submodule "assets/syntaxes/Vue"]
-	path = assets/syntaxes/Vue
+	path = assets/syntaxes/02_Extra/Vue
 	url = https://github.com/vuejs/vue-syntax-highlight.git
 	branch = new
 [submodule "assets/syntaxes/CoffeeScript"]
-	path = assets/syntaxes/CoffeeScript
+	path = assets/syntaxes/02_Extra/CoffeeScript
 	url = https://github.com/sustained/CoffeeScript-Sublime-Plugin
diff --git a/assets/JavaDoc.sublime-syntax.patch b/assets/JavaDoc.sublime-syntax.patch
index 731a75a7..62ee742e 100644
--- a/assets/JavaDoc.sublime-syntax.patch
+++ b/assets/JavaDoc.sublime-syntax.patch
@@ -1,7 +1,7 @@
-diff --git syntaxes/Packages/Java/JavaDoc.sublime-syntax syntaxes/Packages/Java/JavaDoc.sublime-syntax
+diff --git syntaxes/01_Packages/Java/JavaDoc.sublime-syntax syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
 index 422a6a9..40a741e 100644
---- syntaxes/Packages/Java/JavaDoc.sublime-syntax
-+++ syntaxes/Packages/Java/JavaDoc.sublime-syntax
+--- syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
++++ syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
 @@ -13,7 +13,7 @@ variables:
  contexts:
    prototype:
diff --git a/assets/create.sh b/assets/create.sh
index 0ebd1dcd..3fb63ebf 100755
--- a/assets/create.sh
+++ b/assets/create.sh
@@ -44,7 +44,7 @@ bat cache --clear
 
 # TODO: Remove this (and the reverse part below) when
 # https://github.com/trishume/syntect/issues/222 has been fixed
-JAVADOC_FILE="${ASSET_DIR}/syntaxes/Packages/Java/JavaDoc.sublime-syntax"
+JAVADOC_FILE="${ASSET_DIR}/syntaxes/01_Packages/Java/JavaDoc.sublime-syntax"
 JAVADOC_PATCH="${ASSET_DIR}/JavaDoc.sublime-syntax.patch"
 patch "$JAVADOC_FILE" "$JAVADOC_PATCH"
 
diff --git a/assets/syntaxes.bin b/assets/syntaxes.bin
index 9992cb81..a412e5e3 100644
Binary files a/assets/syntaxes.bin and b/assets/syntaxes.bin differ
diff --git a/assets/syntaxes/Packages b/assets/syntaxes/01_Packages
similarity index 100%
rename from assets/syntaxes/Packages
rename to assets/syntaxes/01_Packages
diff --git a/assets/syntaxes/AWK b/assets/syntaxes/02_Extra/AWK
similarity index 100%
rename from assets/syntaxes/AWK
rename to assets/syntaxes/02_Extra/AWK
diff --git a/assets/syntaxes/AsciiDoc b/assets/syntaxes/02_Extra/AsciiDoc
similarity index 100%
rename from assets/syntaxes/AsciiDoc
rename to assets/syntaxes/02_Extra/AsciiDoc
diff --git a/assets/syntaxes/AsciiDoc.sublime-syntax b/assets/syntaxes/02_Extra/AsciiDoc.sublime-syntax
similarity index 100%
rename from assets/syntaxes/AsciiDoc.sublime-syntax
rename to assets/syntaxes/02_Extra/AsciiDoc.sublime-syntax
diff --git a/assets/syntaxes/Assembly (ARM) b/assets/syntaxes/02_Extra/Assembly (ARM)
similarity index 100%
rename from assets/syntaxes/Assembly (ARM)
rename to assets/syntaxes/02_Extra/Assembly (ARM)
diff --git a/assets/syntaxes/Assembly (ARM).sublime-syntax b/assets/syntaxes/02_Extra/Assembly (ARM).sublime-syntax
similarity index 100%
rename from assets/syntaxes/Assembly (ARM).sublime-syntax
rename to assets/syntaxes/02_Extra/Assembly (ARM).sublime-syntax
diff --git a/assets/syntaxes/Assembly (x86_64).sublime-syntax b/assets/syntaxes/02_Extra/Assembly (x86_64).sublime-syntax
similarity index 100%
rename from assets/syntaxes/Assembly (x86_64).sublime-syntax
rename to assets/syntaxes/02_Extra/Assembly (x86_64).sublime-syntax
diff --git a/assets/syntaxes/CMake b/assets/syntaxes/02_Extra/CMake
similarity index 100%
rename from assets/syntaxes/CMake
rename to assets/syntaxes/02_Extra/CMake
diff --git a/assets/syntaxes/CSV b/assets/syntaxes/02_Extra/CSV
similarity index 100%
rename from assets/syntaxes/CSV
rename to assets/syntaxes/02_Extra/CSV
diff --git a/assets/syntaxes/CSV.sublime-syntax b/assets/syntaxes/02_Extra/CSV.sublime-syntax
similarity index 100%
rename from assets/syntaxes/CSV.sublime-syntax
rename to assets/syntaxes/02_Extra/CSV.sublime-syntax
diff --git a/assets/syntaxes/Cabal b/assets/syntaxes/02_Extra/Cabal
similarity index 100%
rename from assets/syntaxes/Cabal
rename to assets/syntaxes/02_Extra/Cabal
diff --git a/assets/syntaxes/Cabal.sublime-syntax b/assets/syntaxes/02_Extra/Cabal.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Cabal.sublime-syntax
rename to assets/syntaxes/02_Extra/Cabal.sublime-syntax
diff --git a/assets/syntaxes/CoffeeScript b/assets/syntaxes/02_Extra/CoffeeScript
similarity index 100%
rename from assets/syntaxes/CoffeeScript
rename to assets/syntaxes/02_Extra/CoffeeScript
diff --git a/assets/syntaxes/CoffeeScript.sublime-syntax b/assets/syntaxes/02_Extra/CoffeeScript.sublime-syntax
similarity index 100%
rename from assets/syntaxes/CoffeeScript.sublime-syntax
rename to assets/syntaxes/02_Extra/CoffeeScript.sublime-syntax
diff --git a/assets/syntaxes/CpuInfo.sublime-syntax b/assets/syntaxes/02_Extra/CpuInfo.sublime-syntax
similarity index 100%
rename from assets/syntaxes/CpuInfo.sublime-syntax
rename to assets/syntaxes/02_Extra/CpuInfo.sublime-syntax
diff --git a/assets/syntaxes/Crystal b/assets/syntaxes/02_Extra/Crystal
similarity index 100%
rename from assets/syntaxes/Crystal
rename to assets/syntaxes/02_Extra/Crystal
diff --git a/assets/syntaxes/Crystal.sublime-syntax b/assets/syntaxes/02_Extra/Crystal.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Crystal.sublime-syntax
rename to assets/syntaxes/02_Extra/Crystal.sublime-syntax
diff --git a/assets/syntaxes/Dart b/assets/syntaxes/02_Extra/Dart
similarity index 100%
rename from assets/syntaxes/Dart
rename to assets/syntaxes/02_Extra/Dart
diff --git a/assets/syntaxes/Dart.sublime-syntax b/assets/syntaxes/02_Extra/Dart.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Dart.sublime-syntax
rename to assets/syntaxes/02_Extra/Dart.sublime-syntax
diff --git a/assets/syntaxes/Docker b/assets/syntaxes/02_Extra/Docker
similarity index 100%
rename from assets/syntaxes/Docker
rename to assets/syntaxes/02_Extra/Docker
diff --git a/assets/syntaxes/DotENV b/assets/syntaxes/02_Extra/DotENV
similarity index 100%
rename from assets/syntaxes/DotENV
rename to assets/syntaxes/02_Extra/DotENV
diff --git a/assets/syntaxes/DotENV.sublime-syntax b/assets/syntaxes/02_Extra/DotENV.sublime-syntax
similarity index 100%
rename from assets/syntaxes/DotENV.sublime-syntax
rename to assets/syntaxes/02_Extra/DotENV.sublime-syntax
diff --git a/assets/syntaxes/Elixir b/assets/syntaxes/02_Extra/Elixir
similarity index 100%
rename from assets/syntaxes/Elixir
rename to assets/syntaxes/02_Extra/Elixir
diff --git a/assets/syntaxes/Elm b/assets/syntaxes/02_Extra/Elm
similarity index 100%
rename from assets/syntaxes/Elm
rename to assets/syntaxes/02_Extra/Elm
diff --git a/assets/syntaxes/FSharp b/assets/syntaxes/02_Extra/FSharp
similarity index 100%
rename from assets/syntaxes/FSharp
rename to assets/syntaxes/02_Extra/FSharp
diff --git a/assets/syntaxes/Fish b/assets/syntaxes/02_Extra/Fish
similarity index 100%
rename from assets/syntaxes/Fish
rename to assets/syntaxes/02_Extra/Fish
diff --git a/assets/syntaxes/Fstab.sublime-syntax b/assets/syntaxes/02_Extra/Fstab.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Fstab.sublime-syntax
rename to assets/syntaxes/02_Extra/Fstab.sublime-syntax
diff --git a/assets/syntaxes/GraphQL b/assets/syntaxes/02_Extra/GraphQL
similarity index 100%
rename from assets/syntaxes/GraphQL
rename to assets/syntaxes/02_Extra/GraphQL
diff --git a/assets/syntaxes/Group.sublime-syntax b/assets/syntaxes/02_Extra/Group.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Group.sublime-syntax
rename to assets/syntaxes/02_Extra/Group.sublime-syntax
diff --git a/assets/syntaxes/HTML (Twig) b/assets/syntaxes/02_Extra/HTML (Twig)
similarity index 100%
rename from assets/syntaxes/HTML (Twig)
rename to assets/syntaxes/02_Extra/HTML (Twig)
diff --git a/assets/syntaxes/HTML (Twig).sublime-syntax b/assets/syntaxes/02_Extra/HTML (Twig).sublime-syntax
similarity index 100%
rename from assets/syntaxes/HTML (Twig).sublime-syntax
rename to assets/syntaxes/02_Extra/HTML (Twig).sublime-syntax
diff --git a/assets/syntaxes/Hosts.sublime-syntax b/assets/syntaxes/02_Extra/Hosts.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Hosts.sublime-syntax
rename to assets/syntaxes/02_Extra/Hosts.sublime-syntax
diff --git a/assets/syntaxes/INI b/assets/syntaxes/02_Extra/INI
similarity index 100%
rename from assets/syntaxes/INI
rename to assets/syntaxes/02_Extra/INI
diff --git a/assets/syntaxes/INI.sublime-syntax b/assets/syntaxes/02_Extra/INI.sublime-syntax
similarity index 100%
rename from assets/syntaxes/INI.sublime-syntax
rename to assets/syntaxes/02_Extra/INI.sublime-syntax
diff --git a/assets/syntaxes/JavaScript (Babel) b/assets/syntaxes/02_Extra/JavaScript (Babel)
similarity index 100%
rename from assets/syntaxes/JavaScript (Babel)
rename to assets/syntaxes/02_Extra/JavaScript (Babel)
diff --git a/assets/syntaxes/JavaScript (Babel).sublime-syntax b/assets/syntaxes/02_Extra/JavaScript (Babel).sublime-syntax
similarity index 100%
rename from assets/syntaxes/JavaScript (Babel).sublime-syntax
rename to assets/syntaxes/02_Extra/JavaScript (Babel).sublime-syntax
diff --git a/assets/syntaxes/Jinja2 b/assets/syntaxes/02_Extra/Jinja2
similarity index 100%
rename from assets/syntaxes/Jinja2
rename to assets/syntaxes/02_Extra/Jinja2
diff --git a/assets/syntaxes/Jsonnet b/assets/syntaxes/02_Extra/Jsonnet
similarity index 100%
rename from assets/syntaxes/Jsonnet
rename to assets/syntaxes/02_Extra/Jsonnet
diff --git a/assets/syntaxes/Julia b/assets/syntaxes/02_Extra/Julia
similarity index 100%
rename from assets/syntaxes/Julia
rename to assets/syntaxes/02_Extra/Julia
diff --git a/assets/syntaxes/Kotlin b/assets/syntaxes/02_Extra/Kotlin
similarity index 100%
rename from assets/syntaxes/Kotlin
rename to assets/syntaxes/02_Extra/Kotlin
diff --git a/assets/syntaxes/Kotlin.sublime-syntax b/assets/syntaxes/02_Extra/Kotlin.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Kotlin.sublime-syntax
rename to assets/syntaxes/02_Extra/Kotlin.sublime-syntax
diff --git a/assets/syntaxes/LESS b/assets/syntaxes/02_Extra/LESS
similarity index 100%
rename from assets/syntaxes/LESS
rename to assets/syntaxes/02_Extra/LESS
diff --git a/assets/syntaxes/Manpage.sublime-syntax b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Manpage.sublime-syntax
rename to assets/syntaxes/02_Extra/Manpage.sublime-syntax
diff --git a/assets/syntaxes/MemInfo.sublime-syntax b/assets/syntaxes/02_Extra/MemInfo.sublime-syntax
similarity index 100%
rename from assets/syntaxes/MemInfo.sublime-syntax
rename to assets/syntaxes/02_Extra/MemInfo.sublime-syntax
diff --git a/assets/syntaxes/Nim.sublime-syntax b/assets/syntaxes/02_Extra/Nim.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Nim.sublime-syntax
rename to assets/syntaxes/02_Extra/Nim.sublime-syntax
diff --git a/assets/syntaxes/Nix b/assets/syntaxes/02_Extra/Nix
similarity index 100%
rename from assets/syntaxes/Nix
rename to assets/syntaxes/02_Extra/Nix
diff --git a/assets/syntaxes/Nix.sublime-syntax b/assets/syntaxes/02_Extra/Nix.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Nix.sublime-syntax
rename to assets/syntaxes/02_Extra/Nix.sublime-syntax
diff --git a/assets/syntaxes/Org mode b/assets/syntaxes/02_Extra/Org mode
similarity index 100%
rename from assets/syntaxes/Org mode
rename to assets/syntaxes/02_Extra/Org mode
diff --git a/assets/syntaxes/Org mode.sublime-syntax b/assets/syntaxes/02_Extra/Org mode.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Org mode.sublime-syntax
rename to assets/syntaxes/02_Extra/Org mode.sublime-syntax
diff --git a/assets/syntaxes/Passwd.sublime-syntax b/assets/syntaxes/02_Extra/Passwd.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Passwd.sublime-syntax
rename to assets/syntaxes/02_Extra/Passwd.sublime-syntax
diff --git a/assets/syntaxes/PowerShell b/assets/syntaxes/02_Extra/PowerShell
similarity index 100%
rename from assets/syntaxes/PowerShell
rename to assets/syntaxes/02_Extra/PowerShell
diff --git a/assets/syntaxes/PowerShell.sublime-syntax b/assets/syntaxes/02_Extra/PowerShell.sublime-syntax
similarity index 100%
rename from assets/syntaxes/PowerShell.sublime-syntax
rename to assets/syntaxes/02_Extra/PowerShell.sublime-syntax
diff --git a/assets/syntaxes/Protobuf b/assets/syntaxes/02_Extra/Protobuf
similarity index 100%
rename from assets/syntaxes/Protobuf
rename to assets/syntaxes/02_Extra/Protobuf
diff --git a/assets/syntaxes/Puppet b/assets/syntaxes/02_Extra/Puppet
similarity index 100%
rename from assets/syntaxes/Puppet
rename to assets/syntaxes/02_Extra/Puppet
diff --git a/assets/syntaxes/PureScript b/assets/syntaxes/02_Extra/PureScript
similarity index 100%
rename from assets/syntaxes/PureScript
rename to assets/syntaxes/02_Extra/PureScript
diff --git a/assets/syntaxes/Resolv.sublime-syntax b/assets/syntaxes/02_Extra/Resolv.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Resolv.sublime-syntax
rename to assets/syntaxes/02_Extra/Resolv.sublime-syntax
diff --git a/assets/syntaxes/Robot b/assets/syntaxes/02_Extra/Robot
similarity index 100%
rename from assets/syntaxes/Robot
rename to assets/syntaxes/02_Extra/Robot
diff --git a/assets/syntaxes/Robot.sublime-syntax b/assets/syntaxes/02_Extra/Robot.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Robot.sublime-syntax
rename to assets/syntaxes/02_Extra/Robot.sublime-syntax
diff --git a/assets/syntaxes/SCSS_Sass b/assets/syntaxes/02_Extra/SCSS_Sass
similarity index 100%
rename from assets/syntaxes/SCSS_Sass
rename to assets/syntaxes/02_Extra/SCSS_Sass
diff --git a/assets/syntaxes/SLS b/assets/syntaxes/02_Extra/SLS
similarity index 100%
rename from assets/syntaxes/SLS
rename to assets/syntaxes/02_Extra/SLS
diff --git a/assets/syntaxes/Strace b/assets/syntaxes/02_Extra/Strace
similarity index 100%
rename from assets/syntaxes/Strace
rename to assets/syntaxes/02_Extra/Strace
diff --git a/assets/syntaxes/Swift b/assets/syntaxes/02_Extra/Swift
similarity index 100%
rename from assets/syntaxes/Swift
rename to assets/syntaxes/02_Extra/Swift
diff --git a/assets/syntaxes/Swift.sublime-syntax b/assets/syntaxes/02_Extra/Swift.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Swift.sublime-syntax
rename to assets/syntaxes/02_Extra/Swift.sublime-syntax
diff --git a/assets/syntaxes/Syslog b/assets/syntaxes/02_Extra/Syslog
similarity index 100%
rename from assets/syntaxes/Syslog
rename to assets/syntaxes/02_Extra/Syslog
diff --git a/assets/syntaxes/TOML b/assets/syntaxes/02_Extra/TOML
similarity index 100%
rename from assets/syntaxes/TOML
rename to assets/syntaxes/02_Extra/TOML
diff --git a/assets/syntaxes/Terraform b/assets/syntaxes/02_Extra/Terraform
similarity index 100%
rename from assets/syntaxes/Terraform
rename to assets/syntaxes/02_Extra/Terraform
diff --git a/assets/syntaxes/TypeScript b/assets/syntaxes/02_Extra/TypeScript
similarity index 100%
rename from assets/syntaxes/TypeScript
rename to assets/syntaxes/02_Extra/TypeScript
diff --git a/assets/syntaxes/TypeScript.sublime-syntax b/assets/syntaxes/02_Extra/TypeScript.sublime-syntax
similarity index 100%
rename from assets/syntaxes/TypeScript.sublime-syntax
rename to assets/syntaxes/02_Extra/TypeScript.sublime-syntax
diff --git a/assets/syntaxes/TypsecriptReact.sublime-syntax b/assets/syntaxes/02_Extra/TypsecriptReact.sublime-syntax
similarity index 100%
rename from assets/syntaxes/TypsecriptReact.sublime-syntax
rename to assets/syntaxes/02_Extra/TypsecriptReact.sublime-syntax
diff --git a/assets/syntaxes/Verilog b/assets/syntaxes/02_Extra/Verilog
similarity index 100%
rename from assets/syntaxes/Verilog
rename to assets/syntaxes/02_Extra/Verilog
diff --git a/assets/syntaxes/Verilog.sublime-syntax b/assets/syntaxes/02_Extra/Verilog.sublime-syntax
similarity index 100%
rename from assets/syntaxes/Verilog.sublime-syntax
rename to assets/syntaxes/02_Extra/Verilog.sublime-syntax
diff --git a/assets/syntaxes/VimL b/assets/syntaxes/02_Extra/VimL
similarity index 100%
rename from assets/syntaxes/VimL
rename to assets/syntaxes/02_Extra/VimL
diff --git a/assets/syntaxes/VimL.sublime-syntax b/assets/syntaxes/02_Extra/VimL.sublime-syntax
similarity index 100%
rename from assets/syntaxes/VimL.sublime-syntax
rename to assets/syntaxes/02_Extra/VimL.sublime-syntax
diff --git a/assets/syntaxes/Vue b/assets/syntaxes/02_Extra/Vue
similarity index 100%
rename from assets/syntaxes/Vue
rename to assets/syntaxes/02_Extra/Vue
diff --git a/assets/syntaxes/hosts b/assets/syntaxes/02_Extra/hosts
similarity index 100%
rename from assets/syntaxes/hosts
rename to assets/syntaxes/02_Extra/hosts
diff --git a/assets/syntaxes/requirementstxt b/assets/syntaxes/02_Extra/requirementstxt
similarity index 100%
rename from assets/syntaxes/requirementstxt
rename to assets/syntaxes/02_Extra/requirementstxt
diff --git a/assets/syntaxes/requirementstxt.sublime-syntax b/assets/syntaxes/02_Extra/requirementstxt.sublime-syntax
similarity index 100%
rename from assets/syntaxes/requirementstxt.sublime-syntax
rename to assets/syntaxes/02_Extra/requirementstxt.sublime-syntax
diff --git a/assets/syntaxes/show-nonprintable.sublime-syntax b/assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax
similarity index 100%
rename from assets/syntaxes/show-nonprintable.sublime-syntax
rename to assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax
diff --git a/assets/syntaxes/ssh-config b/assets/syntaxes/02_Extra/ssh-config
similarity index 100%
rename from assets/syntaxes/ssh-config
rename to assets/syntaxes/02_Extra/ssh-config
diff --git a/assets/syntaxes/varlink b/assets/syntaxes/02_Extra/varlink
similarity index 100%
rename from assets/syntaxes/varlink
rename to assets/syntaxes/02_Extra/varlink
diff --git a/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.orig b/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.orig
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.rej b/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.rej
new file mode 100644
index 00000000..c04d5998
--- /dev/null
+++ b/assets/syntaxes/Packages/Java/JavaDoc.sublime-syntax.rej
@@ -0,0 +1,11 @@
+--- JavaDoc.sublime-syntax
++++ JavaDoc.sublime-syntax
+@@ -13,7 +13,7 @@ variables:
+ contexts:
+   prototype:
+     # https://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#leadingasterisks
+-    - match: ^\s*(\*)\s*(?!\s*@)
++    - match: ^\s*(\*)(?!/)\s*(?!\s*@)
+       captures:
+         1: punctuation.definition.comment.javadoc
+ 
diff --git a/src/assets.rs b/src/assets.rs
index 79305660..4196b6af 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -273,6 +273,8 @@ mod tests {
         assert_eq!(test.syntax_name("test.rs"), "Rust");
         assert_eq!(test.syntax_name("test.cpp"), "C++");
         assert_eq!(test.syntax_name("PKGBUILD"), "Bourne Again Shell (bash)");
+        assert_eq!(test.syntax_name(".bashrc"), "Bourne Again Shell (bash)");
+        assert_eq!(test.syntax_name("Makefile"), "Makefile");
     }
 
     #[test]
@@ -280,10 +282,8 @@ mod tests {
         let test = SyntaxDetectionTest::new();
 
         assert_eq!(test.syntax_name("test.sass"), "Sass");
-        // TODO: make these tests pass:
-        // assert_eq!(test.syntax_name("test.h"), "C");
-        // assert_eq!(test.syntax_name("test.hs"), "Haskell (Improved)");
-        // assert_eq!(test.syntax_name("test.js"), "JavaScript (Babel)");
+        assert_eq!(test.syntax_name("test.hs"), "Haskell (improved)");
+        assert_eq!(test.syntax_name("test.js"), "JavaScript (Babel)");
     }
 
     #[test]