diff --git a/src/public/libraries/codemirror/addon/edit/matchbrackets.js b/src/public/libraries/codemirror/addon/edit/matchbrackets.js
index c9851bda3..c918c3f99 100644
--- a/src/public/libraries/codemirror/addon/edit/matchbrackets.js
+++ b/src/public/libraries/codemirror/addon/edit/matchbrackets.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/addon/edit/matchtags.js b/src/public/libraries/codemirror/addon/edit/matchtags.js
index fb1911a8d..2203d9390 100644
--- a/src/public/libraries/codemirror/addon/edit/matchtags.js
+++ b/src/public/libraries/codemirror/addon/edit/matchtags.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/addon/fold/xml-fold.js b/src/public/libraries/codemirror/addon/fold/xml-fold.js
index 867ecb5cb..13bc3838b 100644
--- a/src/public/libraries/codemirror/addon/fold/xml-fold.js
+++ b/src/public/libraries/codemirror/addon/fold/xml-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/addon/mode/loadmode.js b/src/public/libraries/codemirror/addon/mode/loadmode.js
index 10117ec22..4ce716a01 100644
--- a/src/public/libraries/codemirror/addon/mode/loadmode.js
+++ b/src/public/libraries/codemirror/addon/mode/loadmode.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/addon/search/match-highlighter.js b/src/public/libraries/codemirror/addon/search/match-highlighter.js
index 260cdeb2a..b344ac79e 100644
--- a/src/public/libraries/codemirror/addon/search/match-highlighter.js
+++ b/src/public/libraries/codemirror/addon/search/match-highlighter.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Highlighting text that matches the selection
 //
diff --git a/src/public/libraries/codemirror/codemirror.js b/src/public/libraries/codemirror/codemirror.js
index 68a109bf0..e178478d2 100644
--- a/src/public/libraries/codemirror/codemirror.js
+++ b/src/public/libraries/codemirror/codemirror.js
@@ -1,7 +1,7 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
-// This is CodeMirror (http://codemirror.net), a code editor
+// This is CodeMirror (https://codemirror.net), a code editor
 // implemented in JavaScript on top of the browser's DOM.
 //
 // You can find some technical background for some of the code below
@@ -1820,7 +1820,7 @@ function buildLineContent(cm, lineView) {
   var builder = {pre: eltP("pre", [content], "CodeMirror-line"), content: content,
                  col: 0, pos: 0, cm: cm,
                  trailingSpace: false,
-                 splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
+                 splitSpaces: cm.getOption("lineWrapping")}
   lineView.measure = {}
 
   // Iterate over the logical lines that make up this visual line.
@@ -1941,6 +1941,8 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) {
   builder.content.appendChild(content)
 }
 
+// Change some spaces to NBSP to prevent the browser from collapsing
+// trailing spaces at the end of a line when rendering text (issue #1362).
 function splitSpaces(text, trailingBefore) {
   if (text.length > 1 && !/  /.test(text)) { return text }
   var spaceBefore = trailingBefore, result = ""
@@ -7242,8 +7244,9 @@ function onMouseDown(e) {
     }
     return
   }
-  if (clickInGutter(cm, e)) { return }
-  var pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single"
+  var button = e_button(e)
+  if (button == 3 && captureRightClick ? contextMenuInGutter(cm, e) : clickInGutter(cm, e)) { return }
+  var pos = posFromMouse(cm, e), repeat = pos ? clickRepeat(pos, button) : "single"
   window.focus()
 
   // #3261: make sure, that we're not starting a second selection
@@ -7722,6 +7725,7 @@ function defineOptions(CodeMirror) {
   option("tabindex", null, function (cm, val) { return cm.display.input.getField().tabIndex = val || ""; })
   option("autofocus", null)
   option("direction", "ltr", function (cm, val) { return cm.doc.setDirection(val); }, true)
+  option("phrases", null)
 }
 
 function guttersChanged(cm) {
@@ -8560,6 +8564,11 @@ function addEditorMethods(CodeMirror) {
       return old
     }),
 
+    phrase: function(phraseText) {
+      var phrases = this.options.phrases
+      return phrases && Object.prototype.hasOwnProperty.call(phrases, phraseText) ? phrases[phraseText] : phraseText
+    },
+
     getInputField: function(){return this.display.input.getField()},
     getWrapperElement: function(){return this.display.wrapper},
     getScrollerElement: function(){return this.display.scroller},
@@ -9677,7 +9686,7 @@ CodeMirror.fromTextArea = fromTextArea
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.39.2"
+CodeMirror.version = "5.40.2"
 
 return CodeMirror;
 
diff --git a/src/public/libraries/codemirror/mode/apl/apl.js b/src/public/libraries/codemirror/mode/apl/apl.js
index caafe4e91..b1955f6c9 100644
--- a/src/public/libraries/codemirror/mode/apl/apl.js
+++ b/src/public/libraries/codemirror/mode/apl/apl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/apl/index.html b/src/public/libraries/codemirror/mode/apl/index.html
index 53dda6b58..56ab02ffb 100644
--- a/src/public/libraries/codemirror/mode/apl/index.html
+++ b/src/public/libraries/codemirror/mode/apl/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/asciiarmor/asciiarmor.js b/src/public/libraries/codemirror/mode/asciiarmor/asciiarmor.js
index fa1b0f8c6..f560f4242 100644
--- a/src/public/libraries/codemirror/mode/asciiarmor/asciiarmor.js
+++ b/src/public/libraries/codemirror/mode/asciiarmor/asciiarmor.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/asciiarmor/index.html b/src/public/libraries/codemirror/mode/asciiarmor/index.html
index 4d584efbc..de39a1857 100644
--- a/src/public/libraries/codemirror/mode/asciiarmor/index.html
+++ b/src/public/libraries/codemirror/mode/asciiarmor/index.html
@@ -9,7 +9,7 @@
 <script src="asciiarmor.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/asn.1/asn.1.js b/src/public/libraries/codemirror/mode/asn.1/asn.1.js
index 9600247ea..d3ecb0878 100644
--- a/src/public/libraries/codemirror/mode/asn.1/asn.1.js
+++ b/src/public/libraries/codemirror/mode/asn.1/asn.1.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/asn.1/index.html b/src/public/libraries/codemirror/mode/asn.1/index.html
index 699fd4473..43ad0e031 100644
--- a/src/public/libraries/codemirror/mode/asn.1/index.html
+++ b/src/public/libraries/codemirror/mode/asn.1/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="asn.1.js"></script>
 <style type="text/css">
     .CodeMirror {
@@ -14,7 +15,7 @@
     }
 </style>
 <div id=nav>
-    <a href="http://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png">
     </a>
 
diff --git a/src/public/libraries/codemirror/mode/asterisk/asterisk.js b/src/public/libraries/codemirror/mode/asterisk/asterisk.js
index b7ebfc5ad..025a8b3ef 100644
--- a/src/public/libraries/codemirror/mode/asterisk/asterisk.js
+++ b/src/public/libraries/codemirror/mode/asterisk/asterisk.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
  * =====================================================================================
diff --git a/src/public/libraries/codemirror/mode/asterisk/index.html b/src/public/libraries/codemirror/mode/asterisk/index.html
index 257bd3987..956e1e125 100644
--- a/src/public/libraries/codemirror/mode/asterisk/index.html
+++ b/src/public/libraries/codemirror/mode/asterisk/index.html
@@ -6,13 +6,14 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="asterisk.js"></script>
 <style>
       .CodeMirror {border: 1px solid #999;}
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/brainfuck/brainfuck.js b/src/public/libraries/codemirror/mode/brainfuck/brainfuck.js
index 3becf2a5a..af6d889ae 100644
--- a/src/public/libraries/codemirror/mode/brainfuck/brainfuck.js
+++ b/src/public/libraries/codemirror/mode/brainfuck/brainfuck.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Brainfuck mode created by Michael Kaminsky https://github.com/mkaminsky11
 
diff --git a/src/public/libraries/codemirror/mode/brainfuck/index.html b/src/public/libraries/codemirror/mode/brainfuck/index.html
index 6048fc241..a04bddb14 100644
--- a/src/public/libraries/codemirror/mode/brainfuck/index.html
+++ b/src/public/libraries/codemirror/mode/brainfuck/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/clike/clike.js b/src/public/libraries/codemirror/mode/clike/clike.js
index dec87a474..480c38041 100644
--- a/src/public/libraries/codemirror/mode/clike/clike.js
+++ b/src/public/libraries/codemirror/mode/clike/clike.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -573,7 +573,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         return state.tokenize(stream, state)
       }
     },
