diff --git a/data/content.go b/data/content.go
index 4bae68d..e9afe0a 100644
--- a/data/content.go
+++ b/data/content.go
@@ -4,441 +4,439 @@ package data
 // THIS FILE SHOULD NOT BE EDITED BY HAND
 // Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
-import (
-	"regexp"
-)
+import "gopkg.in/toqueteos/substring.v1"
 
 type languageMatcher func([]byte) []string
 
 var ContentMatchers = map[string]languageMatcher{
 	".asc": func(i []byte) []string {
-		if asc_PublicKey_Matcher_0.Match(i) {
+		if asc_PublicKey_Matcher_0.Match(string(i)) {
 			return []string{"Public Key"}
-		} else if asc_AsciiDoc_Matcher_0.Match(i) {
+		} else if asc_AsciiDoc_Matcher_0.Match(string(i)) {
 			return []string{"AsciiDoc"}
-		} else if asc_AGSScript_Matcher_0.Match(i) {
+		} else if asc_AGSScript_Matcher_0.Match(string(i)) {
 			return []string{"AGS Script"}
 		}
 
 		return nil
 	},
 	".bb": func(i []byte) []string {
-		if bb_BlitzBasic_Matcher_0.Match(i) || bb_BlitzBasic_Matcher_1.Match(i) {
+		if bb_BlitzBasic_Matcher_0.Match(string(i)) || bb_BlitzBasic_Matcher_1.Match(string(i)) {
 			return []string{"BlitzBasic"}
-		} else if bb_BitBake_Matcher_0.Match(i) {
+		} else if bb_BitBake_Matcher_0.Match(string(i)) {
 			return []string{"BitBake"}
 		}
 
 		return nil
 	},
 	".builds": func(i []byte) []string {
-		if builds_XML_Matcher_0.Match(i) {
+		if builds_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
 		}
 
 		return []string{"Text"}
 	},
 	".ch": func(i []byte) []string {
-		if ch_xBase_Matcher_0.Match(i) {
+		if ch_xBase_Matcher_0.Match(string(i)) {
 			return []string{"xBase"}
 		}
 
 		return nil
 	},
 	".cl": func(i []byte) []string {
-		if cl_CommonLisp_Matcher_0.Match(i) {
+		if cl_CommonLisp_Matcher_0.Match(string(i)) {
 			return []string{"Common Lisp"}
-		} else if cl_Cool_Matcher_0.Match(i) {
+		} else if cl_Cool_Matcher_0.Match(string(i)) {
 			return []string{"Cool"}
-		} else if cl_OpenCL_Matcher_0.Match(i) {
+		} else if cl_OpenCL_Matcher_0.Match(string(i)) {
 			return []string{"OpenCL"}
 		}
 
 		return nil
 	},
 	".cls": func(i []byte) []string {
-		if cls_TeX_Matcher_0.Match(i) {
+		if cls_TeX_Matcher_0.Match(string(i)) {
 			return []string{"TeX"}
 		}
 
 		return nil
 	},
 	".cs": func(i []byte) []string {
-		if cs_Smalltalk_Matcher_0.Match(i) {
+		if cs_Smalltalk_Matcher_0.Match(string(i)) {
 			return []string{"Smalltalk"}
-		} else if cs_CSharp_Matcher_0.Match(i) || cs_CSharp_Matcher_1.Match(i) {
+		} else if cs_CSharp_Matcher_0.Match(string(i)) || cs_CSharp_Matcher_1.Match(string(i)) {
 			return []string{"C#"}
 		}
 
 		return nil
 	},
 	".d": func(i []byte) []string {
-		if d_D_Matcher_0.Match(i) {
+		if d_D_Matcher_0.Match(string(i)) {
 			return []string{"D"}
-		} else if d_DTrace_Matcher_0.Match(i) {
+		} else if d_DTrace_Matcher_0.Match(string(i)) {
 			return []string{"DTrace"}
-		} else if d_Makefile_Matcher_0.Match(i) {
+		} else if d_Makefile_Matcher_0.Match(string(i)) {
 			return []string{"Makefile"}
 		}
 
 		return nil
 	},
 	".ecl": func(i []byte) []string {
-		if ecl_ECLiPSe_Matcher_0.Match(i) {
+		if ecl_ECLiPSe_Matcher_0.Match(string(i)) {
 			return []string{"ECLiPSe"}
-		} else if ecl_ECL_Matcher_0.Match(i) {
+		} else if ecl_ECL_Matcher_0.Match(string(i)) {
 			return []string{"ECL"}
 		}
 
 		return nil
 	},
 	".es": func(i []byte) []string {
-		if es_Erlang_Matcher_0.Match(i) {
+		if es_Erlang_Matcher_0.Match(string(i)) {
 			return []string{"Erlang"}
 		}
 
 		return nil
 	},
 	".f": func(i []byte) []string {
-		if f_Forth_Matcher_0.Match(i) {
+		if f_Forth_Matcher_0.Match(string(i)) {
 			return []string{"Forth"}
-		} else if f_FilebenchWML_Matcher_0.Match(i) {
+		} else if f_FilebenchWML_Matcher_0.Match(string(i)) {
 			return []string{"Filebench WML"}
-		} else if f_Fortran_Matcher_0.Match(i) {
+		} else if f_Fortran_Matcher_0.Match(string(i)) {
 			return []string{"Fortran"}
 		}
 
 		return nil
 	},
 	".for": func(i []byte) []string {
-		if for_Forth_Matcher_0.Match(i) {
+		if for_Forth_Matcher_0.Match(string(i)) {
 			return []string{"Forth"}
-		} else if for_Fortran_Matcher_0.Match(i) {
+		} else if for_Fortran_Matcher_0.Match(string(i)) {
 			return []string{"Fortran"}
 		}
 
 		return nil
 	},
 	".fr": func(i []byte) []string {
-		if fr_Forth_Matcher_0.Match(i) {
+		if fr_Forth_Matcher_0.Match(string(i)) {
 			return []string{"Forth"}
-		} else if fr_Frege_Matcher_0.Match(i) {
+		} else if fr_Frege_Matcher_0.Match(string(i)) {
 			return []string{"Frege"}
 		}
 
 		return []string{"Text"}
 	},
 	".fs": func(i []byte) []string {
-		if fs_Forth_Matcher_0.Match(i) {
+		if fs_Forth_Matcher_0.Match(string(i)) {
 			return []string{"Forth"}
-		} else if fs_FSharp_Matcher_0.Match(i) {
+		} else if fs_FSharp_Matcher_0.Match(string(i)) {
 			return []string{"F#"}
-		} else if fs_GLSL_Matcher_0.Match(i) {
+		} else if fs_GLSL_Matcher_0.Match(string(i)) {
 			return []string{"GLSL"}
-		} else if fs_Filterscript_Matcher_0.Match(i) {
+		} else if fs_Filterscript_Matcher_0.Match(string(i)) {
 			return []string{"Filterscript"}
 		}
 
 		return nil
 	},
 	".gs": func(i []byte) []string {
-		if gs_Gosu_Matcher_0.Match(i) {
+		if gs_Gosu_Matcher_0.Match(string(i)) {
 			return []string{"Gosu"}
 		}
 
 		return nil
 	},
 	".h": func(i []byte) []string {
-		if h_ObjectiveDashC_Matcher_0.Match(i) {
+		if h_ObjectiveDashC_Matcher_0.Match(string(i)) {
 			return []string{"Objective-C"}
-		} else if h_CPlusPlus_Matcher_0.Match(i) || h_CPlusPlus_Matcher_1.Match(i) || h_CPlusPlus_Matcher_2.Match(i) || h_CPlusPlus_Matcher_3.Match(i) || h_CPlusPlus_Matcher_4.Match(i) || h_CPlusPlus_Matcher_5.Match(i) || h_CPlusPlus_Matcher_6.Match(i) {
+		} else if h_CPlusPlus_Matcher_0.Match(string(i)) || h_CPlusPlus_Matcher_1.Match(string(i)) || h_CPlusPlus_Matcher_2.Match(string(i)) || h_CPlusPlus_Matcher_3.Match(string(i)) || h_CPlusPlus_Matcher_4.Match(string(i)) || h_CPlusPlus_Matcher_5.Match(string(i)) || h_CPlusPlus_Matcher_6.Match(string(i)) {
 			return []string{"C++"}
 		}
 
 		return nil
 	},
 	".inc": func(i []byte) []string {
-		if inc_PHP_Matcher_0.Match(i) {
+		if inc_PHP_Matcher_0.Match(string(i)) {
 			return []string{"PHP"}
-		} else if inc_POVDashRaySDL_Matcher_0.Match(i) {
+		} else if inc_POVDashRaySDL_Matcher_0.Match(string(i)) {
 			return []string{"POV-Ray SDL"}
 		}
 
 		return nil
 	},
 	".l": func(i []byte) []string {
-		if l_CommonLisp_Matcher_0.Match(i) {
+		if l_CommonLisp_Matcher_0.Match(string(i)) {
 			return []string{"Common Lisp"}
-		} else if l_Lex_Matcher_0.Match(i) {
+		} else if l_Lex_Matcher_0.Match(string(i)) {
 			return []string{"Lex"}
-		} else if l_Roff_Matcher_0.Match(i) {
+		} else if l_Roff_Matcher_0.Match(string(i)) {
 			return []string{"Roff"}
-		} else if l_PicoLisp_Matcher_0.Match(i) {
+		} else if l_PicoLisp_Matcher_0.Match(string(i)) {
 			return []string{"PicoLisp"}
 		}
 
 		return nil
 	},
 	".ls": func(i []byte) []string {
-		if ls_LoomScript_Matcher_0.Match(i) {
+		if ls_LoomScript_Matcher_0.Match(string(i)) {
 			return []string{"LoomScript"}
 		}
 
 		return []string{"LiveScript"}
 	},
 	".lsp": func(i []byte) []string {
-		if lsp_CommonLisp_Matcher_0.Match(i) {
+		if lsp_CommonLisp_Matcher_0.Match(string(i)) {
 			return []string{"Common Lisp"}
-		} else if lsp_NewLisp_Matcher_0.Match(i) {
+		} else if lsp_NewLisp_Matcher_0.Match(string(i)) {
 			return []string{"NewLisp"}
 		}
 
 		return nil
 	},
 	".lisp": func(i []byte) []string {
-		if lisp_CommonLisp_Matcher_0.Match(i) {
+		if lisp_CommonLisp_Matcher_0.Match(string(i)) {
 			return []string{"Common Lisp"}
-		} else if lisp_NewLisp_Matcher_0.Match(i) {
+		} else if lisp_NewLisp_Matcher_0.Match(string(i)) {
 			return []string{"NewLisp"}
 		}
 
 		return nil
 	},
 	".m": func(i []byte) []string {
-		if m_ObjectiveDashC_Matcher_0.Match(i) {
+		if m_ObjectiveDashC_Matcher_0.Match(string(i)) {
 			return []string{"Objective-C"}
-		} else if m_Mercury_Matcher_0.Match(i) {
+		} else if m_Mercury_Matcher_0.Match(string(i)) {
 			return []string{"Mercury"}
-		} else if m_MUF_Matcher_0.Match(i) {
+		} else if m_MUF_Matcher_0.Match(string(i)) {
 			return []string{"MUF"}
-		} else if m_M_Matcher_0.Match(i) {
+		} else if m_M_Matcher_0.Match(string(i)) {
 			return []string{"M"}
-		} else if m_Mathematica_Matcher_0.Match(i) {
+		} else if m_Mathematica_Matcher_0.Match(string(i)) {
 			return []string{"Mathematica"}
-		} else if m_Matlab_Matcher_0.Match(i) {
+		} else if m_Matlab_Matcher_0.Match(string(i)) {
 			return []string{"Matlab"}
-		} else if m_Limbo_Matcher_0.Match(i) {
+		} else if m_Limbo_Matcher_0.Match(string(i)) {
 			return []string{"Limbo"}
 		}
 
 		return nil
 	},
 	".md": func(i []byte) []string {
-		if md_Markdown_Matcher_0.Match(i) || md_Markdown_Matcher_1.Match(i) {
+		if md_Markdown_Matcher_0.Match(string(i)) || md_Markdown_Matcher_1.Match(string(i)) {
 			return []string{"Markdown"}
-		} else if md_GCCMachineDescription_Matcher_0.Match(i) {
+		} else if md_GCCMachineDescription_Matcher_0.Match(string(i)) {
 			return []string{"GCC Machine Description"}
 		}
 
 		return []string{"Markdown"}
 	},
 	".ml": func(i []byte) []string {
-		if ml_OCaml_Matcher_0.Match(i) {
+		if ml_OCaml_Matcher_0.Match(string(i)) {
 			return []string{"OCaml"}
-		} else if ml_StandardML_Matcher_0.Match(i) {
+		} else if ml_StandardML_Matcher_0.Match(string(i)) {
 			return []string{"Standard ML"}
 		}
 
 		return nil
 	},
 	".mod": func(i []byte) []string {
-		if mod_XML_Matcher_0.Match(i) {
+		if mod_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
-		} else if mod_ModulaDash2_Matcher_0.Match(i) || mod_ModulaDash2_Matcher_1.Match(i) {
+		} else if mod_ModulaDash2_Matcher_0.Match(string(i)) || mod_ModulaDash2_Matcher_1.Match(string(i)) {
 			return []string{"Modula-2"}
 		}
 
 		return []string{"Linux Kernel Module", "AMPL"}
 	},
 	".ms": func(i []byte) []string {
-		if ms_Roff_Matcher_0.Match(i) {
+		if ms_Roff_Matcher_0.Match(string(i)) {
 			return []string{"Roff"}
 		}
 
 		return []string{"MAXScript"}
 	},
 	".n": func(i []byte) []string {
-		if n_Roff_Matcher_0.Match(i) {
+		if n_Roff_Matcher_0.Match(string(i)) {
 			return []string{"Roff"}
-		} else if n_Nemerle_Matcher_0.Match(i) {
+		} else if n_Nemerle_Matcher_0.Match(string(i)) {
 			return []string{"Nemerle"}
 		}
 
 		return nil
 	},
 	".ncl": func(i []byte) []string {
-		if ncl_Text_Matcher_0.Match(i) {
+		if ncl_Text_Matcher_0.Match(string(i)) {
 			return []string{"Text"}
 		}
 
 		return nil
 	},
 	".nl": func(i []byte) []string {
-		if nl_NL_Matcher_0.Match(i) {
+		if nl_NL_Matcher_0.Match(string(i)) {
 			return []string{"NL"}
 		}
 
 		return []string{"NewLisp"}
 	},
 	".php": func(i []byte) []string {
-		if php_Hack_Matcher_0.Match(i) {
+		if php_Hack_Matcher_0.Match(string(i)) {
 			return []string{"Hack"}
-		} else if php_PHP_Matcher_0.Match(i) {
+		} else if php_PHP_Matcher_0.Match(string(i)) {
 			return []string{"PHP"}
 		}
 
 		return nil
 	},
 	".pl": func(i []byte) []string {
-		if pl_Prolog_Matcher_0.Match(i) {
+		if pl_Prolog_Matcher_0.Match(string(i)) {
 			return []string{"Prolog"}
-		} else if pl_Perl_Matcher_0.Match(i) {
+		} else if pl_Perl_Matcher_0.Match(string(i)) {
 			return []string{"Perl"}
-		} else if pl_Perl6_Matcher_0.Match(i) {
+		} else if pl_Perl6_Matcher_0.Match(string(i)) {
 			return []string{"Perl 6"}
 		}
 
 		return nil
 	},
 	".pm": func(i []byte) []string {
-		if pm_Perl6_Matcher_0.Match(i) {
+		if pm_Perl6_Matcher_0.Match(string(i)) {
 			return []string{"Perl 6"}
-		} else if pm_Perl_Matcher_0.Match(i) {
+		} else if pm_Perl_Matcher_0.Match(string(i)) {
 			return []string{"Perl"}
 		}
 
 		return nil
 	},
 	".pod": func(i []byte) []string {
-		if pod_Pod_Matcher_0.Match(i) {
+		if pod_Pod_Matcher_0.Match(string(i)) {
 			return []string{"Pod"}
 		}
 
 		return []string{"Perl"}
 	},
 	".pro": func(i []byte) []string {
-		if pro_Prolog_Matcher_0.Match(i) {
+		if pro_Prolog_Matcher_0.Match(string(i)) {
 			return []string{"Prolog"}
-		} else if pro_INI_Matcher_0.Match(i) {
+		} else if pro_INI_Matcher_0.Match(string(i)) {
 			return []string{"INI"}
-		} else if pro_QMake_Matcher_0.Match(i) && pro_QMake_Matcher_1.Match(i) {
+		} else if pro_QMake_Matcher_0.Match(string(i)) && pro_QMake_Matcher_1.Match(string(i)) {
 			return []string{"QMake"}
-		} else if pro_IDL_Matcher_0.Match(i) {
+		} else if pro_IDL_Matcher_0.Match(string(i)) {
 			return []string{"IDL"}
 		}
 
 		return nil
 	},
 	".props": func(i []byte) []string {
-		if props_XML_Matcher_0.Match(i) {
+		if props_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
-		} else if props_INI_Matcher_0.Match(i) {
+		} else if props_INI_Matcher_0.Match(string(i)) {
 			return []string{"INI"}
 		}
 
 		return nil
 	},
 	".r": func(i []byte) []string {
-		if r_Rebol_Matcher_0.Match(i) {
+		if r_Rebol_Matcher_0.Match(string(i)) {
 			return []string{"Rebol"}
-		} else if r_R_Matcher_0.Match(i) {
+		} else if r_R_Matcher_0.Match(string(i)) {
 			return []string{"R"}
 		}
 
 		return nil
 	},
 	".rno": func(i []byte) []string {
-		if rno_RUNOFF_Matcher_0.Match(i) {
+		if rno_RUNOFF_Matcher_0.Match(string(i)) {
 			return []string{"RUNOFF"}
-		} else if rno_Roff_Matcher_0.Match(i) {
+		} else if rno_Roff_Matcher_0.Match(string(i)) {
 			return []string{"Roff"}
 		}
 
 		return nil
 	},
 	".rpy": func(i []byte) []string {
-		if rpy_Python_Matcher_0.Match(i) {
+		if rpy_Python_Matcher_0.Match(string(i)) {
 			return []string{"Python"}
 		}
 
 		return []string{"Ren'Py"}
 	},
 	".rs": func(i []byte) []string {
-		if rs_Rust_Matcher_0.Match(i) {
+		if rs_Rust_Matcher_0.Match(string(i)) {
 			return []string{"Rust"}
-		} else if rs_RenderScript_Matcher_0.Match(i) {
+		} else if rs_RenderScript_Matcher_0.Match(string(i)) {
 			return []string{"RenderScript"}
 		}
 
 		return nil
 	},
 	".sc": func(i []byte) []string {
-		if sc_SuperCollider_Matcher_0.Match(i) || sc_SuperCollider_Matcher_1.Match(i) || sc_SuperCollider_Matcher_2.Match(i) {
+		if sc_SuperCollider_Matcher_0.Match(string(i)) || sc_SuperCollider_Matcher_1.Match(string(i)) || sc_SuperCollider_Matcher_2.Match(string(i)) {
 			return []string{"SuperCollider"}
-		} else if sc_Scala_Matcher_0.Match(i) || sc_Scala_Matcher_1.Match(i) || sc_Scala_Matcher_2.Match(i) {
+		} else if sc_Scala_Matcher_0.Match(string(i)) || sc_Scala_Matcher_1.Match(string(i)) || sc_Scala_Matcher_2.Match(string(i)) {
 			return []string{"Scala"}
 		}
 
 		return nil
 	},
 	".sql": func(i []byte) []string {
-		if sql_PLpgSQL_Matcher_0.Match(i) || sql_PLpgSQL_Matcher_1.Match(i) || sql_PLpgSQL_Matcher_2.Match(i) {
+		if sql_PLpgSQL_Matcher_0.Match(string(i)) || sql_PLpgSQL_Matcher_1.Match(string(i)) || sql_PLpgSQL_Matcher_2.Match(string(i)) {
 			return []string{"PLpgSQL"}
-		} else if sql_SQLPL_Matcher_0.Match(i) || sql_SQLPL_Matcher_1.Match(i) {
+		} else if sql_SQLPL_Matcher_0.Match(string(i)) || sql_SQLPL_Matcher_1.Match(string(i)) {
 			return []string{"SQLPL"}
-		} else if sql_PLSQL_Matcher_0.Match(i) || sql_PLSQL_Matcher_1.Match(i) {
+		} else if sql_PLSQL_Matcher_0.Match(string(i)) || sql_PLSQL_Matcher_1.Match(string(i)) {
 			return []string{"PLSQL"}
-		} else if sql_SQL_Matcher_0.Match(i) {
+		} else if sql_SQL_Matcher_0.Match(string(i)) {
 			return []string{"SQL"}
 		}
 
 		return nil
 	},
 	".srt": func(i []byte) []string {
-		if srt_SubRipText_Matcher_0.Match(i) {
+		if srt_SubRipText_Matcher_0.Match(string(i)) {
 			return []string{"SubRip Text"}
 		}
 
 		return nil
 	},
 	".t": func(i []byte) []string {
-		if t_Turing_Matcher_0.Match(i) {
+		if t_Turing_Matcher_0.Match(string(i)) {
 			return []string{"Turing"}
-		} else if t_Perl6_Matcher_0.Match(i) {
+		} else if t_Perl6_Matcher_0.Match(string(i)) {
 			return []string{"Perl 6"}
-		} else if t_Perl_Matcher_0.Match(i) {
+		} else if t_Perl_Matcher_0.Match(string(i)) {
 			return []string{"Perl"}
 		}
 
 		return nil
 	},
 	".toc": func(i []byte) []string {
-		if toc_WorldofWarcraftAddonData_Matcher_0.Match(i) {
+		if toc_WorldofWarcraftAddonData_Matcher_0.Match(string(i)) {
 			return []string{"World of Warcraft Addon Data"}
-		} else if toc_TeX_Matcher_0.Match(i) {
+		} else if toc_TeX_Matcher_0.Match(string(i)) {
 			return []string{"TeX"}
 		}
 
 		return nil
 	},
 	".ts": func(i []byte) []string {
-		if ts_XML_Matcher_0.Match(i) {
+		if ts_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
 		}
 
 		return []string{"TypeScript"}
 	},
 	".tst": func(i []byte) []string {
-		if tst_GAP_Matcher_0.Match(i) {
+		if tst_GAP_Matcher_0.Match(string(i)) {
 			return []string{"GAP"}
 		}
 
 		return []string{"Scilab"}
 	},
 	".tsx": func(i []byte) []string {
-		if tsx_TypeScript_Matcher_0.Match(i) {
+		if tsx_TypeScript_Matcher_0.Match(string(i)) {
 			return []string{"TypeScript"}
-		} else if tsx_XML_Matcher_0.Match(i) {
+		} else if tsx_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
 		}
 
@@ -447,122 +445,122 @@ var ContentMatchers = map[string]languageMatcher{
 }
 
 var (
-	asc_PublicKey_Matcher_0                = regexp.MustCompile(`(?m)^(----[- ]BEGIN|ssh-(rsa|dss)) `)
-	asc_AsciiDoc_Matcher_0                 = regexp.MustCompile(`(?m)^[=-]+(\s|\n)|{{[A-Za-z]`)
-	asc_AGSScript_Matcher_0                = regexp.MustCompile(`(?m)^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])`)
-	bb_BlitzBasic_Matcher_0                = regexp.MustCompile(`(?m)^\s*; `)
-	bb_BlitzBasic_Matcher_1                = regexp.MustCompile(`(?m)End Function`)
-	bb_BitBake_Matcher_0                   = regexp.MustCompile(`(?m)^\s*(# |include|require)\b`)
-	builds_XML_Matcher_0                   = regexp.MustCompile(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
-	ch_xBase_Matcher_0                     = regexp.MustCompile(`(?mi)^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b`)
-	cl_CommonLisp_Matcher_0                = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
-	cl_Cool_Matcher_0                      = regexp.MustCompile(`(?m)^class`)
-	cl_OpenCL_Matcher_0                    = regexp.MustCompile(`(?m)\/\* |\/\/ |^\}`)
-	cls_TeX_Matcher_0                      = regexp.MustCompile(`(?m)\\\w+{`)
-	cs_Smalltalk_Matcher_0                 = regexp.MustCompile(`(?m)![\w\s]+methodsFor: `)
-	cs_CSharp_Matcher_0                    = regexp.MustCompile(`(?m)^\s*namespace\s*[\w\.]+\s*{`)
-	cs_CSharp_Matcher_1                    = regexp.MustCompile(`(?m)^\s*\/\/`)
-	d_D_Matcher_0                          = regexp.MustCompile(`(?m)^module\s+[\w.]*\s*;|import\s+[\w\s,.:]*;|\w+\s+\w+\s*\(.*\)(?:\(.*\))?\s*{[^}]*}|unittest\s*(?:\(.*\))?\s*{[^}]*}`)
-	d_DTrace_Matcher_0                     = regexp.MustCompile(`(?m)^(\w+:\w*:\w*:\w*|BEGIN|END|provider\s+|(tick|profile)-\w+\s+{[^}]*}|#pragma\s+D\s+(option|attributes|depends_on)\s|#pragma\s+ident\s)`)
-	d_Makefile_Matcher_0                   = regexp.MustCompile(`(?m)([\/\\].*:\s+.*\s\\$|: \\$|^ : |^[\w\s\/\\.]+\w+\.\w+\s*:\s+[\w\s\/\\.]+\w+\.\w+)`)
-	ecl_ECLiPSe_Matcher_0                  = regexp.MustCompile(`(?m)^[^#]+:-`)
-	ecl_ECL_Matcher_0                      = regexp.MustCompile(`(?m):=`)
-	es_Erlang_Matcher_0                    = regexp.MustCompile(`(?m)^\s*(?:%%|main\s*\(.*?\)\s*->)`)
-	f_Forth_Matcher_0                      = regexp.MustCompile(`(?m)^: `)
-	f_FilebenchWML_Matcher_0               = regexp.MustCompile(`(?m)flowop`)
-	f_Fortran_Matcher_0                    = regexp.MustCompile(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
-	for_Forth_Matcher_0                    = regexp.MustCompile(`(?m)^: `)
-	for_Fortran_Matcher_0                  = regexp.MustCompile(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
-	fr_Forth_Matcher_0                     = regexp.MustCompile(`(?m)^(: |also |new-device|previous )`)
-	fr_Frege_Matcher_0                     = regexp.MustCompile(`(?m)^\s*(import|module|package|data|type) `)
-	fs_Forth_Matcher_0                     = regexp.MustCompile(`(?m)^(: |new-device)`)
-	fs_FSharp_Matcher_0                    = regexp.MustCompile(`(?m)^\s*(#light|import|let|module|namespace|open|type)`)
-	fs_GLSL_Matcher_0                      = regexp.MustCompile(`(?m)^\s*(#version|precision|uniform|varying|vec[234])`)
-	fs_Filterscript_Matcher_0              = regexp.MustCompile(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
-	gs_Gosu_Matcher_0                      = regexp.MustCompile(`(?m)^uses java\.`)
-	h_ObjectiveDashC_Matcher_0             = regexp.MustCompile(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
-	h_CPlusPlus_Matcher_0                  = regexp.MustCompile(`(?m)^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>`)
-	h_CPlusPlus_Matcher_1                  = regexp.MustCompile(`(?m)^\s*template\s*<`)
-	h_CPlusPlus_Matcher_2                  = regexp.MustCompile(`(?m)^[ \t]*try`)
-	h_CPlusPlus_Matcher_3                  = regexp.MustCompile(`(?m)^[ \t]*catch\s*\(`)
-	h_CPlusPlus_Matcher_4                  = regexp.MustCompile(`(?m)^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+`)
-	h_CPlusPlus_Matcher_5                  = regexp.MustCompile(`(?m)^[ \t]*(private|public|protected):$`)
-	h_CPlusPlus_Matcher_6                  = regexp.MustCompile(`(?m)std::\w+`)
-	inc_PHP_Matcher_0                      = regexp.MustCompile(`(?m)^<\?(?:php)?`)
-	inc_POVDashRaySDL_Matcher_0            = regexp.MustCompile(`(?m)^\s*#(declare|local|macro|while)\s`)
-	l_CommonLisp_Matcher_0                 = regexp.MustCompile(`(?m)\(def(un|macro)\s`)
-	l_Lex_Matcher_0                        = regexp.MustCompile(`(?m)^(%[%{}]xs|<.*>)`)
-	l_Roff_Matcher_0                       = regexp.MustCompile(`(?mi)^\.[a-z][a-z](\s|$)`)
-	l_PicoLisp_Matcher_0                   = regexp.MustCompile(`(?m)^\((de|class|rel|code|data|must)\s`)
-	ls_LoomScript_Matcher_0                = regexp.MustCompile(`(?m)^\s*package\s*[\w\.\/\*\s]*\s*{`)
-	lsp_CommonLisp_Matcher_0               = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
-	lsp_NewLisp_Matcher_0                  = regexp.MustCompile(`(?m)^\s*\(define `)
-	lisp_CommonLisp_Matcher_0              = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
-	lisp_NewLisp_Matcher_0                 = regexp.MustCompile(`(?m)^\s*\(define `)
-	m_ObjectiveDashC_Matcher_0             = regexp.MustCompile(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
-	m_Mercury_Matcher_0                    = regexp.MustCompile(`(?m):- module`)
-	m_MUF_Matcher_0                        = regexp.MustCompile(`(?m)^: `)
-	m_M_Matcher_0                          = regexp.MustCompile(`(?m)^\s*;`)
-	m_Mathematica_Matcher_0                = regexp.MustCompile(`(?m)\*\)$`)
-	m_Matlab_Matcher_0                     = regexp.MustCompile(`(?m)^\s*%`)
-	m_Limbo_Matcher_0                      = regexp.MustCompile(`(?m)^\w+\s*:\s*module\s*{`)
-	md_Markdown_Matcher_0                  = regexp.MustCompile(`(?mi)(^[-a-z0-9=#!\*\[|>])|<\/`)
-	md_Markdown_Matcher_1                  = regexp.MustCompile(`^$`)
-	md_GCCMachineDescription_Matcher_0     = regexp.MustCompile(`(?m)^(;;|\(define_)`)
-	ml_OCaml_Matcher_0                     = regexp.MustCompile(`(?m)(^\s*module)|let rec |match\s+(\S+\s)+with`)
-	ml_StandardML_Matcher_0                = regexp.MustCompile(`(?m)=> |case\s+(\S+\s)+of`)
-	mod_XML_Matcher_0                      = regexp.MustCompile(`(?m)<!ENTITY `)
-	mod_ModulaDash2_Matcher_0              = regexp.MustCompile(`(?mi)^\s*MODULE [\w\.]+;`)
-	mod_ModulaDash2_Matcher_1              = regexp.MustCompile(`(?mi)^\s*END [\w\.]+;`)
-	ms_Roff_Matcher_0                      = regexp.MustCompile(`(?mi)^[.'][a-z][a-z](\s|$)`)
-	n_Roff_Matcher_0                       = regexp.MustCompile(`(?m)^[.']`)
-	n_Nemerle_Matcher_0                    = regexp.MustCompile(`(?m)^(module|namespace|using)\s`)
-	ncl_Text_Matcher_0                     = regexp.MustCompile(`(?m)THE_TITLE`)
-	nl_NL_Matcher_0                        = regexp.MustCompile(`(?m)^(b|g)[0-9]+ `)
-	php_Hack_Matcher_0                     = regexp.MustCompile(`(?m)<\?hh`)
-	php_PHP_Matcher_0                      = regexp.MustCompile(`(?m)<?[^h]`)
-	pl_Prolog_Matcher_0                    = regexp.MustCompile(`(?m)^[^#]*:-`)
-	pl_Perl_Matcher_0                      = regexp.MustCompile(`(?m)use strict|use\s+v?5\.`)
-	pl_Perl6_Matcher_0                     = regexp.MustCompile(`(?m)^(use v6|(my )?class|module)`)
-	pm_Perl6_Matcher_0                     = regexp.MustCompile(`(?m)^\s*(?:use\s+v6\s*;|(?:\bmy\s+)?class|module)\b`)
-	pm_Perl_Matcher_0                      = regexp.MustCompile(`(?m)\buse\s+(?:strict\b|v?5\.)`)
-	pod_Pod_Matcher_0                      = regexp.MustCompile(`(?m)^=\w+\b`)
-	pro_Prolog_Matcher_0                   = regexp.MustCompile(`(?m)^[^#]+:-`)
-	pro_INI_Matcher_0                      = regexp.MustCompile(`(?m)last_client=`)
-	pro_QMake_Matcher_0                    = regexp.MustCompile(`(?m)HEADERS`)
-	pro_QMake_Matcher_1                    = regexp.MustCompile(`(?m)SOURCES`)
-	pro_IDL_Matcher_0                      = regexp.MustCompile(`(?m)^\s*function[ \w,]+$`)
-	props_XML_Matcher_0                    = regexp.MustCompile(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
-	props_INI_Matcher_0                    = regexp.MustCompile(`(?mi)\w+\s*=\s*`)
-	r_Rebol_Matcher_0                      = regexp.MustCompile(`(?mi)\bRebol\b`)
-	r_R_Matcher_0                          = regexp.MustCompile(`(?m)<-|^\s*#`)
-	rno_RUNOFF_Matcher_0                   = regexp.MustCompile(`(?mi)^\.!|^\.end lit(?:eral)?\b`)
-	rno_Roff_Matcher_0                     = regexp.MustCompile(`(?m)^\.\\" `)
-	rpy_Python_Matcher_0                   = regexp.MustCompile(`(?ms)(^(import|from|class|def)\s)`)
-	rs_Rust_Matcher_0                      = regexp.MustCompile(`(?m)^(use |fn |mod |pub |macro_rules|impl|#!?\[)`)
-	rs_RenderScript_Matcher_0              = regexp.MustCompile(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
-	sc_SuperCollider_Matcher_0             = regexp.MustCompile(`(?m)\^(this|super)\.`)
-	sc_SuperCollider_Matcher_1             = regexp.MustCompile(`(?m)^\s*(\+|\*)\s*\w+\s*{`)
-	sc_SuperCollider_Matcher_2             = regexp.MustCompile(`(?m)^\s*~\w+\s*=\.`)
-	sc_Scala_Matcher_0                     = regexp.MustCompile(`(?m)^\s*import (scala|java)\.`)
-	sc_Scala_Matcher_1                     = regexp.MustCompile(`(?m)^\s*val\s+\w+\s*=`)
-	sc_Scala_Matcher_2                     = regexp.MustCompile(`(?m)^\s*class\b`)
-	sql_PLpgSQL_Matcher_0                  = regexp.MustCompile(`(?mi)^\\i\b|AS \$\$|LANGUAGE '?plpgsql'?`)
-	sql_PLpgSQL_Matcher_1                  = regexp.MustCompile(`(?mi)SECURITY (DEFINER|INVOKER)`)
-	sql_PLpgSQL_Matcher_2                  = regexp.MustCompile(`(?mi)BEGIN( WORK| TRANSACTION)?;`)
-	sql_SQLPL_Matcher_0                    = regexp.MustCompile(`(?mi)(alter module)|(language sql)|(begin( NOT)+ atomic)`)
-	sql_SQLPL_Matcher_1                    = regexp.MustCompile(`(?mi)signal SQLSTATE '[0-9]+'`)
-	sql_PLSQL_Matcher_0                    = regexp.MustCompile(`(?mi)\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)`)
-	sql_PLSQL_Matcher_1                    = regexp.MustCompile(`(?mi)constructor\W+function`)
-	sql_SQL_Matcher_0                      = regexp.MustCompile(`(?mi)! /begin|boolean|package|exception`)
-	srt_SubRipText_Matcher_0               = regexp.MustCompile(`(?m)^(\d{2}:\d{2}:\d{2},\d{3})\s*(-->)\s*(\d{2}:\d{2}:\d{2},\d{3})$`)
-	t_Turing_Matcher_0                     = regexp.MustCompile(`(?m)^\s*%[ \t]+|^\s*var\s+\w+\s*:=\s*\w+`)
-	t_Perl6_Matcher_0                      = regexp.MustCompile(`(?m)^\s*(?:use\s+v6\s*;|\bmodule\b|\b(?:my\s+)?class\b)`)
-	t_Perl_Matcher_0                       = regexp.MustCompile(`(?m)\buse\s+(?:strict\b|v?5\.)`)
-	toc_WorldofWarcraftAddonData_Matcher_0 = regexp.MustCompile(`(?m)^## |@no-lib-strip@`)
-	toc_TeX_Matcher_0                      = regexp.MustCompile(`(?m)^\\(contentsline|defcounter|beamer|boolfalse)`)
-	ts_XML_Matcher_0                       = regexp.MustCompile(`(?m)<TS`)
-	tst_GAP_Matcher_0                      = regexp.MustCompile(`(?m)gap> `)
-	tsx_TypeScript_Matcher_0               = regexp.MustCompile(`(?m)^\s*(import.+(from\s+|require\()['"]react|\/\/\/\s*<reference\s)`)
-	tsx_XML_Matcher_0                      = regexp.MustCompile(`(?mi)^\s*<\?xml\s+version`)
+	asc_PublicKey_Matcher_0                = substring.Regexp(`(?m)^(----[- ]BEGIN|ssh-(rsa|dss)) `)
+	asc_AsciiDoc_Matcher_0                 = substring.Regexp(`(?m)^[=-]+(\s|\n)|{{[A-Za-z]`)
+	asc_AGSScript_Matcher_0                = substring.Regexp(`(?m)^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])`)
+	bb_BlitzBasic_Matcher_0                = substring.Regexp(`(?m)^\s*; `)
+	bb_BlitzBasic_Matcher_1                = substring.Regexp(`(?m)End Function`)
+	bb_BitBake_Matcher_0                   = substring.Regexp(`(?m)^\s*(# |include|require)\b`)
+	builds_XML_Matcher_0                   = substring.Regexp(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
+	ch_xBase_Matcher_0                     = substring.Regexp(`(?mi)^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b`)
+	cl_CommonLisp_Matcher_0                = substring.Regexp(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	cl_Cool_Matcher_0                      = substring.Regexp(`(?m)^class`)
+	cl_OpenCL_Matcher_0                    = substring.Regexp(`(?m)\/\* |\/\/ |^\}`)
+	cls_TeX_Matcher_0                      = substring.Regexp(`(?m)\\\w+{`)
+	cs_Smalltalk_Matcher_0                 = substring.Regexp(`(?m)![\w\s]+methodsFor: `)
+	cs_CSharp_Matcher_0                    = substring.Regexp(`(?m)^\s*namespace\s*[\w\.]+\s*{`)
+	cs_CSharp_Matcher_1                    = substring.Regexp(`(?m)^\s*\/\/`)
+	d_D_Matcher_0                          = substring.Regexp(`(?m)^module\s+[\w.]*\s*;|import\s+[\w\s,.:]*;|\w+\s+\w+\s*\(.*\)(?:\(.*\))?\s*{[^}]*}|unittest\s*(?:\(.*\))?\s*{[^}]*}`)
+	d_DTrace_Matcher_0                     = substring.Regexp(`(?m)^(\w+:\w*:\w*:\w*|BEGIN|END|provider\s+|(tick|profile)-\w+\s+{[^}]*}|#pragma\s+D\s+(option|attributes|depends_on)\s|#pragma\s+ident\s)`)
+	d_Makefile_Matcher_0                   = substring.Regexp(`(?m)([\/\\].*:\s+.*\s\\$|: \\$|^ : |^[\w\s\/\\.]+\w+\.\w+\s*:\s+[\w\s\/\\.]+\w+\.\w+)`)
+	ecl_ECLiPSe_Matcher_0                  = substring.Regexp(`(?m)^[^#]+:-`)
+	ecl_ECL_Matcher_0                      = substring.Regexp(`(?m):=`)
+	es_Erlang_Matcher_0                    = substring.Regexp(`(?m)^\s*(?:%%|main\s*\(.*?\)\s*->)`)
+	f_Forth_Matcher_0                      = substring.Regexp(`(?m)^: `)
+	f_FilebenchWML_Matcher_0               = substring.Regexp(`(?m)flowop`)
+	f_Fortran_Matcher_0                    = substring.Regexp(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
+	for_Forth_Matcher_0                    = substring.Regexp(`(?m)^: `)
+	for_Fortran_Matcher_0                  = substring.Regexp(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
+	fr_Forth_Matcher_0                     = substring.Regexp(`(?m)^(: |also |new-device|previous )`)
+	fr_Frege_Matcher_0                     = substring.Regexp(`(?m)^\s*(import|module|package|data|type) `)
+	fs_Forth_Matcher_0                     = substring.Regexp(`(?m)^(: |new-device)`)
+	fs_FSharp_Matcher_0                    = substring.Regexp(`(?m)^\s*(#light|import|let|module|namespace|open|type)`)
+	fs_GLSL_Matcher_0                      = substring.Regexp(`(?m)^\s*(#version|precision|uniform|varying|vec[234])`)
+	fs_Filterscript_Matcher_0              = substring.Regexp(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
+	gs_Gosu_Matcher_0                      = substring.Regexp(`(?m)^uses java\.`)
+	h_ObjectiveDashC_Matcher_0             = substring.Regexp(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
+	h_CPlusPlus_Matcher_0                  = substring.Regexp(`(?m)^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>`)
+	h_CPlusPlus_Matcher_1                  = substring.Regexp(`(?m)^\s*template\s*<`)
+	h_CPlusPlus_Matcher_2                  = substring.Regexp(`(?m)^[ \t]*try`)
+	h_CPlusPlus_Matcher_3                  = substring.Regexp(`(?m)^[ \t]*catch\s*\(`)
+	h_CPlusPlus_Matcher_4                  = substring.Regexp(`(?m)^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+`)
+	h_CPlusPlus_Matcher_5                  = substring.Regexp(`(?m)^[ \t]*(private|public|protected):$`)
+	h_CPlusPlus_Matcher_6                  = substring.Regexp(`(?m)std::\w+`)
+	inc_PHP_Matcher_0                      = substring.Regexp(`(?m)^<\?(?:php)?`)
+	inc_POVDashRaySDL_Matcher_0            = substring.Regexp(`(?m)^\s*#(declare|local|macro|while)\s`)
+	l_CommonLisp_Matcher_0                 = substring.Regexp(`(?m)\(def(un|macro)\s`)
+	l_Lex_Matcher_0                        = substring.Regexp(`(?m)^(%[%{}]xs|<.*>)`)
+	l_Roff_Matcher_0                       = substring.Regexp(`(?mi)^\.[a-z][a-z](\s|$)`)
+	l_PicoLisp_Matcher_0                   = substring.Regexp(`(?m)^\((de|class|rel|code|data|must)\s`)
+	ls_LoomScript_Matcher_0                = substring.Regexp(`(?m)^\s*package\s*[\w\.\/\*\s]*\s*{`)
+	lsp_CommonLisp_Matcher_0               = substring.Regexp(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	lsp_NewLisp_Matcher_0                  = substring.Regexp(`(?m)^\s*\(define `)
+	lisp_CommonLisp_Matcher_0              = substring.Regexp(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	lisp_NewLisp_Matcher_0                 = substring.Regexp(`(?m)^\s*\(define `)
+	m_ObjectiveDashC_Matcher_0             = substring.Regexp(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
+	m_Mercury_Matcher_0                    = substring.Regexp(`(?m):- module`)
+	m_MUF_Matcher_0                        = substring.Regexp(`(?m)^: `)
+	m_M_Matcher_0                          = substring.Regexp(`(?m)^\s*;`)
+	m_Mathematica_Matcher_0                = substring.Regexp(`(?m)\*\)$`)
+	m_Matlab_Matcher_0                     = substring.Regexp(`(?m)^\s*%`)
+	m_Limbo_Matcher_0                      = substring.Regexp(`(?m)^\w+\s*:\s*module\s*{`)
+	md_Markdown_Matcher_0                  = substring.Regexp(`(?mi)(^[-a-z0-9=#!\*\[|>])|<\/`)
+	md_Markdown_Matcher_1                  = substring.Regexp(`^$`)
+	md_GCCMachineDescription_Matcher_0     = substring.Regexp(`(?m)^(;;|\(define_)`)
+	ml_OCaml_Matcher_0                     = substring.Regexp(`(?m)(^\s*module)|let rec |match\s+(\S+\s)+with`)
+	ml_StandardML_Matcher_0                = substring.Regexp(`(?m)=> |case\s+(\S+\s)+of`)
+	mod_XML_Matcher_0                      = substring.Regexp(`(?m)<!ENTITY `)
+	mod_ModulaDash2_Matcher_0              = substring.Regexp(`(?mi)^\s*MODULE [\w\.]+;`)
+	mod_ModulaDash2_Matcher_1              = substring.Regexp(`(?mi)^\s*END [\w\.]+;`)
+	ms_Roff_Matcher_0                      = substring.Regexp(`(?mi)^[.'][a-z][a-z](\s|$)`)
+	n_Roff_Matcher_0                       = substring.Regexp(`(?m)^[.']`)
+	n_Nemerle_Matcher_0                    = substring.Regexp(`(?m)^(module|namespace|using)\s`)
+	ncl_Text_Matcher_0                     = substring.Regexp(`(?m)THE_TITLE`)
+	nl_NL_Matcher_0                        = substring.Regexp(`(?m)^(b|g)[0-9]+ `)
+	php_Hack_Matcher_0                     = substring.Regexp(`(?m)<\?hh`)
+	php_PHP_Matcher_0                      = substring.Regexp(`(?m)<?[^h]`)
+	pl_Prolog_Matcher_0                    = substring.Regexp(`(?m)^[^#]*:-`)
+	pl_Perl_Matcher_0                      = substring.Regexp(`(?m)use strict|use\s+v?5\.`)
+	pl_Perl6_Matcher_0                     = substring.Regexp(`(?m)^(use v6|(my )?class|module)`)
+	pm_Perl6_Matcher_0                     = substring.Regexp(`(?m)^\s*(?:use\s+v6\s*;|(?:\bmy\s+)?class|module)\b`)
+	pm_Perl_Matcher_0                      = substring.Regexp(`(?m)\buse\s+(?:strict\b|v?5\.)`)
+	pod_Pod_Matcher_0                      = substring.Regexp(`(?m)^=\w+\b`)
+	pro_Prolog_Matcher_0                   = substring.Regexp(`(?m)^[^#]+:-`)
+	pro_INI_Matcher_0                      = substring.Regexp(`(?m)last_client=`)
+	pro_QMake_Matcher_0                    = substring.Regexp(`(?m)HEADERS`)
+	pro_QMake_Matcher_1                    = substring.Regexp(`(?m)SOURCES`)
+	pro_IDL_Matcher_0                      = substring.Regexp(`(?m)^\s*function[ \w,]+$`)
+	props_XML_Matcher_0                    = substring.Regexp(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
+	props_INI_Matcher_0                    = substring.Regexp(`(?mi)\w+\s*=\s*`)
+	r_Rebol_Matcher_0                      = substring.Regexp(`(?mi)\bRebol\b`)
+	r_R_Matcher_0                          = substring.Regexp(`(?m)<-|^\s*#`)
+	rno_RUNOFF_Matcher_0                   = substring.Regexp(`(?mi)^\.!|^\.end lit(?:eral)?\b`)
+	rno_Roff_Matcher_0                     = substring.Regexp(`(?m)^\.\\" `)
+	rpy_Python_Matcher_0                   = substring.Regexp(`(?ms)(^(import|from|class|def)\s)`)
+	rs_Rust_Matcher_0                      = substring.Regexp(`(?m)^(use |fn |mod |pub |macro_rules|impl|#!?\[)`)
+	rs_RenderScript_Matcher_0              = substring.Regexp(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
+	sc_SuperCollider_Matcher_0             = substring.Regexp(`(?m)\^(this|super)\.`)
+	sc_SuperCollider_Matcher_1             = substring.Regexp(`(?m)^\s*(\+|\*)\s*\w+\s*{`)
+	sc_SuperCollider_Matcher_2             = substring.Regexp(`(?m)^\s*~\w+\s*=\.`)
+	sc_Scala_Matcher_0                     = substring.Regexp(`(?m)^\s*import (scala|java)\.`)
+	sc_Scala_Matcher_1                     = substring.Regexp(`(?m)^\s*val\s+\w+\s*=`)
+	sc_Scala_Matcher_2                     = substring.Regexp(`(?m)^\s*class\b`)
+	sql_PLpgSQL_Matcher_0                  = substring.Regexp(`(?mi)^\\i\b|AS \$\$|LANGUAGE '?plpgsql'?`)
+	sql_PLpgSQL_Matcher_1                  = substring.Regexp(`(?mi)SECURITY (DEFINER|INVOKER)`)
+	sql_PLpgSQL_Matcher_2                  = substring.Regexp(`(?mi)BEGIN( WORK| TRANSACTION)?;`)
+	sql_SQLPL_Matcher_0                    = substring.Regexp(`(?mi)(alter module)|(language sql)|(begin( NOT)+ atomic)`)
+	sql_SQLPL_Matcher_1                    = substring.Regexp(`(?mi)signal SQLSTATE '[0-9]+'`)
+	sql_PLSQL_Matcher_0                    = substring.Regexp(`(?mi)\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)`)
+	sql_PLSQL_Matcher_1                    = substring.Regexp(`(?mi)constructor\W+function`)
+	sql_SQL_Matcher_0                      = substring.Regexp(`(?mi)! /begin|boolean|package|exception`)
+	srt_SubRipText_Matcher_0               = substring.Regexp(`(?m)^(\d{2}:\d{2}:\d{2},\d{3})\s*(-->)\s*(\d{2}:\d{2}:\d{2},\d{3})$`)
+	t_Turing_Matcher_0                     = substring.Regexp(`(?m)^\s*%[ \t]+|^\s*var\s+\w+\s*:=\s*\w+`)
+	t_Perl6_Matcher_0                      = substring.Regexp(`(?m)^\s*(?:use\s+v6\s*;|\bmodule\b|\b(?:my\s+)?class\b)`)
+	t_Perl_Matcher_0                       = substring.Regexp(`(?m)\buse\s+(?:strict\b|v?5\.)`)
+	toc_WorldofWarcraftAddonData_Matcher_0 = substring.Regexp(`(?m)^## |@no-lib-strip@`)
+	toc_TeX_Matcher_0                      = substring.Regexp(`(?m)^\\(contentsline|defcounter|beamer|boolfalse)`)
+	ts_XML_Matcher_0                       = substring.Regexp(`(?m)<TS`)
+	tst_GAP_Matcher_0                      = substring.Regexp(`(?m)gap> `)
+	tsx_TypeScript_Matcher_0               = substring.Regexp(`(?m)^\s*(import.+(from\s+|require\()['"]react|\/\/\/\s*<reference\s)`)
+	tsx_XML_Matcher_0                      = substring.Regexp(`(?mi)^\s*<\?xml\s+version`)
 )
diff --git a/internal/code-generator/assets/content.go.tmpl b/internal/code-generator/assets/content.go.tmpl
index 2a48e41..2681029 100644
--- a/internal/code-generator/assets/content.go.tmpl
+++ b/internal/code-generator/assets/content.go.tmpl
@@ -4,9 +4,7 @@ package data
 // THIS FILE SHOULD NOT BE EDITED BY HAND
 // Extracted from github/linguist commit: {{ getCommit }}
 
-import (
-	"regexp"
-)
+import "gopkg.in/toqueteos/substring.v1"
 
 type languageMatcher func ([]byte) []string
 
@@ -17,8 +15,8 @@ var ContentMatchers = map[string]languageMatcher{
 
 		{{- if not (avoidLanguage $language) }}
 		{{- if gt (len $language.Heuristics) 0 }}
-		{{- if gt $i 0 }} else {{ end -}}
-		if {{- range $j, $heuristic := $language.Heuristics }} {{ $heuristic.Name }}.Match(i)
+		{{- if gt $i 0 }} else {{ end -}} 
+		if {{- range $j, $heuristic := $language.Heuristics }} {{ $heuristic.Name }}.Match(string(i)) 
 		{{- if lt $j (len $language.LogicRelations) }} {{index $language.LogicRelations $j}} {{- end -}} {{ end }} {
 			return []string{ {{- printf "%q" $language.Language -}} }
 		}
@@ -34,6 +32,6 @@ var ContentMatchers = map[string]languageMatcher{
 
 var (
     {{ range $index, $heuristic := getAllHeuristics . -}}
-    {{ $heuristic.Name }} = regexp.MustCompile(`{{ $heuristic.Regexp }}`)
+    {{ $heuristic.Name }} = substring.Regexp(`{{ $heuristic.Regexp }}`)
     {{ end -}}
 )
diff --git a/internal/code-generator/generator/generator_test.go b/internal/code-generator/generator/generator_test.go
index b000ca2..83b62bb 100644
--- a/internal/code-generator/generator/generator_test.go
+++ b/internal/code-generator/generator/generator_test.go
@@ -14,7 +14,7 @@ import (
 
 const (
 	lingustURL    = "https://github.com/github/linguist.git"
-	commit        = "b6460f8ed6b249281ada099ca28bd8f1230b8892"
+	commit        = "d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68"
 	samplesDir    = "samples"
 	languagesFile = "lib/linguist/languages.yml"
 
diff --git a/internal/code-generator/generator/test_files/alias.gold b/internal/code-generator/generator/test_files/alias.gold
index 6949f44..ff15fcc 100644
--- a/internal/code-generator/generator/test_files/alias.gold
+++ b/internal/code-generator/generator/test_files/alias.gold
@@ -2,7 +2,7 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 // LanguagesByAlias keeps alias for different languages and use the name of the languages as an alias too.
 // All the keys (alias or not) are written in lower case and the whitespaces has been replaced by underscores.
@@ -163,6 +163,7 @@ var LanguagesByAlias = map[string]string{
 	"dylan":                    "Dylan",
 	"e":                        "E",
 	"eagle":                    "Eagle",
+	"easybuild":                "Easybuild",
 	"ebnf":                     "EBNF",
 	"ec":                       "eC",
 	"ecere_projects":           "Ecere Projects",
@@ -438,7 +439,7 @@ var LanguagesByAlias = map[string]string{
 	"pawn":                  "PAWN",
 	"pep8":                  "Pep8",
 	"perl":                  "Perl",
-	"perl6":                 "Perl6",
+	"perl_6":                "Perl 6",
 	"php":                   "PHP",
 	"pic":                   "Pic",
 	"pickle":                "Pickle",
@@ -508,6 +509,7 @@ var LanguagesByAlias = map[string]string{
 	"restructuredtext":      "reStructuredText",
 	"rexx":                  "REXX",
 	"rhtml":                 "RHTML",
+	"ring":                  "Ring",
 	"rmarkdown":             "RMarkdown",
 	"robotframework":        "RobotFramework",
 	"roff":                  "Roff",
diff --git a/internal/code-generator/generator/test_files/commit.gold b/internal/code-generator/generator/test_files/commit.gold
index 332fb00..eca459f 100644
--- a/internal/code-generator/generator/test_files/commit.gold
+++ b/internal/code-generator/generator/test_files/commit.gold
@@ -2,7 +2,7 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 // linguist's commit from which files were generated.
-var LinguistCommit = "b6460f8ed6b249281ada099ca28bd8f1230b8892"
+var LinguistCommit = "d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68"
diff --git a/internal/code-generator/generator/test_files/content.gold b/internal/code-generator/generator/test_files/content.gold
index 639999d..e9afe0a 100644
--- a/internal/code-generator/generator/test_files/content.gold
+++ b/internal/code-generator/generator/test_files/content.gold
@@ -2,443 +2,441 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
-import (
-	"regexp"
-)
+import "gopkg.in/toqueteos/substring.v1"
 
 type languageMatcher func([]byte) []string
 
 var ContentMatchers = map[string]languageMatcher{
 	".asc": func(i []byte) []string {
-		if asc_PublicKey_Matcher_0.Match(i) {
+		if asc_PublicKey_Matcher_0.Match(string(i)) {
 			return []string{"Public Key"}
-		} else if asc_AsciiDoc_Matcher_0.Match(i) {
+		} else if asc_AsciiDoc_Matcher_0.Match(string(i)) {
 			return []string{"AsciiDoc"}
-		} else if asc_AGSScript_Matcher_0.Match(i) {
+		} else if asc_AGSScript_Matcher_0.Match(string(i)) {
 			return []string{"AGS Script"}
 		}
 
 		return nil
 	},
 	".bb": func(i []byte) []string {
-		if bb_BlitzBasic_Matcher_0.Match(i) || bb_BlitzBasic_Matcher_1.Match(i) {
+		if bb_BlitzBasic_Matcher_0.Match(string(i)) || bb_BlitzBasic_Matcher_1.Match(string(i)) {
 			return []string{"BlitzBasic"}
-		} else if bb_BitBake_Matcher_0.Match(i) {
+		} else if bb_BitBake_Matcher_0.Match(string(i)) {
 			return []string{"BitBake"}
 		}
 
 		return nil
 	},
 	".builds": func(i []byte) []string {
-		if builds_XML_Matcher_0.Match(i) {
+		if builds_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
 		}
 
 		return []string{"Text"}
 	},
 	".ch": func(i []byte) []string {
-		if ch_xBase_Matcher_0.Match(i) {
+		if ch_xBase_Matcher_0.Match(string(i)) {
 			return []string{"xBase"}
 		}
 
 		return nil
 	},
 	".cl": func(i []byte) []string {
-		if cl_CommonLisp_Matcher_0.Match(i) {
+		if cl_CommonLisp_Matcher_0.Match(string(i)) {
 			return []string{"Common Lisp"}
-		} else if cl_Cool_Matcher_0.Match(i) {
+		} else if cl_Cool_Matcher_0.Match(string(i)) {
 			return []string{"Cool"}
-		} else if cl_OpenCL_Matcher_0.Match(i) {
+		} else if cl_OpenCL_Matcher_0.Match(string(i)) {
 			return []string{"OpenCL"}
 		}
 
 		return nil
 	},
 	".cls": func(i []byte) []string {
-		if cls_TeX_Matcher_0.Match(i) {
+		if cls_TeX_Matcher_0.Match(string(i)) {
 			return []string{"TeX"}
 		}
 
 		return nil
 	},
 	".cs": func(i []byte) []string {
-		if cs_Smalltalk_Matcher_0.Match(i) {
+		if cs_Smalltalk_Matcher_0.Match(string(i)) {
 			return []string{"Smalltalk"}
-		} else if cs_CSharp_Matcher_0.Match(i) || cs_CSharp_Matcher_1.Match(i) {
+		} else if cs_CSharp_Matcher_0.Match(string(i)) || cs_CSharp_Matcher_1.Match(string(i)) {
 			return []string{"C#"}
 		}
 
 		return nil
 	},
 	".d": func(i []byte) []string {
-		if d_D_Matcher_0.Match(i) {
+		if d_D_Matcher_0.Match(string(i)) {
 			return []string{"D"}
-		} else if d_DTrace_Matcher_0.Match(i) {
+		} else if d_DTrace_Matcher_0.Match(string(i)) {
 			return []string{"DTrace"}
-		} else if d_Makefile_Matcher_0.Match(i) {
+		} else if d_Makefile_Matcher_0.Match(string(i)) {
 			return []string{"Makefile"}
 		}
 
 		return nil
 	},
 	".ecl": func(i []byte) []string {
-		if ecl_ECLiPSe_Matcher_0.Match(i) {
+		if ecl_ECLiPSe_Matcher_0.Match(string(i)) {
 			return []string{"ECLiPSe"}
-		} else if ecl_ECL_Matcher_0.Match(i) {
+		} else if ecl_ECL_Matcher_0.Match(string(i)) {
 			return []string{"ECL"}
 		}
 
 		return nil
 	},
 	".es": func(i []byte) []string {
-		if es_Erlang_Matcher_0.Match(i) {
+		if es_Erlang_Matcher_0.Match(string(i)) {
 			return []string{"Erlang"}
 		}
 
 		return nil
 	},
 	".f": func(i []byte) []string {
-		if f_Forth_Matcher_0.Match(i) {
+		if f_Forth_Matcher_0.Match(string(i)) {
 			return []string{"Forth"}
-		} else if f_FilebenchWML_Matcher_0.Match(i) {
+		} else if f_FilebenchWML_Matcher_0.Match(string(i)) {
 			return []string{"Filebench WML"}
-		} else if f_Fortran_Matcher_0.Match(i) {
+		} else if f_Fortran_Matcher_0.Match(string(i)) {
 			return []string{"Fortran"}
 		}
 
 		return nil
 	},
 	".for": func(i []byte) []string {
-		if for_Forth_Matcher_0.Match(i) {
+		if for_Forth_Matcher_0.Match(string(i)) {
 			return []string{"Forth"}
-		} else if for_Fortran_Matcher_0.Match(i) {
+		} else if for_Fortran_Matcher_0.Match(string(i)) {
 			return []string{"Fortran"}
 		}
 
 		return nil
 	},
 	".fr": func(i []byte) []string {
-		if fr_Forth_Matcher_0.Match(i) {
+		if fr_Forth_Matcher_0.Match(string(i)) {
 			return []string{"Forth"}
-		} else if fr_Frege_Matcher_0.Match(i) {
+		} else if fr_Frege_Matcher_0.Match(string(i)) {
 			return []string{"Frege"}
 		}
 
 		return []string{"Text"}
 	},
 	".fs": func(i []byte) []string {
-		if fs_Forth_Matcher_0.Match(i) {
+		if fs_Forth_Matcher_0.Match(string(i)) {
 			return []string{"Forth"}
-		} else if fs_FSharp_Matcher_0.Match(i) {
+		} else if fs_FSharp_Matcher_0.Match(string(i)) {
 			return []string{"F#"}
-		} else if fs_GLSL_Matcher_0.Match(i) {
+		} else if fs_GLSL_Matcher_0.Match(string(i)) {
 			return []string{"GLSL"}
-		} else if fs_Filterscript_Matcher_0.Match(i) {
+		} else if fs_Filterscript_Matcher_0.Match(string(i)) {
 			return []string{"Filterscript"}
 		}
 
 		return nil
 	},
 	".gs": func(i []byte) []string {
-		if gs_Gosu_Matcher_0.Match(i) {
+		if gs_Gosu_Matcher_0.Match(string(i)) {
 			return []string{"Gosu"}
 		}
 
 		return nil
 	},
 	".h": func(i []byte) []string {
-		if h_ObjectiveDashC_Matcher_0.Match(i) {
+		if h_ObjectiveDashC_Matcher_0.Match(string(i)) {
 			return []string{"Objective-C"}
-		} else if h_CPlusPlus_Matcher_0.Match(i) || h_CPlusPlus_Matcher_1.Match(i) || h_CPlusPlus_Matcher_2.Match(i) || h_CPlusPlus_Matcher_3.Match(i) || h_CPlusPlus_Matcher_4.Match(i) || h_CPlusPlus_Matcher_5.Match(i) || h_CPlusPlus_Matcher_6.Match(i) {
+		} else if h_CPlusPlus_Matcher_0.Match(string(i)) || h_CPlusPlus_Matcher_1.Match(string(i)) || h_CPlusPlus_Matcher_2.Match(string(i)) || h_CPlusPlus_Matcher_3.Match(string(i)) || h_CPlusPlus_Matcher_4.Match(string(i)) || h_CPlusPlus_Matcher_5.Match(string(i)) || h_CPlusPlus_Matcher_6.Match(string(i)) {
 			return []string{"C++"}
 		}
 
 		return nil
 	},
 	".inc": func(i []byte) []string {
-		if inc_PHP_Matcher_0.Match(i) {
+		if inc_PHP_Matcher_0.Match(string(i)) {
 			return []string{"PHP"}
-		} else if inc_POVDashRaySDL_Matcher_0.Match(i) {
+		} else if inc_POVDashRaySDL_Matcher_0.Match(string(i)) {
 			return []string{"POV-Ray SDL"}
 		}
 
 		return nil
 	},
 	".l": func(i []byte) []string {
-		if l_CommonLisp_Matcher_0.Match(i) {
+		if l_CommonLisp_Matcher_0.Match(string(i)) {
 			return []string{"Common Lisp"}
-		} else if l_Lex_Matcher_0.Match(i) {
+		} else if l_Lex_Matcher_0.Match(string(i)) {
 			return []string{"Lex"}
-		} else if l_Roff_Matcher_0.Match(i) {
+		} else if l_Roff_Matcher_0.Match(string(i)) {
 			return []string{"Roff"}
-		} else if l_PicoLisp_Matcher_0.Match(i) {
+		} else if l_PicoLisp_Matcher_0.Match(string(i)) {
 			return []string{"PicoLisp"}
 		}
 
 		return nil
 	},
 	".ls": func(i []byte) []string {
-		if ls_LoomScript_Matcher_0.Match(i) {
+		if ls_LoomScript_Matcher_0.Match(string(i)) {
 			return []string{"LoomScript"}
 		}
 
 		return []string{"LiveScript"}
 	},
 	".lsp": func(i []byte) []string {
-		if lsp_CommonLisp_Matcher_0.Match(i) {
+		if lsp_CommonLisp_Matcher_0.Match(string(i)) {
 			return []string{"Common Lisp"}
-		} else if lsp_NewLisp_Matcher_0.Match(i) {
+		} else if lsp_NewLisp_Matcher_0.Match(string(i)) {
 			return []string{"NewLisp"}
 		}
 
 		return nil
 	},
 	".lisp": func(i []byte) []string {
-		if lisp_CommonLisp_Matcher_0.Match(i) {
+		if lisp_CommonLisp_Matcher_0.Match(string(i)) {
 			return []string{"Common Lisp"}
-		} else if lisp_NewLisp_Matcher_0.Match(i) {
+		} else if lisp_NewLisp_Matcher_0.Match(string(i)) {
 			return []string{"NewLisp"}
 		}
 
 		return nil
 	},
 	".m": func(i []byte) []string {
-		if m_ObjectiveDashC_Matcher_0.Match(i) {
+		if m_ObjectiveDashC_Matcher_0.Match(string(i)) {
 			return []string{"Objective-C"}
-		} else if m_Mercury_Matcher_0.Match(i) {
+		} else if m_Mercury_Matcher_0.Match(string(i)) {
 			return []string{"Mercury"}
-		} else if m_MUF_Matcher_0.Match(i) {
+		} else if m_MUF_Matcher_0.Match(string(i)) {
 			return []string{"MUF"}
-		} else if m_M_Matcher_0.Match(i) {
+		} else if m_M_Matcher_0.Match(string(i)) {
 			return []string{"M"}
-		} else if m_Mathematica_Matcher_0.Match(i) {
+		} else if m_Mathematica_Matcher_0.Match(string(i)) {
 			return []string{"Mathematica"}
-		} else if m_Matlab_Matcher_0.Match(i) {
+		} else if m_Matlab_Matcher_0.Match(string(i)) {
 			return []string{"Matlab"}
-		} else if m_Limbo_Matcher_0.Match(i) {
+		} else if m_Limbo_Matcher_0.Match(string(i)) {
 			return []string{"Limbo"}
 		}
 
 		return nil
 	},
 	".md": func(i []byte) []string {
-		if md_Markdown_Matcher_0.Match(i) || md_Markdown_Matcher_1.Match(i) {
+		if md_Markdown_Matcher_0.Match(string(i)) || md_Markdown_Matcher_1.Match(string(i)) {
 			return []string{"Markdown"}
-		} else if md_GCCMachineDescription_Matcher_0.Match(i) {
+		} else if md_GCCMachineDescription_Matcher_0.Match(string(i)) {
 			return []string{"GCC Machine Description"}
 		}
 
 		return []string{"Markdown"}
 	},
 	".ml": func(i []byte) []string {
-		if ml_OCaml_Matcher_0.Match(i) {
+		if ml_OCaml_Matcher_0.Match(string(i)) {
 			return []string{"OCaml"}
-		} else if ml_StandardML_Matcher_0.Match(i) {
+		} else if ml_StandardML_Matcher_0.Match(string(i)) {
 			return []string{"Standard ML"}
 		}
 
 		return nil
 	},
 	".mod": func(i []byte) []string {
-		if mod_XML_Matcher_0.Match(i) {
+		if mod_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
-		} else if mod_ModulaDash2_Matcher_0.Match(i) || mod_ModulaDash2_Matcher_1.Match(i) {
+		} else if mod_ModulaDash2_Matcher_0.Match(string(i)) || mod_ModulaDash2_Matcher_1.Match(string(i)) {
 			return []string{"Modula-2"}
 		}
 
 		return []string{"Linux Kernel Module", "AMPL"}
 	},
 	".ms": func(i []byte) []string {
-		if ms_Roff_Matcher_0.Match(i) {
+		if ms_Roff_Matcher_0.Match(string(i)) {
 			return []string{"Roff"}
 		}
 
 		return []string{"MAXScript"}
 	},
 	".n": func(i []byte) []string {
-		if n_Roff_Matcher_0.Match(i) {
+		if n_Roff_Matcher_0.Match(string(i)) {
 			return []string{"Roff"}
-		} else if n_Nemerle_Matcher_0.Match(i) {
+		} else if n_Nemerle_Matcher_0.Match(string(i)) {
 			return []string{"Nemerle"}
 		}
 
 		return nil
 	},
 	".ncl": func(i []byte) []string {
-		if ncl_Text_Matcher_0.Match(i) {
+		if ncl_Text_Matcher_0.Match(string(i)) {
 			return []string{"Text"}
 		}
 
 		return nil
 	},
 	".nl": func(i []byte) []string {
-		if nl_NL_Matcher_0.Match(i) {
+		if nl_NL_Matcher_0.Match(string(i)) {
 			return []string{"NL"}
 		}
 
 		return []string{"NewLisp"}
 	},
 	".php": func(i []byte) []string {
-		if php_Hack_Matcher_0.Match(i) {
+		if php_Hack_Matcher_0.Match(string(i)) {
 			return []string{"Hack"}
-		} else if php_PHP_Matcher_0.Match(i) {
+		} else if php_PHP_Matcher_0.Match(string(i)) {
 			return []string{"PHP"}
 		}
 
 		return nil
 	},
 	".pl": func(i []byte) []string {
-		if pl_Prolog_Matcher_0.Match(i) {
+		if pl_Prolog_Matcher_0.Match(string(i)) {
 			return []string{"Prolog"}
-		} else if pl_Perl_Matcher_0.Match(i) {
+		} else if pl_Perl_Matcher_0.Match(string(i)) {
 			return []string{"Perl"}
-		} else if pl_Perl6_Matcher_0.Match(i) {
-			return []string{"Perl6"}
+		} else if pl_Perl6_Matcher_0.Match(string(i)) {
+			return []string{"Perl 6"}
 		}
 
 		return nil
 	},
 	".pm": func(i []byte) []string {
-		if pm_Perl6_Matcher_0.Match(i) {
-			return []string{"Perl6"}
-		} else if pm_Perl_Matcher_0.Match(i) {
+		if pm_Perl6_Matcher_0.Match(string(i)) {
+			return []string{"Perl 6"}
+		} else if pm_Perl_Matcher_0.Match(string(i)) {
 			return []string{"Perl"}
 		}
 
 		return nil
 	},
 	".pod": func(i []byte) []string {
-		if pod_Pod_Matcher_0.Match(i) {
+		if pod_Pod_Matcher_0.Match(string(i)) {
 			return []string{"Pod"}
 		}
 
 		return []string{"Perl"}
 	},
 	".pro": func(i []byte) []string {
-		if pro_Prolog_Matcher_0.Match(i) {
+		if pro_Prolog_Matcher_0.Match(string(i)) {
 			return []string{"Prolog"}
-		} else if pro_INI_Matcher_0.Match(i) {
+		} else if pro_INI_Matcher_0.Match(string(i)) {
 			return []string{"INI"}
-		} else if pro_QMake_Matcher_0.Match(i) && pro_QMake_Matcher_1.Match(i) {
+		} else if pro_QMake_Matcher_0.Match(string(i)) && pro_QMake_Matcher_1.Match(string(i)) {
 			return []string{"QMake"}
-		} else if pro_IDL_Matcher_0.Match(i) {
+		} else if pro_IDL_Matcher_0.Match(string(i)) {
 			return []string{"IDL"}
 		}
 
 		return nil
 	},
 	".props": func(i []byte) []string {
-		if props_XML_Matcher_0.Match(i) {
+		if props_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
-		} else if props_INI_Matcher_0.Match(i) {
+		} else if props_INI_Matcher_0.Match(string(i)) {
 			return []string{"INI"}
 		}
 
 		return nil
 	},
 	".r": func(i []byte) []string {
-		if r_Rebol_Matcher_0.Match(i) {
+		if r_Rebol_Matcher_0.Match(string(i)) {
 			return []string{"Rebol"}
-		} else if r_R_Matcher_0.Match(i) {
+		} else if r_R_Matcher_0.Match(string(i)) {
 			return []string{"R"}
 		}
 
 		return nil
 	},
 	".rno": func(i []byte) []string {
-		if rno_RUNOFF_Matcher_0.Match(i) {
+		if rno_RUNOFF_Matcher_0.Match(string(i)) {
 			return []string{"RUNOFF"}
-		} else if rno_Roff_Matcher_0.Match(i) {
+		} else if rno_Roff_Matcher_0.Match(string(i)) {
 			return []string{"Roff"}
 		}
 
 		return nil
 	},
 	".rpy": func(i []byte) []string {
-		if rpy_Python_Matcher_0.Match(i) {
+		if rpy_Python_Matcher_0.Match(string(i)) {
 			return []string{"Python"}
 		}
 
 		return []string{"Ren'Py"}
 	},
 	".rs": func(i []byte) []string {
-		if rs_Rust_Matcher_0.Match(i) {
+		if rs_Rust_Matcher_0.Match(string(i)) {
 			return []string{"Rust"}
-		} else if rs_RenderScript_Matcher_0.Match(i) {
+		} else if rs_RenderScript_Matcher_0.Match(string(i)) {
 			return []string{"RenderScript"}
 		}
 
 		return nil
 	},
 	".sc": func(i []byte) []string {
-		if sc_SuperCollider_Matcher_0.Match(i) || sc_SuperCollider_Matcher_1.Match(i) || sc_SuperCollider_Matcher_2.Match(i) {
+		if sc_SuperCollider_Matcher_0.Match(string(i)) || sc_SuperCollider_Matcher_1.Match(string(i)) || sc_SuperCollider_Matcher_2.Match(string(i)) {
 			return []string{"SuperCollider"}
-		} else if sc_Scala_Matcher_0.Match(i) || sc_Scala_Matcher_1.Match(i) || sc_Scala_Matcher_2.Match(i) {
+		} else if sc_Scala_Matcher_0.Match(string(i)) || sc_Scala_Matcher_1.Match(string(i)) || sc_Scala_Matcher_2.Match(string(i)) {
 			return []string{"Scala"}
 		}
 
 		return nil
 	},
 	".sql": func(i []byte) []string {
-		if sql_PLpgSQL_Matcher_0.Match(i) || sql_PLpgSQL_Matcher_1.Match(i) || sql_PLpgSQL_Matcher_2.Match(i) {
+		if sql_PLpgSQL_Matcher_0.Match(string(i)) || sql_PLpgSQL_Matcher_1.Match(string(i)) || sql_PLpgSQL_Matcher_2.Match(string(i)) {
 			return []string{"PLpgSQL"}
-		} else if sql_SQLPL_Matcher_0.Match(i) || sql_SQLPL_Matcher_1.Match(i) {
+		} else if sql_SQLPL_Matcher_0.Match(string(i)) || sql_SQLPL_Matcher_1.Match(string(i)) {
 			return []string{"SQLPL"}
-		} else if sql_PLSQL_Matcher_0.Match(i) || sql_PLSQL_Matcher_1.Match(i) {
+		} else if sql_PLSQL_Matcher_0.Match(string(i)) || sql_PLSQL_Matcher_1.Match(string(i)) {
 			return []string{"PLSQL"}
-		} else if sql_SQL_Matcher_0.Match(i) {
+		} else if sql_SQL_Matcher_0.Match(string(i)) {
 			return []string{"SQL"}
 		}
 
 		return nil
 	},
 	".srt": func(i []byte) []string {
-		if srt_SubRipText_Matcher_0.Match(i) {
+		if srt_SubRipText_Matcher_0.Match(string(i)) {
 			return []string{"SubRip Text"}
 		}
 
 		return nil
 	},
 	".t": func(i []byte) []string {
-		if t_Turing_Matcher_0.Match(i) {
+		if t_Turing_Matcher_0.Match(string(i)) {
 			return []string{"Turing"}
-		} else if t_Perl6_Matcher_0.Match(i) {
-			return []string{"Perl6"}
-		} else if t_Perl_Matcher_0.Match(i) {
+		} else if t_Perl6_Matcher_0.Match(string(i)) {
+			return []string{"Perl 6"}
+		} else if t_Perl_Matcher_0.Match(string(i)) {
 			return []string{"Perl"}
 		}
 
 		return nil
 	},
 	".toc": func(i []byte) []string {
-		if toc_WorldofWarcraftAddonData_Matcher_0.Match(i) {
+		if toc_WorldofWarcraftAddonData_Matcher_0.Match(string(i)) {
 			return []string{"World of Warcraft Addon Data"}
-		} else if toc_TeX_Matcher_0.Match(i) {
+		} else if toc_TeX_Matcher_0.Match(string(i)) {
 			return []string{"TeX"}
 		}
 
 		return nil
 	},
 	".ts": func(i []byte) []string {
-		if ts_XML_Matcher_0.Match(i) {
+		if ts_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
 		}
 
 		return []string{"TypeScript"}
 	},
 	".tst": func(i []byte) []string {
-		if tst_GAP_Matcher_0.Match(i) {
+		if tst_GAP_Matcher_0.Match(string(i)) {
 			return []string{"GAP"}
 		}
 
 		return []string{"Scilab"}
 	},
 	".tsx": func(i []byte) []string {
-		if tsx_TypeScript_Matcher_0.Match(i) {
+		if tsx_TypeScript_Matcher_0.Match(string(i)) {
 			return []string{"TypeScript"}
-		} else if tsx_XML_Matcher_0.Match(i) {
+		} else if tsx_XML_Matcher_0.Match(string(i)) {
 			return []string{"XML"}
 		}
 
@@ -447,122 +445,122 @@ var ContentMatchers = map[string]languageMatcher{
 }
 
 var (
-	asc_PublicKey_Matcher_0                = regexp.MustCompile(`(?m)^(----[- ]BEGIN|ssh-(rsa|dss)) `)
-	asc_AsciiDoc_Matcher_0                 = regexp.MustCompile(`(?m)^[=-]+(\s|\n)|{{[A-Za-z]`)
-	asc_AGSScript_Matcher_0                = regexp.MustCompile(`(?m)^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])`)
-	bb_BlitzBasic_Matcher_0                = regexp.MustCompile(`(?m)^\s*; `)
-	bb_BlitzBasic_Matcher_1                = regexp.MustCompile(`(?m)End Function`)
-	bb_BitBake_Matcher_0                   = regexp.MustCompile(`(?m)^\s*(# |include|require)\b`)
-	builds_XML_Matcher_0                   = regexp.MustCompile(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
-	ch_xBase_Matcher_0                     = regexp.MustCompile(`(?mi)^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b`)
-	cl_CommonLisp_Matcher_0                = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
-	cl_Cool_Matcher_0                      = regexp.MustCompile(`(?m)^class`)
-	cl_OpenCL_Matcher_0                    = regexp.MustCompile(`(?m)\/\* |\/\/ |^\}`)
-	cls_TeX_Matcher_0                      = regexp.MustCompile(`(?m)\\\w+{`)
-	cs_Smalltalk_Matcher_0                 = regexp.MustCompile(`(?m)![\w\s]+methodsFor: `)
-	cs_CSharp_Matcher_0                    = regexp.MustCompile(`(?m)^\s*namespace\s*[\w\.]+\s*{`)
-	cs_CSharp_Matcher_1                    = regexp.MustCompile(`(?m)^\s*\/\/`)
-	d_D_Matcher_0                          = regexp.MustCompile(`(?m)^module\s+[\w.]*\s*;|import\s+[\w\s,.:]*;|\w+\s+\w+\s*\(.*\)(?:\(.*\))?\s*{[^}]*}|unittest\s*(?:\(.*\))?\s*{[^}]*}`)
-	d_DTrace_Matcher_0                     = regexp.MustCompile(`(?m)^(\w+:\w*:\w*:\w*|BEGIN|END|provider\s+|(tick|profile)-\w+\s+{[^}]*}|#pragma\s+D\s+(option|attributes|depends_on)\s|#pragma\s+ident\s)`)
-	d_Makefile_Matcher_0                   = regexp.MustCompile(`(?m)([\/\\].*:\s+.*\s\\$|: \\$|^ : |^[\w\s\/\\.]+\w+\.\w+\s*:\s+[\w\s\/\\.]+\w+\.\w+)`)
-	ecl_ECLiPSe_Matcher_0                  = regexp.MustCompile(`(?m)^[^#]+:-`)
-	ecl_ECL_Matcher_0                      = regexp.MustCompile(`(?m):=`)
-	es_Erlang_Matcher_0                    = regexp.MustCompile(`(?m)^\s*(?:%%|main\s*\(.*?\)\s*->)`)
-	f_Forth_Matcher_0                      = regexp.MustCompile(`(?m)^: `)
-	f_FilebenchWML_Matcher_0               = regexp.MustCompile(`(?m)flowop`)
-	f_Fortran_Matcher_0                    = regexp.MustCompile(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
-	for_Forth_Matcher_0                    = regexp.MustCompile(`(?m)^: `)
-	for_Fortran_Matcher_0                  = regexp.MustCompile(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
-	fr_Forth_Matcher_0                     = regexp.MustCompile(`(?m)^(: |also |new-device|previous )`)
-	fr_Frege_Matcher_0                     = regexp.MustCompile(`(?m)^\s*(import|module|package|data|type) `)
-	fs_Forth_Matcher_0                     = regexp.MustCompile(`(?m)^(: |new-device)`)
-	fs_FSharp_Matcher_0                    = regexp.MustCompile(`(?m)^\s*(#light|import|let|module|namespace|open|type)`)
-	fs_GLSL_Matcher_0                      = regexp.MustCompile(`(?m)^\s*(#version|precision|uniform|varying|vec[234])`)
-	fs_Filterscript_Matcher_0              = regexp.MustCompile(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
-	gs_Gosu_Matcher_0                      = regexp.MustCompile(`(?m)^uses java\.`)
-	h_ObjectiveDashC_Matcher_0             = regexp.MustCompile(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
-	h_CPlusPlus_Matcher_0                  = regexp.MustCompile(`(?m)^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>`)
-	h_CPlusPlus_Matcher_1                  = regexp.MustCompile(`(?m)^\s*template\s*<`)
-	h_CPlusPlus_Matcher_2                  = regexp.MustCompile(`(?m)^[ \t]*try`)
-	h_CPlusPlus_Matcher_3                  = regexp.MustCompile(`(?m)^[ \t]*catch\s*\(`)
-	h_CPlusPlus_Matcher_4                  = regexp.MustCompile(`(?m)^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+`)
-	h_CPlusPlus_Matcher_5                  = regexp.MustCompile(`(?m)^[ \t]*(private|public|protected):$`)
-	h_CPlusPlus_Matcher_6                  = regexp.MustCompile(`(?m)std::\w+`)
-	inc_PHP_Matcher_0                      = regexp.MustCompile(`(?m)^<\?(?:php)?`)
-	inc_POVDashRaySDL_Matcher_0            = regexp.MustCompile(`(?m)^\s*#(declare|local|macro|while)\s`)
-	l_CommonLisp_Matcher_0                 = regexp.MustCompile(`(?m)\(def(un|macro)\s`)
-	l_Lex_Matcher_0                        = regexp.MustCompile(`(?m)^(%[%{}]xs|<.*>)`)
-	l_Roff_Matcher_0                       = regexp.MustCompile(`(?mi)^\.[a-z][a-z](\s|$)`)
-	l_PicoLisp_Matcher_0                   = regexp.MustCompile(`(?m)^\((de|class|rel|code|data|must)\s`)
-	ls_LoomScript_Matcher_0                = regexp.MustCompile(`(?m)^\s*package\s*[\w\.\/\*\s]*\s*{`)
-	lsp_CommonLisp_Matcher_0               = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
-	lsp_NewLisp_Matcher_0                  = regexp.MustCompile(`(?m)^\s*\(define `)
-	lisp_CommonLisp_Matcher_0              = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
-	lisp_NewLisp_Matcher_0                 = regexp.MustCompile(`(?m)^\s*\(define `)
-	m_ObjectiveDashC_Matcher_0             = regexp.MustCompile(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
-	m_Mercury_Matcher_0                    = regexp.MustCompile(`(?m):- module`)
-	m_MUF_Matcher_0                        = regexp.MustCompile(`(?m)^: `)
-	m_M_Matcher_0                          = regexp.MustCompile(`(?m)^\s*;`)
-	m_Mathematica_Matcher_0                = regexp.MustCompile(`(?m)\*\)$`)
-	m_Matlab_Matcher_0                     = regexp.MustCompile(`(?m)^\s*%`)
-	m_Limbo_Matcher_0                      = regexp.MustCompile(`(?m)^\w+\s*:\s*module\s*{`)
-	md_Markdown_Matcher_0                  = regexp.MustCompile(`(?mi)(^[-a-z0-9=#!\*\[|>])|<\/`)
-	md_Markdown_Matcher_1                  = regexp.MustCompile(`^$`)
-	md_GCCMachineDescription_Matcher_0     = regexp.MustCompile(`(?m)^(;;|\(define_)`)
-	ml_OCaml_Matcher_0                     = regexp.MustCompile(`(?m)(^\s*module)|let rec |match\s+(\S+\s)+with`)
-	ml_StandardML_Matcher_0                = regexp.MustCompile(`(?m)=> |case\s+(\S+\s)+of`)
-	mod_XML_Matcher_0                      = regexp.MustCompile(`(?m)<!ENTITY `)
-	mod_ModulaDash2_Matcher_0              = regexp.MustCompile(`(?mi)^\s*MODULE [\w\.]+;`)
-	mod_ModulaDash2_Matcher_1              = regexp.MustCompile(`(?mi)^\s*END [\w\.]+;`)
-	ms_Roff_Matcher_0                      = regexp.MustCompile(`(?mi)^[.'][a-z][a-z](\s|$)`)
-	n_Roff_Matcher_0                       = regexp.MustCompile(`(?m)^[.']`)
-	n_Nemerle_Matcher_0                    = regexp.MustCompile(`(?m)^(module|namespace|using)\s`)
-	ncl_Text_Matcher_0                     = regexp.MustCompile(`(?m)THE_TITLE`)
-	nl_NL_Matcher_0                        = regexp.MustCompile(`(?m)^(b|g)[0-9]+ `)
-	php_Hack_Matcher_0                     = regexp.MustCompile(`(?m)<\?hh`)
-	php_PHP_Matcher_0                      = regexp.MustCompile(`(?m)<?[^h]`)
-	pl_Prolog_Matcher_0                    = regexp.MustCompile(`(?m)^[^#]*:-`)
-	pl_Perl_Matcher_0                      = regexp.MustCompile(`(?m)use strict|use\s+v?5\.`)
-	pl_Perl6_Matcher_0                     = regexp.MustCompile(`(?m)^(use v6|(my )?class|module)`)
-	pm_Perl6_Matcher_0                     = regexp.MustCompile(`(?m)^\s*(?:use\s+v6\s*;|(?:\bmy\s+)?class|module)\b`)
-	pm_Perl_Matcher_0                      = regexp.MustCompile(`(?m)\buse\s+(?:strict\b|v?5\.)`)
-	pod_Pod_Matcher_0                      = regexp.MustCompile(`(?m)^=\w+\b`)
-	pro_Prolog_Matcher_0                   = regexp.MustCompile(`(?m)^[^#]+:-`)
-	pro_INI_Matcher_0                      = regexp.MustCompile(`(?m)last_client=`)
-	pro_QMake_Matcher_0                    = regexp.MustCompile(`(?m)HEADERS`)
-	pro_QMake_Matcher_1                    = regexp.MustCompile(`(?m)SOURCES`)
-	pro_IDL_Matcher_0                      = regexp.MustCompile(`(?m)^\s*function[ \w,]+$`)
-	props_XML_Matcher_0                    = regexp.MustCompile(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
-	props_INI_Matcher_0                    = regexp.MustCompile(`(?mi)\w+\s*=\s*`)
-	r_Rebol_Matcher_0                      = regexp.MustCompile(`(?mi)\bRebol\b`)
-	r_R_Matcher_0                          = regexp.MustCompile(`(?m)<-|^\s*#`)
-	rno_RUNOFF_Matcher_0                   = regexp.MustCompile(`(?mi)^\.!|^\.end lit(?:eral)?\b`)
-	rno_Roff_Matcher_0                     = regexp.MustCompile(`(?m)^\.\\" `)
-	rpy_Python_Matcher_0                   = regexp.MustCompile(`(?ms)(^(import|from|class|def)\s)`)
-	rs_Rust_Matcher_0                      = regexp.MustCompile(`(?m)^(use |fn |mod |pub |macro_rules|impl|#!?\[)`)
-	rs_RenderScript_Matcher_0              = regexp.MustCompile(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
-	sc_SuperCollider_Matcher_0             = regexp.MustCompile(`(?m)\^(this|super)\.`)
-	sc_SuperCollider_Matcher_1             = regexp.MustCompile(`(?m)^\s*(\+|\*)\s*\w+\s*{`)
-	sc_SuperCollider_Matcher_2             = regexp.MustCompile(`(?m)^\s*~\w+\s*=\.`)
-	sc_Scala_Matcher_0                     = regexp.MustCompile(`(?m)^\s*import (scala|java)\.`)
-	sc_Scala_Matcher_1                     = regexp.MustCompile(`(?m)^\s*val\s+\w+\s*=`)
-	sc_Scala_Matcher_2                     = regexp.MustCompile(`(?m)^\s*class\b`)
-	sql_PLpgSQL_Matcher_0                  = regexp.MustCompile(`(?mi)^\\i\b|AS \$\$|LANGUAGE '?plpgsql'?`)
-	sql_PLpgSQL_Matcher_1                  = regexp.MustCompile(`(?mi)SECURITY (DEFINER|INVOKER)`)
-	sql_PLpgSQL_Matcher_2                  = regexp.MustCompile(`(?mi)BEGIN( WORK| TRANSACTION)?;`)
-	sql_SQLPL_Matcher_0                    = regexp.MustCompile(`(?mi)(alter module)|(language sql)|(begin( NOT)+ atomic)`)
-	sql_SQLPL_Matcher_1                    = regexp.MustCompile(`(?mi)signal SQLSTATE '[0-9]+'`)
-	sql_PLSQL_Matcher_0                    = regexp.MustCompile(`(?mi)\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)`)
-	sql_PLSQL_Matcher_1                    = regexp.MustCompile(`(?mi)constructor\W+function`)
-	sql_SQL_Matcher_0                      = regexp.MustCompile(`(?mi)! /begin|boolean|package|exception`)
-	srt_SubRipText_Matcher_0               = regexp.MustCompile(`(?m)^(\d{2}:\d{2}:\d{2},\d{3})\s*(-->)\s*(\d{2}:\d{2}:\d{2},\d{3})$`)
-	t_Turing_Matcher_0                     = regexp.MustCompile(`(?m)^\s*%[ \t]+|^\s*var\s+\w+\s*:=\s*\w+`)
-	t_Perl6_Matcher_0                      = regexp.MustCompile(`(?m)^\s*(?:use\s+v6\s*;|\bmodule\b|\b(?:my\s+)?class\b)`)
-	t_Perl_Matcher_0                       = regexp.MustCompile(`(?m)\buse\s+(?:strict\b|v?5\.)`)
-	toc_WorldofWarcraftAddonData_Matcher_0 = regexp.MustCompile(`(?m)^## |@no-lib-strip@`)
-	toc_TeX_Matcher_0                      = regexp.MustCompile(`(?m)^\\(contentsline|defcounter|beamer|boolfalse)`)
-	ts_XML_Matcher_0                       = regexp.MustCompile(`(?m)<TS`)
-	tst_GAP_Matcher_0                      = regexp.MustCompile(`(?m)gap> `)
-	tsx_TypeScript_Matcher_0               = regexp.MustCompile(`(?m)^\s*(import.+(from\s+|require\()['"]react|\/\/\/\s*<reference\s)`)
-	tsx_XML_Matcher_0                      = regexp.MustCompile(`(?mi)^\s*<\?xml\s+version`)
+	asc_PublicKey_Matcher_0                = substring.Regexp(`(?m)^(----[- ]BEGIN|ssh-(rsa|dss)) `)
+	asc_AsciiDoc_Matcher_0                 = substring.Regexp(`(?m)^[=-]+(\s|\n)|{{[A-Za-z]`)
+	asc_AGSScript_Matcher_0                = substring.Regexp(`(?m)^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])`)
+	bb_BlitzBasic_Matcher_0                = substring.Regexp(`(?m)^\s*; `)
+	bb_BlitzBasic_Matcher_1                = substring.Regexp(`(?m)End Function`)
+	bb_BitBake_Matcher_0                   = substring.Regexp(`(?m)^\s*(# |include|require)\b`)
+	builds_XML_Matcher_0                   = substring.Regexp(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
+	ch_xBase_Matcher_0                     = substring.Regexp(`(?mi)^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b`)
+	cl_CommonLisp_Matcher_0                = substring.Regexp(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	cl_Cool_Matcher_0                      = substring.Regexp(`(?m)^class`)
+	cl_OpenCL_Matcher_0                    = substring.Regexp(`(?m)\/\* |\/\/ |^\}`)
+	cls_TeX_Matcher_0                      = substring.Regexp(`(?m)\\\w+{`)
+	cs_Smalltalk_Matcher_0                 = substring.Regexp(`(?m)![\w\s]+methodsFor: `)
+	cs_CSharp_Matcher_0                    = substring.Regexp(`(?m)^\s*namespace\s*[\w\.]+\s*{`)
+	cs_CSharp_Matcher_1                    = substring.Regexp(`(?m)^\s*\/\/`)
+	d_D_Matcher_0                          = substring.Regexp(`(?m)^module\s+[\w.]*\s*;|import\s+[\w\s,.:]*;|\w+\s+\w+\s*\(.*\)(?:\(.*\))?\s*{[^}]*}|unittest\s*(?:\(.*\))?\s*{[^}]*}`)
+	d_DTrace_Matcher_0                     = substring.Regexp(`(?m)^(\w+:\w*:\w*:\w*|BEGIN|END|provider\s+|(tick|profile)-\w+\s+{[^}]*}|#pragma\s+D\s+(option|attributes|depends_on)\s|#pragma\s+ident\s)`)
+	d_Makefile_Matcher_0                   = substring.Regexp(`(?m)([\/\\].*:\s+.*\s\\$|: \\$|^ : |^[\w\s\/\\.]+\w+\.\w+\s*:\s+[\w\s\/\\.]+\w+\.\w+)`)
+	ecl_ECLiPSe_Matcher_0                  = substring.Regexp(`(?m)^[^#]+:-`)
+	ecl_ECL_Matcher_0                      = substring.Regexp(`(?m):=`)
+	es_Erlang_Matcher_0                    = substring.Regexp(`(?m)^\s*(?:%%|main\s*\(.*?\)\s*->)`)
+	f_Forth_Matcher_0                      = substring.Regexp(`(?m)^: `)
+	f_FilebenchWML_Matcher_0               = substring.Regexp(`(?m)flowop`)
+	f_Fortran_Matcher_0                    = substring.Regexp(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
+	for_Forth_Matcher_0                    = substring.Regexp(`(?m)^: `)
+	for_Fortran_Matcher_0                  = substring.Regexp(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
+	fr_Forth_Matcher_0                     = substring.Regexp(`(?m)^(: |also |new-device|previous )`)
+	fr_Frege_Matcher_0                     = substring.Regexp(`(?m)^\s*(import|module|package|data|type) `)
+	fs_Forth_Matcher_0                     = substring.Regexp(`(?m)^(: |new-device)`)
+	fs_FSharp_Matcher_0                    = substring.Regexp(`(?m)^\s*(#light|import|let|module|namespace|open|type)`)
+	fs_GLSL_Matcher_0                      = substring.Regexp(`(?m)^\s*(#version|precision|uniform|varying|vec[234])`)
+	fs_Filterscript_Matcher_0              = substring.Regexp(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
+	gs_Gosu_Matcher_0                      = substring.Regexp(`(?m)^uses java\.`)
+	h_ObjectiveDashC_Matcher_0             = substring.Regexp(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
+	h_CPlusPlus_Matcher_0                  = substring.Regexp(`(?m)^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>`)
+	h_CPlusPlus_Matcher_1                  = substring.Regexp(`(?m)^\s*template\s*<`)
+	h_CPlusPlus_Matcher_2                  = substring.Regexp(`(?m)^[ \t]*try`)
+	h_CPlusPlus_Matcher_3                  = substring.Regexp(`(?m)^[ \t]*catch\s*\(`)
+	h_CPlusPlus_Matcher_4                  = substring.Regexp(`(?m)^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+`)
+	h_CPlusPlus_Matcher_5                  = substring.Regexp(`(?m)^[ \t]*(private|public|protected):$`)
+	h_CPlusPlus_Matcher_6                  = substring.Regexp(`(?m)std::\w+`)
+	inc_PHP_Matcher_0                      = substring.Regexp(`(?m)^<\?(?:php)?`)
+	inc_POVDashRaySDL_Matcher_0            = substring.Regexp(`(?m)^\s*#(declare|local|macro|while)\s`)
+	l_CommonLisp_Matcher_0                 = substring.Regexp(`(?m)\(def(un|macro)\s`)
+	l_Lex_Matcher_0                        = substring.Regexp(`(?m)^(%[%{}]xs|<.*>)`)
+	l_Roff_Matcher_0                       = substring.Regexp(`(?mi)^\.[a-z][a-z](\s|$)`)
+	l_PicoLisp_Matcher_0                   = substring.Regexp(`(?m)^\((de|class|rel|code|data|must)\s`)
+	ls_LoomScript_Matcher_0                = substring.Regexp(`(?m)^\s*package\s*[\w\.\/\*\s]*\s*{`)
+	lsp_CommonLisp_Matcher_0               = substring.Regexp(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	lsp_NewLisp_Matcher_0                  = substring.Regexp(`(?m)^\s*\(define `)
+	lisp_CommonLisp_Matcher_0              = substring.Regexp(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	lisp_NewLisp_Matcher_0                 = substring.Regexp(`(?m)^\s*\(define `)
+	m_ObjectiveDashC_Matcher_0             = substring.Regexp(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
+	m_Mercury_Matcher_0                    = substring.Regexp(`(?m):- module`)
+	m_MUF_Matcher_0                        = substring.Regexp(`(?m)^: `)
+	m_M_Matcher_0                          = substring.Regexp(`(?m)^\s*;`)
+	m_Mathematica_Matcher_0                = substring.Regexp(`(?m)\*\)$`)
+	m_Matlab_Matcher_0                     = substring.Regexp(`(?m)^\s*%`)
+	m_Limbo_Matcher_0                      = substring.Regexp(`(?m)^\w+\s*:\s*module\s*{`)
+	md_Markdown_Matcher_0                  = substring.Regexp(`(?mi)(^[-a-z0-9=#!\*\[|>])|<\/`)
+	md_Markdown_Matcher_1                  = substring.Regexp(`^$`)
+	md_GCCMachineDescription_Matcher_0     = substring.Regexp(`(?m)^(;;|\(define_)`)
+	ml_OCaml_Matcher_0                     = substring.Regexp(`(?m)(^\s*module)|let rec |match\s+(\S+\s)+with`)
+	ml_StandardML_Matcher_0                = substring.Regexp(`(?m)=> |case\s+(\S+\s)+of`)
+	mod_XML_Matcher_0                      = substring.Regexp(`(?m)<!ENTITY `)
+	mod_ModulaDash2_Matcher_0              = substring.Regexp(`(?mi)^\s*MODULE [\w\.]+;`)
+	mod_ModulaDash2_Matcher_1              = substring.Regexp(`(?mi)^\s*END [\w\.]+;`)
+	ms_Roff_Matcher_0                      = substring.Regexp(`(?mi)^[.'][a-z][a-z](\s|$)`)
+	n_Roff_Matcher_0                       = substring.Regexp(`(?m)^[.']`)
+	n_Nemerle_Matcher_0                    = substring.Regexp(`(?m)^(module|namespace|using)\s`)
+	ncl_Text_Matcher_0                     = substring.Regexp(`(?m)THE_TITLE`)
+	nl_NL_Matcher_0                        = substring.Regexp(`(?m)^(b|g)[0-9]+ `)
+	php_Hack_Matcher_0                     = substring.Regexp(`(?m)<\?hh`)
+	php_PHP_Matcher_0                      = substring.Regexp(`(?m)<?[^h]`)
+	pl_Prolog_Matcher_0                    = substring.Regexp(`(?m)^[^#]*:-`)
+	pl_Perl_Matcher_0                      = substring.Regexp(`(?m)use strict|use\s+v?5\.`)
+	pl_Perl6_Matcher_0                     = substring.Regexp(`(?m)^(use v6|(my )?class|module)`)
+	pm_Perl6_Matcher_0                     = substring.Regexp(`(?m)^\s*(?:use\s+v6\s*;|(?:\bmy\s+)?class|module)\b`)
+	pm_Perl_Matcher_0                      = substring.Regexp(`(?m)\buse\s+(?:strict\b|v?5\.)`)
+	pod_Pod_Matcher_0                      = substring.Regexp(`(?m)^=\w+\b`)
+	pro_Prolog_Matcher_0                   = substring.Regexp(`(?m)^[^#]+:-`)
+	pro_INI_Matcher_0                      = substring.Regexp(`(?m)last_client=`)
+	pro_QMake_Matcher_0                    = substring.Regexp(`(?m)HEADERS`)
+	pro_QMake_Matcher_1                    = substring.Regexp(`(?m)SOURCES`)
+	pro_IDL_Matcher_0                      = substring.Regexp(`(?m)^\s*function[ \w,]+$`)
+	props_XML_Matcher_0                    = substring.Regexp(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
+	props_INI_Matcher_0                    = substring.Regexp(`(?mi)\w+\s*=\s*`)
+	r_Rebol_Matcher_0                      = substring.Regexp(`(?mi)\bRebol\b`)
+	r_R_Matcher_0                          = substring.Regexp(`(?m)<-|^\s*#`)
+	rno_RUNOFF_Matcher_0                   = substring.Regexp(`(?mi)^\.!|^\.end lit(?:eral)?\b`)
+	rno_Roff_Matcher_0                     = substring.Regexp(`(?m)^\.\\" `)
+	rpy_Python_Matcher_0                   = substring.Regexp(`(?ms)(^(import|from|class|def)\s)`)
+	rs_Rust_Matcher_0                      = substring.Regexp(`(?m)^(use |fn |mod |pub |macro_rules|impl|#!?\[)`)
+	rs_RenderScript_Matcher_0              = substring.Regexp(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
+	sc_SuperCollider_Matcher_0             = substring.Regexp(`(?m)\^(this|super)\.`)
+	sc_SuperCollider_Matcher_1             = substring.Regexp(`(?m)^\s*(\+|\*)\s*\w+\s*{`)
+	sc_SuperCollider_Matcher_2             = substring.Regexp(`(?m)^\s*~\w+\s*=\.`)
+	sc_Scala_Matcher_0                     = substring.Regexp(`(?m)^\s*import (scala|java)\.`)
+	sc_Scala_Matcher_1                     = substring.Regexp(`(?m)^\s*val\s+\w+\s*=`)
+	sc_Scala_Matcher_2                     = substring.Regexp(`(?m)^\s*class\b`)
+	sql_PLpgSQL_Matcher_0                  = substring.Regexp(`(?mi)^\\i\b|AS \$\$|LANGUAGE '?plpgsql'?`)
+	sql_PLpgSQL_Matcher_1                  = substring.Regexp(`(?mi)SECURITY (DEFINER|INVOKER)`)
+	sql_PLpgSQL_Matcher_2                  = substring.Regexp(`(?mi)BEGIN( WORK| TRANSACTION)?;`)
+	sql_SQLPL_Matcher_0                    = substring.Regexp(`(?mi)(alter module)|(language sql)|(begin( NOT)+ atomic)`)
+	sql_SQLPL_Matcher_1                    = substring.Regexp(`(?mi)signal SQLSTATE '[0-9]+'`)
+	sql_PLSQL_Matcher_0                    = substring.Regexp(`(?mi)\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)`)
+	sql_PLSQL_Matcher_1                    = substring.Regexp(`(?mi)constructor\W+function`)
+	sql_SQL_Matcher_0                      = substring.Regexp(`(?mi)! /begin|boolean|package|exception`)
+	srt_SubRipText_Matcher_0               = substring.Regexp(`(?m)^(\d{2}:\d{2}:\d{2},\d{3})\s*(-->)\s*(\d{2}:\d{2}:\d{2},\d{3})$`)
+	t_Turing_Matcher_0                     = substring.Regexp(`(?m)^\s*%[ \t]+|^\s*var\s+\w+\s*:=\s*\w+`)
+	t_Perl6_Matcher_0                      = substring.Regexp(`(?m)^\s*(?:use\s+v6\s*;|\bmodule\b|\b(?:my\s+)?class\b)`)
+	t_Perl_Matcher_0                       = substring.Regexp(`(?m)\buse\s+(?:strict\b|v?5\.)`)
+	toc_WorldofWarcraftAddonData_Matcher_0 = substring.Regexp(`(?m)^## |@no-lib-strip@`)
+	toc_TeX_Matcher_0                      = substring.Regexp(`(?m)^\\(contentsline|defcounter|beamer|boolfalse)`)
+	ts_XML_Matcher_0                       = substring.Regexp(`(?m)<TS`)
+	tst_GAP_Matcher_0                      = substring.Regexp(`(?m)gap> `)
+	tsx_TypeScript_Matcher_0               = substring.Regexp(`(?m)^\s*(import.+(from\s+|require\()['"]react|\/\/\/\s*<reference\s)`)
+	tsx_XML_Matcher_0                      = substring.Regexp(`(?mi)^\s*<\?xml\s+version`)
 )
diff --git a/internal/code-generator/generator/test_files/documentation.gold b/internal/code-generator/generator/test_files/documentation.gold
index 6462c5e..8664bad 100644
--- a/internal/code-generator/generator/test_files/documentation.gold
+++ b/internal/code-generator/generator/test_files/documentation.gold
@@ -2,7 +2,7 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 import "gopkg.in/toqueteos/substring.v1"
 
diff --git a/internal/code-generator/generator/test_files/extension.gold b/internal/code-generator/generator/test_files/extension.gold
index 7dd67c3..ac1b5b8 100644
--- a/internal/code-generator/generator/test_files/extension.gold
+++ b/internal/code-generator/generator/test_files/extension.gold
@@ -2,7 +2,7 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 var LanguagesByExtension = map[string][]string{
 	".1":                   {"Roff"},
@@ -19,8 +19,8 @@ var LanguagesByExtension = map[string][]string{
 	".4th":                 {"Forth"},
 	".5":                   {"Roff"},
 	".6":                   {"Roff"},
-	".6pl":                 {"Perl6"},
-	".6pm":                 {"Perl6"},
+	".6pl":                 {"Perl 6"},
+	".6pm":                 {"Perl 6"},
 	".7":                   {"Roff"},
 	".8":                   {"Roff"},
 	".8xk":                 {"TI Program"},
@@ -227,6 +227,7 @@ var LanguagesByExtension = map[string][]string{
 	".dylan":               {"Dylan"},
 	".e":                   {"E", "Eiffel"},
 	".eam.fs":              {"Formatted"},
+	".eb":                  {"Easybuild"},
 	".ebnf":                {"EBNF"},
 	".ebuild":              {"Gentoo Ebuild"},
 	".ec":                  {"eC"},
@@ -557,7 +558,7 @@ var LanguagesByExtension = map[string][]string{
 	".nlogo":               {"NetLogo"},
 	".no":                  {"Text"},
 	".nproj":               {"XML"},
-	".nqp":                 {"Perl6"},
+	".nqp":                 {"Perl 6"},
 	".nr":                  {"Roff"},
 	".nse":                 {"Lua"},
 	".nsh":                 {"NSIS"},
@@ -590,9 +591,9 @@ var LanguagesByExtension = map[string][]string{
 	".oz":                  {"Oz"},
 	".p":                   {"OpenEdge ABL"},
 	".p4":                  {"P4"},
-	".p6":                  {"Perl6"},
-	".p6l":                 {"Perl6"},
-	".p6m":                 {"Perl6"},
+	".p6":                  {"Perl 6"},
+	".p6l":                 {"Perl 6"},
+	".p6m":                 {"Perl 6"},
 	".pac":                 {"JavaScript"},
 	".pan":                 {"Pan"},
 	".parrot":              {"Parrot"},
@@ -626,8 +627,8 @@ var LanguagesByExtension = map[string][]string{
 	".pkgproj":             {"XML"},
 	".pkl":                 {"Pickle"},
 	".pks":                 {"PLSQL"},
-	".pl":                  {"Perl", "Perl6", "Prolog"},
-	".pl6":                 {"Perl6"},
+	".pl":                  {"Perl", "Perl 6", "Prolog"},
+	".pl6":                 {"Perl 6"},
 	".plb":                 {"PLSQL"},
 	".plist":               {"XML"},
 	".plot":                {"Gnuplot"},
@@ -636,8 +637,8 @@ var LanguagesByExtension = map[string][]string{
 	".plt":                 {"Gnuplot"},
 	".pluginspec":          {"Ruby", "XML"},
 	".plx":                 {"Perl"},
-	".pm":                  {"Perl", "Perl6"},
-	".pm6":                 {"Perl6"},
+	".pm":                  {"Perl", "Perl 6"},
+	".pm6":                 {"Perl 6"},
 	".pmod":                {"Pike"},
 	".po":                  {"Gettext Catalog"},
 	".pod":                 {"Perl", "Pod"},
@@ -723,6 +724,7 @@ var LanguagesByExtension = map[string][]string{
 	".rexx":                {"REXX"},
 	".rg":                  {"Rouge"},
 	".rhtml":               {"RHTML"},
+	".ring":                {"Ring"},
 	".rkt":                 {"Racket"},
 	".rktd":                {"Racket"},
 	".rktl":                {"Racket"},
@@ -832,7 +834,7 @@ var LanguagesByExtension = map[string][]string{
 	".svh":                 {"SystemVerilog"},
 	".swift":               {"Swift"},
 	".syntax":              {"YAML"},
-	".t":                   {"Perl", "Perl6", "Terra", "Turing"},
+	".t":                   {"Perl", "Perl 6", "Terra", "Turing"},
 	".tab":                 {"SQL"},
 	".tac":                 {"Python"},
 	".targets":             {"XML"},
@@ -1104,6 +1106,7 @@ var ExtensionsByLanguage = map[string][]string{
 	"EJS":            {".ejs"},
 	"EQ":             {".eq"},
 	"Eagle":          {".sch", ".brd"},
+	"Easybuild":      {".eb"},
 	"Ecere Projects": {".epj"},
 	"Eiffel":         {".e"},
 	"Elixir":         {".ex", ".exs"},
@@ -1295,7 +1298,7 @@ var ExtensionsByLanguage = map[string][]string{
 	"Pascal":                       {".pas", ".dfm", ".dpr", ".inc", ".lpr", ".pascal", ".pp"},
 	"Pep8":                         {".pep"},
 	"Perl":                         {".pl", ".al", ".cgi", ".fcgi", ".perl", ".ph", ".plx", ".pm", ".pod", ".psgi", ".t"},
-	"Perl6":                        {".6pl", ".6pm", ".nqp", ".p6", ".p6l", ".p6m", ".pl", ".pl6", ".pm", ".pm6", ".t"},
+	"Perl 6":                       {".6pl", ".6pm", ".nqp", ".p6", ".p6l", ".p6m", ".pl", ".pl6", ".pm", ".pm6", ".t"},
 	"Pic":                          {".pic", ".chem"},
 	"Pickle":                       {".pkl"},
 	"PicoLisp":                     {".l"},
@@ -1341,6 +1344,7 @@ var ExtensionsByLanguage = map[string][]string{
 	"Regular Expression":           {".regexp", ".regex"},
 	"Ren'Py":                       {".rpy"},
 	"RenderScript":                 {".rs", ".rsh"},
+	"Ring":                         {".ring"},
 	"RobotFramework":               {".robot"},
 	"Roff":                         {".man", ".1", ".1in", ".1m", ".1x", ".2", ".3", ".3in", ".3m", ".3qt", ".3x", ".4", ".5", ".6", ".7", ".8", ".9", ".l", ".me", ".ms", ".n", ".nr", ".rno", ".roff", ".tmac"},
 	"Rouge":                        {".rg"},
diff --git a/internal/code-generator/generator/test_files/filename.gold b/internal/code-generator/generator/test_files/filename.gold
index 185667d..bd4dbb5 100644
--- a/internal/code-generator/generator/test_files/filename.gold
+++ b/internal/code-generator/generator/test_files/filename.gold
@@ -2,7 +2,7 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 var LanguagesByFilename = map[string][]string{
 	".Rprofile":          {"R"},
@@ -107,7 +107,7 @@ var LanguagesByFilename = map[string][]string{
 	"README.mysql":       {"Text"},
 	"ROOT":               {"Isabelle ROOT"},
 	"Rakefile":           {"Ruby"},
-	"Rexfile":            {"Perl6"},
+	"Rexfile":            {"Perl 6"},
 	"SConscript":         {"Python"},
 	"SConstruct":         {"Python"},
 	"Settings.StyleCop":  {"XML"},
diff --git a/internal/code-generator/generator/test_files/frequencies.gold b/internal/code-generator/generator/test_files/frequencies.gold
index 5756cf1..e879d5f 100644
--- a/internal/code-generator/generator/test_files/frequencies.gold
+++ b/internal/code-generator/generator/test_files/frequencies.gold
@@ -2,386 +2,389 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 var LanguagesLogProbabilities = map[string]float64{
-	"1C Enterprise":    -5.720858,
-	"ABAP":             -7.512618,
-	"ABNF":             -7.512618,
-	"AGS Script":       -6.126323,
-	"AMPL":             -6.819470,
-	"API Blueprint":    -6.414005,
-	"APL":              -6.414005,
-	"ASN.1":            -7.512618,
-	"ATS":              -5.315393,
-	"Agda":             -7.512618,
-	"Alloy":            -6.414005,
-	"Alpine Abuild":    -7.512618,
-	"Ant Build System": -7.512618,
-	"ApacheConf":       -6.126323,
-	"Apex":             -5.720858,
-	"Apollo Guidance Computer": -7.512618,
-	"AppleScript":              -5.566707,
-	"Arduino":                  -6.819470,
-	"AsciiDoc":                 -6.414005,
-	"AspectJ":                  -6.819470,
-	"Assembly":                 -5.720858,
-	"AutoHotkey":               -7.512618,
-	"Awk":                      -7.512618,
-	"BitBake":                  -6.819470,
-	"Blade":                    -6.819470,
-	"BlitzBasic":               -6.414005,
-	"BlitzMax":                 -7.512618,
-	"Bluespec":                 -6.819470,
-	"Brainfuck":                -5.903180,
-	"Brightscript":             -7.512618,
-	"C":                        -3.505284,
-	"C#":                       -5.720858,
-	"C++":                      -3.705955,
-	"CLIPS":                    -6.819470,
-	"CMake":                    -5.566707,
-	"COBOL":                    -6.126323,
-	"CSON":                     -6.126323,
-	"CSS":                      -6.819470,
-	"CSV":                      -7.512618,
-	"CWeb":                     -7.512618,
-	"CartoCSS":                 -7.512618,
-	"Ceylon":                   -7.512618,
-	"Chapel":                   -5.903180,
-	"Charity":                  -7.512618,
-	"Cirru":                    -5.315393,
-	"Clarion":                  -6.126323,
-	"Clean":                    -5.315393,
-	"Click":                    -6.819470,
-	"Clojure":                  -5.315393,
-	"Closure Templates":        -7.512618,
-	"CoffeeScript":             -5.210032,
-	"ColdFusion":               -7.512618,
-	"ColdFusion CFC":           -6.819470,
-	"Common Lisp":              -5.315393,
-	"Component Pascal":         -6.819470,
-	"Cool":                     -6.819470,
-	"Coq":                      -4.947668,
-	"Creole":                   -7.512618,
-	"Crystal":                  -6.414005,
-	"Csound":                   -6.414005,
-	"Csound Document":          -6.414005,
-	"Csound Score":             -6.414005,
-	"Cuda":                     -6.819470,
-	"Cycript":                  -7.512618,
-	"D":                        -5.315393,
-	"DIGITAL Command Language": -6.126323,
-	"DM":            -7.512618,
-	"DNS Zone":      -6.819470,
-	"DTrace":        -6.414005,
-	"Dart":          -7.512618,
-	"Diff":          -7.512618,
-	"Dockerfile":    -7.512618,
-	"Dogescript":    -7.512618,
-	"E":             -5.566707,
-	"EBNF":          -6.126323,
-	"ECL":           -7.512618,
-	"ECLiPSe":       -7.512618,
-	"EJS":           -6.819470,
-	"EQ":            -6.414005,
-	"Eagle":         -6.819470,
-	"Eiffel":        -6.414005,
-	"Elixir":        -7.512618,
-	"Elm":           -6.414005,
-	"Emacs Lisp":    -5.114722,
-	"EmberScript":   -7.512618,
-	"Erlang":        -4.873560,
-	"F#":            -5.433176,
-	"FLUX":          -6.126323,
-	"Filebench WML": -7.512618,
-	"Filterscript":  -6.819470,
-	"Formatted":     -6.414005,
-	"Forth":         -4.740029,
-	"Fortran":       -5.903180,
-	"FreeMarker":    -6.819470,
-	"Frege":         -6.126323,
-	"G-code":        -6.819470,
-	"GAMS":          -7.512618,
-	"GAP":           -5.315393,
-	"GCC Machine Description": -7.512618,
-	"GDB":      -6.819470,
-	"GDScript": -6.126323,
-	"GLSL":     -4.873560,
-	"GN":       -5.114722,
-	"Game Maker Language":     -5.114722,
-	"Genie":                   -6.819470,
-	"Gnuplot":                 -5.720858,
-	"Go":                      -6.414005,
-	"Golo":                    -4.216781,
-	"Gosu":                    -5.903180,
-	"Grace":                   -6.819470,
-	"Gradle":                  -6.819470,
-	"Grammatical Framework":   -3.799045,
-	"Graph Modeling Language": -7.512618,
-	"GraphQL":                 -6.819470,
-	"Graphviz (DOT)":          -6.819470,
-	"Groovy":                  -5.720858,
-	"Groovy Server Pages":     -6.126323,
-	"HCL":                            -6.414005,
-	"HLSL":                           -5.903180,
-	"HTML":                           -5.720858,
-	"HTML+Django":                    -7.512618,
-	"HTML+ECR":                       -7.512618,
-	"HTML+EEX":                       -7.512618,
-	"HTML+ERB":                       -6.819470,
-	"Hack":                           -4.180413,
-	"Haml":                           -6.819470,
-	"Handlebars":                     -6.819470,
-	"Haskell":                        -5.903180,
-	"Hy":                             -6.819470,
-	"HyPhy":                          -5.433176,
-	"IDL":                            -6.126323,
-	"IGOR Pro":                       -6.819470,
-	"INI":                            -6.414005,
-	"Idris":                          -7.512618,
-	"Inform 7":                       -6.819470,
-	"Inno Setup":                     -7.512618,
-	"Ioke":                           -7.512618,
-	"Isabelle":                       -7.512618,
-	"Isabelle ROOT":                  -7.512618,
-	"J":                              -6.819470,
-	"JFlex":                          -6.819470,
-	"JSON":                           -5.315393,
-	"JSON5":                          -6.414005,
-	"JSONLD":                         -7.512618,
-	"JSONiq":                         -6.819470,
-	"JSX":                            -7.512618,
-	"Jasmin":                         -5.433176,
-	"Java":                           -5.315393,
-	"JavaScript":                     -3.986257,
-	"Jison":                          -6.414005,
-	"Jison Lex":                      -6.819470,
-	"Jolie":                          -5.903180,
-	"Julia":                          -6.819470,
-	"Jupyter Notebook":               -7.512618,
-	"KRL":                            -7.512618,
-	"KiCad":                          -6.126323,
-	"Kit":                            -7.512618,
-	"Kotlin":                         -7.512618,
-	"LFE":                            -6.126323,
-	"LOLCODE":                        -7.512618,
-	"LSL":                            -6.819470,
-	"Lasso":                          -6.126323,
-	"Latte":                          -6.819470,
-	"Lean":                           -6.819470,
-	"Less":                           -7.512618,
-	"Lex":                            -7.512618,
-	"Limbo":                          -6.414005,
-	"Linker Script":                  -6.414005,
-	"Linux Kernel Module":            -6.414005,
-	"Liquid":                         -6.819470,
-	"Literate Agda":                  -7.512618,
-	"Literate CoffeeScript":          -7.512618,
-	"LiveScript":                     -7.512618,
-	"Logos":                          -7.512618,
-	"Logtalk":                        -7.512618,
-	"LookML":                         -6.414005,
-	"LoomScript":                     -6.819470,
-	"Lua":                            -6.126323,
-	"M":                              -4.145322,
-	"M4":                             -7.512618,
-	"M4Sugar":                        -6.414005,
-	"MAXScript":                      -6.126323,
-	"MQL4":                           -6.414005,
-	"MQL5":                           -6.414005,
-	"MTML":                           -7.512618,
-	"MUF":                            -6.819470,
-	"Makefile":                       -5.027711,
-	"Markdown":                       -6.126323,
-	"Marko":                          -6.414005,
-	"Mask":                           -7.512618,
-	"Mathematica":                    -5.027711,
-	"Matlab":                         -3.849056,
-	"Maven POM":                      -7.512618,
-	"Max":                            -6.414005,
-	"MediaWiki":                      -6.819470,
-	"Mercury":                        -5.210032,
-	"Meson":                          -6.819470,
-	"Metal":                          -7.512618,
-	"Modelica":                       -5.027711,
-	"Modula-2":                       -7.512618,
-	"Module Management System":       -5.903180,
-	"Monkey":                         -7.512618,
-	"Moocode":                        -6.414005,
-	"MoonScript":                     -7.512618,
-	"NCL":                            -4.740029,
-	"NL":                             -6.819470,
-	"NSIS":                           -6.819470,
-	"Nemerle":                        -7.512618,
-	"NetLinx":                        -6.819470,
-	"NetLinx+ERB":                    -6.819470,
-	"NetLogo":                        -7.512618,
-	"NewLisp":                        -6.414005,
-	"Nginx":                          -6.819470,
-	"Nim":                            -7.512618,
-	"Nit":                            -4.334564,
-	"Nix":                            -7.512618,
-	"Nu":                             -6.819470,
-	"OCaml":                          -5.210032,
-	"Objective-C":                    -4.421575,
-	"Objective-C++":                  -6.819470,
-	"Objective-J":                    -6.414005,
-	"Omgrofl":                        -7.512618,
-	"Opa":                            -6.819470,
-	"Opal":                           -7.512618,
-	"OpenCL":                         -6.819470,
-	"OpenEdge ABL":                   -5.903180,
-	"OpenRC runscript":               -7.512618,
-	"OpenSCAD":                       -6.819470,
-	"Org":                            -7.512618,
-	"Ox":                             -6.414005,
-	"Oxygene":                        -7.512618,
-	"Oz":                             -7.512618,
-	"P4":                             -6.819470,
-	"PAWN":                           -6.819470,
-	"PHP":                            -4.622246,
-	"PLSQL":                          -5.433176,
-	"PLpgSQL":                        -5.720858,
-	"POV-Ray SDL":                    -5.027711,
-	"Pan":                            -7.512618,
-	"Papyrus":                        -6.414005,
-	"Parrot Assembly":                -7.512618,
-	"Parrot Internal Representation": -7.512618,
-	"Pascal":                       -5.210032,
-	"Pep8":                         -5.566707,
-	"Perl":                         -4.516885,
-	"Perl6":                        -4.421575,
-	"Pic":                          -6.414005,
-	"Pickle":                       -6.126323,
-	"PicoLisp":                     -7.512618,
-	"PigLatin":                     -7.512618,
-	"Pike":                         -6.414005,
-	"Pod":                          -6.819470,
-	"PogoScript":                   -7.512618,
-	"Pony":                         -5.720858,
-	"PostScript":                   -7.512618,
-	"PowerBuilder":                 -5.720858,
-	"PowerShell":                   -6.414005,
-	"Processing":                   -7.512618,
-	"Prolog":                       -5.315393,
-	"Propeller Spin":               -5.210032,
-	"Protocol Buffer":              -7.512618,
-	"Public Key":                   -5.566707,
-	"Pug":                          -6.819470,
-	"Puppet":                       -5.903180,
-	"PureBasic":                    -6.819470,
-	"PureScript":                   -6.126323,
-	"Python":                       -4.334564,
-	"QML":                          -7.512618,
-	"QMake":                        -6.126323,
-	"R":                            -5.433176,
-	"RAML":                         -7.512618,
-	"RDoc":                         -7.512618,
-	"REXX":                         -6.126323,
-	"RMarkdown":                    -7.512618,
-	"RPM Spec":                     -6.414005,
-	"RUNOFF":                       -6.126323,
-	"Racket":                       -6.819470,
-	"Ragel":                        -6.414005,
-	"Rascal":                       -6.126323,
-	"Reason":                       -5.903180,
-	"Rebol":                        -5.720858,
-	"Red":                          -6.819470,
-	"Regular Expression":           -6.126323,
-	"Ren'Py":                       -7.512618,
-	"RenderScript":                 -6.819470,
-	"RobotFramework":               -6.414005,
-	"Roff":                         -5.566707,
-	"Ruby":                         -4.046882,
-	"Rust":                         -6.414005,
-	"SAS":                          -6.414005,
-	"SCSS":                         -7.512618,
-	"SMT":                          -6.126323,
-	"SPARQL":                       -6.819470,
-	"SQF":                          -6.819470,
-	"SQL":                          -5.027711,
-	"SQLPL":                        -5.720858,
-	"SRecode Template":             -7.512618,
-	"STON":                         -5.566707,
-	"Sage":                         -7.512618,
-	"SaltStack":                    -5.720858,
-	"Sass":                         -7.512618,
-	"Scala":                        -6.126323,
-	"Scaml":                        -7.512618,
-	"Scheme":                       -6.414005,
-	"Scilab":                       -6.414005,
-	"ShaderLab":                    -6.414005,
-	"Shell":                        -3.751417,
-	"ShellSession":                 -6.414005,
-	"Shen":                         -6.414005,
-	"Slash":                        -7.512618,
-	"Slim":                         -7.512618,
-	"Smali":                        -5.566707,
-	"Smalltalk":                    -5.210032,
-	"SourcePawn":                   -5.720858,
-	"Squirrel":                     -7.512618,
-	"Stan":                         -6.414005,
-	"Standard ML":                  -5.903180,
-	"Stata":                        -5.566707,
-	"Stylus":                       -7.512618,
-	"SubRip Text":                  -7.512618,
-	"Sublime Text Config":          -5.027711,
-	"SuperCollider":                -5.903180,
-	"Swift":                        -3.751417,
-	"SystemVerilog":                -6.126323,
-	"TI Program":                   -6.126323,
-	"TLA":                          -6.819470,
-	"TXL":                          -7.512618,
-	"Tcl":                          -6.126323,
-	"TeX":                          -5.566707,
-	"Tea":                          -7.512618,
-	"Terra":                        -6.414005,
-	"Text":                         -4.254521,
-	"Thrift":                       -7.512618,
-	"Turing":                       -6.819470,
-	"Turtle":                       -6.819470,
-	"Type Language":                -6.819470,
-	"TypeScript":                   -5.720858,
-	"Unity3D Asset":                -5.903180,
-	"Unix Assembly":                -6.819470,
-	"Uno":                          -6.414005,
-	"UnrealScript":                 -6.819470,
-	"UrWeb":                        -6.819470,
-	"VCL":                          -6.819470,
-	"VHDL":                         -7.512618,
-	"Verilog":                      -4.947668,
-	"Vim script":                   -5.903180,
-	"Visual Basic":                 -6.414005,
-	"Volt":                         -7.512618,
-	"Vue":                          -6.819470,
-	"Wavefront Material":           -6.126323,
-	"Wavefront Object":             -5.903180,
-	"Web Ontology Language":        -7.512618,
-	"WebAssembly":                  -5.720858,
-	"WebIDL":                       -6.819470,
-	"World of Warcraft Addon Data": -6.414005,
-	"X10":              -4.622246,
-	"XC":               -7.512618,
-	"XCompose":         -7.512618,
-	"XML":              -3.641417,
-	"XPages":           -6.819470,
-	"XProc":            -7.512618,
-	"XQuery":           -7.512618,
-	"XS":               -7.512618,
-	"XSLT":             -7.512618,
-	"Xojo":             -5.720858,
-	"Xtend":            -6.819470,
-	"YAML":             -5.566707,
-	"YANG":             -7.512618,
-	"Zephir":           -6.819470,
-	"Zimpl":            -7.512618,
-	"desktop":          -7.512618,
-	"eC":               -7.512618,
-	"edn":              -7.512618,
-	"fish":             -6.414005,
-	"reStructuredText": -7.512618,
-	"wisp":             -7.512618,
-	"xBase":            -6.414005,
+	"1C Enterprise":    -5.724674,
+	"ABAP":             -7.516433,
+	"ABNF":             -7.516433,
+	"AGS Script":       -6.130139,
+	"AMPL":             -6.823286,
+	"API Blueprint":    -6.417821,
+	"APL":              -6.417821,
+	"ASN.1":            -7.516433,
+	"ATS":              -5.319209,
+	"Agda":             -7.516433,
+	"Alloy":            -6.417821,
+	"Alpine Abuild":    -7.516433,
+	"Ant Build System": -7.516433,
+	"ApacheConf":       -6.130139,
+	"Apex":             -5.724674,
+	"Apollo Guidance Computer": -7.516433,
+	"AppleScript":              -5.570523,
+	"Arduino":                  -6.823286,
+	"AsciiDoc":                 -6.417821,
+	"AspectJ":                  -6.823286,
+	"Assembly":                 -5.724674,
+	"AutoHotkey":               -7.516433,
+	"Awk":                      -7.516433,
+	"BitBake":                  -6.823286,
+	"Blade":                    -6.823286,
+	"BlitzBasic":               -6.417821,
+	"BlitzMax":                 -7.516433,
+	"Bluespec":                 -6.823286,
+	"Brainfuck":                -5.906995,
+	"Brightscript":             -7.516433,
+	"C":                        -3.509100,
+	"C#":                       -5.724674,
+	"C++":                      -3.709771,
+	"CLIPS":                    -6.823286,
+	"CMake":                    -5.570523,
+	"COBOL":                    -6.130139,
+	"CSON":                     -6.130139,
+	"CSS":                      -6.823286,
+	"CSV":                      -7.516433,
+	"CWeb":                     -7.516433,
+	"CartoCSS":                 -7.516433,
+	"Ceylon":                   -7.516433,
+	"Chapel":                   -5.906995,
+	"Charity":                  -7.516433,
+	"Cirru":                    -5.319209,
+	"Clarion":                  -6.130139,
+	"Clean":                    -5.319209,
+	"Click":                    -6.823286,
+	"Clojure":                  -5.319209,
+	"Closure Templates":        -7.516433,
+	"CoffeeScript":             -5.213848,
+	"ColdFusion":               -7.516433,
+	"ColdFusion CFC":           -6.823286,
+	"Common Lisp":              -5.319209,
+	"Component Pascal":         -6.823286,
+	"Cool":                     -6.823286,
+	"Coq":                      -4.951484,
+	"Creole":                   -7.516433,
+	"Crystal":                  -6.417821,
+	"Csound":                   -6.417821,
+	"Csound Document":          -6.417821,
+	"Csound Score":             -6.417821,
+	"Cuda":                     -6.823286,
+	"Cycript":                  -7.516433,
+	"D":                        -5.319209,
+	"DIGITAL Command Language": -6.130139,
+	"DM":            -7.516433,
+	"DNS Zone":      -6.823286,
+	"DTrace":        -6.417821,
+	"Dart":          -7.516433,
+	"Diff":          -7.516433,
+	"Dockerfile":    -7.516433,
+	"Dogescript":    -7.516433,
+	"E":             -5.570523,
+	"EBNF":          -6.130139,
+	"ECL":           -7.516433,
+	"ECLiPSe":       -7.516433,
+	"EJS":           -6.823286,
+	"EQ":            -6.417821,
+	"Eagle":         -6.823286,
+	"Easybuild":     -7.516433,
+	"Eiffel":        -6.417821,
+	"Elixir":        -7.516433,
+	"Elm":           -6.417821,
+	"Emacs Lisp":    -5.118538,
+	"EmberScript":   -7.516433,
+	"Erlang":        -4.877376,
+	"F#":            -5.436992,
+	"FLUX":          -6.130139,
+	"Fantom":        -6.823286,
+	"Filebench WML": -7.516433,
+	"Filterscript":  -6.823286,
+	"Formatted":     -6.417821,
+	"Forth":         -4.743845,
+	"Fortran":       -5.906995,
+	"FreeMarker":    -6.823286,
+	"Frege":         -6.130139,
+	"G-code":        -6.823286,
+	"GAMS":          -7.516433,
+	"GAP":           -5.319209,
+	"GCC Machine Description": -7.516433,
+	"GDB":      -6.823286,
+	"GDScript": -6.130139,
+	"GLSL":     -4.877376,
+	"GN":       -5.118538,
+	"Game Maker Language":     -5.118538,
+	"Genie":                   -6.823286,
+	"Gnuplot":                 -5.724674,
+	"Go":                      -6.417821,
+	"Golo":                    -4.220596,
+	"Gosu":                    -5.906995,
+	"Grace":                   -6.823286,
+	"Gradle":                  -6.823286,
+	"Grammatical Framework":   -3.802861,
+	"Graph Modeling Language": -7.516433,
+	"GraphQL":                 -6.823286,
+	"Graphviz (DOT)":          -6.823286,
+	"Groovy":                  -5.724674,
+	"Groovy Server Pages":     -6.130139,
+	"HCL":                            -6.417821,
+	"HLSL":                           -5.906995,
+	"HTML":                           -5.724674,
+	"HTML+Django":                    -7.516433,
+	"HTML+ECR":                       -7.516433,
+	"HTML+EEX":                       -7.516433,
+	"HTML+ERB":                       -6.823286,
+	"Hack":                           -4.184229,
+	"Haml":                           -6.823286,
+	"Handlebars":                     -6.823286,
+	"Haskell":                        -5.906995,
+	"Hy":                             -6.823286,
+	"HyPhy":                          -5.436992,
+	"IDL":                            -6.130139,
+	"IGOR Pro":                       -6.823286,
+	"INI":                            -6.417821,
+	"Idris":                          -7.516433,
+	"Inform 7":                       -6.823286,
+	"Inno Setup":                     -7.516433,
+	"Ioke":                           -7.516433,
+	"Isabelle":                       -7.516433,
+	"Isabelle ROOT":                  -7.516433,
+	"J":                              -6.823286,
+	"JFlex":                          -6.823286,
+	"JSON":                           -5.319209,
+	"JSON5":                          -6.417821,
+	"JSONLD":                         -7.516433,
+	"JSONiq":                         -6.823286,
+	"JSX":                            -7.516433,
+	"Jasmin":                         -5.436992,
+	"Java":                           -5.319209,
+	"JavaScript":                     -3.990073,
+	"Jison":                          -6.417821,
+	"Jison Lex":                      -6.823286,
+	"Jolie":                          -5.906995,
+	"Julia":                          -6.823286,
+	"Jupyter Notebook":               -7.516433,
+	"KRL":                            -7.516433,
+	"KiCad":                          -6.130139,
+	"Kit":                            -7.516433,
+	"Kotlin":                         -7.516433,
+	"LFE":                            -6.130139,
+	"LOLCODE":                        -7.516433,
+	"LSL":                            -6.823286,
+	"Lasso":                          -6.130139,
+	"Latte":                          -6.823286,
+	"Lean":                           -6.823286,
+	"Less":                           -7.516433,
+	"Lex":                            -7.516433,
+	"Limbo":                          -6.417821,
+	"Linker Script":                  -6.417821,
+	"Linux Kernel Module":            -6.417821,
+	"Liquid":                         -6.823286,
+	"Literate Agda":                  -7.516433,
+	"Literate CoffeeScript":          -7.516433,
+	"LiveScript":                     -7.516433,
+	"Logos":                          -7.516433,
+	"Logtalk":                        -7.516433,
+	"LookML":                         -6.417821,
+	"LoomScript":                     -6.823286,
+	"Lua":                            -6.130139,
+	"M":                              -4.149137,
+	"M4":                             -7.516433,
+	"M4Sugar":                        -6.417821,
+	"MAXScript":                      -6.130139,
+	"MQL4":                           -6.417821,
+	"MQL5":                           -6.417821,
+	"MTML":                           -7.516433,
+	"MUF":                            -6.823286,
+	"Makefile":                       -5.031527,
+	"Markdown":                       -6.130139,
+	"Marko":                          -6.417821,
+	"Mask":                           -7.516433,
+	"Mathematica":                    -5.031527,
+	"Matlab":                         -3.852872,
+	"Maven POM":                      -7.516433,
+	"Max":                            -6.417821,
+	"MediaWiki":                      -6.823286,
+	"Mercury":                        -5.213848,
+	"Meson":                          -6.823286,
+	"Metal":                          -7.516433,
+	"Modelica":                       -5.031527,
+	"Modula-2":                       -7.516433,
+	"Module Management System":       -5.906995,
+	"Monkey":                         -7.516433,
+	"Moocode":                        -6.417821,
+	"MoonScript":                     -7.516433,
+	"NCL":                            -4.743845,
+	"NL":                             -6.823286,
+	"NSIS":                           -6.823286,
+	"Nemerle":                        -7.516433,
+	"NetLinx":                        -6.823286,
+	"NetLinx+ERB":                    -6.823286,
+	"NetLogo":                        -7.516433,
+	"NewLisp":                        -6.417821,
+	"Nginx":                          -6.823286,
+	"Nim":                            -7.516433,
+	"Nit":                            -4.338379,
+	"Nix":                            -7.516433,
+	"Nu":                             -6.823286,
+	"OCaml":                          -5.213848,
+	"Objective-C":                    -4.425391,
+	"Objective-C++":                  -6.823286,
+	"Objective-J":                    -6.417821,
+	"Omgrofl":                        -7.516433,
+	"Opa":                            -6.823286,
+	"Opal":                           -7.516433,
+	"OpenCL":                         -6.823286,
+	"OpenEdge ABL":                   -5.906995,
+	"OpenRC runscript":               -7.516433,
+	"OpenSCAD":                       -6.823286,
+	"Org":                            -7.516433,
+	"Ox":                             -6.417821,
+	"Oxygene":                        -7.516433,
+	"Oz":                             -7.516433,
+	"P4":                             -6.823286,
+	"PAWN":                           -6.823286,
+	"PHP":                            -4.626062,
+	"PLSQL":                          -5.436992,
+	"PLpgSQL":                        -5.724674,
+	"POV-Ray SDL":                    -5.031527,
+	"Pan":                            -7.516433,
+	"Papyrus":                        -6.417821,
+	"Parrot Assembly":                -7.516433,
+	"Parrot Internal Representation": -7.516433,
+	"Pascal":                       -5.213848,
+	"Pep8":                         -5.570523,
+	"Perl":                         -4.520701,
+	"Perl 6":                       -4.425391,
+	"Pic":                          -6.417821,
+	"Pickle":                       -6.130139,
+	"PicoLisp":                     -7.516433,
+	"PigLatin":                     -7.516433,
+	"Pike":                         -6.417821,
+	"Pod":                          -6.823286,
+	"PogoScript":                   -7.516433,
+	"Pony":                         -5.724674,
+	"PostScript":                   -7.516433,
+	"PowerBuilder":                 -5.724674,
+	"PowerShell":                   -6.417821,
+	"Processing":                   -7.516433,
+	"Prolog":                       -5.319209,
+	"Propeller Spin":               -5.213848,
+	"Protocol Buffer":              -7.516433,
+	"Public Key":                   -5.570523,
+	"Pug":                          -6.823286,
+	"Puppet":                       -5.906995,
+	"PureBasic":                    -6.823286,
+	"PureScript":                   -6.130139,
+	"Python":                       -4.338379,
+	"QML":                          -7.516433,
+	"QMake":                        -6.130139,
+	"R":                            -5.436992,
+	"RAML":                         -7.516433,
+	"RDoc":                         -7.516433,
+	"REXX":                         -6.130139,
+	"RMarkdown":                    -7.516433,
+	"RPM Spec":                     -6.417821,
+	"RUNOFF":                       -6.130139,
+	"Racket":                       -6.823286,
+	"Ragel":                        -6.417821,
+	"Rascal":                       -6.130139,
+	"Reason":                       -5.906995,
+	"Rebol":                        -5.724674,
+	"Red":                          -6.823286,
+	"Regular Expression":           -6.130139,
+	"Ren'Py":                       -7.516433,
+	"RenderScript":                 -6.823286,
+	"Ring":                         -6.130139,
+	"RobotFramework":               -6.417821,
+	"Roff":                         -5.570523,
+	"Ruby":                         -4.050697,
+	"Rust":                         -6.417821,
+	"SAS":                          -6.417821,
+	"SCSS":                         -7.516433,
+	"SMT":                          -6.130139,
+	"SPARQL":                       -6.823286,
+	"SQF":                          -6.823286,
+	"SQL":                          -5.031527,
+	"SQLPL":                        -5.724674,
+	"SRecode Template":             -7.516433,
+	"STON":                         -5.570523,
+	"Sage":                         -7.516433,
+	"SaltStack":                    -5.724674,
+	"Sass":                         -7.516433,
+	"Scala":                        -6.130139,
+	"Scaml":                        -7.516433,
+	"Scheme":                       -6.417821,
+	"Scilab":                       -6.417821,
+	"ShaderLab":                    -6.417821,
+	"Shell":                        -3.755233,
+	"ShellSession":                 -6.417821,
+	"Shen":                         -6.417821,
+	"Slash":                        -7.516433,
+	"Slim":                         -7.516433,
+	"Smali":                        -5.570523,
+	"Smalltalk":                    -5.213848,
+	"SourcePawn":                   -5.724674,
+	"Squirrel":                     -7.516433,
+	"Stan":                         -6.417821,
+	"Standard ML":                  -5.906995,
+	"Stata":                        -5.570523,
+	"Stylus":                       -7.516433,
+	"SubRip Text":                  -7.516433,
+	"Sublime Text Config":          -5.031527,
+	"SuperCollider":                -5.906995,
+	"Swift":                        -3.755233,
+	"SystemVerilog":                -6.130139,
+	"TI Program":                   -6.130139,
+	"TLA":                          -6.823286,
+	"TXL":                          -7.516433,
+	"Tcl":                          -6.130139,
+	"TeX":                          -5.570523,
+	"Tea":                          -7.516433,
+	"Terra":                        -6.417821,
+	"Text":                         -4.258337,
+	"Thrift":                       -7.516433,
+	"Turing":                       -6.823286,
+	"Turtle":                       -6.823286,
+	"Type Language":                -6.823286,
+	"TypeScript":                   -5.724674,
+	"Unity3D Asset":                -5.906995,
+	"Unix Assembly":                -6.823286,
+	"Uno":                          -6.417821,
+	"UnrealScript":                 -6.823286,
+	"UrWeb":                        -6.823286,
+	"VCL":                          -6.823286,
+	"VHDL":                         -7.516433,
+	"Verilog":                      -4.951484,
+	"Vim script":                   -5.906995,
+	"Visual Basic":                 -6.417821,
+	"Volt":                         -7.516433,
+	"Vue":                          -6.823286,
+	"Wavefront Material":           -6.130139,
+	"Wavefront Object":             -5.906995,
+	"Web Ontology Language":        -7.516433,
+	"WebAssembly":                  -5.724674,
+	"WebIDL":                       -6.823286,
+	"World of Warcraft Addon Data": -6.417821,
+	"X10":              -4.626062,
+	"XC":               -7.516433,
+	"XCompose":         -7.516433,
+	"XML":              -3.645232,
+	"XPages":           -6.823286,
+	"XProc":            -7.516433,
+	"XQuery":           -7.516433,
+	"XS":               -7.516433,
+	"XSLT":             -7.516433,
+	"Xojo":             -5.724674,
+	"Xtend":            -6.823286,
+	"YAML":             -5.570523,
+	"YANG":             -7.516433,
+	"Zephir":           -6.823286,
+	"Zimpl":            -7.516433,
+	"desktop":          -7.516433,
+	"eC":               -7.516433,
+	"edn":              -7.516433,
+	"fish":             -6.417821,
+	"reStructuredText": -7.516433,
+	"wisp":             -7.516433,
+	"xBase":            -6.417821,
 }
 
 var TokensLogProbabilities = map[string]map[string]float64{
@@ -26598,6 +26601,7 @@ var TokensLogProbabilities = map[string]map[string]float64{
 		"ä":                    -10.691240,
 		"ü":                    -10.691240,
 	},
+	"Easybuild": map[string]float64{},
 	"Eiffel": map[string]float64{
 		"(":                                -2.683182,
 		")":                                -2.683182,
@@ -29057,6 +29061,160 @@ var TokensLogProbabilities = map[string]map[string]float64{
 		"{":                    -4.747646,
 		"}":                    -4.747646,
 	},
+	"Fantom": map[string]float64{
+		"(":                   -2.399140,
+		")":                   -2.399140,
+		"**":                  -4.387014,
+		"+":                   -3.981549,
+		",":                   -3.223863,
+		"-":                   -5.996452,
+		".":                   -4.897840,
+		".flatten":            -6.689599,
+		".map":                -6.689599,
+		".max":                -6.689599,
+		".readAllStr":         -6.689599,
+		".toChar":             -5.996452,
+		".unique":             -6.689599,
+		":":                   -3.393762,
+		";":                   -5.996452,
+		"<":                   -5.590987,
+		"=":                   -3.393762,
+		">":                   -5.080161,
+		"?":                   -5.080161,
+		"All":                 -5.996452,
+		"Constant":            -6.689599,
+		"Err":                 -6.689599,
+		"Expr":                -4.743689,
+		"File.os":             -6.689599,
+		"Generate":            -6.689599,
+		"Infix":               -6.689599,
+		"Int":                 -4.204693,
+		"Load":                -6.689599,
+		"Most":                -6.689599,
+		"Obj":                 -5.080161,
+		"Op":                  -5.590987,
+		"Op.minus":            -6.689599,
+		"Op.plus":             -6.689599,
+		"Range":               -6.689599,
+		"Range.makeExclusive": -4.492375,
+		"Range.makeInclusive": -6.689599,
+		"Spelling":            -6.689599,
+		"Str":                 -3.393762,
+		"The":                 -6.689599,
+		"Void":                -6.689599,
+		"Word":                -5.303305,
+		"[":                   -3.856386,
+		"]":                   -3.856386,
+		"`":                   -3.598557,
+		"abstract":            -6.689599,
+		"and":                 -5.996452,
+		"appear":              -6.689599,
+		"are":                 -5.996452,
+		"arg":                 -5.996452,
+		"args":                -6.689599,
+		"args.each":           -6.689599,
+		"at":                  -6.689599,
+		"away":                -5.996452,
+		"candidates":          -5.996452,
+		"case":                -5.996452,
+		"ch":                  -5.996452,
+		"ch.toChar":           -5.996452,
+		"class":               -5.303305,
+		"const":               -6.689599,
+		"correction":          -5.590987,
+		"corrections":         -5.996452,
+		"counts":              -4.050542,
+		"def":                 -6.689599,
+		"default":             -6.689599,
+		"delete":              -5.996452,
+		"each":                -6.689599,
+		"echo":                -6.689599,
+		"edit":                -6.689599,
+		"edits":               -4.204693,
+		"edits.add":           -5.996452,
+		"edits.addAll":        -5.996452,
+		"edits.remove":        -6.689599,
+		"edits.unique":        -6.689599,
+		"enum":                -6.689599,
+		"eval":                -5.590987,
+		"every":               -6.689599,
+		"first":               -5.996452,
+		"for":                 -5.303305,
+		"from":                -5.996452,
+		"i":                   -3.431503,
+		"if":                  -5.303305,
+		"in":                  -6.689599,
+		"input":               -6.689599,
+		"insert":              -5.996452,
+		"inserted":            -6.689599,
+		"known":               -5.303305,
+		"left":                -4.291704,
+		"left.eval":           -5.996452,
+		"letter":              -5.303305,
+		"letter.":             -6.689599,
+		"letters":             -6.689599,
+		"letters.map":         -5.996452,
+		"main":                -6.689599,
+		"make":                -5.996452,
+		"map":                 -6.689599,
+		"minus":               -6.689599,
+		"mixin":               -6.689599,
+		"new":                 -5.996452,
+		"of":                  -5.996452,
+		"offer":               -6.689599,
+		"one":                 -6.689599,
+		"op":                  -5.303305,
+		"other":               -6.689599,
+		"override":            -5.996452,
+		"plus":                -6.689599,
+		"possible":            -6.689599,
+		"probable":            -6.689599,
+		"removed.":            -6.689599,
+		"replace":             -5.996452,
+		"replaced":            -6.689599,
+		"rest":                -5.996452,
+		"result":              -4.897840,
+		"result.size":         -5.590987,
+		"return":              -4.291704,
+		"right":               -4.387014,
+		"right.eval":          -5.996452,
+		"right.get":           -5.996452,
+		"right.getRange":      -6.689599,
+		"right.size":          -6.689599,
+		"sample":              -6.689599,
+		"second":              -5.996452,
+		"spelling":            -5.996452,
+		"st":                  -6.689599,
+		"static":              -4.291704,
+		"subset":              -6.689599,
+		"swapped.":            -6.689599,
+		"switch":              -6.689599,
+		"text":                -5.996452,
+		"text.split.each":     -6.689599,
+		"th":                  -5.590987,
+		"that":                -5.590987,
+		"the":                 -6.689599,
+		"this.left":           -6.689599,
+		"this.op":             -6.689599,
+		"this.right":          -6.689599,
+		"this.value":          -6.689599,
+		"throw":               -6.689599,
+		"transpose":           -5.996452,
+		"two":                 -6.689599,
+		"value":               -5.303305,
+		"w":                   -5.996452,
+		"with":                -5.080161,
+		"word":                -3.393762,
+		"word.getRange":       -4.610158,
+		"word.size":           -4.897840,
+		"words":               -5.996452,
+		"words.findAll":       -6.689599,
+		"x":                   -5.996452,
+		"y":                   -5.996452,
+		"{":                   -3.288402,
+		"|":                   -4.050542,
+		"}":                   -3.288402,
+	},
 	"Filebench WML": map[string]float64{
 		"$":                -2.365284,
 		",":                -2.020443,
@@ -96187,7 +96345,7 @@ var TokensLogProbabilities = map[string]map[string]float64{
 		"}":                    -3.067176,
 		"~":                    -5.037983,
 	},
-	"Perl6": map[string]float64{
+	"Perl 6": map[string]float64{
 		"!":                -4.818414,
 		"\"":               -8.617642,
 		"#":                -5.978584,
@@ -114446,6 +114604,291 @@ var TokensLogProbabilities = map[string]map[string]float64{
 		"{": -4.254193,
 		"}": -4.254193,
 	},
+	"Ring": map[string]float64{
+		"!":              -6.016645,
+		"$":              -6.016645,
+		"(":              -2.750885,
+		")":              -2.750885,
+		"+":              -3.888413,
+		",":              -1.659936,
+		"-":              -6.016645,
+		".setStyleSheet": -6.932936,
+		".tostring":      -6.932936,
+		".x":             -7.626083,
+		".y":             -7.626083,
+		"<":              -5.834323,
+		"<msfclipper@yahoo.com>": -7.626083,
+		"=":                            -2.042586,
+		">":                            -5.680173,
+		"AddFuncScript":                -7.626083,
+		"AddRecord":                    -6.932936,
+		"AddWeight":                    -7.626083,
+		"App":                          -6.239788,
+		"ApplicationObject":            -6.016645,
+		"Class":                        -5.834323,
+		"CloseDatabase":                -7.626083,
+		"ControllerBase":               -7.626083,
+		"CurrentRow":                   -7.626083,
+		"Date":                         -7.626083,
+		"Del":                          -7.626083,
+		"DeleteWeight":                 -7.626083,
+		"FPS":                          -7.626083,
+		"False":                        -7.626083,
+		"FixedFPS":                     -7.626083,
+		"FormViewContent":              -7.626083,
+		"From":                         -6.932936,
+		"Func":                         -5.428858,
+		"GE_AC_BACK":                   -6.932936,
+		"GE_MOUSE_UP":                  -6.932936,
+		"Game":                         -7.626083,
+		"GameState":                    -6.932936,
+		"I":                            -7.626083,
+		"Import":                       -7.626083,
+		"ItemChanged":                  -7.626083,
+		"Key_Space":                    -6.932936,
+		"LayoutData":                   -7.626083,
+		"Load":                         -6.239788,
+		"Map":                          -7.626083,
+		"ModelBase":                    -7.626083,
+		"MyApp":                        -7.626083,
+		"NULL":                         -7.626083,
+		"New":                          -6.239788,
+		"Open":                         -7.626083,
+		"OpenDatabase":                 -7.626083,
+		"QAbstractItemView_SelectRows": -7.626083,
+		"QSqlDatabase":                 -7.626083,
+		"QSqlQuery":                    -6.016645,
+		"QTableWidgetItem":             -6.527470,
+		"Routing":                      -7.626083,
+		"SalaryController":             -6.932936,
+		"SalaryLanguageEnglish":        -6.932936,
+		"SalaryModel":                  -7.626083,
+		"SalaryView":                   -7.626083,
+		"Score":                        -7.626083,
+		"ShowRecords":                  -6.932936,
+		"Sound":                        -6.239788,
+		"Sprite":                       -7.626083,
+		"System.Web":                   -7.626083,
+		"Table":                        -5.680173,
+		"The":                          -7.626083,
+		"Time":                         -7.626083,
+		"Title":                        -7.626083,
+		"True":                         -7.626083,
+		"ViewBase":                     -7.626083,
+		"[":                            -3.937203,
+		"]":                            -3.937203,
+		"aColumnsTitles":               -7.626083,
+		"aIDs":                         -6.932936,
+		"aImages":                      -7.626083,
+		"aMap":                         -6.016645,
+		"aMouseList":                   -6.932936,
+		"aMovePages":                   -7.626083,
+		"aV":                           -6.932936,
+		"aVar":                         -6.932936,
+		"addDatabase":                  -7.626083,
+		"addLayout":                    -6.932936,
+		"addWidget":                    -7.626083,
+		"addlayout":                    -7.626083,
+		"addwidget":                    -6.016645,
+		"animate":                      -5.141176,
+		"blockheight":                  -7.626083,
+		"blockwidth":                   -7.626083,
+		"btnAdd":                       -6.932936,
+		"btnClose":                     -7.626083,
+		"btnDelete":                    -6.932936,
+		"btnclose":                     -7.626083,
+		"but":                          -7.626083,
+		"cAddRecord":                   -7.626083,
+		"cBack":                        -7.626083,
+		"cDate":                        -6.239788,
+		"cDir":                         -6.932936,
+		"cEditRecord":                  -7.626083,
+		"cNoRecords":                   -7.626083,
+		"cOf":                          -7.626083,
+		"cOptions":                     -7.626083,
+		"cPage":                        -7.626083,
+		"cRecordDeleted":               -7.626083,
+		"cRecordsCount":                -7.626083,
+		"cSave":                        -7.626083,
+		"cSearch":                      -7.626083,
+		"cStr":                         -4.735711,
+		"cTextAlign":                   -7.626083,
+		"cTime":                        -6.239788,
+		"cTitle":                       -7.626083,
+		"cValue":                       -6.932936,
+		"cWeight":                      -5.834323,
+		"call":                         -6.932936,
+		"checkwin":                     -6.932936,
+		"class":                        -7.626083,
+		"comboitems":                   -7.626083,
+		"currentdir":                   -7.626083,
+		"currentrow":                   -6.239788,
+		"delete":                       -6.239788,
+		"direction":                    -7.626083,
+		"down":                         -7.626083,
+		"else":                         -6.932936,
+		"end":                          -6.932936,
+		"exec":                         -5.834323,
+		"false":                        -4.987025,
+		"fexists":                      -7.626083,
+		"file":                         -4.792869,
+		"for":                          -6.527470,
+		"frame":                        -5.834323,
+		"framewidth":                   -6.932936,
+		"from":                         -7.626083,
+		"func":                         -4.681644,
+		"gameresult":                   -7.626083,
+		"ge_direction_random":          -7.626083,
+		"getcol":                       -7.626083,
+		"geti":                         -7.626083,
+		"getwant":                      -7.626083,
+		"getwindow":                    -7.626083,
+		"height":                       -6.239788,
+		"horizontalHeader":             -7.626083,
+		"i":                            -7.626083,
+		"if":                           -4.099722,
+		"insertRow":                    -7.626083,
+		"item":                         -6.016645,
+		"key_esc":                      -6.932936,
+		"key_space":                    -6.932936,
+		"keypress":                     -6.527470,
+		"lCreate":                      -6.527470,
+		"label":                        -6.932936,
+		"lastcol":                      -7.626083,
+		"layoutButtons":                -6.932936,
+		"layoutClose":                  -6.932936,
+		"layoutData":                   -7.626083,
+		"layoutMain":                   -6.932936,
+		"main":                         -7.626083,
+		"mouse":                        -6.932936,
+		"movenext":                     -7.626083,
+		"myitem":                       -6.527470,
+		"myitem.text":                  -6.527470,
+		"nCol":                         -5.546641,
+		"nID":                          -6.932936,
+		"nIwantwindow":                 -5.680173,
+		"nKey":                         -5.834323,
+		"nROW":                         -6.932936,
+		"nRow":                         -5.680173,
+		"nRows":                        -6.239788,
+		"nStep":                        -5.546641,
+		"nType":                        -6.239788,
+		"nWindowTitle":                 -6.016645,
+		"new":                          -4.407207,
+		"newmap":                       -6.527470,
+		"next":                         -6.527470,
+		"nkey":                         -6.527470,
+		"nl":                           -6.932936,
+		"not":                          -6.932936,
+		"oApp":                         -7.626083,
+		"oApp.CloseDatabase":           -7.626083,
+		"oCon":                         -7.626083,
+		"oCon.Close":                   -7.626083,
+		"oController":                  -6.932936,
+		"oController.cMainURL":         -7.626083,
+		"oController.cOperation":       -7.626083,
+		"oController.oModel.Name":      -7.626083,
+		"oController.oModel.Salary":    -7.626083,
+		"oGame":                        -4.918033,
+		"oGame.aObjects":               -6.932936,
+		"oGame.refresh":                -6.932936,
+		"oGameState":                   -6.932936,
+		"oGameState.Score":             -6.932936,
+		"oGameState.down":              -6.527470,
+		"oGameState.gameresult":        -6.239788,
+		"oGameState.lastcol":           -6.932936,
+		"oGameState.playerwin":         -6.932936,
+		"oGameState.score":             -6.527470,
+		"oGameState.startplay":         -6.932936,
+		"oLanguage":                    -7.626083,
+		"oPage":                        -6.932936,
+		"oPage.scriptfuncajax":         -7.626083,
+		"oPage.stylewidth":             -6.932936,
+		"oSelf":                        -5.323498,
+		"oSelf.getvalue":               -6.239788,
+		"oTranslation":                 -7.626083,
+		"oTranslation.aColumnsTitles":  -6.932936,
+		"ogame":                   -5.428858,
+		"ogame.shutdown":          -6.016645,
+		"ok":                      -4.015165,
+		"once":                    -6.527470,
+		"or":                      -5.428858,
+		"oself":                   -5.428858,
+		"oself.keypress":          -6.932936,
+		"oself.y":                 -6.527470,
+		"page":                    -7.626083,
+		"playerwin":               -7.626083,
+		"playstart":               -6.932936,
+		"point":                   -6.527470,
+		"private":                 -7.626083,
+		"px":                      -5.834323,
+		"py":                      -6.016645,
+		"qApp":                    -7.626083,
+		"qLabel":                  -7.626083,
+		"qTableWidget":            -7.626083,
+		"qTableWidgetItem":        -7.626083,
+		"qWidget":                 -7.626083,
+		"qhboxlayout":             -6.527470,
+		"qlineedit":               -7.626083,
+		"qpushbutton":             -6.527470,
+		"query":                   -7.626083,
+		"query.value":             -6.932936,
+		"qvboxlayout":             -7.626083,
+		"random":                  -7.626083,
+		"removerow":               -7.626083,
+		"resize":                  -7.626083,
+		"return":                  -6.932936,
+		"rowcount":                -7.626083,
+		"scaled":                  -6.239788,
+		"see":                     -6.932936,
+		"selectrow":               -6.932936,
+		"self.OpenDatabase":       -7.626083,
+		"self.ShowRecords":        -7.626083,
+		"setAlternatingRowColors": -7.626083,
+		"setClickEvent":           -6.527470,
+		"setDatabaseName":         -7.626083,
+		"setHorizontalHeaderItem": -6.527470,
+		"setItem":                 -7.626083,
+		"setText":                 -6.239788,
+		"setWindowTitle":          -7.626083,
+		"setcolumncount":          -7.626083,
+		"setitemChangedEvent":     -6.527470,
+		"setlayout":               -7.626083,
+		"setrowcount":             -6.932936,
+		"setselectionbehavior":    -7.626083,
+		"settitle":                -7.626083,
+		"show":                    -7.626083,
+		"size":                    -5.428858,
+		"sprite":                  -7.626083,
+		"startplay":               -7.626083,
+		"state":                   -5.834323,
+		"step":                    -7.626083,
+		"substr":                  -5.834323,
+		"table":                   -5.680173,
+		"temp":                    -7.626083,
+		"temp.StyleTextRight":     -7.626083,
+		"text":                    -4.490589,
+		"the":                     -7.626083,
+		"this.Table":              -7.626083,
+		"this.aIDs":               -6.239788,
+		"this.oCon":               -7.626083,
+		"this.table":              -7.626083,
+		"title":                   -6.527470,
+		"to":                      -6.527470,
+		"transparent":             -6.932936,
+		"true":                    -4.681644,
+		"verticalHeader":          -7.626083,
+		"want":                    -6.932936,
+		"website":                 -7.626083,
+		"while":                   -6.932936,
+		"width":                   -6.239788,
+		"win":                     -5.680173,
+		"window":                  -6.527470,
+		"x":                       -4.407207,
+		"y":                       -4.367986,
+		"{":                       -3.482948,
+		"}":                       -3.482948,
+	},
 	"RobotFramework": map[string]float64{
 		"$":                 -3.571543,
 		"*":                 -4.824306,
@@ -148321,4 +148764,4 @@ var TokensLogProbabilities = map[string]map[string]float64{
 	},
 }
 
-var TokensTotal = 1684174.000000
+var TokensTotal = 1687029.000000
diff --git a/internal/code-generator/generator/test_files/interpreter.gold b/internal/code-generator/generator/test_files/interpreter.gold
index d5b2662..0a88fff 100644
--- a/internal/code-generator/generator/test_files/interpreter.gold
+++ b/internal/code-generator/generator/test_files/interpreter.gold
@@ -2,7 +2,7 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 var LanguagesByInterpreter = map[string][]string{
 	"Rscript":     {"R"},
@@ -60,7 +60,7 @@ var LanguagesByInterpreter = map[string][]string{
 	"osascript":   {"AppleScript"},
 	"parrot":      {"Parrot Assembly", "Parrot Internal Representation"},
 	"perl":        {"Perl"},
-	"perl6":       {"Perl6"},
+	"perl6":       {"Perl 6"},
 	"php":         {"PHP"},
 	"picolisp":    {"PicoLisp"},
 	"pike":        {"Pike"},
diff --git a/internal/code-generator/generator/test_files/type.gold b/internal/code-generator/generator/test_files/type.gold
index 27f5eb7..c9bc391 100644
--- a/internal/code-generator/generator/test_files/type.gold
+++ b/internal/code-generator/generator/test_files/type.gold
@@ -2,7 +2,7 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 var LanguagesType = map[string]int{
 	"1C Enterprise":    2,
@@ -107,6 +107,7 @@ var LanguagesType = map[string]int{
 	"EJS":            3,
 	"EQ":             2,
 	"Eagle":          3,
+	"Easybuild":      1,
 	"Ecere Projects": 1,
 	"Eiffel":         2,
 	"Elixir":         2,
@@ -302,7 +303,7 @@ var LanguagesType = map[string]int{
 	"Pascal":                       2,
 	"Pep8":                         2,
 	"Perl":                         2,
-	"Perl6":                        2,
+	"Perl 6":                       2,
 	"Pic":                          3,
 	"Pickle":                       1,
 	"PicoLisp":                     2,
@@ -349,6 +350,7 @@ var LanguagesType = map[string]int{
 	"Regular Expression":           1,
 	"Ren'Py":                       2,
 	"RenderScript":                 2,
+	"Ring":                         2,
 	"RobotFramework":               2,
 	"Roff":                         3,
 	"Rouge":                        2,
diff --git a/internal/code-generator/generator/test_files/vendor.gold b/internal/code-generator/generator/test_files/vendor.gold
index 1498a6a..38d035a 100644
--- a/internal/code-generator/generator/test_files/vendor.gold
+++ b/internal/code-generator/generator/test_files/vendor.gold
@@ -2,7 +2,7 @@ package data
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
 
 import "gopkg.in/toqueteos/substring.v1"
 
@@ -35,6 +35,7 @@ var VendorMatchers = substring.Or(
 	substring.Regexp(`(^|/)font-awesome\.(css|less|scss|styl)$`),
 	substring.Regexp(`(^|/)foundation\.(css|less|scss|styl)$`),
 	substring.Regexp(`(^|/)normalize\.(css|less|scss|styl)$`),
+	substring.Regexp(`(^|/)skeleton\.(css|less|scss|styl)$`),
 	substring.Regexp(`(^|/)[Bb]ourbon/.*\.(css|less|scss|styl)$`),
 	substring.Regexp(`(^|/)animate\.(css|less|scss|styl)$`),
 	substring.Regexp(`third[-_]?party/`),
diff --git a/type.go b/type.go
new file mode 100644
index 0000000..5355e62
--- /dev/null
+++ b/type.go
@@ -0,0 +1,461 @@
+package enry
+
+// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
+// THIS FILE SHOULD NOT BE EDITED BY HAND
+// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68
+
+var languagesType = map[string]Type{
+	"1C Enterprise":    Programming,
+	"ABAP":             Programming,
+	"ABNF":             Data,
+	"AGS Script":       Programming,
+	"AMPL":             Programming,
+	"ANTLR":            Programming,
+	"API Blueprint":    Markup,
+	"APL":              Programming,
+	"ASN.1":            Data,
+	"ASP":              Programming,
+	"ATS":              Programming,
+	"ActionScript":     Programming,
+	"Ada":              Programming,
+	"Agda":             Programming,
+	"Alloy":            Programming,
+	"Alpine Abuild":    Programming,
+	"Ant Build System": Data,
+	"ApacheConf":       Markup,
+	"Apex":             Programming,
+	"Apollo Guidance Computer": Programming,
+	"AppleScript":              Programming,
+	"Arc":                      Programming,
+	"Arduino":                  Programming,
+	"AsciiDoc":                 Prose,
+	"AspectJ":                  Programming,
+	"Assembly":                 Programming,
+	"Augeas":                   Programming,
+	"AutoHotkey":               Programming,
+	"AutoIt":                   Programming,
+	"Awk":                      Programming,
+	"Batchfile":                Programming,
+	"Befunge":                  Programming,
+	"Bison":                    Programming,
+	"BitBake":                  Programming,
+	"Blade":                    Markup,
+	"BlitzBasic":               Programming,
+	"BlitzMax":                 Programming,
+	"Bluespec":                 Programming,
+	"Boo":                      Programming,
+	"Brainfuck":                Programming,
+	"Brightscript":             Programming,
+	"Bro":                      Programming,
+	"C":                        Programming,
+	"C#":                       Programming,
+	"C++":                      Programming,
+	"C-ObjDump":                Data,
+	"C2hs Haskell":             Programming,
+	"CLIPS":                    Programming,
+	"CMake":                    Programming,
+	"COBOL":                    Programming,
+	"COLLADA":                  Data,
+	"CSON":                     Data,
+	"CSS":                      Markup,
+	"CSV":                      Data,
+	"CWeb":                     Programming,
+	"Cap'n Proto":              Programming,
+	"CartoCSS":                 Programming,
+	"Ceylon":                   Programming,
+	"Chapel":                   Programming,
+	"Charity":                  Programming,
+	"ChucK":                    Programming,
+	"Cirru":                    Programming,
+	"Clarion":                  Programming,
+	"Clean":                    Programming,
+	"Click":                    Programming,
+	"Clojure":                  Programming,
+	"Closure Templates":        Markup,
+	"CoffeeScript":             Programming,
+	"ColdFusion":               Programming,
+	"ColdFusion CFC":           Programming,
+	"Common Lisp":              Programming,
+	"Component Pascal":         Programming,
+	"Cool":                     Programming,
+	"Coq":                      Programming,
+	"Cpp-ObjDump":              Data,
+	"Creole":                   Prose,
+	"Crystal":                  Programming,
+	"Csound":                   Programming,
+	"Csound Document":          Programming,
+	"Csound Score":             Programming,
+	"Cuda":                     Programming,
+	"Cycript":                  Programming,
+	"Cython":                   Programming,
+	"D":                        Programming,
+	"D-ObjDump":                Data,
+	"DIGITAL Command Language": Programming,
+	"DM":             Programming,
+	"DNS Zone":       Data,
+	"DTrace":         Programming,
+	"Darcs Patch":    Data,
+	"Dart":           Programming,
+	"Diff":           Data,
+	"Dockerfile":     Data,
+	"Dogescript":     Programming,
+	"Dylan":          Programming,
+	"E":              Programming,
+	"EBNF":           Data,
+	"ECL":            Programming,
+	"ECLiPSe":        Programming,
+	"EJS":            Markup,
+	"EQ":             Programming,
+	"Eagle":          Markup,
+	"Easybuild":      Data,
+	"Ecere Projects": Data,
+	"Eiffel":         Programming,
+	"Elixir":         Programming,
+	"Elm":            Programming,
+	"Emacs Lisp":     Programming,
+	"EmberScript":    Programming,
+	"Erlang":         Programming,
+	"F#":             Programming,
+	"FLUX":           Programming,
+	"Factor":         Programming,
+	"Fancy":          Programming,
+	"Fantom":         Programming,
+	"Filebench WML":  Programming,
+	"Filterscript":   Programming,
+	"Formatted":      Data,
+	"Forth":          Programming,
+	"Fortran":        Programming,
+	"FreeMarker":     Programming,
+	"Frege":          Programming,
+	"G-code":         Data,
+	"GAMS":           Programming,
+	"GAP":            Programming,
+	"GCC Machine Description": Programming,
+	"GDB":      Programming,
+	"GDScript": Programming,
+	"GLSL":     Programming,
+	"GN":       Data,
+	"Game Maker Language":     Programming,
+	"Genie":                   Programming,
+	"Genshi":                  Programming,
+	"Gentoo Ebuild":           Programming,
+	"Gentoo Eclass":           Programming,
+	"Gettext Catalog":         Prose,
+	"Gherkin":                 Programming,
+	"Glyph":                   Programming,
+	"Gnuplot":                 Programming,
+	"Go":                      Programming,
+	"Golo":                    Programming,
+	"Gosu":                    Programming,
+	"Grace":                   Programming,
+	"Gradle":                  Data,
+	"Grammatical Framework":   Programming,
+	"Graph Modeling Language": Data,
+	"GraphQL":                 Data,
+	"Graphviz (DOT)":          Data,
+	"Groovy":                  Programming,
+	"Groovy Server Pages":     Programming,
+	"HCL":                      Programming,
+	"HLSL":                     Programming,
+	"HTML":                     Markup,
+	"HTML+Django":              Markup,
+	"HTML+ECR":                 Markup,
+	"HTML+EEX":                 Markup,
+	"HTML+ERB":                 Markup,
+	"HTML+PHP":                 Markup,
+	"HTTP":                     Data,
+	"Hack":                     Programming,
+	"Haml":                     Markup,
+	"Handlebars":               Markup,
+	"Harbour":                  Programming,
+	"Haskell":                  Programming,
+	"Haxe":                     Programming,
+	"Hy":                       Programming,
+	"HyPhy":                    Programming,
+	"IDL":                      Programming,
+	"IGOR Pro":                 Programming,
+	"INI":                      Data,
+	"IRC log":                  Data,
+	"Idris":                    Programming,
+	"Inform 7":                 Programming,
+	"Inno Setup":               Programming,
+	"Io":                       Programming,
+	"Ioke":                     Programming,
+	"Isabelle":                 Programming,
+	"Isabelle ROOT":            Programming,
+	"J":                        Programming,
+	"JFlex":                    Programming,
+	"JSON":                     Data,
+	"JSON5":                    Data,
+	"JSONLD":                   Data,
+	"JSONiq":                   Programming,
+	"JSX":                      Programming,
+	"Jasmin":                   Programming,
+	"Java":                     Programming,
+	"Java Server Pages":        Programming,
+	"JavaScript":               Programming,
+	"Jison":                    Programming,
+	"Jison Lex":                Programming,
+	"Jolie":                    Programming,
+	"Julia":                    Programming,
+	"Jupyter Notebook":         Markup,
+	"KRL":                      Programming,
+	"KiCad":                    Programming,
+	"Kit":                      Markup,
+	"Kotlin":                   Programming,
+	"LFE":                      Programming,
+	"LLVM":                     Programming,
+	"LOLCODE":                  Programming,
+	"LSL":                      Programming,
+	"LabVIEW":                  Programming,
+	"Lasso":                    Programming,
+	"Latte":                    Markup,
+	"Lean":                     Programming,
+	"Less":                     Markup,
+	"Lex":                      Programming,
+	"LilyPond":                 Programming,
+	"Limbo":                    Programming,
+	"Linker Script":            Data,
+	"Linux Kernel Module":      Data,
+	"Liquid":                   Markup,
+	"Literate Agda":            Programming,
+	"Literate CoffeeScript":    Programming,
+	"Literate Haskell":         Programming,
+	"LiveScript":               Programming,
+	"Logos":                    Programming,
+	"Logtalk":                  Programming,
+	"LookML":                   Programming,
+	"LoomScript":               Programming,
+	"Lua":                      Programming,
+	"M":                        Programming,
+	"M4":                       Programming,
+	"M4Sugar":                  Programming,
+	"MAXScript":                Programming,
+	"MQL4":                     Programming,
+	"MQL5":                     Programming,
+	"MTML":                     Markup,
+	"MUF":                      Programming,
+	"Makefile":                 Programming,
+	"Mako":                     Programming,
+	"Markdown":                 Prose,
+	"Marko":                    Markup,
+	"Mask":                     Markup,
+	"Mathematica":              Programming,
+	"Matlab":                   Programming,
+	"Maven POM":                Data,
+	"Max":                      Programming,
+	"MediaWiki":                Prose,
+	"Mercury":                  Programming,
+	"Meson":                    Programming,
+	"Metal":                    Programming,
+	"MiniD":                    Programming,
+	"Mirah":                    Programming,
+	"Modelica":                 Programming,
+	"Modula-2":                 Programming,
+	"Module Management System": Programming,
+	"Monkey":                   Programming,
+	"Moocode":                  Programming,
+	"MoonScript":               Programming,
+	"Myghty":                   Programming,
+	"NCL":                      Programming,
+	"NL":                       Data,
+	"NSIS":                     Programming,
+	"Nemerle":                  Programming,
+	"NetLinx":                  Programming,
+	"NetLinx+ERB":              Programming,
+	"NetLogo":                  Programming,
+	"NewLisp":                  Programming,
+	"Nginx":                    Markup,
+	"Nim":                      Programming,
+	"Ninja":                    Data,
+	"Nit":                      Programming,
+	"Nix":                      Programming,
+	"Nu":                       Programming,
+	"NumPy":                    Programming,
+	"OCaml":                    Programming,
+	"ObjDump":                  Data,
+	"Objective-C":              Programming,
+	"Objective-C++":            Programming,
+	"Objective-J":              Programming,
+	"Omgrofl":                  Programming,
+	"Opa":                      Programming,
+	"Opal":                     Programming,
+	"OpenCL":                   Programming,
+	"OpenEdge ABL":             Programming,
+	"OpenRC runscript":         Programming,
+	"OpenSCAD":                 Programming,
+	"OpenType Feature File":    Data,
+	"Org":                            Prose,
+	"Ox":                             Programming,
+	"Oxygene":                        Programming,
+	"Oz":                             Programming,
+	"P4":                             Programming,
+	"PAWN":                           Programming,
+	"PHP":                            Programming,
+	"PLSQL":                          Programming,
+	"PLpgSQL":                        Programming,
+	"POV-Ray SDL":                    Programming,
+	"Pan":                            Programming,
+	"Papyrus":                        Programming,
+	"Parrot":                         Programming,
+	"Parrot Assembly":                Programming,
+	"Parrot Internal Representation": Programming,
+	"Pascal":                       Programming,
+	"Pep8":                         Programming,
+	"Perl":                         Programming,
+	"Perl 6":                       Programming,
+	"Pic":                          Markup,
+	"Pickle":                       Data,
+	"PicoLisp":                     Programming,
+	"PigLatin":                     Programming,
+	"Pike":                         Programming,
+	"Pod":                          Prose,
+	"PogoScript":                   Programming,
+	"Pony":                         Programming,
+	"PostScript":                   Markup,
+	"PowerBuilder":                 Programming,
+	"PowerShell":                   Programming,
+	"Processing":                   Programming,
+	"Prolog":                       Programming,
+	"Propeller Spin":               Programming,
+	"Protocol Buffer":              Markup,
+	"Public Key":                   Data,
+	"Pug":                          Markup,
+	"Puppet":                       Programming,
+	"Pure Data":                    Programming,
+	"PureBasic":                    Programming,
+	"PureScript":                   Programming,
+	"Python":                       Programming,
+	"Python console":               Programming,
+	"Python traceback":             Data,
+	"QML":                          Programming,
+	"QMake":                        Programming,
+	"R":                            Programming,
+	"RAML":                         Markup,
+	"RDoc":                         Prose,
+	"REALbasic":                    Programming,
+	"REXX":                         Programming,
+	"RHTML":                        Markup,
+	"RMarkdown":                    Prose,
+	"RPM Spec":                     Data,
+	"RUNOFF":                       Markup,
+	"Racket":                       Programming,
+	"Ragel":                        Programming,
+	"Rascal":                       Programming,
+	"Raw token data":               Data,
+	"Reason":                       Programming,
+	"Rebol":                        Programming,
+	"Red":                          Programming,
+	"Redcode":                      Programming,
+	"Regular Expression":           Data,
+	"Ren'Py":                       Programming,
+	"RenderScript":                 Programming,
+	"Ring":                         Programming,
+	"RobotFramework":               Programming,
+	"Roff":                         Markup,
+	"Rouge":                        Programming,
+	"Ruby":                         Programming,
+	"Rust":                         Programming,
+	"SAS":                          Programming,
+	"SCSS":                         Markup,
+	"SMT":                          Programming,
+	"SPARQL":                       Data,
+	"SQF":                          Programming,
+	"SQL":                          Data,
+	"SQLPL":                        Programming,
+	"SRecode Template":             Markup,
+	"STON":                         Data,
+	"SVG":                          Data,
+	"Sage":                         Programming,
+	"SaltStack":                    Programming,
+	"Sass":                         Markup,
+	"Scala":                        Programming,
+	"Scaml":                        Markup,
+	"Scheme":                       Programming,
+	"Scilab":                       Programming,
+	"Self":                         Programming,
+	"ShaderLab":                    Programming,
+	"Shell":                        Programming,
+	"ShellSession":                 Programming,
+	"Shen":                         Programming,
+	"Slash":                        Programming,
+	"Slim":                         Markup,
+	"Smali":                        Programming,
+	"Smalltalk":                    Programming,
+	"Smarty":                       Programming,
+	"SourcePawn":                   Programming,
+	"Spline Font Database":         Data,
+	"Squirrel":                     Programming,
+	"Stan":                         Programming,
+	"Standard ML":                  Programming,
+	"Stata":                        Programming,
+	"Stylus":                       Markup,
+	"SubRip Text":                  Data,
+	"Sublime Text Config":          Data,
+	"SuperCollider":                Programming,
+	"Swift":                        Programming,
+	"SystemVerilog":                Programming,
+	"TI Program":                   Programming,
+	"TLA":                          Programming,
+	"TOML":                         Data,
+	"TXL":                          Programming,
+	"Tcl":                          Programming,
+	"Tcsh":                         Programming,
+	"TeX":                          Markup,
+	"Tea":                          Markup,
+	"Terra":                        Programming,
+	"Text":                         Prose,
+	"Textile":                      Prose,
+	"Thrift":                       Programming,
+	"Turing":                       Programming,
+	"Turtle":                       Data,
+	"Twig":                         Markup,
+	"Type Language":                Data,
+	"TypeScript":                   Programming,
+	"Unified Parallel C":           Programming,
+	"Unity3D Asset":                Data,
+	"Unix Assembly":                Programming,
+	"Uno":                          Programming,
+	"UnrealScript":                 Programming,
+	"UrWeb":                        Programming,
+	"VCL":                          Programming,
+	"VHDL":                         Programming,
+	"Vala":                         Programming,
+	"Verilog":                      Programming,
+	"Vim script":                   Programming,
+	"Visual Basic":                 Programming,
+	"Volt":                         Programming,
+	"Vue":                          Markup,
+	"Wavefront Material":           Data,
+	"Wavefront Object":             Data,
+	"Web Ontology Language":        Markup,
+	"WebAssembly":                  Programming,
+	"WebIDL":                       Programming,
+	"World of Warcraft Addon Data": Data,
+	"X10":              Programming,
+	"XC":               Programming,
+	"XCompose":         Data,
+	"XML":              Data,
+	"XPages":           Programming,
+	"XProc":            Programming,
+	"XQuery":           Programming,
+	"XS":               Programming,
+	"XSLT":             Programming,
+	"Xojo":             Programming,
+	"Xtend":            Programming,
+	"YAML":             Data,
+	"YANG":             Data,
+	"Yacc":             Programming,
+	"Zephir":           Programming,
+	"Zimpl":            Programming,
+	"desktop":          Data,
+	"eC":               Programming,
+	"edn":              Data,
+	"fish":             Programming,
+	"mupad":            Programming,
+	"nesC":             Programming,
+	"ooc":              Programming,
+	"reStructuredText": Prose,
+	"wisp":             Programming,
+	"xBase":            Programming,
+}