diff --git a/www/common/modes.js b/www/common/modes.js
index ffed08b17..668a00e1a 100644
--- a/www/common/modes.js
+++ b/www/common/modes.js
@@ -6,127 +6,127 @@ define([
     // mode language (extension)
     var list = Modes.list = [
         "APL apl .apl",
-        "ASCII-Armor asciiarmor",
-        "ASN.1 asn.1",
+        "ASCII-Armor asciiarmor .asc",
+        "ASN.1 asn.1 .asn1",
         "Asterisk asterisk",
         "Brainfuck brainfuck .b",
         "C text/x-csrc .c",
         "C text/x-c++src .cpp",
-        "C-like clike",
-        "Clojure clojure",
-        "CMake cmake",
-        "COBOL cobol",
-        "CoffeeScript coffeescript",
-        "Common_Lisp commonlisp",
-        "Crystal crystal",
+        "C-like clike .c",
+        "Clojure clojure .clj",
+        "CMake cmake", /* no extension */
+        "COBOL cobol .cbl",
+        "CoffeeScript coffeescript .coffee",
+        "Common_Lisp commonlisp .lisp",
+        "Crystal crystal .cr",
         "CSS css .css",
-        "Cypher cypher",
-        "D d",
-        "Dart dart",
-        "Diff diff",
-        "Django django",
-        "Dockerfile dockerfile",
-        "DTD dtd",
-        "Dylan dylan",
-        "EBNF ebnf",
-        "ECL ecl",
-        "Eiffel eiffel",
+        "Cypher cypher .cypher",
+        "D d .d",
+        "Dart dart .dart",
+        "Diff diff .diff",
+        "Django django .py",
+        "Dockerfile dockerfile", /* no extension */
+        "DTD dtd .dtd",
+        "Dylan dylan .dylan",
+        "EBNF ebnf .ebnf",
+        "ECL ecl .ecl",
+        "Eiffel eiffel .e",
         "Elm elm .elm",
-        "Erlang erlang",
-        "Factor factor",
-        "FCL fcl",
-        "Forth forth",
-        "Fortran fortran",
-        "GAS gas",
-        "Gherkin gherkin",
-        "Go go",
-        "Groovy groovy",
-        "Haml haml",
-        "Handlebars handlebars",
+        "Erlang erlang .erl",
+        "Factor factor .factor",
+        "FCL fcl .fcl",
+        "Forth forth .fs",
+        "Fortran fortran .f90",
+        "GAS gas .gas",
+        "Gherkin gherkin .feature",
+        "Go go .go",
+        "Groovy groovy .groovy",
+        "Haml haml .haml",
+        "Handlebars handlebars .hbs",
         "Haskell haskell .hs",
-        "Haskell-Literate haskell-literate",
-        "Haxe haxe",
+        "Haskell-Literate haskell-literate .lhs",
+        "Haxe haxe .hx",
         "HTML htmlmixed .html",
-        "HTTP http",
-        "IDL idl",
-        "JADE jade",
+        "HTTP http", /* no extension */
+        "IDL idl .idl",
+        "JADE jade .jade",
         "Java text/x-java .java",
         "JavaScript javascript .js",
-        "Jinja2 jinja2",
+        "Jinja2 jinja2 .j2",
         "JSX jsx .jsx",
-        "Julia julia",
-        "LiveScript livescript",
-        "Lua lua",
+        "Julia julia .jl",
+        "LiveScript livescript .ls",
+        "Lua lua .lua",
         "Markdown gfm .md",
         //"markdown markdown .md",
-        "Mathematica mathematica",
-        "mIRC mirc",
-        "ML mllike",
-        "Modelica modelica",
-        "MscGen mscgen",
-        "MUMPS mumps",
-        "Nginx nginx",
-        "NSIS nsis",
-        "N-Triples ntriples",
+        "Mathematica mathematica .nb",
+        "mIRC mirc .irc",
+        "ML mllike", /* no extension */
+        "Modelica modelica .mo",
+        "MscGen mscgen .mscgen",
+        "MUMPS mumps .m",
+        "Nginx nginx .conf",
+        "NSIS nsis .nsi",
+        "N-Triples ntriples .nq",
         "Objective-C text/x-objectivec .m",
-        "Octave octave",
+        "Octave octave .m",
         "Org-mode orgmode .org",
-        "Oz oz",
-        "Pascal pascal",
-        "PEG.js pegjs",
-        "Perl perl",
-        "PHP php",
-        "Pig pig",
-        "PowerShell powershell",
-        "Properties properties",
-        "Protocol_Buffers protobuf",
-        "Puppet puppet",
+        "Oz oz .oz",
+        "Pascal pascal .pas",
+        "PEG.js pegjs .pegjs",
+        "Perl perl .pl",
+        "PHP php .php",
+        "Pig pig .pig",
+        "PowerShell powershell .ps1",
+        "Properties properties .properties",
+        "Protocol_Buffers protobuf .proto",
+        "Puppet puppet .pp",
         "Python python .py",
-        "Q q",
-        "R r",
-        "RPM rpm",
-        "RST rst",
-        "Ruby ruby",
-        "Rust rust",
-        "Sass sass",
+        "Q q .q",
+        "R r .r",
+        "RPM rpm .rpm",
+        "RST rst .rst",
+        "Ruby ruby .rb",
+        "Rust rust .rs",
+        "Sass sass .sass",
         "Scheme scheme .scm",
         "Shell shell .sh",
-        "Sieve sieve",
-        "Slim slim",
-        "Smalltalk smalltalk",
-        "Smarty smarty",
-        "Solr solr",
-        "Soy soy",
-        "SPARQL sparql",
-        "Spreadsheet spreadsheet",
-        "SQL sql",
-        "sTeX stex",
-        "Stylus stylus",
-        "Swift swift",
-        "Tcl tcl",
+        "Sieve sieve .sieve",
+        "Slim slim .slim",
+        "Smalltalk smalltalk", /* no extension */
+        "Smarty smarty", /* no extension */
+        "Solr solr", /* no extension */
+        "Soy soy .soy",
+        "SPARQL sparql .rq",
+        "Spreadsheet spreadsheet .xls",
+        "SQL sql .sql",
+        "sTeX stex .stex",
+        "Stylus stylus .styl",
+        "Swift swift .swift",
+        "Tcl tcl .tcl",
         "Text text .txt",
-        "Textile textile",
-        "TiddlyWiki tiddlywiki",
-        "Tiki tiki",
-        "TOML toml",
-        "Tornado tornado",
-        "troff troff",
+        "Textile textile .textile",
+        "TiddlyWiki tiddlywiki .tw",
+        "Tiki tiki", /* no extension */
+        "TOML toml .toml",
+        "Tornado tornado .tornado",
+        "troff troff .troff",
         "TTCN ttcn",
         "TTCN-cfg ttcn-cfg",
-        "Turtle turtle",
-        "Twig twig",
-        "Visual_Basic vb",
-        "VBScript vbscript",
-        "Velocity velocity",
-        "Verilog verilog",
-        "VHDL vhdl",
-        "Vue vue",
-        "XML xml",
+        "Turtle turtle .ttl",
+        "Twig twig .twig",
+        "Visual_Basic vb .vb",
+        "VBScript vbscript .vbs",
+        "Velocity velocity .vm",
+        "Verilog verilog .v",
+        "VHDL vhdl .vhdl",
+        "Vue vue .vue",
+        "XML xml .xml",
         //"xwiki xwiki21",
-        "XQuery xquery",
+        "XQuery xquery .xquery",
         "YAML yaml .yaml",
-        "YAML_Frontmatter yaml-frontmatter",
-        "Z80 z80"
+        "YAML_Frontmatter yaml-frontmatter", /* no extension */
+        "Z80 z80 .z80"
     ].map(function (line) {
         var kv = line.split(/\s/);
         return {