-    modeProps: {closeBrackets: {triples: '"'}}
+    modeProps: {closeBrackets: {pairs: '()[]{}""', triples: '"'}}
   });
 
   function tokenKotlinString(tripleString){
diff --git a/src/public/libraries/codemirror/mode/clike/index.html b/src/public/libraries/codemirror/mode/clike/index.html
index 45c670ae5..b1cef526b 100644
--- a/src/public/libraries/codemirror/mode/clike/index.html
+++ b/src/public/libraries/codemirror/mode/clike/index.html
@@ -12,7 +12,7 @@
 <script src="clike.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/clike/scala.html b/src/public/libraries/codemirror/mode/clike/scala.html
index aa04cf0f0..ddbd9a0ca 100644
--- a/src/public/libraries/codemirror/mode/clike/scala.html
+++ b/src/public/libraries/codemirror/mode/clike/scala.html
@@ -10,7 +10,7 @@
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clike.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/clike/test.js b/src/public/libraries/codemirror/mode/clike/test.js
index e3bde772a..fc1f5d6cf 100644
--- a/src/public/libraries/codemirror/mode/clike/test.js
+++ b/src/public/libraries/codemirror/mode/clike/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-c");
diff --git a/src/public/libraries/codemirror/mode/clojure/clojure.js b/src/public/libraries/codemirror/mode/clojure/clojure.js
index ed6af2c83..9823d812c 100644
--- a/src/public/libraries/codemirror/mode/clojure/clojure.js
+++ b/src/public/libraries/codemirror/mode/clojure/clojure.js
@@ -1,15 +1,10 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Author: Hans Engel
- * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
- */
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
+  if (typeof exports === "object" && typeof module === "object") // CommonJS
     mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
+  else if (typeof define === "function" && define.amd) // AMD
     define(["../../lib/codemirror"], mod);
   else // Plain browser env
     mod(CodeMirror);
@@ -17,286 +12,277 @@
 "use strict";
 
 CodeMirror.defineMode("clojure", function (options) {
-    var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword", VAR = "variable";
-    var INDENT_WORD_SKIP = options.indentUnit || 2;
-    var NORMAL_INDENT_UNIT = options.indentUnit || 2;
+  var atoms = ["false", "nil", "true"];
+  var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
+      "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
+  var coreSymbols = ["*", "*'", "*1", "*2", "*3", "*agent*",
+      "*allow-unresolved-vars*", "*assert*", "*clojure-version*",
+      "*command-line-args*", "*compile-files*", "*compile-path*",
+      "*compiler-options*", "*data-readers*", "*default-data-reader-fn*", "*e",
+      "*err*", "*file*", "*flush-on-newline*", "*fn-loader*", "*in*",
+      "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*",
+      "*print-level*", "*print-meta*", "*print-namespace-maps*",
+      "*print-readably*", "*read-eval*", "*reader-resolver*", "*source-path*",
+      "*suppress-read*", "*unchecked-math*", "*use-context-classloader*",
+      "*verbose-defrecords*", "*warn-on-reflection*", "+", "+'", "-", "-'",
+      "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
+      "->VecSeq", "-cache-protocol-fn", "-reset-methods", "..", "/", "<", "<=",
+      "=", "==", ">", ">=", "EMPTY-NODE", "Inst", "StackTraceElement->vec",
+      "Throwable->map", "accessor", "aclone", "add-classpath", "add-watch",
+      "agent", "agent-error", "agent-errors", "aget", "alength", "alias",
+      "all-ns", "alter", "alter-meta!", "alter-var-root", "amap", "ancestors",
+      "and", "any?", "apply", "areduce", "array-map", "as->", "aset",
+      "aset-boolean", "aset-byte", "aset-char", "aset-double", "aset-float",
+      "aset-int", "aset-long", "aset-short", "assert", "assoc", "assoc!",
+      "assoc-in", "associative?", "atom", "await", "await-for", "await1",
+      "bases", "bean", "bigdec", "bigint", "biginteger", "binding", "bit-and",
+      "bit-and-not", "bit-clear", "bit-flip", "bit-not", "bit-or", "bit-set",
+      "bit-shift-left", "bit-shift-right", "bit-test", "bit-xor", "boolean",
+      "boolean-array", "boolean?", "booleans", "bound-fn", "bound-fn*",
+      "bound?", "bounded-count", "butlast", "byte", "byte-array", "bytes",
+      "bytes?", "case", "cast", "cat", "char", "char-array",
+      "char-escape-string", "char-name-string", "char?", "chars", "chunk",
+      "chunk-append", "chunk-buffer", "chunk-cons", "chunk-first", "chunk-next",
+      "chunk-rest", "chunked-seq?", "class", "class?", "clear-agent-errors",
+      "clojure-version", "coll?", "comment", "commute", "comp", "comparator",
+      "compare", "compare-and-set!", "compile", "complement", "completing",
+      "concat", "cond", "cond->", "cond->>", "condp", "conj", "conj!", "cons",
+      "constantly", "construct-proxy", "contains?", "count", "counted?",
+      "create-ns", "create-struct", "cycle", "dec", "dec'", "decimal?",
+      "declare", "dedupe", "default-data-readers", "definline", "definterface",
+      "defmacro", "defmethod", "defmulti", "defn", "defn-", "defonce",
+      "defprotocol", "defrecord", "defstruct", "deftype", "delay", "delay?",
+      "deliver", "denominator", "deref", "derive", "descendants", "destructure",
+      "disj", "disj!", "dissoc", "dissoc!", "distinct", "distinct?", "doall",
+      "dorun", "doseq", "dosync", "dotimes", "doto", "double", "double-array",
+      "double?", "doubles", "drop", "drop-last", "drop-while", "eduction",
+      "empty", "empty?", "ensure", "ensure-reduced", "enumeration-seq",
+      "error-handler", "error-mode", "eval", "even?", "every-pred", "every?",
+      "ex-data", "ex-info", "extend", "extend-protocol", "extend-type",
+      "extenders", "extends?", "false?", "ffirst", "file-seq", "filter",
+      "filterv", "find", "find-keyword", "find-ns", "find-protocol-impl",
+      "find-protocol-method", "find-var", "first", "flatten", "float",
+      "float-array", "float?", "floats", "flush", "fn", "fn?", "fnext", "fnil",
+      "for", "force", "format", "frequencies", "future", "future-call",
+      "future-cancel", "future-cancelled?", "future-done?", "future?",
+      "gen-class", "gen-interface", "gensym", "get", "get-in", "get-method",
+      "get-proxy-class", "get-thread-bindings", "get-validator", "group-by",
+      "halt-when", "hash", "hash-combine", "hash-map", "hash-ordered-coll",
+      "hash-set", "hash-unordered-coll", "ident?", "identical?", "identity",
+      "if-let", "if-not", "if-some", "ifn?", "import", "in-ns", "inc", "inc'",
+      "indexed?", "init-proxy", "inst-ms", "inst-ms*", "inst?", "instance?",
+      "int", "int-array", "int?", "integer?", "interleave", "intern",
+      "interpose", "into", "into-array", "ints", "io!", "isa?", "iterate",
+      "iterator-seq", "juxt", "keep", "keep-indexed", "key", "keys", "keyword",
+      "keyword?", "last", "lazy-cat", "lazy-seq", "let", "letfn", "line-seq",
+      "list", "list*", "list?", "load", "load-file", "load-reader",
+      "load-string", "loaded-libs", "locking", "long", "long-array", "longs",
+      "loop", "macroexpand", "macroexpand-1", "make-array", "make-hierarchy",
+      "map", "map-entry?", "map-indexed", "map?", "mapcat", "mapv", "max",
+      "max-key", "memfn", "memoize", "merge", "merge-with", "meta",
+      "method-sig", "methods", "min", "min-key", "mix-collection-hash", "mod",
+      "munge", "name", "namespace", "namespace-munge", "nat-int?", "neg-int?",
+      "neg?", "newline", "next", "nfirst", "nil?", "nnext", "not", "not-any?",
+      "not-empty", "not-every?", "not=", "ns", "ns-aliases", "ns-imports",
+      "ns-interns", "ns-map", "ns-name", "ns-publics", "ns-refers",
+      "ns-resolve", "ns-unalias", "ns-unmap", "nth", "nthnext", "nthrest",
+      "num", "number?", "numerator", "object-array", "odd?", "or", "parents",
+      "partial", "partition", "partition-all", "partition-by", "pcalls", "peek",
+      "persistent!", "pmap", "pop", "pop!", "pop-thread-bindings", "pos-int?",
+      "pos?", "pr", "pr-str", "prefer-method", "prefers",
+      "primitives-classnames", "print", "print-ctor", "print-dup",
+      "print-method", "print-simple", "print-str", "printf", "println",
+      "println-str", "prn", "prn-str", "promise", "proxy",
+      "proxy-call-with-super", "proxy-mappings", "proxy-name", "proxy-super",
+      "push-thread-bindings", "pvalues", "qualified-ident?",
+      "qualified-keyword?", "qualified-symbol?", "quot", "rand", "rand-int",
+      "rand-nth", "random-sample", "range", "ratio?", "rational?",
+      "rationalize", "re-find", "re-groups", "re-matcher", "re-matches",
+      "re-pattern", "re-seq", "read", "read-line", "read-string",
+      "reader-conditional", "reader-conditional?", "realized?", "record?",
+      "reduce", "reduce-kv", "reduced", "reduced?", "reductions", "ref",
+      "ref-history-count", "ref-max-history", "ref-min-history", "ref-set",
+      "refer", "refer-clojure", "reify", "release-pending-sends", "rem",
+      "remove", "remove-all-methods", "remove-method", "remove-ns",
+      "remove-watch", "repeat", "repeatedly", "replace", "replicate", "require",
+      "reset!", "reset-meta!", "reset-vals!", "resolve", "rest",
+      "restart-agent", "resultset-seq", "reverse", "reversible?", "rseq",
+      "rsubseq", "run!", "satisfies?", "second", "select-keys", "send",
+      "send-off", "send-via", "seq", "seq?", "seqable?", "seque", "sequence",
+      "sequential?", "set", "set-agent-send-executor!",
+      "set-agent-send-off-executor!", "set-error-handler!", "set-error-mode!",
+      "set-validator!", "set?", "short", "short-array", "shorts", "shuffle",
+      "shutdown-agents", "simple-ident?", "simple-keyword?", "simple-symbol?",
+      "slurp", "some", "some->", "some->>", "some-fn", "some?", "sort",
+      "sort-by", "sorted-map", "sorted-map-by", "sorted-set", "sorted-set-by",
+      "sorted?", "special-symbol?", "spit", "split-at", "split-with", "str",
+      "string?", "struct", "struct-map", "subs", "subseq", "subvec", "supers",
+      "swap!", "swap-vals!", "symbol", "symbol?", "sync", "tagged-literal",
+      "tagged-literal?", "take", "take-last", "take-nth", "take-while", "test",
+      "the-ns", "thread-bound?", "time", "to-array", "to-array-2d",
+      "trampoline", "transduce", "transient", "tree-seq", "true?", "type",
+      "unchecked-add", "unchecked-add-int", "unchecked-byte", "unchecked-char",
+      "unchecked-dec", "unchecked-dec-int", "unchecked-divide-int",
+      "unchecked-double", "unchecked-float", "unchecked-inc",
+      "unchecked-inc-int", "unchecked-int", "unchecked-long",
+      "unchecked-multiply", "unchecked-multiply-int", "unchecked-negate",
+      "unchecked-negate-int", "unchecked-remainder-int", "unchecked-short",
+      "unchecked-subtract", "unchecked-subtract-int", "underive", "unquote",
+      "unquote-splicing", "unreduced", "unsigned-bit-shift-right", "update",
+      "update-in", "update-proxy", "uri?", "use", "uuid?", "val", "vals",
+      "var-get", "var-set", "var?", "vary-meta", "vec", "vector", "vector-of",
+      "vector?", "volatile!", "volatile?", "vreset!", "vswap!", "when",
+      "when-first", "when-let", "when-not", "when-some", "while",
+      "with-bindings", "with-bindings*", "with-in-str", "with-loading-context",
+      "with-local-vars", "with-meta", "with-open", "with-out-str",
+      "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
+      "zipmap"];
+  var haveBodyParameter = [
+      "->", "->>", "as->", "binding", "bound-fn", "case", "catch", "comment",
+      "cond", "cond->", "cond->>", "condp", "def", "definterface", "defmethod",
+      "defn", "defmacro", "defprotocol", "defrecord", "defstruct", "deftype",
+      "do", "doseq", "dotimes", "doto", "extend", "extend-protocol",
+      "extend-type", "fn", "for", "future", "if", "if-let", "if-not", "if-some",
+      "let", "letfn", "locking", "loop", "ns", "proxy", "reify", "struct-map",
+      "some->", "some->>", "try", "when", "when-first", "when-let", "when-not",
+      "when-some", "while", "with-bindings", "with-bindings*", "with-in-str",
+      "with-loading-context", "with-local-vars", "with-meta", "with-open",
+      "with-out-str", "with-precision", "with-redefs", "with-redefs-fn"];
 
-    function makeKeywords(str) {
-        var obj = {}, words = str.split(" ");
-        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-        return obj;
+  CodeMirror.registerHelper("hintWords", "clojure",
+    [].concat(atoms, specialForms, coreSymbols));
+
+  var atom = createLookupMap(atoms);
+  var specialForm = createLookupMap(specialForms);
+  var coreSymbol = createLookupMap(coreSymbols);
+  var hasBodyParameter = createLookupMap(haveBodyParameter);
+  var delimiter = /^(?:[\\\[\]\s"(),;@^`{}~]|$)/;
+  var numberLiteral = /^(?:[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?(?=[\\\[\]\s"#'(),;@^`{}~]|$))/;
+  var characterLiteral = /^(?:\\(?:backspace|formfeed|newline|return|space|tab|o[0-7]{3}|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{4}|.)?(?=[\\\[\]\s"(),;@^`{}~]|$))/;
+
+  // simple-namespace := /^[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*/
+  // simple-symbol    := /^(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)/
+  // qualified-symbol := (<simple-namespace>(<.><simple-namespace>)*</>)?<simple-symbol>
+  var qualifiedSymbol = /^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/;
+
+  function base(stream, state) {
+    if (stream.eatSpace()) return ["space", null];
+    if (stream.match(numberLiteral)) return [null, "number"];
+    if (stream.match(characterLiteral)) return [null, "string-2"];
+    if (stream.eat(/^"/)) return (state.tokenize = inString)(stream, state);
+    if (stream.eat(/^[(\[{]/)) return ["open", "bracket"];
+    if (stream.eat(/^[)\]}]/)) return ["close", "bracket"];
+    if (stream.eat(/^;/)) {stream.skipToEnd(); return ["space", "comment"];}
+    if (stream.eat(/^[#'@^`~]/)) return [null, "meta"];
+
+    var matches = stream.match(qualifiedSymbol);
+    var symbol = matches && matches[0];
+
+    if (!symbol) {
+      // advance stream by at least one character so we don't get stuck.
+      stream.next();
+      stream.eatWhile(function (c) {return !is(c, delimiter);});
+      return [null, "error"];
     }
 
-    var atoms = makeKeywords("true false nil");
+    if (symbol === "comment" && state.lastToken === "(")
+      return (state.tokenize = inComment)(stream, state);
+    if (is(symbol, atom) || symbol.charAt(0) === ":") return ["symbol", "atom"];
+    if (is(symbol, specialForm) || is(symbol, coreSymbol)) return ["symbol", "keyword"];
+    if (state.lastToken === "(") return ["symbol", "builtin"]; // other operator
 
-    var keywords = makeKeywords(
-      "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest " +
-      "slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn " +
-      "do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync " +
-      "doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars " +
-      "binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
+    return ["symbol", "variable"];
+  }
 
-    var builtins = makeKeywords(
-        "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* " +
-        "*compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* " +
-        "*math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* " +
-        "*source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> " +
-        "->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor " +
-        "aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! " +
-        "alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double " +
-        "aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 " +
-        "bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set " +
-        "bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast " +
-        "byte byte-array bytes case cat cast char char-array char-escape-string char-name-string char? chars chunk chunk-append " +
-        "chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors " +
-        "clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement completing concat cond condp " +
-        "conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? " +
-        "declare dedupe default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol " +
-        "defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc " +
-        "dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last " +
-        "drop-while eduction empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info " +
-        "extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword " +
-        "find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? " +
-        "fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? " +
-        "gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash " +
-        "hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? " +
-        "int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep " +
-        "keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file " +
-        "load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array " +
-        "make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods " +
-        "min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty " +
-        "not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias " +
-        "ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all " +
-        "partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers " +
-        "primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str " +
-        "prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues " +
-        "quot rand rand-int rand-nth random-sample range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern " +
-        "re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history " +
-        "ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods " +
-        "remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest " +
-        "restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? " +
-        "seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts " +
-        "shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? " +
-        "special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol " +
-        "symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transduce " +
-        "transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec " +
-        "unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int " +
-        "unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int "+
-        "unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote " +
-        "unquote-splicing update update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of " +
-        "vector? volatile! volatile? vreset! vswap! when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context " +
-        "with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap " +
-        "*default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! " +
-        "set-agent-send-off-executor! some-> some->>");
+  function inString(stream, state) {
+    var escaped = false, next;
 
-    var indentKeys = makeKeywords(
-        // Built-ins
-        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto " +
-        "locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type " +
-        "try catch " +
-
-        // Binding forms
-        "let letfn binding loop for doseq dotimes when-let if-let " +
-
-        // Data structures
-        "defstruct struct-map assoc " +
-
-        // clojure.test
-        "testing deftest " +
-
-        // contrib
-        "handler-case handle dotrace deftrace");
-
-    var tests = {
-        digit: /\d/,
-        digit_or_colon: /[\d:]/,
-        hex: /[0-9a-f]/i,
-        sign: /[+-]/,
-        exponent: /e/i,
-        keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/,
-        block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
-    };
-
-    function stateStack(indent, type, prev) { // represents a state stack object
-        this.indent = indent;
-        this.type = type;
-        this.prev = prev;
+    while (next = stream.next()) {
+      if (next === "\"" && !escaped) {state.tokenize = base; break;}
+      escaped = !escaped && next === "\\";
     }
 
-    function pushStack(state, indent, type) {
-        state.indentStack = new stateStack(indent, type, state.indentStack);
+    return [null, "string"];
+  }
+
+  function inComment(stream, state) {
+    var parenthesisCount = 1;
+    var next;
+
+    while (next = stream.next()) {
+      if (next === ")") parenthesisCount--;
+      if (next === "(") parenthesisCount++;
+      if (parenthesisCount === 0) {
+        stream.backUp(1);
+        state.tokenize = base;
+        break;
+      }
     }
 
-    function popStack(state) {
-        state.indentStack = state.indentStack.prev;
-    }
+    return ["space", "comment"];
+  }
 
-    function isNumber(ch, stream){
-        // hex
-        if ( ch === '0' && stream.eat(/x/i) ) {
-            stream.eatWhile(tests.hex);
-            return true;
+  function createLookupMap(words) {
+    var obj = {};
+
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+
+    return obj;
+  }
+
+  function is(value, test) {
+    if (test instanceof RegExp) return test.test(value);
+    if (test instanceof Object) return test.propertyIsEnumerable(value);
+  }
+
+  return {
+    startState: function () {
+      return {
+        ctx: {prev: null, start: 0, indentTo: 0},
+        lastToken: null,
+        tokenize: base
+      };
+    },
+
+    token: function (stream, state) {
+      if (stream.sol() && (typeof state.ctx.indentTo !== "number"))
+        state.ctx.indentTo = state.ctx.start + 1;
+
+      var typeStylePair = state.tokenize(stream, state);
+      var type = typeStylePair[0];
+      var style = typeStylePair[1];
+      var current = stream.current();
+
+      if (type !== "space") {
+        if (state.lastToken === "(" && state.ctx.indentTo === null) {
+          if (type === "symbol" && is(current, hasBodyParameter))
+            state.ctx.indentTo = state.ctx.start + options.indentUnit;
+          else state.ctx.indentTo = "next";
+        } else if (state.ctx.indentTo === "next") {
+          state.ctx.indentTo = stream.column();
         }
 
-        // leading sign
-        if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
-          stream.eat(tests.sign);
-          ch = stream.next();
-        }
+        state.lastToken = current;
+      }
 
-        if ( tests.digit.test(ch) ) {
-            stream.eat(ch);
-            stream.eatWhile(tests.digit);
+      if (type === "open")
+        state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
+      else if (type === "close") state.ctx = state.ctx.prev || state.ctx;
 
-            if ( '.' == stream.peek() ) {
-                stream.eat('.');
-                stream.eatWhile(tests.digit);
-            } else if ('/' == stream.peek() ) {
-                stream.eat('/');
-                stream.eatWhile(tests.digit);
-            }
+      return style;
+    },
 
-            if ( stream.eat(tests.exponent) ) {
-                stream.eat(tests.sign);
-                stream.eatWhile(tests.digit);
-            }
+    indent: function (state) {
+      var i = state.ctx.indentTo;
 
-            return true;
-        }
+      return (typeof i === "number") ?
+        i :
+        state.ctx.start + 1;
+    },
 
-        return false;
-    }
-
-    // Eat character that starts after backslash \
-    function eatCharacter(stream) {
-        var first = stream.next();
-        // Read special literals: backspace, newline, space, return.
-        // Just read all lowercase letters.
-        if (first && first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
-            return;
-        }
-        // Read unicode character: \u1000 \uA0a1
-        if (first === "u") {
-            stream.match(/[0-9a-z]{4}/i, true);
-        }
-    }
-
-    return {
-        startState: function () {
-            return {
-                indentStack: null,
-                indentation: 0,
-                mode: false
-            };
-        },
-
-        token: function (stream, state) {
-            if (state.indentStack == null && stream.sol()) {
-                // update indentation, but only if indentStack is empty
-                state.indentation = stream.indentation();
-            }
-
-            // skip spaces
-            if (state.mode != "string" && stream.eatSpace()) {
-                return null;
-            }
-            var returnType = null;
-
-            switch(state.mode){
-                case "string": // multi-line string parsing mode
-                    var next, escaped = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "\"" && !escaped) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        escaped = !escaped && next == "\\";
-                    }
-                    returnType = STRING; // continue on in string mode
-                    break;
-                default: // default parsing mode
-                    var ch = stream.next();
-
-                    if (ch == "\"") {
-                        state.mode = "string";
-                        returnType = STRING;
-                    } else if (ch == "\\") {
-                        eatCharacter(stream);
-                        returnType = CHARACTER;
-                    } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
-                        returnType = ATOM;
-                    } else if (ch == ";") { // comment
-                        stream.skipToEnd(); // rest of the line is a comment
-                        returnType = COMMENT;
-                    } else if (isNumber(ch,stream)){
-                        returnType = NUMBER;
-                    } else if (ch == "(" || ch == "[" || ch == "{" ) {
-                        var keyWord = '', indentTemp = stream.column(), letter;
-                        /**
-                        Either
-                        (indent-word ..
-                        (non-indent-word ..
-                        (;something else, bracket, etc.
-                        */
-
-                        if (ch == "(") while ((letter = stream.eat(tests.keyword_char)) != null) {
-                            keyWord += letter;
-                        }
-
-                        if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
-                                                   tests.block_indent.test(keyWord))) { // indent-word
-                            pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
-                        } else { // non-indent word
-                            // we continue eating the spaces
-                            stream.eatSpace();
-                            if (stream.eol() || stream.peek() == ";") {
-                                // nothing significant after
-                                // we restart indentation the user defined spaces after
-                                pushStack(state, indentTemp + NORMAL_INDENT_UNIT, ch);
-                            } else {
-                                pushStack(state, indentTemp + stream.current().length, ch); // else we match
-                            }
-                        }
-                        stream.backUp(stream.current().length - 1); // undo all the eating
-
-                        returnType = BRACKET;
-                    } else if (ch == ")" || ch == "]" || ch == "}") {
-                        returnType = BRACKET;
-                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : (ch == "]" ? "[" :"{"))) {
-                            popStack(state);
-                        }
-                    } else if ( ch == ":" ) {
-                        stream.eatWhile(tests.symbol);
-                        return ATOM;
-                    } else {
-                        stream.eatWhile(tests.symbol);
-
-                        if (keywords && keywords.propertyIsEnumerable(stream.current())) {
-                            returnType = KEYWORD;
-                        } else if (builtins && builtins.propertyIsEnumerable(stream.current())) {
-                            returnType = BUILTIN;
-                        } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
-                            returnType = ATOM;
-                        } else {
-                          returnType = VAR;
-                        }
-                    }
-            }
-
-            return returnType;
-        },
-
-        indent: function (state) {
-            if (state.indentStack == null) return state.indentation;
-            return state.indentStack.indent;
-        },
-
-        closeBrackets: {pairs: "()[]{}\"\""},
-        lineComment: ";;"
-    };
+    closeBrackets: {pairs: "()[]{}\"\""},
+    lineComment: ";;"
+  };
 });
 
 CodeMirror.defineMIME("text/x-clojure", "clojure");
diff --git a/src/public/libraries/codemirror/mode/clojure/index.html b/src/public/libraries/codemirror/mode/clojure/index.html
index 81294bc14..ff9ac3ae6 100644
--- a/src/public/libraries/codemirror/mode/clojure/index.html
+++ b/src/public/libraries/codemirror/mode/clojure/index.html
@@ -6,10 +6,12 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/closebrackets.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clojure.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
@@ -25,65 +27,67 @@
 <article>
 <h2>Clojure mode</h2>
 <form><textarea id="code" name="code">
-; Conway's Game of Life, based on the work of:
-;; Laurent Petit https://gist.github.com/1200343
-;; Christophe Grand http://clj-me.cgrand.net/2011/08/19/conways-game-of-life
+(ns game-of-life
+  "Conway's Game of Life, based on the work of
+  Christophe Grand (http://clj-me.cgrand.net/2011/08/19/conways-game-of-life)
+  and Laurent Petit (https://gist.github.com/1200343).")
 
-(ns ^{:doc "Conway's Game of Life."}
- game-of-life)
+;;; Core game of life's algorithm functions
 
-;; Core game of life's algorithm functions
-
-(defn neighbours
-  "Given a cell's coordinates, returns the coordinates of its neighbours."
+(defn neighbors
+  "Given a cell's coordinates `[x y]`, returns the coordinates of its
+  neighbors."
   [[x y]]
-  (for [dx [-1 0 1] dy (if (zero? dx) [-1 1] [-1 0 1])]
+  (for [dx [-1 0 1]
+        dy (if (zero? dx)
+             [-1 1]
+             [-1 0 1])]
     [(+ dx x) (+ dy y)]))
 
 (defn step
-  "Given a set of living cells, computes the new set of living cells."
+  "Given a set of living `cells`, computes the new set of living cells."
   [cells]
-  (set (for [[cell n] (frequencies (mapcat neighbours cells))
-             :when (or (= n 3) (and (= n 2) (cells cell)))]
+  (set (for [[cell n] (frequencies (mapcat neighbors cells))
+             :when (or (= n 3)
+                       (and (= n 2)
+                            (cells cell)))]
          cell)))
 
-;; Utility methods for displaying game on a text terminal
+;;; Utility methods for displaying game on a text terminal
 
-(defn print-board
-  "Prints a board on *out*, representing a step in the game."
-  [board w h]
-  (doseq [x (range (inc w)) y (range (inc h))]
-    (if (= y 0) (print "\n"))
-    (print (if (board [x y]) "[X]" " . "))))
+(defn print-grid
+  "Prints a `grid` of `w` columns and `h` rows, on *out*, representing a
+  step in the game."
+  [grid w h]
+  (doseq [x (range (inc w))
+          y (range (inc h))]
+    (when (= y 0) (println))
+    (print (if (grid [x y])
+             "[X]"
+             " . "))))
 
-(defn display-grids
-  "Prints a squence of boards on *out*, representing several steps."
+(defn print-grids
+  "Prints a sequence of `grids` of `w` columns and `h` rows on *out*,
+  representing several steps."
   [grids w h]
-  (doseq [board grids]
-    (print-board board w h)
-    (print "\n")))
+  (doseq [grid grids]
+    (print-grid grid w h)
+    (println)))
 
-;; Launches an example board
+;;; Launches an example grid
 
-(def
-  ^{:doc "board represents the initial set of living cells"}
-   board #{[2 1] [2 2] [2 3]})
+(def grid
+  "`grid` represents the initial set of living cells"
+  #{[2 1] [2 2] [2 3]})
 
-(display-grids (take 3 (iterate step board)) 5 5)
-
-;; Let's play with characters
-(println \1 \a \# \\
-         \" \( \newline
-         \} \" \space
-         \tab \return \backspace
-         \u1000 \uAaAa \u9F9F)
-
-;; Let's play with numbers
-(+ 1 -1 1/2 -1/2 -0.5 0.5)
-
-</textarea></form>
+(print-grids (take 3 (iterate step grid)) 5 5)</textarea></form>
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+          autoCloseBrackets: true,
+          lineNumbers: true,
+          matchBrackets: true,
+          mode: 'text/x-clojure'
+      });
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-clojure</code>.</p>
diff --git a/src/public/libraries/codemirror/mode/clojure/test.js b/src/public/libraries/codemirror/mode/clojure/test.js
new file mode 100644
index 000000000..642473b28
--- /dev/null
+++ b/src/public/libraries/codemirror/mode/clojure/test.js
@@ -0,0 +1,384 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function () {
+    var mode = CodeMirror.getMode({indentUnit: 2}, "clojure");
+
+    function MT(name) {
+        test.mode(name, mode, Array.prototype.slice.call(arguments, 1));
+    }
+
+    MT("atoms",
+        "[atom false]",
+        "[atom nil]",
+        "[atom true]"
+    );
+
+    MT("keywords",
+        "[atom :foo]",
+        "[atom ::bar]",
+        "[atom :foo/bar]",
+        "[atom :foo.bar/baz]"
+    );
+
+    MT("numbers",
+        "[number 42] [number +42] [number -421]",
+        "[number 42N] [number +42N] [number -42N]",
+        "[number 0.42] [number +0.42] [number -0.42]",
+        "[number 42M] [number +42M] [number -42M]",
+        "[number 42.42M] [number +42.42M] [number -42.42M]",
+        "[number 1/42] [number +1/42] [number -1/42]",
+        "[number 0x42af] [number +0x42af] [number -0x42af]",
+        "[number 0x42AF] [number +0x42AF] [number -0x42AF]",
+        "[number 1e2] [number 1e+2] [number 1e-2]",
+        "[number +1e2] [number +1e+2] [number +1e-2]",
+        "[number -1e2] [number -1e+2] [number -1e-2]",
+        "[number -1.0e2] [number -0.1e+2] [number -1.01e-2]",
+        "[number 1E2] [number 1E+2] [number 1E-2]",
+        "[number +1E2] [number +1E+2] [number +1E-2]",
+        "[number -1E2] [number -1E+2] [number -1E-2]",
+        "[number -1.0E2] [number -0.1E+2] [number -1.01E-2]",
+        "[number 2r101010] [number +2r101010] [number -2r101010]",
+        "[number 2r101010] [number +2r101010] [number -2r101010]",
+        "[number 8r52] [number +8r52] [number -8r52]",
+        "[number 36rhello] [number +36rhello] [number -36rhello]",
+        "[number 36rz] [number +36rz] [number -36rz]",
+        "[number 36rZ] [number +36rZ] [number -36rZ]",
+
+        // invalid numbers
+        "[error 42foo]",
+        "[error 42Nfoo]",
+        "[error 42Mfoo]",
+        "[error 42.42Mfoo]",
+        "[error 42.42M!]",
+        "[error 42!]",
+        "[error 0x42afm]"
+    );
+
+    MT("characters",
+        "[string-2 \\1]",
+        "[string-2 \\a]",
+        "[string-2 \\a\\b\\c]",
+        "[string-2 \\#]",
+        "[string-2 \\\\]",
+        "[string-2 \\\"]",
+        "[string-2 \\(]",
+        "[string-2 \\A]",
+        "[string-2 \\backspace]",
+        "[string-2 \\formfeed]",
+        "[string-2 \\newline]",
+        "[string-2 \\space]",
+        "[string-2 \\return]",
+        "[string-2 \\tab]",
+        "[string-2 \\u1000]",
+        "[string-2 \\uAaAa]",
+        "[string-2 \\u9F9F]",
+        "[string-2 \\o123]",
+        "[string-2 \\符]",
+        "[string-2 \\シ]",
+        "[string-2 \\ۇ]",
+        // FIXME
+        // "[string-2 \\🙂]",
+
+        // invalid character literals
+        "[error \\abc]",
+        "[error \\a123]",
+        "[error \\a!]",
+        "[error \\newlines]",
+        "[error \\NEWLINE]",
+        "[error \\u9F9FF]",
+        "[error \\o1234]"
+    );
+
+    MT("strings",
+        "[string \"I'm a teapot.\"]",
+        "[string \"I'm a \\\"teapot\\\".\"]",
+        "[string \"I'm]",       // this is
+        "[string a]",           // a multi-line
+        "[string teapot.\"]"    // string
+
+        // TODO unterminated (multi-line) strings?
+    );
+
+    MT("comments",
+        "[comment ; this is an in-line comment.]",
+        "[comment ;; this is a line comment.]",
+        "[keyword comment]",
+        "[bracket (][comment comment (foo 1 2 3)][bracket )]"
+    );
+
+    MT("reader macro characters",
+        "[meta #][variable _]",
+        "[meta #][variable -Inf]",
+        "[meta ##][variable Inf]",
+        "[meta ##][variable NaN]",
+        "[meta @][variable x]",
+        "[meta ^][bracket {][atom :tag] [variable String][bracket }]",
+        "[meta `][bracket (][builtin f] [variable x][bracket )]",
+        "[meta ~][variable foo#]",
+        "[meta '][number 1]",
+        "[meta '][atom :foo]",
+        "[meta '][string \"foo\"]",
+        "[meta '][variable x]",
+        "[meta '][bracket (][builtin a] [variable b] [variable c][bracket )]",
+        "[meta '][bracket [[][variable a] [variable b] [variable c][bracket ]]]",
+        "[meta '][bracket {][variable a] [number 1] [atom :foo] [number 2] [variable c] [number 3][bracket }]",
+        "[meta '#][bracket {][variable a] [number 1] [atom :foo][bracket }]"
+    );
+
+    MT("symbols",
+      "[variable foo!]",
+      "[variable foo#]",
+      "[variable foo$]",
+      "[variable foo&]",
+      "[variable foo']",
+      "[variable foo*]",
+      "[variable foo+]",
+      "[variable foo-]",
+      "[variable foo.]",
+      "[variable foo/bar]",
+      "[variable foo:bar]",
+      "[variable foo<]",
+      "[variable foo=]",
+      "[variable foo>]",
+      "[variable foo?]",
+      "[variable foo_]",
+      "[variable foo|]",
+      "[variable foobarBaz]",
+      "[variable foo¡]",
+      "[variable 符号]",
+      "[variable シンボル]",
+      "[variable ئۇيغۇر]",
+      "[variable 🙂❤🇺🇸]",
+
+      // invalid symbols
+      "[error 3foo]",
+      "[error 3+]",
+      "[error 3|]",
+      "[error 3_]"
+    );
+
+    MT("numbers and other forms",
+      "[number 42][bracket (][builtin foo][bracket )]",
+      "[number 42][bracket [[][variable foo][bracket ]]]",
+      "[number 42][meta #][bracket {][variable foo][bracket }]",
+      "[number 42][bracket {][atom :foo] [variable bar][bracket }]",
+      "[number 42][meta `][variable foo]",
+      "[number 42][meta ~][variable foo]",
+      "[number 42][meta #][variable foo]"
+    );
+
+    var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
+        "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
+
+    MT("should highlight special forms as keywords",
+        typeTokenPairs("keyword", specialForms)
+    );
+
+    var coreSymbols1 = [
+        "*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
+        "*clojure-version*", "*command-line-args*", "*compile-files*", "*compile-path*", "*compiler-options*",
+        "*data-readers*", "*default-data-reader-fn*", "*e", "*err*", "*file*", "*flush-on-newline*", "*fn-loader*",
+        "*in*", "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*", "*print-level*", "*print-meta*",
+        "*print-namespace-maps*", "*print-readably*", "*read-eval*", "*reader-resolver*", "*source-path*",
+        "*suppress-read*", "*unchecked-math*", "*use-context-classloader*", "*verbose-defrecords*",
+        "*warn-on-reflection*", "+", "+'", "-", "-'", "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
+        "->VecSeq", "-cache-protocol-fn", "-reset-methods", "..", "/", "<", "<=", "=", "==", ">", ">=",
+        "EMPTY-NODE", "Inst", "StackTraceElement->vec", "Throwable->map", "accessor", "aclone", "add-classpath",
+        "add-watch", "agent", "agent-error", "agent-errors", "aget", "alength", "alias", "all-ns", "alter",
+        "alter-meta!", "alter-var-root", "amap", "ancestors", "and", "any?", "apply", "areduce", "array-map",
+        "as->", "aset", "aset-boolean", "aset-byte", "aset-char", "aset-double", "aset-float", "aset-int",
+        "aset-long", "aset-short", "assert", "assoc", "assoc!", "assoc-in", "associative?", "atom", "await",
+        "await-for", "await1", "bases", "bean", "bigdec", "bigint", "biginteger", "binding", "bit-and", "bit-and-not",
+        "bit-clear", "bit-flip", "bit-not", "bit-or", "bit-set", "bit-shift-left", "bit-shift-right", "bit-test",
+        "bit-xor", "boolean", "boolean-array", "boolean?", "booleans", "bound-fn", "bound-fn*", "bound?",
+        "bounded-count", "butlast", "byte", "byte-array", "bytes", "bytes?", "case", "cast", "cat", "char",
+        "char-array", "char-escape-string", "char-name-string", "char?", "chars", "chunk", "chunk-append",
+        "chunk-buffer", "chunk-cons", "chunk-first", "chunk-next", "chunk-rest", "chunked-seq?", "class", "class?",
+        "clear-agent-errors", "clojure-version", "coll?", "comment", "commute", "comp", "comparator", "compare",
+        "compare-and-set!", "compile", "complement", "completing", "concat", "cond", "cond->", "cond->>", "condp",
+        "conj", "conj!", "cons", "constantly", "construct-proxy", "contains?", "count", "counted?", "create-ns",
+        "create-struct", "cycle", "dec", "dec'", "decimal?", "declare", "dedupe", "default-data-readers", "definline",
+        "definterface", "defmacro", "defmethod", "defmulti", "defn", "defn-", "defonce", "defprotocol", "defrecord",
+        "defstruct", "deftype", "delay", "delay?", "deliver", "denominator", "deref", "derive", "descendants",
+        "destructure", "disj", "disj!", "dissoc", "dissoc!", "distinct", "distinct?", "doall", "dorun", "doseq",
+        "dosync", "dotimes", "doto", "double", "double-array", "double?", "doubles", "drop", "drop-last", "drop-while",
+        "eduction", "empty", "empty?", "ensure", "ensure-reduced", "enumeration-seq", "error-handler", "error-mode",
+        "eval", "even?", "every-pred", "every?", "ex-data", "ex-info", "extend", "extend-protocol", "extend-type",
+        "extenders", "extends?", "false?", "ffirst", "file-seq", "filter", "filterv", "find", "find-keyword", "find-ns",
+        "find-protocol-impl", "find-protocol-method", "find-var", "first", "flatten", "float", "float-array", "float?",
+        "floats", "flush", "fn", "fn?", "fnext", "fnil", "for", "force", "format", "frequencies", "future", "future-call",
+        "future-cancel", "future-cancelled?", "future-done?", "future?", "gen-class", "gen-interface", "gensym", "get",
+        "get-in", "get-method", "get-proxy-class", "get-thread-bindings", "get-validator", "group-by", "halt-when", "hash",
+        "hash-combine", "hash-map", "hash-ordered-coll", "hash-set", "hash-unordered-coll", "ident?", "identical?",
+        "identity", "if-let", "if-not", "if-some", "ifn?", "import", "in-ns", "inc", "inc'", "indexed?", "init-proxy",
+        "inst-ms", "inst-ms*", "inst?", "instance?", "int", "int-array", "int?", "integer?", "interleave", "intern",
+        "interpose", "into", "into-array", "ints", "io!", "isa?", "iterate", "iterator-seq", "juxt", "keep", "keep-indexed",
+        "key", "keys", "keyword", "keyword?", "last", "lazy-cat", "lazy-seq", "let", "letfn", "line-seq", "list", "list*",
+        "list?", "load", "load-file", "load-reader", "load-string", "loaded-libs", "locking", "long", "long-array", "longs",
+        "loop", "macroexpand", "macroexpand-1", "make-array", "make-hierarchy", "map", "map-entry?", "map-indexed", "map?",
+        "mapcat", "mapv", "max", "max-key", "memfn", "memoize", "merge", "merge-with", "meta", "method-sig", "methods"];
+
+    var coreSymbols2 = [
+        "min", "min-key", "mix-collection-hash", "mod", "munge", "name", "namespace", "namespace-munge", "nat-int?",
+        "neg-int?", "neg?", "newline", "next", "nfirst", "nil?", "nnext", "not", "not-any?", "not-empty", "not-every?",
+        "not=", "ns", "ns-aliases", "ns-imports", "ns-interns", "ns-map", "ns-name", "ns-publics", "ns-refers", "ns-resolve",
+        "ns-unalias", "ns-unmap", "nth", "nthnext", "nthrest", "num", "number?", "numerator", "object-array", "odd?", "or",
+        "parents", "partial", "partition", "partition-all", "partition-by", "pcalls", "peek", "persistent!", "pmap", "pop",
+        "pop!", "pop-thread-bindings", "pos-int?", "pos?", "pr", "pr-str", "prefer-method", "prefers",
+        "primitives-classnames", "print", "print-ctor", "print-dup", "print-method", "print-simple", "print-str", "printf",
+        "println", "println-str", "prn", "prn-str", "promise", "proxy", "proxy-call-with-super", "proxy-mappings",
+        "proxy-name", "proxy-super", "push-thread-bindings", "pvalues", "qualified-ident?", "qualified-keyword?",
+        "qualified-symbol?", "quot", "rand", "rand-int", "rand-nth", "random-sample", "range", "ratio?", "rational?",
+        "rationalize", "re-find", "re-groups", "re-matcher", "re-matches", "re-pattern", "re-seq", "read", "read-line",
+        "read-string", "reader-conditional", "reader-conditional?", "realized?", "record?", "reduce", "reduce-kv", "reduced",
+        "reduced?", "reductions", "ref", "ref-history-count", "ref-max-history", "ref-min-history", "ref-set", "refer",
+        "refer-clojure", "reify", "release-pending-sends", "rem", "remove", "remove-all-methods", "remove-method", "remove-ns",
+        "remove-watch", "repeat", "repeatedly", "replace", "replicate", "require", "reset!", "reset-meta!", "reset-vals!",
+        "resolve", "rest", "restart-agent", "resultset-seq", "reverse", "reversible?", "rseq", "rsubseq", "run!", "satisfies?",
+        "second", "select-keys", "send", "send-off", "send-via", "seq", "seq?", "seqable?", "seque", "sequence", "sequential?",
+        "set", "set-agent-send-executor!", "set-agent-send-off-executor!", "set-error-handler!", "set-error-mode!",
+        "set-validator!", "set?", "short", "short-array", "shorts", "shuffle", "shutdown-agents", "simple-ident?",
+        "simple-keyword?", "simple-symbol?", "slurp", "some", "some->", "some->>", "some-fn", "some?", "sort", "sort-by",
+        "sorted-map", "sorted-map-by", "sorted-set", "sorted-set-by", "sorted?", "special-symbol?", "spit", "split-at",
+        "split-with", "str", "string?", "struct", "struct-map", "subs", "subseq", "subvec", "supers", "swap!", "swap-vals!",
+        "symbol", "symbol?", "sync", "tagged-literal", "tagged-literal?", "take", "take-last", "take-nth", "take-while", "test",
+        "the-ns", "thread-bound?", "time", "to-array", "to-array-2d", "trampoline", "transduce", "transient", "tree-seq",
+        "true?", "type", "unchecked-add", "unchecked-add-int", "unchecked-byte", "unchecked-char", "unchecked-dec",
+        "unchecked-dec-int", "unchecked-divide-int", "unchecked-double", "unchecked-float", "unchecked-inc", "unchecked-inc-int",
+        "unchecked-int", "unchecked-long", "unchecked-multiply", "unchecked-multiply-int", "unchecked-negate",
+        "unchecked-negate-int", "unchecked-remainder-int", "unchecked-short", "unchecked-subtract", "unchecked-subtract-int",
+        "underive", "unquote", "unquote-splicing", "unreduced", "unsigned-bit-shift-right", "update", "update-in",
+        "update-proxy", "uri?", "use", "uuid?", "val", "vals", "var-get", "var-set", "var?", "vary-meta", "vec", "vector",
+        "vector-of", "vector?", "volatile!", "volatile?", "vreset!", "vswap!", "when", "when-first", "when-let", "when-not",
+        "when-some", "while", "with-bindings", "with-bindings*", "with-in-str", "with-loading-context", "with-local-vars",
+        "with-meta", "with-open", "with-out-str", "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
+        "zipmap"
+    ];
+
+    MT("should highlight core symbols as keywords (part 1/2)",
+        typeTokenPairs("keyword", coreSymbols1)
+    );
+
+    MT("should highlight core symbols as keywords (part 2/2)",
+        typeTokenPairs("keyword", coreSymbols2)
+    );
+
+    MT("should properly indent forms in list literals",
+        "[bracket (][builtin foo] [atom :a] [number 1] [atom true] [atom nil][bracket )]",
+        "",
+        "[bracket (][builtin foo] [atom :a]",
+        "     [number 1]",
+        "     [atom true]",
+        "     [atom nil][bracket )]",
+        "",
+        "[bracket (][builtin foo] [atom :a] [number 1]",
+        "     [atom true]",
+        "     [atom nil][bracket )]",
+        "",
+        "[bracket (]",
+        " [builtin foo]",
+        " [atom :a]",
+        " [number 1]",
+        " [atom true]",
+        " [atom nil][bracket )]",
+        "",
+        "[bracket (][builtin foo] [bracket [[][atom :a][bracket ]]]",
+        "     [number 1]",
+        "     [atom true]",
+        "     [atom nil][bracket )]"
+    );
+
+    MT("should properly indent forms in vector literals",
+        "[bracket [[][atom :a] [number 1] [atom true] [atom nil][bracket ]]]",
+        "",
+        "[bracket [[][atom :a]",
+        " [number 1]",
+        " [atom true]",
+        " [atom nil][bracket ]]]",
+        "",
+        "[bracket [[][atom :a] [number 1]",
+        " [atom true]",
+        " [atom nil][bracket ]]]",
+        "",
+        "[bracket [[]",
+        " [variable foo]",
+        " [atom :a]",
+        " [number 1]",
+        " [atom true]",
+        " [atom nil][bracket ]]]"
+    );
+
+    MT("should properly indent forms in map literals",
+        "[bracket {][atom :a] [atom :a] [atom :b] [number 1] [atom :c] [atom true] [atom :d] [atom nil] [bracket }]",
+        "",
+        "[bracket {][atom :a] [atom :a]",
+        " [atom :b] [number 1]",
+        " [atom :c] [atom true]",
+        " [atom :d] [atom nil][bracket }]",
+        "",
+        "[bracket {][atom :a]",
+        " [atom :a]",
+        " [atom :b]",
+        " [number 1]",
+        " [atom :c]",
+        " [atom true]",
+        " [atom :d]",
+        " [atom nil][bracket }]",
+        "",
+        "[bracket {]",
+        " [atom :a] [atom :a]",
+        " [atom :b] [number 1]",
+        " [atom :c] [atom true]",
+        " [atom :d] [atom nil][bracket }]"
+    );
+
+    MT("should properly indent forms in set literals",
+        "[meta #][bracket {][atom :a] [number 1] [atom true] [atom nil] [bracket }]",
+        "",
+        "[meta #][bracket {][atom :a]",
+        "  [number 1]",
+        "  [atom true]",
+        "  [atom nil][bracket }]",
+        "",
+        "[meta #][bracket {]",
+        "  [atom :a]",
+        "  [number 1]",
+        "  [atom true]",
+        "  [atom nil][bracket }]"
+    );
+
+    var haveBodyParameter = [
+        "->", "->>", "as->", "binding", "bound-fn", "case", "catch", "cond",
+        "cond->", "cond->>", "condp", "def", "definterface", "defmethod", "defn",
+        "defmacro", "defprotocol", "defrecord", "defstruct", "deftype", "do",
+        "doseq", "dotimes", "doto", "extend", "extend-protocol", "extend-type",
+        "fn", "for", "future", "if", "if-let", "if-not", "if-some", "let",
+        "letfn", "locking", "loop", "ns", "proxy", "reify", "some->", "some->>",
+        "struct-map", "try", "when", "when-first", "when-let", "when-not",
+        "when-some", "while", "with-bindings", "with-bindings*", "with-in-str",
+        "with-loading-context", "with-local-vars", "with-meta", "with-open",
+        "with-out-str", "with-precision", "with-redefs", "with-redefs-fn"];
+
+    function testFormsThatHaveBodyParameter(forms) {
+        for (var i = 0; i < forms.length; i++) {
+            MT("should indent body argument of `" + forms[i] + "` by `options.indentUnit` spaces",
+                "[bracket (][keyword " + forms[i] + "] [variable foo] [variable bar]",
+                "  [variable baz]",
+                "  [variable qux][bracket )]"
+            );
+        }
+    }
+
+    testFormsThatHaveBodyParameter(haveBodyParameter);
+
+    MT("should indent body argument of `comment` by `options.indentUnit` spaces",
+        "[bracket (][comment comment foo bar]",
+        "[comment  baz]",
+        "[comment  qux][bracket )]"
+    );
+
+    function typeTokenPairs(type, tokens) {
+        return "[" + type + " " + tokens.join("] [" + type + " ") + "]";
+    }
+})();
diff --git a/src/public/libraries/codemirror/mode/cmake/cmake.js b/src/public/libraries/codemirror/mode/cmake/cmake.js
index 9f9eda541..496c71d1f 100644
--- a/src/public/libraries/codemirror/mode/cmake/cmake.js
+++ b/src/public/libraries/codemirror/mode/cmake/cmake.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object")
diff --git a/src/public/libraries/codemirror/mode/cmake/index.html b/src/public/libraries/codemirror/mode/cmake/index.html
index ed114fece..6dcfd7b4a 100644
--- a/src/public/libraries/codemirror/mode/cmake/index.html
+++ b/src/public/libraries/codemirror/mode/cmake/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/cobol/cobol.js b/src/public/libraries/codemirror/mode/cobol/cobol.js
index 897022b18..275857b4b 100644
--- a/src/public/libraries/codemirror/mode/cobol/cobol.js
+++ b/src/public/libraries/codemirror/mode/cobol/cobol.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Author: Gautam Mehta
diff --git a/src/public/libraries/codemirror/mode/cobol/index.html b/src/public/libraries/codemirror/mode/cobol/index.html
index 4352419a0..1e0874052 100644
--- a/src/public/libraries/codemirror/mode/cobol/index.html
+++ b/src/public/libraries/codemirror/mode/cobol/index.html
@@ -39,7 +39,7 @@
         .CodeMirror-activeline-background {background: #555555 !important;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/coffeescript/coffeescript.js b/src/public/libraries/codemirror/mode/coffeescript/coffeescript.js
index ae955db34..a54e9d5ed 100644
--- a/src/public/libraries/codemirror/mode/coffeescript/coffeescript.js
+++ b/src/public/libraries/codemirror/mode/coffeescript/coffeescript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Link to the project's GitHub page:
diff --git a/src/public/libraries/codemirror/mode/coffeescript/index.html b/src/public/libraries/codemirror/mode/coffeescript/index.html
index 92d161e9d..650ccf5db 100644
--- a/src/public/libraries/codemirror/mode/coffeescript/index.html
+++ b/src/public/libraries/codemirror/mode/coffeescript/index.html
@@ -9,7 +9,7 @@
 <script src="coffeescript.js"></script>
 <style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/commonlisp/commonlisp.js b/src/public/libraries/codemirror/mode/commonlisp/commonlisp.js
index 8cd212d3a..52abbb25c 100644
--- a/src/public/libraries/codemirror/mode/commonlisp/commonlisp.js
+++ b/src/public/libraries/codemirror/mode/commonlisp/commonlisp.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/commonlisp/index.html b/src/public/libraries/codemirror/mode/commonlisp/index.html
index f2bf4522d..a5b907e83 100644
--- a/src/public/libraries/codemirror/mode/commonlisp/index.html
+++ b/src/public/libraries/codemirror/mode/commonlisp/index.html
@@ -9,7 +9,7 @@
 <script src="commonlisp.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/crystal/crystal.js b/src/public/libraries/codemirror/mode/crystal/crystal.js
index dada112da..5c601c6ab 100644
--- a/src/public/libraries/codemirror/mode/crystal/crystal.js
+++ b/src/public/libraries/codemirror/mode/crystal/crystal.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/crystal/index.html b/src/public/libraries/codemirror/mode/crystal/index.html
index 95412579f..ae4218eec 100644
--- a/src/public/libraries/codemirror/mode/crystal/index.html
+++ b/src/public/libraries/codemirror/mode/crystal/index.html
@@ -14,7 +14,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/css/css.js b/src/public/libraries/codemirror/mode/css/css.js
index f5f3a41ba..8b5722905 100644
--- a/src/public/libraries/codemirror/mode/css/css.js
+++ b/src/public/libraries/codemirror/mode/css/css.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/css/gss.html b/src/public/libraries/codemirror/mode/css/gss.html
index 232fe8c12..447929bf2 100644
--- a/src/public/libraries/codemirror/mode/css/gss.html
+++ b/src/public/libraries/codemirror/mode/css/gss.html
@@ -8,11 +8,12 @@
 <link rel="stylesheet" href="../../addon/hint/show-hint.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="css.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="../../addon/hint/show-hint.js"></script>
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
@@ -90,7 +91,7 @@ body {
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         extraKeys: {"Ctrl-Space": "autocomplete"},
         lineNumbers: true,
-        matchBrackets: "text/x-less",
+        matchBrackets: true,
         mode: "text/x-gss"
       });
     </script>
diff --git a/src/public/libraries/codemirror/mode/css/gss_test.js b/src/public/libraries/codemirror/mode/css/gss_test.js
index d56e59280..2401bc496 100644
--- a/src/public/libraries/codemirror/mode/css/gss_test.js
+++ b/src/public/libraries/codemirror/mode/css/gss_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   "use strict";
diff --git a/src/public/libraries/codemirror/mode/css/index.html b/src/public/libraries/codemirror/mode/css/index.html
index 0d85311f1..b39f12659 100644
--- a/src/public/libraries/codemirror/mode/css/index.html
+++ b/src/public/libraries/codemirror/mode/css/index.html
@@ -12,7 +12,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/css/less.html b/src/public/libraries/codemirror/mode/css/less.html
index adf7427d3..6ceb7a034 100644
--- a/src/public/libraries/codemirror/mode/css/less.html
+++ b/src/public/libraries/codemirror/mode/css/less.html
@@ -10,7 +10,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
@@ -140,8 +140,8 @@ fieldset span button, fieldset span input[type="file"] {
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers : true,
-        matchBrackets : true,
+        lineNumbers: true,
+        matchBrackets: true,
         mode: "text/x-less"
       });
     </script>
diff --git a/src/public/libraries/codemirror/mode/css/less_test.js b/src/public/libraries/codemirror/mode/css/less_test.js
index dd821558b..2e33a23c9 100644
--- a/src/public/libraries/codemirror/mode/css/less_test.js
+++ b/src/public/libraries/codemirror/mode/css/less_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   "use strict";
diff --git a/src/public/libraries/codemirror/mode/css/scss.html b/src/public/libraries/codemirror/mode/css/scss.html
index f8e4d3736..3e42ea653 100644
--- a/src/public/libraries/codemirror/mode/css/scss.html
+++ b/src/public/libraries/codemirror/mode/css/scss.html
@@ -6,10 +6,11 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/css/scss_test.js b/src/public/libraries/codemirror/mode/css/scss_test.js
index 785921b39..1fc1bbdc2 100644
--- a/src/public/libraries/codemirror/mode/css/scss_test.js
+++ b/src/public/libraries/codemirror/mode/css/scss_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
diff --git a/src/public/libraries/codemirror/mode/css/test.js b/src/public/libraries/codemirror/mode/css/test.js
index e5c55d399..6d83df285 100644
--- a/src/public/libraries/codemirror/mode/css/test.js
+++ b/src/public/libraries/codemirror/mode/css/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "css");
diff --git a/src/public/libraries/codemirror/mode/cypher/cypher.js b/src/public/libraries/codemirror/mode/cypher/cypher.js
index 9b2490014..8b22e65db 100644
--- a/src/public/libraries/codemirror/mode/cypher/cypher.js
+++ b/src/public/libraries/codemirror/mode/cypher/cypher.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // By the Neo4j Team and contributors.
 // https://github.com/neo4j-contrib/CodeMirror
diff --git a/src/public/libraries/codemirror/mode/cypher/index.html b/src/public/libraries/codemirror/mode/cypher/index.html
index b8bd75c8b..0db7a6a7c 100644
--- a/src/public/libraries/codemirror/mode/cypher/index.html
+++ b/src/public/libraries/codemirror/mode/cypher/index.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css" />
 <link rel="stylesheet" href="../../theme/neo.css" />
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="cypher.js"></script>
 <style>
 .CodeMirror {
@@ -15,7 +16,7 @@
 }
         </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
@@ -53,7 +54,7 @@ window.onload = function() {
     indentWithTabs: true,
     smartIndent: true,
     lineNumbers: true,
-    matchBrackets : true,
+    matchBrackets: true,
     autofocus: true,
     theme: 'neo'
   });
diff --git a/src/public/libraries/codemirror/mode/cypher/test.js b/src/public/libraries/codemirror/mode/cypher/test.js
index 76d0d0829..691835596 100644
--- a/src/public/libraries/codemirror/mode/cypher/test.js
+++ b/src/public/libraries/codemirror/mode/cypher/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "cypher");
diff --git a/src/public/libraries/codemirror/mode/d/d.js b/src/public/libraries/codemirror/mode/d/d.js
index 77b09c224..6f68c3a69 100644
--- a/src/public/libraries/codemirror/mode/d/d.js
+++ b/src/public/libraries/codemirror/mode/d/d.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/d/index.html b/src/public/libraries/codemirror/mode/d/index.html
index 08cabd8a2..95437e5e7 100644
--- a/src/public/libraries/codemirror/mode/d/index.html
+++ b/src/public/libraries/codemirror/mode/d/index.html
@@ -10,7 +10,7 @@
 <script src="d.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/d/test.js b/src/public/libraries/codemirror/mode/d/test.js
index d8de4ad35..f8ac9de1c 100644
--- a/src/public/libraries/codemirror/mode/d/test.js
+++ b/src/public/libraries/codemirror/mode/d/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "d");
diff --git a/src/public/libraries/codemirror/mode/dart/dart.js b/src/public/libraries/codemirror/mode/dart/dart.js
index 4db0d3715..0a66bf168 100644
--- a/src/public/libraries/codemirror/mode/dart/dart.js
+++ b/src/public/libraries/codemirror/mode/dart/dart.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -12,7 +12,7 @@
   "use strict";
 
   var keywords = ("this super static final const abstract class extends external factory " +
-    "implements get native set typedef with enum throw rethrow " +
+    "implements mixin get native set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
     "part of show hide is as").split(" ");
diff --git a/src/public/libraries/codemirror/mode/dart/index.html b/src/public/libraries/codemirror/mode/dart/index.html
index e79da5a8b..b68a4c593 100644
--- a/src/public/libraries/codemirror/mode/dart/index.html
+++ b/src/public/libraries/codemirror/mode/dart/index.html
@@ -9,7 +9,7 @@
 <script src="dart.js"></script>
 <style>.CodeMirror {border: 1px solid #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/diff/diff.js b/src/public/libraries/codemirror/mode/diff/diff.js
index fe0305e7b..a30fd37a5 100644
--- a/src/public/libraries/codemirror/mode/diff/diff.js
+++ b/src/public/libraries/codemirror/mode/diff/diff.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/diff/index.html b/src/public/libraries/codemirror/mode/diff/index.html
index 0af611fa4..5c7ef7dee 100644
--- a/src/public/libraries/codemirror/mode/diff/index.html
+++ b/src/public/libraries/codemirror/mode/diff/index.html
@@ -15,7 +15,7 @@
       span.cm-error.cm-tag { background-color: #2b2; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/django/django.js b/src/public/libraries/codemirror/mode/django/django.js
index 7b4ef3b56..07be12398 100644
--- a/src/public/libraries/codemirror/mode/django/django.js
+++ b/src/public/libraries/codemirror/mode/django/django.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/django/index.html b/src/public/libraries/codemirror/mode/django/index.html
index 41ea07c91..2060d7ae9 100644
--- a/src/public/libraries/codemirror/mode/django/index.html
+++ b/src/public/libraries/codemirror/mode/django/index.html
@@ -13,7 +13,7 @@
 <script src="django.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/dockerfile/dockerfile.js b/src/public/libraries/codemirror/mode/dockerfile/dockerfile.js
index 769e787e4..983170f51 100644
--- a/src/public/libraries/codemirror/mode/dockerfile/dockerfile.js
+++ b/src/public/libraries/codemirror/mode/dockerfile/dockerfile.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/dockerfile/index.html b/src/public/libraries/codemirror/mode/dockerfile/index.html
index a31759bce..93df336ec 100644
--- a/src/public/libraries/codemirror/mode/dockerfile/index.html
+++ b/src/public/libraries/codemirror/mode/dockerfile/index.html
@@ -10,7 +10,7 @@
 <script src="dockerfile.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/dockerfile/test.js b/src/public/libraries/codemirror/mode/dockerfile/test.js
index 9a2b89ad2..51add3ce9 100644
--- a/src/public/libraries/codemirror/mode/dockerfile/test.js
+++ b/src/public/libraries/codemirror/mode/dockerfile/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-dockerfile");
diff --git a/src/public/libraries/codemirror/mode/dtd/dtd.js b/src/public/libraries/codemirror/mode/dtd/dtd.js
index 52d76ee11..74b8c6bde 100644
--- a/src/public/libraries/codemirror/mode/dtd/dtd.js
+++ b/src/public/libraries/codemirror/mode/dtd/dtd.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
   DTD mode
diff --git a/src/public/libraries/codemirror/mode/dtd/index.html b/src/public/libraries/codemirror/mode/dtd/index.html
index e6798a748..a6f50fa37 100644
--- a/src/public/libraries/codemirror/mode/dtd/index.html
+++ b/src/public/libraries/codemirror/mode/dtd/index.html
@@ -9,7 +9,7 @@
 <script src="dtd.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/dylan/dylan.js b/src/public/libraries/codemirror/mode/dylan/dylan.js
index 0acc1a388..6725edccc 100644
--- a/src/public/libraries/codemirror/mode/dylan/dylan.js
+++ b/src/public/libraries/codemirror/mode/dylan/dylan.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/dylan/index.html b/src/public/libraries/codemirror/mode/dylan/index.html
index ddf5ad067..83d734aff 100644
--- a/src/public/libraries/codemirror/mode/dylan/index.html
+++ b/src/public/libraries/codemirror/mode/dylan/index.html
@@ -12,7 +12,7 @@
 <script src="dylan.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/dylan/test.js b/src/public/libraries/codemirror/mode/dylan/test.js
index bf25be27e..8b121b913 100644
--- a/src/public/libraries/codemirror/mode/dylan/test.js
+++ b/src/public/libraries/codemirror/mode/dylan/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "dylan");
diff --git a/src/public/libraries/codemirror/mode/ebnf/ebnf.js b/src/public/libraries/codemirror/mode/ebnf/ebnf.js
index 9618f8e42..238bbe23b 100644
--- a/src/public/libraries/codemirror/mode/ebnf/ebnf.js
+++ b/src/public/libraries/codemirror/mode/ebnf/ebnf.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/ebnf/index.html b/src/public/libraries/codemirror/mode/ebnf/index.html
index 13845629b..e92e0f085 100644
--- a/src/public/libraries/codemirror/mode/ebnf/index.html
+++ b/src/public/libraries/codemirror/mode/ebnf/index.html
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/ecl/ecl.js b/src/public/libraries/codemirror/mode/ecl/ecl.js
index 8df7ebe4a..9af8aee18 100644
--- a/src/public/libraries/codemirror/mode/ecl/ecl.js
+++ b/src/public/libraries/codemirror/mode/ecl/ecl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/ecl/index.html b/src/public/libraries/codemirror/mode/ecl/index.html
index 2306860dc..1acaec332 100644
--- a/src/public/libraries/codemirror/mode/ecl/index.html
+++ b/src/public/libraries/codemirror/mode/ecl/index.html
@@ -9,7 +9,7 @@
 <script src="ecl.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/eiffel/eiffel.js b/src/public/libraries/codemirror/mode/eiffel/eiffel.js
index b8b70e36e..f6f3f458b 100644
--- a/src/public/libraries/codemirror/mode/eiffel/eiffel.js
+++ b/src/public/libraries/codemirror/mode/eiffel/eiffel.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/eiffel/index.html b/src/public/libraries/codemirror/mode/eiffel/index.html
index 108a71bec..568fbb79b 100644
--- a/src/public/libraries/codemirror/mode/eiffel/index.html
+++ b/src/public/libraries/codemirror/mode/eiffel/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/elm/elm.js b/src/public/libraries/codemirror/mode/elm/elm.js
index 9fcfc8837..fe8dd497f 100644
--- a/src/public/libraries/codemirror/mode/elm/elm.js
+++ b/src/public/libraries/codemirror/mode/elm/elm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/elm/index.html b/src/public/libraries/codemirror/mode/elm/index.html
index d5cb16abf..fb64b53f4 100644
--- a/src/public/libraries/codemirror/mode/elm/index.html
+++ b/src/public/libraries/codemirror/mode/elm/index.html
@@ -9,7 +9,7 @@
 <script src="elm.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/erlang/erlang.js b/src/public/libraries/codemirror/mode/erlang/erlang.js
index 9528e19f9..f0541bb95 100644
--- a/src/public/libraries/codemirror/mode/erlang/erlang.js
+++ b/src/public/libraries/codemirror/mode/erlang/erlang.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*jshint unused:true, eqnull:true, curly:true, bitwise:true */
 /*jshint undef:true, latedef:true, trailing:true */
diff --git a/src/public/libraries/codemirror/mode/erlang/index.html b/src/public/libraries/codemirror/mode/erlang/index.html
index 6d06a890a..eb0a62e8d 100644
--- a/src/public/libraries/codemirror/mode/erlang/index.html
+++ b/src/public/libraries/codemirror/mode/erlang/index.html
@@ -11,7 +11,7 @@
 <script src="erlang.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/factor/factor.js b/src/public/libraries/codemirror/mode/factor/factor.js
index e238c5ea6..7108278cc 100644
--- a/src/public/libraries/codemirror/mode/factor/factor.js
+++ b/src/public/libraries/codemirror/mode/factor/factor.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Factor syntax highlight - simple mode
 //
diff --git a/src/public/libraries/codemirror/mode/factor/index.html b/src/public/libraries/codemirror/mode/factor/index.html
index 9f1548914..13fe42978 100644
--- a/src/public/libraries/codemirror/mode/factor/index.html
+++ b/src/public/libraries/codemirror/mode/factor/index.html
@@ -16,7 +16,7 @@
 }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/fcl/fcl.js b/src/public/libraries/codemirror/mode/fcl/fcl.js
index 518116976..2d3f2001d 100644
--- a/src/public/libraries/codemirror/mode/fcl/fcl.js
+++ b/src/public/libraries/codemirror/mode/fcl/fcl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/fcl/index.html b/src/public/libraries/codemirror/mode/fcl/index.html
index 3c18d0b3c..7ea0fd15f 100644
--- a/src/public/libraries/codemirror/mode/fcl/index.html
+++ b/src/public/libraries/codemirror/mode/fcl/index.html
@@ -11,7 +11,7 @@
 <script src="fcl.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/forth/forth.js b/src/public/libraries/codemirror/mode/forth/forth.js
index 1f519d886..f2caa27af 100644
--- a/src/public/libraries/codemirror/mode/forth/forth.js
+++ b/src/public/libraries/codemirror/mode/forth/forth.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Author: Aliaksei Chapyzhenka
 
diff --git a/src/public/libraries/codemirror/mode/forth/index.html b/src/public/libraries/codemirror/mode/forth/index.html
index ae8cd3458..470363f48 100644
--- a/src/public/libraries/codemirror/mode/forth/index.html
+++ b/src/public/libraries/codemirror/mode/forth/index.html
@@ -16,7 +16,7 @@
 }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/fortran/fortran.js b/src/public/libraries/codemirror/mode/fortran/fortran.js
index 4d88f006a..85bacc42c 100644
--- a/src/public/libraries/codemirror/mode/fortran/fortran.js
+++ b/src/public/libraries/codemirror/mode/fortran/fortran.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/fortran/index.html b/src/public/libraries/codemirror/mode/fortran/index.html
index 9aed0efcc..0d2632f4b 100644
--- a/src/public/libraries/codemirror/mode/fortran/index.html
+++ b/src/public/libraries/codemirror/mode/fortran/index.html
@@ -9,7 +9,7 @@
 <script src="fortran.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/gas/gas.js b/src/public/libraries/codemirror/mode/gas/gas.js
index 0c74bedc5..e34d7a7b6 100644
--- a/src/public/libraries/codemirror/mode/gas/gas.js
+++ b/src/public/libraries/codemirror/mode/gas/gas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/gas/index.html b/src/public/libraries/codemirror/mode/gas/index.html
index df75ca2db..34eea72da 100644
--- a/src/public/libraries/codemirror/mode/gas/index.html
+++ b/src/public/libraries/codemirror/mode/gas/index.html
@@ -9,7 +9,7 @@
 <script src="gas.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/gfm/gfm.js b/src/public/libraries/codemirror/mode/gfm/gfm.js
index 471ae906b..492c9487a 100644
--- a/src/public/libraries/codemirror/mode/gfm/gfm.js
+++ b/src/public/libraries/codemirror/mode/gfm/gfm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/gfm/index.html b/src/public/libraries/codemirror/mode/gfm/index.html
index ea4bac15f..b4bc81d6b 100644
--- a/src/public/libraries/codemirror/mode/gfm/index.html
+++ b/src/public/libraries/codemirror/mode/gfm/index.html
@@ -20,7 +20,7 @@
   .cm-s-default .cm-emoji {color: #009688;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/gfm/test.js b/src/public/libraries/codemirror/mode/gfm/test.js
index e7135264c..d933896aa 100644
--- a/src/public/libraries/codemirror/mode/gfm/test.js
+++ b/src/public/libraries/codemirror/mode/gfm/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var config = {tabSize: 4, indentUnit: 2}
diff --git a/src/public/libraries/codemirror/mode/gherkin/gherkin.js b/src/public/libraries/codemirror/mode/gherkin/gherkin.js
index fc2ebee16..1b438b905 100644
--- a/src/public/libraries/codemirror/mode/gherkin/gherkin.js
+++ b/src/public/libraries/codemirror/mode/gherkin/gherkin.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
 Gherkin mode - http://www.cukes.info/
diff --git a/src/public/libraries/codemirror/mode/gherkin/index.html b/src/public/libraries/codemirror/mode/gherkin/index.html
index af8184c98..52e9ff67b 100644
--- a/src/public/libraries/codemirror/mode/gherkin/index.html
+++ b/src/public/libraries/codemirror/mode/gherkin/index.html
@@ -9,7 +9,7 @@
 <script src="gherkin.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/go/go.js b/src/public/libraries/codemirror/mode/go/go.js
index 36131f10f..c005e42dd 100644
--- a/src/public/libraries/codemirror/mode/go/go.js
+++ b/src/public/libraries/codemirror/mode/go/go.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/go/index.html b/src/public/libraries/codemirror/mode/go/index.html
index 72e3b364c..448921104 100644
--- a/src/public/libraries/codemirror/mode/go/index.html
+++ b/src/public/libraries/codemirror/mode/go/index.html
@@ -11,7 +11,7 @@
 <script src="go.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/groovy/groovy.js b/src/public/libraries/codemirror/mode/groovy/groovy.js
index 0df97dd0b..b76a03fa1 100644
--- a/src/public/libraries/codemirror/mode/groovy/groovy.js
+++ b/src/public/libraries/codemirror/mode/groovy/groovy.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/groovy/index.html b/src/public/libraries/codemirror/mode/groovy/index.html
index bb0df078c..3e022fdf0 100644
--- a/src/public/libraries/codemirror/mode/groovy/index.html
+++ b/src/public/libraries/codemirror/mode/groovy/index.html
@@ -10,7 +10,7 @@
 <script src="groovy.js"></script>
 <style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/haml/haml.js b/src/public/libraries/codemirror/mode/haml/haml.js
index 20ae1e19c..3c8f505eb 100644
--- a/src/public/libraries/codemirror/mode/haml/haml.js
+++ b/src/public/libraries/codemirror/mode/haml/haml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/haml/index.html b/src/public/libraries/codemirror/mode/haml/index.html
index 2894a938e..ba3ea3062 100644
--- a/src/public/libraries/codemirror/mode/haml/index.html
+++ b/src/public/libraries/codemirror/mode/haml/index.html
@@ -13,7 +13,7 @@
 <script src="haml.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/haml/test.js b/src/public/libraries/codemirror/mode/haml/test.js
index 508458a43..e05145273 100644
--- a/src/public/libraries/codemirror/mode/haml/test.js
+++ b/src/public/libraries/codemirror/mode/haml/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
diff --git a/src/public/libraries/codemirror/mode/handlebars/handlebars.js b/src/public/libraries/codemirror/mode/handlebars/handlebars.js
index 39445ebbf..93865b7a0 100644
--- a/src/public/libraries/codemirror/mode/handlebars/handlebars.js
+++ b/src/public/libraries/codemirror/mode/handlebars/handlebars.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/handlebars/index.html b/src/public/libraries/codemirror/mode/handlebars/index.html
index b1bfad1ca..13cfcf35a 100644
--- a/src/public/libraries/codemirror/mode/handlebars/index.html
+++ b/src/public/libraries/codemirror/mode/handlebars/index.html
@@ -8,11 +8,12 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/mode/simple.js"></script>
 <script src="../../addon/mode/multiplex.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="../xml/xml.js"></script>
 <script src="handlebars.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/haskell-literate/haskell-literate.js b/src/public/libraries/codemirror/mode/haskell-literate/haskell-literate.js
index 906415b4c..4bb926849 100644
--- a/src/public/libraries/codemirror/mode/haskell-literate/haskell-literate.js
+++ b/src/public/libraries/codemirror/mode/haskell-literate/haskell-literate.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function (mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/haskell-literate/index.html b/src/public/libraries/codemirror/mode/haskell-literate/index.html
index 8c9bc60d1..aa3f3ea5b 100644
--- a/src/public/libraries/codemirror/mode/haskell-literate/index.html
+++ b/src/public/libraries/codemirror/mode/haskell-literate/index.html
@@ -13,7 +13,7 @@
   border-bottom : 1px solid #DDDDDD;
 }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo
                                                           src="../../doc/logo.png"></a>
 
   <ul>
diff --git a/src/public/libraries/codemirror/mode/haskell/haskell.js b/src/public/libraries/codemirror/mode/haskell/haskell.js
index acc52b5c3..2e882dc60 100644
--- a/src/public/libraries/codemirror/mode/haskell/haskell.js
+++ b/src/public/libraries/codemirror/mode/haskell/haskell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/haskell/index.html b/src/public/libraries/codemirror/mode/haskell/index.html
index 42240b0f2..afa7a898e 100644
--- a/src/public/libraries/codemirror/mode/haskell/index.html
+++ b/src/public/libraries/codemirror/mode/haskell/index.html
@@ -11,7 +11,7 @@
 <script src="haskell.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/haxe/haxe.js b/src/public/libraries/codemirror/mode/haxe/haxe.js
index d159d082e..45376852a 100644
--- a/src/public/libraries/codemirror/mode/haxe/haxe.js
+++ b/src/public/libraries/codemirror/mode/haxe/haxe.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/haxe/index.html b/src/public/libraries/codemirror/mode/haxe/index.html
index d415b5e10..10a241c41 100644
--- a/src/public/libraries/codemirror/mode/haxe/index.html
+++ b/src/public/libraries/codemirror/mode/haxe/index.html
@@ -9,7 +9,7 @@
 <script src="haxe.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/htmlembedded/htmlembedded.js b/src/public/libraries/codemirror/mode/htmlembedded/htmlembedded.js
index 8099d370b..439e63a42 100644
--- a/src/public/libraries/codemirror/mode/htmlembedded/htmlembedded.js
+++ b/src/public/libraries/codemirror/mode/htmlembedded/htmlembedded.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/htmlembedded/index.html b/src/public/libraries/codemirror/mode/htmlembedded/index.html
index 9ed33cffe..ad9bfe412 100644
--- a/src/public/libraries/codemirror/mode/htmlembedded/index.html
+++ b/src/public/libraries/codemirror/mode/htmlembedded/index.html
@@ -14,7 +14,7 @@
 <script src="htmlembedded.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/htmlmixed/htmlmixed.js b/src/public/libraries/codemirror/mode/htmlmixed/htmlmixed.js
index 33398ec5c..c99253847 100644
--- a/src/public/libraries/codemirror/mode/htmlmixed/htmlmixed.js
+++ b/src/public/libraries/codemirror/mode/htmlmixed/htmlmixed.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/htmlmixed/index.html b/src/public/libraries/codemirror/mode/htmlmixed/index.html
index e576c0592..6e3d79fc7 100644
--- a/src/public/libraries/codemirror/mode/htmlmixed/index.html
+++ b/src/public/libraries/codemirror/mode/htmlmixed/index.html
@@ -14,7 +14,7 @@
 <script src="htmlmixed.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/http/http.js b/src/public/libraries/codemirror/mode/http/http.js
index 9a3c5f9fd..092353259 100644
--- a/src/public/libraries/codemirror/mode/http/http.js
+++ b/src/public/libraries/codemirror/mode/http/http.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/http/index.html b/src/public/libraries/codemirror/mode/http/index.html
index 0b8d5315d..9335dd79c 100644
--- a/src/public/libraries/codemirror/mode/http/index.html
+++ b/src/public/libraries/codemirror/mode/http/index.html
@@ -9,7 +9,7 @@
 <script src="http.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/idl/idl.js b/src/public/libraries/codemirror/mode/idl/idl.js
index 07308d71d..168761cd8 100644
--- a/src/public/libraries/codemirror/mode/idl/idl.js
+++ b/src/public/libraries/codemirror/mode/idl/idl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/idl/index.html b/src/public/libraries/codemirror/mode/idl/index.html
index 4c169e2d6..8a3ca9d6f 100644
--- a/src/public/libraries/codemirror/mode/idl/index.html
+++ b/src/public/libraries/codemirror/mode/idl/index.html
@@ -6,10 +6,11 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="idl.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/index.html b/src/public/libraries/codemirror/mode/index.html
index ccabf88be..858ba127f 100644
--- a/src/public/libraries/codemirror/mode/index.html
+++ b/src/public/libraries/codemirror/mode/index.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/javascript/index.html b/src/public/libraries/codemirror/mode/javascript/index.html
index 592a133d8..37115d5b1 100644
--- a/src/public/libraries/codemirror/mode/javascript/index.html
+++ b/src/public/libraries/codemirror/mode/javascript/index.html
@@ -12,7 +12,7 @@
 <script src="javascript.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/javascript/javascript.js b/src/public/libraries/codemirror/mode/javascript/javascript.js
index 64fefcf2b..e98799bfc 100644
--- a/src/public/libraries/codemirror/mode/javascript/javascript.js
+++ b/src/public/libraries/codemirror/mode/javascript/javascript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -644,7 +644,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(pattern) }
     if (type == "variable") { register(value); return cont(); }
     if (type == "spread") return cont(pattern);
-    if (type == "[") return contCommasep(pattern, "]");
+    if (type == "[") return contCommasep(eltpattern, "]");
     if (type == "{") return contCommasep(proppattern, "}");
   }
   function proppattern(type, value) {
@@ -657,6 +657,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "}") return pass();
     return cont(expect(":"), pattern, maybeAssign);
   }
+  function eltpattern() {
+    return pass(pattern, maybeAssign)
+  }
   function maybeAssign(_type, value) {
     if (value == "=") return cont(expressionNoComma);
   }
diff --git a/src/public/libraries/codemirror/mode/javascript/json-ld.html b/src/public/libraries/codemirror/mode/javascript/json-ld.html
index 3a37f0bce..5c31f39f4 100644
--- a/src/public/libraries/codemirror/mode/javascript/json-ld.html
+++ b/src/public/libraries/codemirror/mode/javascript/json-ld.html
@@ -12,7 +12,7 @@
 <script src="javascript.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id="nav">
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"/></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"/></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/javascript/test.js b/src/public/libraries/codemirror/mode/javascript/test.js
index f8c95bf7c..ec0a8117c 100644
--- a/src/public/libraries/codemirror/mode/javascript/test.js
+++ b/src/public/libraries/codemirror/mode/javascript/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
diff --git a/src/public/libraries/codemirror/mode/javascript/typescript.html b/src/public/libraries/codemirror/mode/javascript/typescript.html
index 1f26d7fe1..ea82158de 100644
--- a/src/public/libraries/codemirror/mode/javascript/typescript.html
+++ b/src/public/libraries/codemirror/mode/javascript/typescript.html
@@ -6,10 +6,11 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="javascript.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/jinja2/index.html b/src/public/libraries/codemirror/mode/jinja2/index.html
index 5a70e9153..3314d49d7 100644
--- a/src/public/libraries/codemirror/mode/jinja2/index.html
+++ b/src/public/libraries/codemirror/mode/jinja2/index.html
@@ -9,7 +9,7 @@
 <script src="jinja2.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/jinja2/jinja2.js b/src/public/libraries/codemirror/mode/jinja2/jinja2.js
index 5d57d1344..3ccfe7f18 100644
--- a/src/public/libraries/codemirror/mode/jinja2/jinja2.js
+++ b/src/public/libraries/codemirror/mode/jinja2/jinja2.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -136,7 +136,9 @@
       },
       token: function (stream, state) {
         return state.tokenize(stream, state);
-      }
+      },
+      blockCommentStart: "{#",
+      blockCommentEnd: "#}"
     };
   });
 });
diff --git a/src/public/libraries/codemirror/mode/jsx/index.html b/src/public/libraries/codemirror/mode/jsx/index.html
index 1054bbcc0..0fb3f7552 100644
--- a/src/public/libraries/codemirror/mode/jsx/index.html
+++ b/src/public/libraries/codemirror/mode/jsx/index.html
@@ -11,7 +11,7 @@
 <script src="jsx.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/jsx/jsx.js b/src/public/libraries/codemirror/mode/jsx/jsx.js
index 039e37bb5..2c91beb95 100644
--- a/src/public/libraries/codemirror/mode/jsx/jsx.js
+++ b/src/public/libraries/codemirror/mode/jsx/jsx.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/jsx/test.js b/src/public/libraries/codemirror/mode/jsx/test.js
index 891f98830..5ecd5a8b0 100644
--- a/src/public/libraries/codemirror/mode/jsx/test.js
+++ b/src/public/libraries/codemirror/mode/jsx/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "jsx")
diff --git a/src/public/libraries/codemirror/mode/julia/index.html b/src/public/libraries/codemirror/mode/julia/index.html
index e1492c210..57b7d8010 100644
--- a/src/public/libraries/codemirror/mode/julia/index.html
+++ b/src/public/libraries/codemirror/mode/julia/index.html
@@ -6,10 +6,11 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="julia.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/julia/julia.js b/src/public/libraries/codemirror/mode/julia/julia.js
index 2d89c497d..3e3560dcc 100644
--- a/src/public/libraries/codemirror/mode/julia/julia.js
+++ b/src/public/libraries/codemirror/mode/julia/julia.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -34,17 +34,28 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       /^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/;
 
   var chars = wordRegexp([octChar, hexChar, sChar, uChar], "'");
-  var openers = wordRegexp(["begin", "function", "type", "struct", "immutable",
+
+  var commonOpeners = ["begin", "function", "type", "struct", "immutable",
       "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try",
-      "finally", "catch", "do"]);
-  var closers = wordRegexp(["end", "else", "elseif", "catch", "finally"]);
-  var keywords = wordRegexp(["if", "else", "elseif", "while", "for", "begin",
-      "let", "end", "do", "try", "catch", "finally", "return", "break",
-      "continue", "global", "local", "const", "export", "import", "importall",
-      "using", "function", "where", "macro", "module", "baremodule", "struct",
-      "type", "mutable", "immutable", "quote", "typealias", "abstract",
-      "primitive", "bitstype"]);
-  var builtins = wordRegexp(["true", "false", "nothing", "NaN", "Inf"]);
+                       "finally", "catch", "do"];
+
+  var commonClosers = ["end", "else", "elseif", "catch", "finally"];
+
+  var commonKeywords = ["if", "else", "elseif", "while", "for", "begin",
+                        "let", "end", "do", "try", "catch", "finally", "return", "break",
+                        "continue", "global", "local", "const", "export", "import", "importall",
+                        "using", "function", "where", "macro", "module", "baremodule", "struct",
+                        "type", "mutable", "immutable", "quote", "typealias", "abstract",
+                        "primitive", "bitstype"];
+
+  var commonBuiltins = ["true", "false", "nothing", "NaN", "Inf"];
+
+  CodeMirror.registerHelper("hintWords", "julia", commonKeywords.concat(commonBuiltins));
+
+  var openers = wordRegexp(commonOpeners);
+  var closers = wordRegexp(commonClosers);
+  var keywords = wordRegexp(commonKeywords);
+  var builtins = wordRegexp(commonBuiltins);
 
   var macro = /^@[_A-Za-z][\w]*/;
   var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
diff --git a/src/public/libraries/codemirror/mode/livescript/index.html b/src/public/libraries/codemirror/mode/livescript/index.html
index f41547987..297b1c7bc 100644
--- a/src/public/libraries/codemirror/mode/livescript/index.html
+++ b/src/public/libraries/codemirror/mode/livescript/index.html
@@ -10,7 +10,7 @@
 <script src="livescript.js"></script>
 <style>.CodeMirror {font-size: 80%;border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/livescript/livescript.js b/src/public/libraries/codemirror/mode/livescript/livescript.js
index 1e363f876..595e067d1 100644
--- a/src/public/libraries/codemirror/mode/livescript/livescript.js
+++ b/src/public/libraries/codemirror/mode/livescript/livescript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Link to the project's GitHub page:
diff --git a/src/public/libraries/codemirror/mode/lua/index.html b/src/public/libraries/codemirror/mode/lua/index.html
index fc98b9446..59f4df3e3 100644
--- a/src/public/libraries/codemirror/mode/lua/index.html
+++ b/src/public/libraries/codemirror/mode/lua/index.html
@@ -11,7 +11,7 @@
 <script src="lua.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
@@ -75,7 +75,7 @@ end
     </script>
 
     <p>Loosely based on Franciszek
-    Wawrzak's <a href="http://codemirror.net/1/contrib/lua">CodeMirror
+    Wawrzak's <a href="https://codemirror.net/1/contrib/lua">CodeMirror
     1 mode</a>. One configuration parameter is
     supported, <code>specials</code>, to which you can provide an
     array of strings to have those identifiers highlighted with
diff --git a/src/public/libraries/codemirror/mode/lua/lua.js b/src/public/libraries/codemirror/mode/lua/lua.js
index 0b19abd30..202f37358 100644
--- a/src/public/libraries/codemirror/mode/lua/lua.js
+++ b/src/public/libraries/codemirror/mode/lua/lua.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
 // CodeMirror 1 mode.
diff --git a/src/public/libraries/codemirror/mode/markdown/index.html b/src/public/libraries/codemirror/mode/markdown/index.html
index f17ecdc9a..c571463e5 100644
--- a/src/public/libraries/codemirror/mode/markdown/index.html
+++ b/src/public/libraries/codemirror/mode/markdown/index.html
@@ -16,7 +16,7 @@
       .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/markdown/markdown.js b/src/public/libraries/codemirror/mode/markdown/markdown.js
index d523ec8bb..df7183669 100644
--- a/src/public/libraries/codemirror/mode/markdown/markdown.js
+++ b/src/public/libraries/codemirror/mode/markdown/markdown.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -620,7 +620,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
-    if (modeCfg.emoji && ch === ":" && stream.match(/^[a-z_\d+-]+:/)) {
+    if (modeCfg.emoji && ch === ":" && stream.match(/^(?:[a-z_\d+][a-z_\d+-]*|\-[a-z_\d+][a-z_\d+-]*):/)) {
       state.emoji = true;
       if (modeCfg.highlightFormatting) state.formatting = "emoji";
       var retType = getType(state);
@@ -869,6 +869,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     getType: getType,
 
+    blockCommentStart: "<!--",
+    blockCommentEnd: "-->",
     closeBrackets: "()[]{}''\"\"``",
     fold: "markdown"
   };
diff --git a/src/public/libraries/codemirror/mode/markdown/test.js b/src/public/libraries/codemirror/mode/markdown/test.js
index a6da158d0..aa1263e11 100644
--- a/src/public/libraries/codemirror/mode/markdown/test.js
+++ b/src/public/libraries/codemirror/mode/markdown/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var config = {tabSize: 4, indentUnit: 2}
@@ -45,6 +45,8 @@
       "formatting" : "override-formatting"
   }});
   function FormatTokenTypeOverrideTest(name) { test.mode(name, modeFormattingOverride, Array.prototype.slice.call(arguments, 1)); }
+  var modeET = CodeMirror.getMode(config, {name: "markdown", emoji: true});
+  function ET(name) { test.mode(name, modeET, Array.prototype.slice.call(arguments, 1)); }
 
 
   FT("formatting_emAsterisk",
@@ -1305,4 +1307,11 @@
   MT_noXml("xmlHighlightDisabled",
      "<div>foo</div>");
 
+  // Tests Emojis
+
+  ET("emojiDefault",
+    "[builtin :foobar:]");
+
+  ET("emojiTable",
+    " :--:");
 })();
diff --git a/src/public/libraries/codemirror/mode/mathematica/index.html b/src/public/libraries/codemirror/mode/mathematica/index.html
index 57c429853..2e5a5748f 100644
--- a/src/public/libraries/codemirror/mode/mathematica/index.html
+++ b/src/public/libraries/codemirror/mode/mathematica/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/mathematica/mathematica.js b/src/public/libraries/codemirror/mode/mathematica/mathematica.js
index 07e808b1e..72b349210 100644
--- a/src/public/libraries/codemirror/mode/mathematica/mathematica.js
+++ b/src/public/libraries/codemirror/mode/mathematica/mathematica.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Mathematica mode copyright (c) 2015 by Calin Barbat
 // Based on code by Patrick Scheibe (halirutan)
diff --git a/src/public/libraries/codemirror/mode/mbox/index.html b/src/public/libraries/codemirror/mode/mbox/index.html
index 248ea98e1..c70cf3607 100644
--- a/src/public/libraries/codemirror/mode/mbox/index.html
+++ b/src/public/libraries/codemirror/mode/mbox/index.html
@@ -9,7 +9,7 @@
 <script src="mbox.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/mbox/mbox.js b/src/public/libraries/codemirror/mode/mbox/mbox.js
index ba2416ac8..640437ed6 100644
--- a/src/public/libraries/codemirror/mode/mbox/mbox.js
+++ b/src/public/libraries/codemirror/mode/mbox/mbox.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/meta.js b/src/public/libraries/codemirror/mode/meta.js
index 7890bdd7b..8517c2ef6 100644
--- a/src/public/libraries/codemirror/mode/meta.js
+++ b/src/public/libraries/codemirror/mode/meta.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -75,7 +75,7 @@
     {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
     {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
     {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
-    {name: "Jinja2", mime: "null", mode: "jinja2"},
+    {name: "Jinja2", mime: "null", mode: "jinja2", ext: ["j2", "jinja", "jinja2"]},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
     {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
diff --git a/src/public/libraries/codemirror/mode/mirc/index.html b/src/public/libraries/codemirror/mode/mirc/index.html
index fd2f34e4b..98f81750f 100644
--- a/src/public/libraries/codemirror/mode/mirc/index.html
+++ b/src/public/libraries/codemirror/mode/mirc/index.html
@@ -7,10 +7,11 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <link rel="stylesheet" href="../../theme/twilight.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="mirc.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/mirc/mirc.js b/src/public/libraries/codemirror/mode/mirc/mirc.js
index 71ac4ddfd..d27b0152e 100644
--- a/src/public/libraries/codemirror/mode/mirc/mirc.js
+++ b/src/public/libraries/codemirror/mode/mirc/mirc.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 //mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
 
diff --git a/src/public/libraries/codemirror/mode/mllike/index.html b/src/public/libraries/codemirror/mode/mllike/index.html
index b1ed6c7d7..491373171 100644
--- a/src/public/libraries/codemirror/mode/mllike/index.html
+++ b/src/public/libraries/codemirror/mode/mllike/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/mllike/mllike.js b/src/public/libraries/codemirror/mode/mllike/mllike.js
index 92b51cbc3..a1538f720 100644
--- a/src/public/libraries/codemirror/mode/mllike/mllike.js
+++ b/src/public/libraries/codemirror/mode/mllike/mllike.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -41,6 +41,9 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
       words[prop] = parserConfig.extraWords[prop];
     }
   }
+  var hintWords = [];
+  for (var k in words) { hintWords.push(k); }
+  CodeMirror.registerHelper("hintWords", "mllike", hintWords);
 
   function tokenBase(stream, state) {
     var ch = stream.next();
diff --git a/src/public/libraries/codemirror/mode/modelica/index.html b/src/public/libraries/codemirror/mode/modelica/index.html
index 408c3b17e..ed344e712 100644
--- a/src/public/libraries/codemirror/mode/modelica/index.html
+++ b/src/public/libraries/codemirror/mode/modelica/index.html
@@ -12,7 +12,7 @@
 <script src="modelica.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/modelica/modelica.js b/src/public/libraries/codemirror/mode/modelica/modelica.js
index 77ec7a3c1..a83a4135d 100644
--- a/src/public/libraries/codemirror/mode/modelica/modelica.js
+++ b/src/public/libraries/codemirror/mode/modelica/modelica.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Modelica support for CodeMirror, copyright (c) by Lennart Ochel
 
diff --git a/src/public/libraries/codemirror/mode/mscgen/index.html b/src/public/libraries/codemirror/mode/mscgen/index.html
index b1d7e7c2e..a35ffd432 100644
--- a/src/public/libraries/codemirror/mode/mscgen/index.html
+++ b/src/public/libraries/codemirror/mode/mscgen/index.html
@@ -9,7 +9,7 @@
 <script src="mscgen.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
diff --git a/src/public/libraries/codemirror/mode/mscgen/mscgen.js b/src/public/libraries/codemirror/mode/mscgen/mscgen.js
index 2cd6f4270..01be09b29 100644
--- a/src/public/libraries/codemirror/mode/mscgen/mscgen.js
+++ b/src/public/libraries/codemirror/mode/mscgen/mscgen.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // mode(s) for the sequence chart dsl's mscgen, xù and msgenny
 // For more information on mscgen, see the site of the original author:
diff --git a/src/public/libraries/codemirror/mode/mscgen/mscgen_test.js b/src/public/libraries/codemirror/mode/mscgen/mscgen_test.js
index 956c5758e..286b7ce90 100644
--- a/src/public/libraries/codemirror/mode/mscgen/mscgen_test.js
+++ b/src/public/libraries/codemirror/mode/mscgen/mscgen_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "mscgen");
diff --git a/src/public/libraries/codemirror/mode/mscgen/msgenny_test.js b/src/public/libraries/codemirror/mode/mscgen/msgenny_test.js
index edf9da09a..90ec38ca8 100644
--- a/src/public/libraries/codemirror/mode/mscgen/msgenny_test.js
+++ b/src/public/libraries/codemirror/mode/mscgen/msgenny_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-msgenny");
diff --git a/src/public/libraries/codemirror/mode/mscgen/xu_test.js b/src/public/libraries/codemirror/mode/mscgen/xu_test.js
index 950aeca1f..76a85d23b 100644
--- a/src/public/libraries/codemirror/mode/mscgen/xu_test.js
+++ b/src/public/libraries/codemirror/mode/mscgen/xu_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-xu");
diff --git a/src/public/libraries/codemirror/mode/mumps/index.html b/src/public/libraries/codemirror/mode/mumps/index.html
index b1f92c213..8931e7ffc 100644
--- a/src/public/libraries/codemirror/mode/mumps/index.html
+++ b/src/public/libraries/codemirror/mode/mumps/index.html
@@ -9,7 +9,7 @@
 <script src="mumps.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/mumps/mumps.js b/src/public/libraries/codemirror/mode/mumps/mumps.js
index 469f8c3d1..3671c9cb3 100644
--- a/src/public/libraries/codemirror/mode/mumps/mumps.js
+++ b/src/public/libraries/codemirror/mode/mumps/mumps.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
   This MUMPS Language script was constructed using vbscript.js as a template.
diff --git a/src/public/libraries/codemirror/mode/nginx/index.html b/src/public/libraries/codemirror/mode/nginx/index.html
index dde54574d..7d4ad7e63 100644
--- a/src/public/libraries/codemirror/mode/nginx/index.html
+++ b/src/public/libraries/codemirror/mode/nginx/index.html
@@ -21,7 +21,7 @@
     }
   </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/nginx/nginx.js b/src/public/libraries/codemirror/mode/nginx/nginx.js
index 00a322492..a09f1501f 100644
--- a/src/public/libraries/codemirror/mode/nginx/nginx.js
+++ b/src/public/libraries/codemirror/mode/nginx/nginx.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/nsis/index.html b/src/public/libraries/codemirror/mode/nsis/index.html
index 2afae87f0..4bd73650a 100644
--- a/src/public/libraries/codemirror/mode/nsis/index.html
+++ b/src/public/libraries/codemirror/mode/nsis/index.html
@@ -13,7 +13,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/nsis/nsis.js b/src/public/libraries/codemirror/mode/nsis/nsis.js
index 69bc95074..94b8eae24 100644
--- a/src/public/libraries/codemirror/mode/nsis/nsis.js
+++ b/src/public/libraries/codemirror/mode/nsis/nsis.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Author: Jan T. Sott (http://github.com/idleberg)
 
diff --git a/src/public/libraries/codemirror/mode/ntriples/index.html b/src/public/libraries/codemirror/mode/ntriples/index.html
index 9c9984639..ea2eeefa5 100644
--- a/src/public/libraries/codemirror/mode/ntriples/index.html
+++ b/src/public/libraries/codemirror/mode/ntriples/index.html
@@ -14,7 +14,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/ntriples/ntriples.js b/src/public/libraries/codemirror/mode/ntriples/ntriples.js
index 148272e1f..5dd027286 100644
--- a/src/public/libraries/codemirror/mode/ntriples/ntriples.js
+++ b/src/public/libraries/codemirror/mode/ntriples/ntriples.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**********************************************************
 * This script provides syntax highlighting support for
diff --git a/src/public/libraries/codemirror/mode/octave/index.html b/src/public/libraries/codemirror/mode/octave/index.html
index 3490ee637..92f942669 100644
--- a/src/public/libraries/codemirror/mode/octave/index.html
+++ b/src/public/libraries/codemirror/mode/octave/index.html
@@ -6,10 +6,11 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="octave.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/octave/octave.js b/src/public/libraries/codemirror/mode/octave/octave.js
index b77ad682e..4040b6703 100644
--- a/src/public/libraries/codemirror/mode/octave/octave.js
+++ b/src/public/libraries/codemirror/mode/octave/octave.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/oz/index.html b/src/public/libraries/codemirror/mode/oz/index.html
index febd82a59..782a27c96 100644
--- a/src/public/libraries/codemirror/mode/oz/index.html
+++ b/src/public/libraries/codemirror/mode/oz/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border: 1px solid #aaa;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
diff --git a/src/public/libraries/codemirror/mode/oz/oz.js b/src/public/libraries/codemirror/mode/oz/oz.js
index 50ffda37a..a9738495b 100644
--- a/src/public/libraries/codemirror/mode/oz/oz.js
+++ b/src/public/libraries/codemirror/mode/oz/oz.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/pascal/index.html b/src/public/libraries/codemirror/mode/pascal/index.html
index f8a99ad01..c3fdf74c9 100644
--- a/src/public/libraries/codemirror/mode/pascal/index.html
+++ b/src/public/libraries/codemirror/mode/pascal/index.html
@@ -9,7 +9,7 @@
 <script src="pascal.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/pascal/pascal.js b/src/public/libraries/codemirror/mode/pascal/pascal.js
index 3240532f5..dc3b1a3a3 100644
--- a/src/public/libraries/codemirror/mode/pascal/pascal.js
+++ b/src/public/libraries/codemirror/mode/pascal/pascal.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/pegjs/index.html b/src/public/libraries/codemirror/mode/pegjs/index.html
index 0c7460488..34fa5e8bd 100644
--- a/src/public/libraries/codemirror/mode/pegjs/index.html
+++ b/src/public/libraries/codemirror/mode/pegjs/index.html
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/pegjs/pegjs.js b/src/public/libraries/codemirror/mode/pegjs/pegjs.js
index 6c7207466..19d5fa4c0 100644
--- a/src/public/libraries/codemirror/mode/pegjs/pegjs.js
+++ b/src/public/libraries/codemirror/mode/pegjs/pegjs.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/perl/index.html b/src/public/libraries/codemirror/mode/perl/index.html
index 8c1021c42..71757b215 100644
--- a/src/public/libraries/codemirror/mode/perl/index.html
+++ b/src/public/libraries/codemirror/mode/perl/index.html
@@ -9,7 +9,7 @@
 <script src="perl.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/perl/perl.js b/src/public/libraries/codemirror/mode/perl/perl.js
index 66e4ed034..a3101a7c5 100644
--- a/src/public/libraries/codemirror/mode/perl/perl.js
+++ b/src/public/libraries/codemirror/mode/perl/perl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
 // This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
diff --git a/src/public/libraries/codemirror/mode/php/index.html b/src/public/libraries/codemirror/mode/php/index.html
index adf6b1be2..3995c8454 100644
--- a/src/public/libraries/codemirror/mode/php/index.html
+++ b/src/public/libraries/codemirror/mode/php/index.html
@@ -15,7 +15,7 @@
 <script src="php.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/php/php.js b/src/public/libraries/codemirror/mode/php/php.js
index 589c9a663..80e2f20bf 100644
--- a/src/public/libraries/codemirror/mode/php/php.js
+++ b/src/public/libraries/codemirror/mode/php/php.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/php/test.js b/src/public/libraries/codemirror/mode/php/test.js
index e2ecefc18..ec158145c 100644
--- a/src/public/libraries/codemirror/mode/php/test.js
+++ b/src/public/libraries/codemirror/mode/php/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "php");
diff --git a/src/public/libraries/codemirror/mode/pig/index.html b/src/public/libraries/codemirror/mode/pig/index.html
index ea77f7044..80fed6e1c 100644
--- a/src/public/libraries/codemirror/mode/pig/index.html
+++ b/src/public/libraries/codemirror/mode/pig/index.html
@@ -8,7 +8,7 @@
 <script src="pig.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/pig/pig.js b/src/public/libraries/codemirror/mode/pig/pig.js
index 5b567272e..3b9c7746b 100644
--- a/src/public/libraries/codemirror/mode/pig/pig.js
+++ b/src/public/libraries/codemirror/mode/pig/pig.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
  *      Pig Latin Mode for CodeMirror 2
diff --git a/src/public/libraries/codemirror/mode/powershell/index.html b/src/public/libraries/codemirror/mode/powershell/index.html
index 6b235df8f..81c050a81 100644
--- a/src/public/libraries/codemirror/mode/powershell/index.html
+++ b/src/public/libraries/codemirror/mode/powershell/index.html
@@ -6,12 +6,13 @@
     <link rel="stylesheet" href="../../doc/docs.css">
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="powershell.js"></script>
     <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
   </head>
   <body>
     <div id=nav>
-      <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/powershell/powershell.js b/src/public/libraries/codemirror/mode/powershell/powershell.js
index 2728ef9d9..85f89b9ec 100644
--- a/src/public/libraries/codemirror/mode/powershell/powershell.js
+++ b/src/public/libraries/codemirror/mode/powershell/powershell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   'use strict';
diff --git a/src/public/libraries/codemirror/mode/powershell/test.js b/src/public/libraries/codemirror/mode/powershell/test.js
index 9c9aed0d5..ba1ecf194 100644
--- a/src/public/libraries/codemirror/mode/powershell/test.js
+++ b/src/public/libraries/codemirror/mode/powershell/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "powershell");
diff --git a/src/public/libraries/codemirror/mode/properties/index.html b/src/public/libraries/codemirror/mode/properties/index.html
index f885302de..eb49f9291 100644
--- a/src/public/libraries/codemirror/mode/properties/index.html
+++ b/src/public/libraries/codemirror/mode/properties/index.html
@@ -9,7 +9,7 @@
 <script src="properties.js"></script>
 <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/properties/properties.js b/src/public/libraries/codemirror/mode/properties/properties.js
index ef8bf37ee..02fd7fe5e 100644
--- a/src/public/libraries/codemirror/mode/properties/properties.js
+++ b/src/public/libraries/codemirror/mode/properties/properties.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/protobuf/index.html b/src/public/libraries/codemirror/mode/protobuf/index.html
index 55d453566..ee58cd9a4 100644
--- a/src/public/libraries/codemirror/mode/protobuf/index.html
+++ b/src/public/libraries/codemirror/mode/protobuf/index.html
@@ -9,7 +9,7 @@
 <script src="protobuf.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/protobuf/protobuf.js b/src/public/libraries/codemirror/mode/protobuf/protobuf.js
index 93cb3b0e0..68b240a40 100644
--- a/src/public/libraries/codemirror/mode/protobuf/protobuf.js
+++ b/src/public/libraries/codemirror/mode/protobuf/protobuf.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/pug/index.html b/src/public/libraries/codemirror/mode/pug/index.html
index 1765853a1..321284806 100644
--- a/src/public/libraries/codemirror/mode/pug/index.html
+++ b/src/public/libraries/codemirror/mode/pug/index.html
@@ -13,7 +13,7 @@
 <script src="pug.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/pug/pug.js b/src/public/libraries/codemirror/mode/pug/pug.js
index 401823365..8701b0238 100644
--- a/src/public/libraries/codemirror/mode/pug/pug.js
+++ b/src/public/libraries/codemirror/mode/pug/pug.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/puppet/index.html b/src/public/libraries/codemirror/mode/puppet/index.html
index 5614c3695..757377b1d 100644
--- a/src/public/libraries/codemirror/mode/puppet/index.html
+++ b/src/public/libraries/codemirror/mode/puppet/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/puppet/puppet.js b/src/public/libraries/codemirror/mode/puppet/puppet.js
index 57041300a..364934209 100644
--- a/src/public/libraries/codemirror/mode/puppet/puppet.js
+++ b/src/public/libraries/codemirror/mode/puppet/puppet.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/python/index.html b/src/public/libraries/codemirror/mode/python/index.html
index 134387ff2..e52eea680 100644
--- a/src/public/libraries/codemirror/mode/python/index.html
+++ b/src/public/libraries/codemirror/mode/python/index.html
@@ -10,7 +10,7 @@
 <script src="python.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/python/python.js b/src/public/libraries/codemirror/mode/python/python.js
index a13a85092..623c03f7f 100644
--- a/src/public/libraries/codemirror/mode/python/python.js
+++ b/src/public/libraries/codemirror/mode/python/python.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/python/test.js b/src/public/libraries/codemirror/mode/python/test.js
index 40f0a61f4..604c2eb9d 100644
--- a/src/public/libraries/codemirror/mode/python/test.js
+++ b/src/public/libraries/codemirror/mode/python/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4},
diff --git a/src/public/libraries/codemirror/mode/q/index.html b/src/public/libraries/codemirror/mode/q/index.html
index 72785ba3b..e13ad5b6a 100644
--- a/src/public/libraries/codemirror/mode/q/index.html
+++ b/src/public/libraries/codemirror/mode/q/index.html
@@ -10,7 +10,7 @@
 <script src="q.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/q/q.js b/src/public/libraries/codemirror/mode/q/q.js
index 9aee18ab1..c016a6aa6 100644
--- a/src/public/libraries/codemirror/mode/q/q.js
+++ b/src/public/libraries/codemirror/mode/q/q.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/r/index.html b/src/public/libraries/codemirror/mode/r/index.html
index 01b6e664b..28192dabc 100644
--- a/src/public/libraries/codemirror/mode/r/index.html
+++ b/src/public/libraries/codemirror/mode/r/index.html
@@ -15,7 +15,7 @@
       .cm-s-default span.cm-arg-is { color: brown; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/r/r.js b/src/public/libraries/codemirror/mode/r/r.js
index be7db46b8..df5824003 100644
--- a/src/public/libraries/codemirror/mode/r/r.js
+++ b/src/public/libraries/codemirror/mode/r/r.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -14,15 +14,22 @@
 CodeMirror.registerHelper("wordChars", "r", /[\w.]/);
 
 CodeMirror.defineMode("r", function(config) {
-  function wordObj(str) {
-    var words = str.split(" "), res = {};
+  function wordObj(words) {
+    var res = {};
     for (var i = 0; i < words.length; ++i) res[words[i]] = true;
     return res;
   }
-  var atoms = wordObj("NULL NA Inf NaN NA_integer_ NA_real_ NA_complex_ NA_character_");
-  var builtins = wordObj("list quote bquote eval return call parse deparse");
-  var keywords = wordObj("if else repeat while function for in next break");
-  var blockkeywords = wordObj("if else repeat while function for");
+  var commonAtoms = ["NULL", "NA", "Inf", "NaN", "NA_integer_", "NA_real_", "NA_complex_", "NA_character_"];
+  var commonBuiltins = ["list", "quote", "bquote", "eval", "return", "call", "parse", "deparse"];
+  var commonKeywords = ["if", "else", "repeat", "while", "function", "for", "in", "next", "break"];
+  var commonBlockKeywords = ["if", "else", "repeat", "while", "function", "for"];
+
+  CodeMirror.registerHelper("hintWords", "r", commonAtoms.concat(commonBuiltins, commonKeywords));
+
+  var atoms = wordObj(commonAtoms);
+  var builtins = wordObj(commonBuiltins);
+  var keywords = wordObj(commonKeywords);
+  var blockkeywords = wordObj(commonBlockKeywords);
   var opChars = /[+\-*\/^<>=!&|~$:]/;
   var curPunc;
 
diff --git a/src/public/libraries/codemirror/mode/rpm/changes/index.html b/src/public/libraries/codemirror/mode/rpm/changes/index.html
index 6e5031bd1..7026cc528 100644
--- a/src/public/libraries/codemirror/mode/rpm/changes/index.html
+++ b/src/public/libraries/codemirror/mode/rpm/changes/index.html
@@ -11,7 +11,7 @@
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/rpm/index.html b/src/public/libraries/codemirror/mode/rpm/index.html
index 9a34e6dfb..f1f831684 100644
--- a/src/public/libraries/codemirror/mode/rpm/index.html
+++ b/src/public/libraries/codemirror/mode/rpm/index.html
@@ -11,7 +11,7 @@
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/rpm/rpm.js b/src/public/libraries/codemirror/mode/rpm/rpm.js
index 87cde591a..2dece2eab 100644
--- a/src/public/libraries/codemirror/mode/rpm/rpm.js
+++ b/src/public/libraries/codemirror/mode/rpm/rpm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/rst/index.html b/src/public/libraries/codemirror/mode/rst/index.html
index 2902dea23..eec301313 100644
--- a/src/public/libraries/codemirror/mode/rst/index.html
+++ b/src/public/libraries/codemirror/mode/rst/index.html
@@ -10,7 +10,7 @@
 <script src="rst.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/rst/rst.js b/src/public/libraries/codemirror/mode/rst/rst.js
index bcf110c1a..f14eb270f 100644
--- a/src/public/libraries/codemirror/mode/rst/rst.js
+++ b/src/public/libraries/codemirror/mode/rst/rst.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/ruby/index.html b/src/public/libraries/codemirror/mode/ruby/index.html
index 97544babc..486b1e245 100644
--- a/src/public/libraries/codemirror/mode/ruby/index.html
+++ b/src/public/libraries/codemirror/mode/ruby/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/ruby/ruby.js b/src/public/libraries/codemirror/mode/ruby/ruby.js
index 874c1830e..f954ed221 100644
--- a/src/public/libraries/codemirror/mode/ruby/ruby.js
+++ b/src/public/libraries/codemirror/mode/ruby/ruby.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/ruby/test.js b/src/public/libraries/codemirror/mode/ruby/test.js
index 3133bd63f..5677e0de8 100644
--- a/src/public/libraries/codemirror/mode/ruby/test.js
+++ b/src/public/libraries/codemirror/mode/ruby/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
diff --git a/src/public/libraries/codemirror/mode/rust/index.html b/src/public/libraries/codemirror/mode/rust/index.html
index 1fe0ad1e6..5903fb40a 100644
--- a/src/public/libraries/codemirror/mode/rust/index.html
+++ b/src/public/libraries/codemirror/mode/rust/index.html
@@ -10,7 +10,7 @@
 <script src="rust.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/rust/rust.js b/src/public/libraries/codemirror/mode/rust/rust.js
index b635563ae..6bcfbc444 100644
--- a/src/public/libraries/codemirror/mode/rust/rust.js
+++ b/src/public/libraries/codemirror/mode/rust/rust.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/rust/test.js b/src/public/libraries/codemirror/mode/rust/test.js
index eb256c47e..36c5cdeba 100644
--- a/src/public/libraries/codemirror/mode/rust/test.js
+++ b/src/public/libraries/codemirror/mode/rust/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "rust");
diff --git a/src/public/libraries/codemirror/mode/sas/index.html b/src/public/libraries/codemirror/mode/sas/index.html
index 636e06594..714648678 100644
--- a/src/public/libraries/codemirror/mode/sas/index.html
+++ b/src/public/libraries/codemirror/mode/sas/index.html
@@ -15,7 +15,7 @@
   .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/sas/sas.js b/src/public/libraries/codemirror/mode/sas/sas.js
index d85b33534..c6f528e0a 100755
--- a/src/public/libraries/codemirror/mode/sas/sas.js
+++ b/src/public/libraries/codemirror/mode/sas/sas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 
 // SAS mode copyright (c) 2016 Jared Dean, SAS Institute
diff --git a/src/public/libraries/codemirror/mode/sass/index.html b/src/public/libraries/codemirror/mode/sass/index.html
index 6305649e5..0db5eacbc 100644
--- a/src/public/libraries/codemirror/mode/sass/index.html
+++ b/src/public/libraries/codemirror/mode/sass/index.html
@@ -11,7 +11,7 @@
 <script src="sass.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/sass/sass.js b/src/public/libraries/codemirror/mode/sass/sass.js
index 7d8135bfe..c37ab0b28 100644
--- a/src/public/libraries/codemirror/mode/sass/sass.js
+++ b/src/public/libraries/codemirror/mode/sass/sass.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/sass/test.js b/src/public/libraries/codemirror/mode/sass/test.js
index 6b2f59321..63d79193b 100644
--- a/src/public/libraries/codemirror/mode/sass/test.js
+++ b/src/public/libraries/codemirror/mode/sass/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "sass");
diff --git a/src/public/libraries/codemirror/mode/scheme/index.html b/src/public/libraries/codemirror/mode/scheme/index.html
index 04d5c6a2a..f2eda51d6 100644
--- a/src/public/libraries/codemirror/mode/scheme/index.html
+++ b/src/public/libraries/codemirror/mode/scheme/index.html
@@ -9,7 +9,7 @@
 <script src="scheme.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/scheme/scheme.js b/src/public/libraries/codemirror/mode/scheme/scheme.js
index 1d8f7d17f..3191fe811 100644
--- a/src/public/libraries/codemirror/mode/scheme/scheme.js
+++ b/src/public/libraries/codemirror/mode/scheme/scheme.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Author: Koh Zi Han, based on implementation by Koh Zi Chun
diff --git a/src/public/libraries/codemirror/mode/shell/index.html b/src/public/libraries/codemirror/mode/shell/index.html
index e42f4b5f3..a844c1a40 100644
--- a/src/public/libraries/codemirror/mode/shell/index.html
+++ b/src/public/libraries/codemirror/mode/shell/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/shell/shell.js b/src/public/libraries/codemirror/mode/shell/shell.js
index b806c2bcb..5af12413b 100644
--- a/src/public/libraries/codemirror/mode/shell/shell.js
+++ b/src/public/libraries/codemirror/mode/shell/shell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -14,26 +14,27 @@
 CodeMirror.defineMode('shell', function() {
 
   var words = {};
-  function define(style, string) {
-    var split = string.split(' ');
-    for(var i = 0; i < split.length; i++) {
-      words[split[i]] = style;
+  function define(style, dict) {
+    for(var i = 0; i < dict.length; i++) {
+      words[dict[i]] = style;
     }
   };
 
-  // Atoms
-  define('atom', 'true false');
+  var commonAtoms = ["true", "false"];
+  var commonKeywords = ["if", "then", "do", "else", "elif", "while", "until", "for", "in", "esac", "fi",
+    "fin", "fil", "done", "exit", "set", "unset", "export", "function"];
+  var commonCommands = ["ab", "awk", "bash", "beep", "cat", "cc", "cd", "chown", "chmod", "chroot", "clear",
+    "cp", "curl", "cut", "diff", "echo", "find", "gawk", "gcc", "get", "git", "grep", "hg", "kill", "killall",
+    "ln", "ls", "make", "mkdir", "openssl", "mv", "nc", "nl", "node", "npm", "ping", "ps", "restart", "rm",
+    "rmdir", "sed", "service", "sh", "shopt", "shred", "source", "sort", "sleep", "ssh", "start", "stop",
+    "su", "sudo", "svn", "tee", "telnet", "top", "touch", "vi", "vim", "wall", "wc", "wget", "who", "write",
+    "yes", "zsh"];
 
-  // Keywords
-  define('keyword', 'if then do else elif while until for in esac fi fin ' +
-    'fil done exit set unset export function');
+  CodeMirror.registerHelper("hintWords", "shell", commonAtoms.concat(commonKeywords, commonCommands));
 
-  // Commands
-  define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
-    'curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make ' +
-    'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
-    'shopt shred source sort sleep ssh start stop su sudo svn tee telnet top ' +
-    'touch vi vim wall wc wget who write yes zsh');
+  define('atom', commonAtoms);
+  define('keyword', commonKeywords);
+  define('builtin', commonCommands);
 
   function tokenBase(stream, state) {
     if (stream.eatSpace()) return null;
diff --git a/src/public/libraries/codemirror/mode/shell/test.js b/src/public/libraries/codemirror/mode/shell/test.js
index 4be557216..7571d907d 100644
--- a/src/public/libraries/codemirror/mode/shell/test.js
+++ b/src/public/libraries/codemirror/mode/shell/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({}, "shell");
diff --git a/src/public/libraries/codemirror/mode/sieve/index.html b/src/public/libraries/codemirror/mode/sieve/index.html
index 6f029b623..36369acba 100644
--- a/src/public/libraries/codemirror/mode/sieve/index.html
+++ b/src/public/libraries/codemirror/mode/sieve/index.html
@@ -9,7 +9,7 @@
 <script src="sieve.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/sieve/sieve.js b/src/public/libraries/codemirror/mode/sieve/sieve.js
index 0920d0bab..f02a867e7 100644
--- a/src/public/libraries/codemirror/mode/sieve/sieve.js
+++ b/src/public/libraries/codemirror/mode/sieve/sieve.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/slim/index.html b/src/public/libraries/codemirror/mode/slim/index.html
index 7fa4e50df..7aebf0aef 100644
--- a/src/public/libraries/codemirror/mode/slim/index.html
+++ b/src/public/libraries/codemirror/mode/slim/index.html
@@ -20,7 +20,7 @@
 <script src="slim.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/slim/slim.js b/src/public/libraries/codemirror/mode/slim/slim.js
index 991a97efc..b8ccb1381 100644
--- a/src/public/libraries/codemirror/mode/slim/slim.js
+++ b/src/public/libraries/codemirror/mode/slim/slim.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
 
diff --git a/src/public/libraries/codemirror/mode/slim/test.js b/src/public/libraries/codemirror/mode/slim/test.js
index be4ddacb6..991797fc8 100644
--- a/src/public/libraries/codemirror/mode/slim/test.js
+++ b/src/public/libraries/codemirror/mode/slim/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
 
diff --git a/src/public/libraries/codemirror/mode/smalltalk/index.html b/src/public/libraries/codemirror/mode/smalltalk/index.html
index 2155ebc2a..2dd45a206 100644
--- a/src/public/libraries/codemirror/mode/smalltalk/index.html
+++ b/src/public/libraries/codemirror/mode/smalltalk/index.html
@@ -14,7 +14,7 @@
       .CodeMirror-gutter pre {color: white; font-weight: bold;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/smalltalk/smalltalk.js b/src/public/libraries/codemirror/mode/smalltalk/smalltalk.js
index bb510ba2e..5039fe2d1 100644
--- a/src/public/libraries/codemirror/mode/smalltalk/smalltalk.js
+++ b/src/public/libraries/codemirror/mode/smalltalk/smalltalk.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/smarty/index.html b/src/public/libraries/codemirror/mode/smarty/index.html
index b19c8f09b..8bc1c3d8f 100644
--- a/src/public/libraries/codemirror/mode/smarty/index.html
+++ b/src/public/libraries/codemirror/mode/smarty/index.html
@@ -10,7 +10,7 @@
 <script src="smarty.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/smarty/smarty.js b/src/public/libraries/codemirror/mode/smarty/smarty.js
index 6e0fbed42..c0777e0c7 100644
--- a/src/public/libraries/codemirror/mode/smarty/smarty.js
+++ b/src/public/libraries/codemirror/mode/smarty/smarty.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Smarty 2 and 3 mode.
diff --git a/src/public/libraries/codemirror/mode/solr/index.html b/src/public/libraries/codemirror/mode/solr/index.html
index 4b18c25b7..8a0fdbed7 100644
--- a/src/public/libraries/codemirror/mode/solr/index.html
+++ b/src/public/libraries/codemirror/mode/solr/index.html
@@ -18,7 +18,7 @@
   }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/solr/solr.js b/src/public/libraries/codemirror/mode/solr/solr.js
index dc8b82501..eda4a7a17 100644
--- a/src/public/libraries/codemirror/mode/solr/solr.js
+++ b/src/public/libraries/codemirror/mode/solr/solr.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/soy/index.html b/src/public/libraries/codemirror/mode/soy/index.html
index f0216f097..f9a1b5991 100644
--- a/src/public/libraries/codemirror/mode/soy/index.html
+++ b/src/public/libraries/codemirror/mode/soy/index.html
@@ -14,7 +14,7 @@
 <script src="soy.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/soy/soy.js b/src/public/libraries/codemirror/mode/soy/soy.js
index 6b9d5125e..4c0a106d6 100644
--- a/src/public/libraries/codemirror/mode/soy/soy.js
+++ b/src/public/libraries/codemirror/mode/soy/soy.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/soy/test.js b/src/public/libraries/codemirror/mode/soy/test.js
index d503d7f83..12515eda0 100644
--- a/src/public/libraries/codemirror/mode/soy/test.js
+++ b/src/public/libraries/codemirror/mode/soy/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "soy");
diff --git a/src/public/libraries/codemirror/mode/sparql/index.html b/src/public/libraries/codemirror/mode/sparql/index.html
index 84ef4d363..dfd3f9070 100644
--- a/src/public/libraries/codemirror/mode/sparql/index.html
+++ b/src/public/libraries/codemirror/mode/sparql/index.html
@@ -10,7 +10,7 @@
 <script src="sparql.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/sparql/sparql.js b/src/public/libraries/codemirror/mode/sparql/sparql.js
index 095dcca65..f246776b1 100644
--- a/src/public/libraries/codemirror/mode/sparql/sparql.js
+++ b/src/public/libraries/codemirror/mode/sparql/sparql.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/spreadsheet/index.html b/src/public/libraries/codemirror/mode/spreadsheet/index.html
index a52f76f05..03422bb94 100644
--- a/src/public/libraries/codemirror/mode/spreadsheet/index.html
+++ b/src/public/libraries/codemirror/mode/spreadsheet/index.html
@@ -10,7 +10,7 @@
 <script src="spreadsheet.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/spreadsheet/spreadsheet.js b/src/public/libraries/codemirror/mode/spreadsheet/spreadsheet.js
index 222f29766..d87f988d3 100644
--- a/src/public/libraries/codemirror/mode/spreadsheet/spreadsheet.js
+++ b/src/public/libraries/codemirror/mode/spreadsheet/spreadsheet.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/sql/index.html b/src/public/libraries/codemirror/mode/sql/index.html
index b434f0f40..5791c968c 100644
--- a/src/public/libraries/codemirror/mode/sql/index.html
+++ b/src/public/libraries/codemirror/mode/sql/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css" />
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="sql.js"></script>
 <link rel="stylesheet" href="../../addon/hint/show-hint.css" />
 <script src="../../addon/hint/show-hint.js"></script>
@@ -17,7 +18,7 @@
 }
         </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/sql/sql.js b/src/public/libraries/codemirror/mode/sql/sql.js
index ab99c5a04..2ab55c352 100644
--- a/src/public/libraries/codemirror/mode/sql/sql.js
+++ b/src/public/libraries/codemirror/mode/sql/sql.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/stex/index.html b/src/public/libraries/codemirror/mode/stex/index.html
index 25225e41c..225f485fe 100644
--- a/src/public/libraries/codemirror/mode/stex/index.html
+++ b/src/public/libraries/codemirror/mode/stex/index.html
@@ -9,7 +9,7 @@
 <script src="stex.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/stex/stex.js b/src/public/libraries/codemirror/mode/stex/stex.js
index 44908675f..140e5a8af 100644
--- a/src/public/libraries/codemirror/mode/stex/stex.js
+++ b/src/public/libraries/codemirror/mode/stex/stex.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
  * Author: Constantin Jucovschi (c.jucovschi@jacobs-university.de)
diff --git a/src/public/libraries/codemirror/mode/stex/test.js b/src/public/libraries/codemirror/mode/stex/test.js
index 634dc49d9..b1dbcf4cd 100644
--- a/src/public/libraries/codemirror/mode/stex/test.js
+++ b/src/public/libraries/codemirror/mode/stex/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, "stex");
diff --git a/src/public/libraries/codemirror/mode/stylus/index.html b/src/public/libraries/codemirror/mode/stylus/index.html
index 862c18f25..491c14d55 100644
--- a/src/public/libraries/codemirror/mode/stylus/index.html
+++ b/src/public/libraries/codemirror/mode/stylus/index.html
@@ -11,7 +11,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;} form{margin-bottom: .7em;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/stylus/stylus.js b/src/public/libraries/codemirror/mode/stylus/stylus.js
index a9f50c05d..dbe241d61 100644
--- a/src/public/libraries/codemirror/mode/stylus/stylus.js
+++ b/src/public/libraries/codemirror/mode/stylus/stylus.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Stylus mode created by Dmitry Kiselyov http://git.io/AaRB
 
diff --git a/src/public/libraries/codemirror/mode/swift/index.html b/src/public/libraries/codemirror/mode/swift/index.html
index 109f3fdb0..d33eba4fc 100644
--- a/src/public/libraries/codemirror/mode/swift/index.html
+++ b/src/public/libraries/codemirror/mode/swift/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/swift/swift.js b/src/public/libraries/codemirror/mode/swift/swift.js
index 1795d86e9..b75118519 100644
--- a/src/public/libraries/codemirror/mode/swift/swift.js
+++ b/src/public/libraries/codemirror/mode/swift/swift.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
 
diff --git a/src/public/libraries/codemirror/mode/swift/test.js b/src/public/libraries/codemirror/mode/swift/test.js
index 4091ac6f4..d8a0609b8 100644
--- a/src/public/libraries/codemirror/mode/swift/test.js
+++ b/src/public/libraries/codemirror/mode/swift/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "swift");
diff --git a/src/public/libraries/codemirror/mode/tcl/index.html b/src/public/libraries/codemirror/mode/tcl/index.html
index ce4ad3423..328c9eaf3 100644
--- a/src/public/libraries/codemirror/mode/tcl/index.html
+++ b/src/public/libraries/codemirror/mode/tcl/index.html
@@ -10,7 +10,7 @@
 <script src="tcl.js"></script>
 <script src="../../addon/scroll/scrollpastend.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/tcl/tcl.js b/src/public/libraries/codemirror/mode/tcl/tcl.js
index 8c76d52ca..a7ec89c9e 100644
--- a/src/public/libraries/codemirror/mode/tcl/tcl.js
+++ b/src/public/libraries/codemirror/mode/tcl/tcl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 //tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
 
diff --git a/src/public/libraries/codemirror/mode/textile/index.html b/src/public/libraries/codemirror/mode/textile/index.html
index 42b156b1e..e8d9b99a7 100644
--- a/src/public/libraries/codemirror/mode/textile/index.html
+++ b/src/public/libraries/codemirror/mode/textile/index.html
@@ -9,7 +9,7 @@
 <script src="textile.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/textile/test.js b/src/public/libraries/codemirror/mode/textile/test.js
index 49cdaf9c9..754c5f6bd 100644
--- a/src/public/libraries/codemirror/mode/textile/test.js
+++ b/src/public/libraries/codemirror/mode/textile/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, 'textile');
@@ -39,12 +39,12 @@
       '3 ** 3 = 27');
 
   MT('simpleLink',
-      '[link "CodeMirror":http://codemirror.net]');
+      '[link "CodeMirror":https://codemirror.net]');
 
   MT('referenceLink',
       '[link "CodeMirror":code_mirror]',
       'Normal Text.',
-      '[link [[code_mirror]]http://codemirror.net]');
+      '[link [[code_mirror]]https://codemirror.net]');
 
   MT('footCite',
       'foo bar[qualifier [[1]]]');
diff --git a/src/public/libraries/codemirror/mode/textile/textile.js b/src/public/libraries/codemirror/mode/textile/textile.js
index bc5a2f369..b378fb61f 100644
--- a/src/public/libraries/codemirror/mode/textile/textile.js
+++ b/src/public/libraries/codemirror/mode/textile/textile.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") { // CommonJS
diff --git a/src/public/libraries/codemirror/mode/tiddlywiki/index.html b/src/public/libraries/codemirror/mode/tiddlywiki/index.html
index 77dd0457c..661ddfefa 100644
--- a/src/public/libraries/codemirror/mode/tiddlywiki/index.html
+++ b/src/public/libraries/codemirror/mode/tiddlywiki/index.html
@@ -11,7 +11,7 @@
 <script src="tiddlywiki.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/tiddlywiki/tiddlywiki.js b/src/public/libraries/codemirror/mode/tiddlywiki/tiddlywiki.js
index 1a3b3bc68..a4fb89f65 100644
--- a/src/public/libraries/codemirror/mode/tiddlywiki/tiddlywiki.js
+++ b/src/public/libraries/codemirror/mode/tiddlywiki/tiddlywiki.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /***
     |''Name''|tiddlywiki.js|
@@ -8,7 +8,7 @@
     |''Version''|0.1.7|
     |''Status''|''stable''|
     |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
-    |''Documentation''|http://codemirror.tiddlyspace.com/|
+    |''Documentation''|https://codemirror.tiddlyspace.com/|
     |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
     |''CoreVersion''|2.5.0|
     |''Requires''|codemirror.js|
diff --git a/src/public/libraries/codemirror/mode/tiki/index.html b/src/public/libraries/codemirror/mode/tiki/index.html
index 091c5fb2a..c9dbf8f79 100644
--- a/src/public/libraries/codemirror/mode/tiki/index.html
+++ b/src/public/libraries/codemirror/mode/tiki/index.html
@@ -10,7 +10,7 @@
 <script src="tiki.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/tiki/tiki.js b/src/public/libraries/codemirror/mode/tiki/tiki.js
index b4794e433..092b85953 100644
--- a/src/public/libraries/codemirror/mode/tiki/tiki.js
+++ b/src/public/libraries/codemirror/mode/tiki/tiki.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/toml/index.html b/src/public/libraries/codemirror/mode/toml/index.html
index 90a2a0215..05038a968 100644
--- a/src/public/libraries/codemirror/mode/toml/index.html
+++ b/src/public/libraries/codemirror/mode/toml/index.html
@@ -9,7 +9,7 @@
 <script src="toml.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/toml/toml.js b/src/public/libraries/codemirror/mode/toml/toml.js
index baeca1556..891f384b5 100644
--- a/src/public/libraries/codemirror/mode/toml/toml.js
+++ b/src/public/libraries/codemirror/mode/toml/toml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/tornado/index.html b/src/public/libraries/codemirror/mode/tornado/index.html
index 8ee7ef56c..d4a3a74a6 100644
--- a/src/public/libraries/codemirror/mode/tornado/index.html
+++ b/src/public/libraries/codemirror/mode/tornado/index.html
@@ -12,7 +12,7 @@
 <script src="tornado.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/tornado/tornado.js b/src/public/libraries/codemirror/mode/tornado/tornado.js
index dbfbc3489..aa589a08c 100644
--- a/src/public/libraries/codemirror/mode/tornado/tornado.js
+++ b/src/public/libraries/codemirror/mode/tornado/tornado.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/troff/index.html b/src/public/libraries/codemirror/mode/troff/index.html
index 7c5a54e54..181076421 100644
--- a/src/public/libraries/codemirror/mode/troff/index.html
+++ b/src/public/libraries/codemirror/mode/troff/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/troff/troff.js b/src/public/libraries/codemirror/mode/troff/troff.js
index 86154b6e1..0c2220d2c 100644
--- a/src/public/libraries/codemirror/mode/troff/troff.js
+++ b/src/public/libraries/codemirror/mode/troff/troff.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object")
diff --git a/src/public/libraries/codemirror/mode/ttcn-cfg/index.html b/src/public/libraries/codemirror/mode/ttcn-cfg/index.html
index 4a4cd4571..2ab7c2012 100644
--- a/src/public/libraries/codemirror/mode/ttcn-cfg/index.html
+++ b/src/public/libraries/codemirror/mode/ttcn-cfg/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="ttcn-cfg.js"></script>
 <style type="text/css">
     .CodeMirror {
@@ -14,7 +15,7 @@
     }
 </style>
 <div id=nav>
-    <a href="http://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png">
     </a>
 
diff --git a/src/public/libraries/codemirror/mode/ttcn-cfg/ttcn-cfg.js b/src/public/libraries/codemirror/mode/ttcn-cfg/ttcn-cfg.js
index e10805119..9d4b8405a 100644
--- a/src/public/libraries/codemirror/mode/ttcn-cfg/ttcn-cfg.js
+++ b/src/public/libraries/codemirror/mode/ttcn-cfg/ttcn-cfg.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/ttcn/index.html b/src/public/libraries/codemirror/mode/ttcn/index.html
index f1ef81131..597329d87 100644
--- a/src/public/libraries/codemirror/mode/ttcn/index.html
+++ b/src/public/libraries/codemirror/mode/ttcn/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="ttcn.js"></script>
 <style type="text/css">
     .CodeMirror {
@@ -14,7 +15,7 @@
     }
 </style>
 <div id=nav>
-    <a href="http://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png">
     </a>
 
diff --git a/src/public/libraries/codemirror/mode/ttcn/ttcn.js b/src/public/libraries/codemirror/mode/ttcn/ttcn.js
index 305185177..0304e7c53 100644
--- a/src/public/libraries/codemirror/mode/ttcn/ttcn.js
+++ b/src/public/libraries/codemirror/mode/ttcn/ttcn.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/turtle/index.html b/src/public/libraries/codemirror/mode/turtle/index.html
index a4962b617..79fe6dfdf 100644
--- a/src/public/libraries/codemirror/mode/turtle/index.html
+++ b/src/public/libraries/codemirror/mode/turtle/index.html
@@ -6,10 +6,11 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="turtle.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/turtle/turtle.js b/src/public/libraries/codemirror/mode/turtle/turtle.js
index 0988f0a44..695239661 100644
--- a/src/public/libraries/codemirror/mode/turtle/turtle.js
+++ b/src/public/libraries/codemirror/mode/turtle/turtle.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/twig/index.html b/src/public/libraries/codemirror/mode/twig/index.html
index 02493a5cb..1fac45d0c 100644
--- a/src/public/libraries/codemirror/mode/twig/index.html
+++ b/src/public/libraries/codemirror/mode/twig/index.html
@@ -9,7 +9,7 @@
 <script src="twig.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/twig/twig.js b/src/public/libraries/codemirror/mode/twig/twig.js
index b4e98972b..a6dd3f1a6 100644
--- a/src/public/libraries/codemirror/mode/twig/twig.js
+++ b/src/public/libraries/codemirror/mode/twig/twig.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/vb/index.html b/src/public/libraries/codemirror/mode/vb/index.html
index 869724890..bb84221c8 100644
--- a/src/public/libraries/codemirror/mode/vb/index.html
+++ b/src/public/libraries/codemirror/mode/vb/index.html
@@ -15,7 +15,7 @@
       .CodeMirror pre { font-family: Inconsolata; font-size: 14px}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/vb/vb.js b/src/public/libraries/codemirror/mode/vb/vb.js
index 735eb7f7e..5892cc04e 100644
--- a/src/public/libraries/codemirror/mode/vb/vb.js
+++ b/src/public/libraries/codemirror/mode/vb/vb.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/vbscript/index.html b/src/public/libraries/codemirror/mode/vbscript/index.html
index ad7532d7d..d40da17f3 100644
--- a/src/public/libraries/codemirror/mode/vbscript/index.html
+++ b/src/public/libraries/codemirror/mode/vbscript/index.html
@@ -9,7 +9,7 @@
 <script src="vbscript.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/vbscript/vbscript.js b/src/public/libraries/codemirror/mode/vbscript/vbscript.js
index b66df2239..0670c0cee 100644
--- a/src/public/libraries/codemirror/mode/vbscript/vbscript.js
+++ b/src/public/libraries/codemirror/mode/vbscript/vbscript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
 For extra ASP classic objects, initialize CodeMirror instance with this option:
diff --git a/src/public/libraries/codemirror/mode/velocity/index.html b/src/public/libraries/codemirror/mode/velocity/index.html
index 7eba8f418..b38c570df 100644
--- a/src/public/libraries/codemirror/mode/velocity/index.html
+++ b/src/public/libraries/codemirror/mode/velocity/index.html
@@ -10,7 +10,7 @@
 <script src="velocity.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/velocity/velocity.js b/src/public/libraries/codemirror/mode/velocity/velocity.js
index 2525fda5c..56caa671b 100644
--- a/src/public/libraries/codemirror/mode/velocity/velocity.js
+++ b/src/public/libraries/codemirror/mode/velocity/velocity.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/verilog/index.html b/src/public/libraries/codemirror/mode/verilog/index.html
index 9c52722af..04122511d 100644
--- a/src/public/libraries/codemirror/mode/verilog/index.html
+++ b/src/public/libraries/codemirror/mode/verilog/index.html
@@ -10,7 +10,7 @@
 <script src="verilog.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/verilog/test.js b/src/public/libraries/codemirror/mode/verilog/test.js
index 8334fab05..bafe726db 100644
--- a/src/public/libraries/codemirror/mode/verilog/test.js
+++ b/src/public/libraries/codemirror/mode/verilog/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "verilog");
diff --git a/src/public/libraries/codemirror/mode/verilog/verilog.js b/src/public/libraries/codemirror/mode/verilog/verilog.js
index 340468609..2b6850659 100644
--- a/src/public/libraries/codemirror/mode/verilog/verilog.js
+++ b/src/public/libraries/codemirror/mode/verilog/verilog.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/vhdl/index.html b/src/public/libraries/codemirror/mode/vhdl/index.html
index 3051bc37e..71caf2f0b 100644
--- a/src/public/libraries/codemirror/mode/vhdl/index.html
+++ b/src/public/libraries/codemirror/mode/vhdl/index.html
@@ -10,7 +10,7 @@
 <script src="vhdl.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/vhdl/vhdl.js b/src/public/libraries/codemirror/mode/vhdl/vhdl.js
index 97e086e42..133e67a26 100644
--- a/src/public/libraries/codemirror/mode/vhdl/vhdl.js
+++ b/src/public/libraries/codemirror/mode/vhdl/vhdl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Originally written by Alf Nielsen, re-written by Michael Zhou
 (function(mod) {
diff --git a/src/public/libraries/codemirror/mode/vue/index.html b/src/public/libraries/codemirror/mode/vue/index.html
index e0b45b945..3888e3deb 100644
--- a/src/public/libraries/codemirror/mode/vue/index.html
+++ b/src/public/libraries/codemirror/mode/vue/index.html
@@ -21,7 +21,7 @@
 <script src="vue.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/vue/vue.js b/src/public/libraries/codemirror/mode/vue/vue.js
index 84cd07c9a..b6e6cc513 100644
--- a/src/public/libraries/codemirror/mode/vue/vue.js
+++ b/src/public/libraries/codemirror/mode/vue/vue.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function (mod) {
   "use strict";
diff --git a/src/public/libraries/codemirror/mode/webidl/index.html b/src/public/libraries/codemirror/mode/webidl/index.html
index 1d4112e1c..45b6eeffe 100644
--- a/src/public/libraries/codemirror/mode/webidl/index.html
+++ b/src/public/libraries/codemirror/mode/webidl/index.html
@@ -10,7 +10,7 @@
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id="nav">
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id="logo" src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id="logo" src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/webidl/webidl.js b/src/public/libraries/codemirror/mode/webidl/webidl.js
index 814333620..120de6bea 100644
--- a/src/public/libraries/codemirror/mode/webidl/webidl.js
+++ b/src/public/libraries/codemirror/mode/webidl/webidl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/xml/index.html b/src/public/libraries/codemirror/mode/xml/index.html
index c56b8b6eb..ba6b0ef5b 100644
--- a/src/public/libraries/codemirror/mode/xml/index.html
+++ b/src/public/libraries/codemirror/mode/xml/index.html
@@ -9,7 +9,7 @@
 <script src="xml.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/xml/test.js b/src/public/libraries/codemirror/mode/xml/test.js
index f48156b51..b586d2b45 100644
--- a/src/public/libraries/codemirror/mode/xml/test.js
+++ b/src/public/libraries/codemirror/mode/xml/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "xml"), mname = "xml";
diff --git a/src/public/libraries/codemirror/mode/xml/xml.js b/src/public/libraries/codemirror/mode/xml/xml.js
index 5927bc917..b67bf850b 100644
--- a/src/public/libraries/codemirror/mode/xml/xml.js
+++ b/src/public/libraries/codemirror/mode/xml/xml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/xquery/index.html b/src/public/libraries/codemirror/mode/xquery/index.html
index 7ac5aaeff..d79dbbf06 100644
--- a/src/public/libraries/codemirror/mode/xquery/index.html
+++ b/src/public/libraries/codemirror/mode/xquery/index.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <link rel="stylesheet" href="../../theme/xq-dark.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="xquery.js"></script>
 <style type="text/css">
 	.CodeMirror {
@@ -15,7 +16,7 @@
 	}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/xquery/test.js b/src/public/libraries/codemirror/mode/xquery/test.js
index 9697f9b0a..f7ad3ac52 100644
--- a/src/public/libraries/codemirror/mode/xquery/test.js
+++ b/src/public/libraries/codemirror/mode/xquery/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Don't take these too seriously -- the expected results appear to be
 // based on the results of actual runs without any serious manual
diff --git a/src/public/libraries/codemirror/mode/xquery/xquery.js b/src/public/libraries/codemirror/mode/xquery/xquery.js
index f5db831c1..395b6a701 100644
--- a/src/public/libraries/codemirror/mode/xquery/xquery.js
+++ b/src/public/libraries/codemirror/mode/xquery/xquery.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/yacas/index.html b/src/public/libraries/codemirror/mode/yacas/index.html
index 8e52cafb1..52236fc97 100644
--- a/src/public/libraries/codemirror/mode/yacas/index.html
+++ b/src/public/libraries/codemirror/mode/yacas/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/yacas/yacas.js b/src/public/libraries/codemirror/mode/yacas/yacas.js
index 34c84fbd0..b7ac96b71 100644
--- a/src/public/libraries/codemirror/mode/yacas/yacas.js
+++ b/src/public/libraries/codemirror/mode/yacas/yacas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Yacas mode copyright (c) 2015 by Grzegorz Mazur
 // Loosely based on mathematica mode by Calin Barbat
diff --git a/src/public/libraries/codemirror/mode/yaml-frontmatter/index.html b/src/public/libraries/codemirror/mode/yaml-frontmatter/index.html
index 30cb294e8..e6283fc67 100644
--- a/src/public/libraries/codemirror/mode/yaml-frontmatter/index.html
+++ b/src/public/libraries/codemirror/mode/yaml-frontmatter/index.html
@@ -13,7 +13,7 @@
 <script src="yaml-frontmatter.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js b/src/public/libraries/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js
index 5f4977237..e9faefcf9 100644
--- a/src/public/libraries/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/src/public/libraries/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function (mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/src/public/libraries/codemirror/mode/yaml/index.html b/src/public/libraries/codemirror/mode/yaml/index.html
index be9b63236..bfea6111d 100644
--- a/src/public/libraries/codemirror/mode/yaml/index.html
+++ b/src/public/libraries/codemirror/mode/yaml/index.html
@@ -9,7 +9,7 @@
 <script src="yaml.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/yaml/yaml.js b/src/public/libraries/codemirror/mode/yaml/yaml.js
index f35a40130..a29d7ea4a 100644
--- a/src/public/libraries/codemirror/mode/yaml/yaml.js
+++ b/src/public/libraries/codemirror/mode/yaml/yaml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -109,7 +109,8 @@ CodeMirror.defineMode("yaml", function() {
         escaped: false
       };
     },
-    lineComment: "#"
+    lineComment: "#",
+    fold: "indent"
   };
 });
 
diff --git a/src/public/libraries/codemirror/mode/z80/index.html b/src/public/libraries/codemirror/mode/z80/index.html
index a41b7473e..39db506fb 100644
--- a/src/public/libraries/codemirror/mode/z80/index.html
+++ b/src/public/libraries/codemirror/mode/z80/index.html
@@ -9,7 +9,7 @@
 <script src="z80.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/src/public/libraries/codemirror/mode/z80/z80.js b/src/public/libraries/codemirror/mode/z80/z80.js
index aae70216f..8cea4ff90 100644
--- a/src/public/libraries/codemirror/mode/z80/z80.js
+++ b/src/public/libraries/codemirror/mode/z80/z80.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS