diff --git a/static/js/lib/codemirror-4.5/addon/comment/comment.js b/static/js/lib/codemirror-4.5/addon/comment/comment.js
index d7f569c..2dd114d 100644
--- a/static/js/lib/codemirror-4.5/addon/comment/comment.js
+++ b/static/js/lib/codemirror-4.5/addon/comment/comment.js
@@ -109,7 +109,7 @@
   CodeMirror.defineExtension("uncomment", function(from, to, options) {
     if (!options) options = noOptions;
     var self = this, mode = self.getModeAt(from);
-    var end = Math.min(to.line, self.lastLine()), start = Math.min(from.line, end);
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
 
     // Try finding line comments
     var lineString = options.lineComment || mode.lineComment, lines = [];
diff --git a/static/js/lib/codemirror-4.5/addon/dialog/dialog.js b/static/js/lib/codemirror-4.5/addon/dialog/dialog.js
index 946040c..5a88d99 100644
--- a/static/js/lib/codemirror-4.5/addon/dialog/dialog.js
+++ b/static/js/lib/codemirror-4.5/addon/dialog/dialog.js
@@ -56,7 +56,10 @@
 
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
-      if (options.value) inp.value = options.value;
+      if (options.value) {
+        inp.value = options.value;
+        inp.select();
+      }
 
       if (options.onInput)
         CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
@@ -129,8 +132,8 @@
   CodeMirror.defineExtension("openNotification", function(template, options) {
     closeNotification(this, close);
     var dialog = dialogDiv(this, template, options && options.bottom);
-    var duration = options && (options.duration === undefined ? 5000 : options.duration);
     var closed = false, doneTimer;
+    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
 
     function close() {
       if (closed) return;
@@ -143,7 +146,10 @@
       CodeMirror.e_preventDefault(e);
       close();
     });
+
     if (duration)
-      doneTimer = setTimeout(close, options.duration);
+      doneTimer = setTimeout(close, duration);
+
+    return close;
   });
 });
diff --git a/static/js/lib/codemirror-4.5/addon/edit/closebrackets.js b/static/js/lib/codemirror-4.5/addon/edit/closebrackets.js
index 1a04f36..32eca01 100644
--- a/static/js/lib/codemirror-4.5/addon/edit/closebrackets.js
+++ b/static/js/lib/codemirror-4.5/addon/edit/closebrackets.js
@@ -78,24 +78,25 @@
         for (var i = 0; i < ranges.length; i++) {
           var range = ranges[i], cur = range.head, curType;
           var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
-          if (!range.empty())
+          if (!range.empty()) {
             curType = "surround";
-          else if (left == right && next == right) {
+          } else if (left == right && next == right) {
             if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
               curType = "skipThree";
             else
               curType = "skip";
           } else if (left == right && cur.ch > 1 &&
                      cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
-                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left))
+                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left)) {
             curType = "addFour";
-          else if (left == '"' || left == "'") {
+          } else if (left == '"' || left == "'") {
             if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, left)) curType = "both";
             else return CodeMirror.Pass;
-          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
+          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next)) {
             curType = "both";
-          else
+          } else {
             return CodeMirror.Pass;
+          }
           if (!type) type = curType;
           else if (type != curType) return CodeMirror.Pass;
         }
diff --git a/static/js/lib/codemirror-4.5/addon/edit/closetag.js b/static/js/lib/codemirror-4.5/addon/edit/closetag.js
index 69ea444..a0bec7d 100644
--- a/static/js/lib/codemirror-4.5/addon/edit/closetag.js
+++ b/static/js/lib/codemirror-4.5/addon/edit/closetag.js
@@ -102,11 +102,25 @@
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
       if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-          tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
-          !state.context || !state.context.tagName ||
-          closingTagExists(cm, state.context.tagName, pos, state))
+          tok.start != pos.ch - 1)
         return CodeMirror.Pass;
-      replacements[i] = "/" + state.context.tagName + ">";
+      // Kludge to get around the fact that we are not in XML mode
+      // when completing in JS/CSS snippet in htmlmixed mode. Does not
+      // work for other XML embedded languages (there is no general
+      // way to go from a mixed mode to its current XML state).
+      if (inner.mode.name != "xml") {
+        if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
+          replacements[i] = "/script>";
+        else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
+          replacements[i] = "/style>";
+        else
+          return CodeMirror.Pass;
+      } else {
+        if (!state.context || !state.context.tagName ||
+            closingTagExists(cm, state.context.tagName, pos, state))
+          return CodeMirror.Pass;
+        replacements[i] = "/" + state.context.tagName + ">";
+      }
     }
     cm.replaceSelections(replacements);
     ranges = cm.listSelections();
diff --git a/static/js/lib/codemirror-4.5/addon/edit/continuelist.js b/static/js/lib/codemirror-4.5/addon/edit/continuelist.js
index 8cee761..9ad0a98 100644
--- a/static/js/lib/codemirror-4.5/addon/edit/continuelist.js
+++ b/static/js/lib/codemirror-4.5/addon/edit/continuelist.js
@@ -11,7 +11,8 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)([*+-]|(\d+)\.)(\s+)/,
+  var listRE = /^(\s*)([> ]+|[*+-]|(\d+)\.)(\s+)/,
+      emptyListRE = /^(\s*)([> ]+|[*+-]|(\d+)\.)(\s*)$/,
       unorderedBullets = "*+-";
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
@@ -19,18 +20,30 @@
     var ranges = cm.listSelections(), replacements = [];
     for (var i = 0; i < ranges.length; i++) {
       var pos = ranges[i].head, match;
-      var inList = cm.getStateAfter(pos.line).list !== false;
+      var eolState = cm.getStateAfter(pos.line);
+      var inList = eolState.list !== false;
+      var inQuote = eolState.quote !== false;
 
-      if (!ranges[i].empty() || !inList || !(match = cm.getLine(pos.line).match(listRE))) {
+      if (!ranges[i].empty() || (!inList && !inQuote) || !(match = cm.getLine(pos.line).match(listRE))) {
         cm.execCommand("newlineAndIndent");
         return;
       }
-      var indent = match[1], after = match[4];
-      var bullet = unorderedBullets.indexOf(match[2]) >= 0
-        ? match[2]
-        : (parseInt(match[3], 10) + 1) + ".";
+      if (cm.getLine(pos.line).match(emptyListRE)) {
+        cm.replaceRange("", {
+          line: pos.line, ch: 0
+        }, {
+          line: pos.line, ch: pos.ch + 1
+        });
+        replacements[i] = "\n";
 
-      replacements[i] = "\n" + indent + bullet + after;
+      } else {
+        var indent = match[1], after = match[4];
+        var bullet = unorderedBullets.indexOf(match[2]) >= 0 || match[2].indexOf(">") >= 0
+          ? match[2]
+          : (parseInt(match[3], 10) + 1) + ".";
+
+        replacements[i] = "\n" + indent + bullet + after;
+      }
     }
 
     cm.replaceSelections(replacements);
diff --git a/static/js/lib/codemirror-4.5/addon/hint/html-hint.js b/static/js/lib/codemirror-4.5/addon/hint/html-hint.js
index addd9b7..992218f 100644
--- a/static/js/lib/codemirror-4.5/addon/hint/html-hint.js
+++ b/static/js/lib/codemirror-4.5/addon/hint/html-hint.js
@@ -3,9 +3,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror", "./xml-hint"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "./xml-hint"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
diff --git a/static/js/lib/codemirror-4.5/addon/hint/show-hint.css b/static/js/lib/codemirror-4.5/addon/hint/show-hint.css
index 8a4ff05..924e638 100644
--- a/static/js/lib/codemirror-4.5/addon/hint/show-hint.css
+++ b/static/js/lib/codemirror-4.5/addon/hint/show-hint.css
@@ -32,7 +32,7 @@
   cursor: pointer;
 }
 
-.CodeMirror-hint-active {
+li.CodeMirror-hint-active {
   background: #08f;
   color: white;
 }
diff --git a/static/js/lib/codemirror-4.5/addon/hint/sql-hint.js b/static/js/lib/codemirror-4.5/addon/hint/sql-hint.js
index 20653b5..c2b511f 100644
--- a/static/js/lib/codemirror-4.5/addon/hint/sql-hint.js
+++ b/static/js/lib/codemirror-4.5/addon/hint/sql-hint.js
@@ -12,6 +12,7 @@
   "use strict";
 
   var tables;
+  var defaultTable;
   var keywords;
   var CONS = {
     QUERY_DIV: ";",
@@ -43,18 +44,55 @@
     }
   }
 
-  function columnCompletion(result, editor) {
+  function nameCompletion(result, editor) {
     var cur = editor.getCursor();
     var token = editor.getTokenAt(cur);
+    var useBacktick = (token.string.charAt(0) == "`");
     var string = token.string.substr(1);
-    var prevCur = Pos(cur.line, token.start);
-    var table = editor.getTokenAt(prevCur).string;
-    if (!tables.hasOwnProperty(table))
-      table = findTableByAlias(table, editor);
-    var columns = tables[table];
-    if (!columns) return;
+    var prevToken = editor.getTokenAt(Pos(cur.line, token.start));
+    if (token.string.charAt(0) == "." || prevToken.string == "."){
+      //Suggest colunm names
+      if (prevToken.string == ".") {
+        var prevToken = editor.getTokenAt(Pos(cur.line, token.start - 1));
+      }
+      var table = prevToken.string;
+      //Check if backtick is used in table name. If yes, use it for columns too.
+      var useBacktickTable = false;
+      if (table.match(/`/g)) {
+        useBacktickTable = true;
+        table = table.replace(/`/g, "");
+      }
+      //Check if table is available. If not, find table by Alias
+      if (!tables.hasOwnProperty(table))
+        table = findTableByAlias(table, editor);
+      var columns = tables[table];
+      if (!columns) return;
 
-    addMatches(result, string, columns, function(w) {return "." + w;});
+      if (useBacktick) {
+        addMatches(result, string, columns, function(w) {return "`" + w + "`";});
+      }
+      else if(useBacktickTable) {
+        addMatches(result, string, columns, function(w) {return ".`" + w + "`";});
+      }
+      else {
+        addMatches(result, string, columns, function(w) {return "." + w;});
+      }
+    }
+    else {
+      //Suggest table names or colums in defaultTable
+      while (token.start && string.charAt(0) == ".") {
+        token = editor.getTokenAt(Pos(cur.line, token.start - 1));
+        string = token.string + string;
+      }
+      if (useBacktick) {
+        addMatches(result, string, tables, function(w) {return "`" + w + "`";});
+        addMatches(result, string, defaultTable, function(w) {return "`" + w + "`";});
+      }
+      else {
+        addMatches(result, string, tables, function(w) {return w;});
+        addMatches(result, string, defaultTable, function(w) {return w;});
+      }
+    }
   }
 
   function eachWord(lineText, f) {
@@ -128,11 +166,14 @@
 
   CodeMirror.registerHelper("hint", "sql", function(editor, options) {
     tables = (options && options.tables) || {};
+    var defaultTableName = options && options.defaultTable;
+    defaultTable = (defaultTableName && tables[defaultTableName] || []);
     keywords = keywords || getKeywords(editor);
+
     var cur = editor.getCursor();
     var result = [];
     var token = editor.getTokenAt(cur), start, end, search;
-    if (token.string.match(/^[.\w@]\w*$/)) {
+    if (token.string.match(/^[.`\w@]\w*$/)) {
       search = token.string;
       start = token.start;
       end = token.end;
@@ -140,18 +181,11 @@
       start = end = cur.ch;
       search = "";
     }
-    if (search.charAt(0) == ".") {
-      columnCompletion(result, editor);
-      if (!result.length) {
-        while (start && search.charAt(0) == ".") {
-          token = editor.getTokenAt(Pos(cur.line, token.start - 1));
-          start = token.start;
-          search = token.string + search;
-        }
-        addMatches(result, search, tables, function(w) {return w;});
-      }
+    if (search.charAt(0) == "." || search.charAt(0) == "`") {
+      nameCompletion(result, editor);
     } else {
       addMatches(result, search, tables, function(w) {return w;});
+      addMatches(result, search, defaultTable, function(w) {return w;});
       addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
     }
 
diff --git a/static/js/lib/codemirror-4.5/addon/lint/lint.js b/static/js/lib/codemirror-4.5/addon/lint/lint.js
index a87e70c..66f187e 100644
--- a/static/js/lib/codemirror-4.5/addon/lint/lint.js
+++ b/static/js/lib/codemirror-4.5/addon/lint/lint.js
@@ -118,10 +118,11 @@
 
   function startLinting(cm) {
     var state = cm.state.lint, options = state.options;
+    var passOptions = options.options || options; // Support deprecated passing of `options` property in options
     if (options.async)
-      options.getAnnotations(cm, updateLinting, options);
+      options.getAnnotations(cm.getValue(), updateLinting, passOptions, cm);
     else
-      updateLinting(cm, options.getAnnotations(cm.getValue(), options.options));
+      updateLinting(cm, options.getAnnotations(cm.getValue(), passOptions, cm));
   }
 
   function updateLinting(cm, annotationsNotSorted) {
@@ -170,20 +171,14 @@
     showTooltipFor(e, annotationTooltip(ann), target);
   }
 
-  // When the mouseover fires, the cursor might not actually be over
-  // the character itself yet. These pairs of x,y offsets are used to
-  // probe a few nearby points when no suitable marked range is found.
-  var nearby = [0, 0, 0, 5, 0, -5, 5, 0, -5, 0];
-
   function onMouseOver(cm, e) {
-    if (!/\bCodeMirror-lint-mark-/.test((e.target || e.srcElement).className)) return;
-    for (var i = 0; i < nearby.length; i += 2) {
-      var spans = cm.findMarksAt(cm.coordsChar({left: e.clientX + nearby[i],
-                                                top: e.clientY + nearby[i + 1]}, "client"));
-      for (var j = 0; j < spans.length; ++j) {
-        var span = spans[j], ann = span.__annotation;
-        if (ann) return popupSpanTooltip(ann, e);
-      }
+    var target = e.target || e.srcElement;
+    if (!/\bCodeMirror-lint-mark-/.test(target.className)) return;
+    var box = target.getBoundingClientRect(), x = (box.left + box.right) / 2, y = (box.top + box.bottom) / 2;
+    var spans = cm.findMarksAt(cm.coordsChar({left: x, top: y}, "client"));
+    for (var i = 0; i < spans.length; ++i) {
+      var ann = spans[i].__annotation;
+      if (ann) return popupSpanTooltip(ann, e);
     }
   }
 
diff --git a/static/js/lib/codemirror-4.5/addon/merge/merge.js b/static/js/lib/codemirror-4.5/addon/merge/merge.js
index d9b2776..da3ea47 100644
--- a/static/js/lib/codemirror-4.5/addon/merge/merge.js
+++ b/static/js/lib/codemirror-4.5/addon/merge/merge.js
@@ -1,17 +1,17 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
+// declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("diff_match_patch"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "diff_match_patch"], mod);
   else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
+    mod(CodeMirror, diff_match_patch);
+})(function(CodeMirror, diff_match_patch) {
   "use strict";
-  // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
-
   var Pos = CodeMirror.Pos;
   var svgNS = "http://www.w3.org/2000/svg";
 
diff --git a/static/js/lib/codemirror-4.5/addon/mode/simple.js b/static/js/lib/codemirror-4.5/addon/mode/simple.js
new file mode 100644
index 0000000..a4a86b9
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/addon/mode/simple.js
@@ -0,0 +1,210 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineSimpleMode = function(name, states, props) {
+    CodeMirror.defineMode(name, function(config) {
+      return CodeMirror.simpleMode(config, states, props);
+    });
+  };
+
+  CodeMirror.simpleMode = function(config, states) {
+    ensureState(states, "start");
+    var states_ = {}, meta = states.meta || {}, hasIndentation = false;
+    for (var state in states) if (state != meta && states.hasOwnProperty(state)) {
+      var list = states_[state] = [], orig = states[state];
+      for (var i = 0; i < orig.length; i++) {
+        var data = orig[i];
+        list.push(new Rule(data, states));
+        if (data.indent || data.dedent) hasIndentation = true;
+      }
+    }
+    var mode = {
+      startState: function() {
+        return {state: "start", pending: null,
+                local: null, localState: null,
+                indent: hasIndentation ? [] : null};
+      },
+      copyState: function(state) {
+        var s = {state: state.state, pending: state.pending,
+                 local: state.local, localState: null,
+                 indent: state.indent && state.indent.slice(0)};
+        if (state.localState)
+          s.localState = CodeMirror.copyState(state.local.mode, state.localState);
+        if (state.stack)
+          s.stack = state.stack.slice(0);
+        for (var pers = state.persistentStates; pers; pers = pers.next)
+          s.persistentStates = {mode: pers.mode,
+                                spec: pers.spec,
+                                state: pers.state == state.localState ? s.localState : CodeMirror.copyState(pers.mode, pers.state),
+                                next: s.persistentStates};
+        return s;
+      },
+      token: tokenFunction(states_, config),
+      innerMode: function(state) { return state.local && {mode: state.local.mode, state: state.localState}; },
+      indent: indentFunction(states_, meta)
+    };
+    if (meta) for (var prop in meta) if (meta.hasOwnProperty(prop))
+      mode[prop] = meta[prop];
+    return mode;
+  };
+
+  function ensureState(states, name) {
+    if (!states.hasOwnProperty(name))
+      throw new Error("Undefined state " + name + "in simple mode");
+  }
+
+  function toRegex(val, caret) {
+    if (!val) return /(?:)/;
+    var flags = "";
+    if (val instanceof RegExp) {
+      if (val.ignoreCase) flags = "i";
+      val = val.source;
+    } else {
+      val = String(val);
+    }
+    return new RegExp((caret === false ? "" : "^") + "(?:" + val + ")", flags);
+  }
+
+  function asToken(val) {
+    if (!val) return null;
+    if (typeof val == "string") return val.replace(/\./g, " ");
+    var result = [];
+    for (var i = 0; i < val.length; i++)
+      result.push(val[i] && val[i].replace(/\./g, " "));
+    return result;
+  }
+
+  function Rule(data, states) {
+    if (data.next || data.push) ensureState(states, data.next || data.push);
+    this.regex = toRegex(data.regex);
+    this.token = asToken(data.token);
+    this.data = data;
+  }
+
+  function tokenFunction(states, config) {
+    return function(stream, state) {
+      if (state.pending) {
+        var pend = state.pending.shift();
+        if (state.pending.length == 0) state.pending = null;
+        stream.pos += pend.text.length;
+        return pend.token;
+      }
+
+      if (state.local) {
+        if (state.local.end && stream.match(state.local.end)) {
+          var tok = state.local.endToken || null;
+          state.local = state.localState = null;
+          return tok;
+        } else {
+          var tok = state.local.mode.token(stream, state.localState), m;
+          if (state.local.endScan && (m = state.local.endScan.exec(stream.current())))
+            stream.pos = stream.start + m.index;
+          return tok;
+        }
+      }
+
+      var curState = states[state.state];
+      for (var i = 0; i < curState.length; i++) {
+        var rule = curState[i];
+        var matches = stream.match(rule.regex);
+        if (matches) {
+          if (rule.data.next) {
+            state.state = rule.data.next;
+          } else if (rule.data.push) {
+            (state.stack || (state.stack = [])).push(state.state);
+            state.state = rule.data.push;
+          } else if (rule.data.pop && state.stack && state.stack.length) {
+            state.state = state.stack.pop();
+          }
+
+          if (rule.data.mode)
+            enterLocalMode(config, state, rule.data.mode, rule.token);
+          if (rule.data.indent)
+            state.indent.push(stream.indentation() + config.indentUnit);
+          if (rule.data.dedent)
+            state.indent.pop();
+          if (matches.length > 2) {
+            state.pending = [];
+            for (var j = 2; j < matches.length; j++)
+              if (matches[j])
+                state.pending.push({text: matches[j], token: rule.token[j - 1]});
+            stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
+            return rule.token[0];
+          } else if (rule.token && rule.token.join) {
+            return rule.token[0];
+          } else {
+            return rule.token;
+          }
+        }
+      }
+      stream.next();
+      return null;
+    };
+  }
+
+  function cmp(a, b) {
+    if (a === b) return true;
+    if (!a || typeof a != "object" || !b || typeof b != "object") return false;
+    var props = 0;
+    for (var prop in a) if (a.hasOwnProperty(prop)) {
+      if (!b.hasOwnProperty(prop) || !cmp(a[prop], b[prop])) return false;
+      props++;
+    }
+    for (var prop in b) if (b.hasOwnProperty(prop)) props--;
+    return props == 0;
+  }
+
+  function enterLocalMode(config, state, spec, token) {
+    var pers;
+    if (spec.persistent) for (var p = state.persistentStates; p && !pers; p = p.next)
+      if (spec.spec ? cmp(spec.spec, p.spec) : spec.mode == p.mode) pers = p;
+    var mode = pers ? pers.mode : spec.mode || CodeMirror.getMode(config, spec.spec);
+    var lState = pers ? pers.state : CodeMirror.startState(mode);
+    if (spec.persistent && !pers)
+      state.persistentStates = {mode: mode, spec: spec.spec, state: lState, next: state.persistentStates};
+
+    state.localState = lState;
+    state.local = {mode: mode,
+                   end: spec.end && toRegex(spec.end),
+                   endScan: spec.end && spec.forceEnd !== false && toRegex(spec.end, false),
+                   endToken: token && token.join ? token[token.length - 1] : token};
+  }
+
+  function indexOf(val, arr) {
+    for (var i = 0; i < arr.length; i++) if (arr[i] === val) return true;
+  }
+
+  function indentFunction(states, meta) {
+    return function(state, textAfter, line) {
+      if (state.local && state.local.mode.indent)
+        return state.local.mode.indent(state.localState, textAfter, line);
+      if (state.indent == null || state.local || meta.dontIndentStates && indexOf(state.state, meta.dontIndentStates) > -1)
+        return CodeMirror.Pass;
+
+      var pos = state.indent.length - 1, rules = states[state.state];
+      scan: for (;;) {
+        for (var i = 0; i < rules.length; i++) {
+          var rule = rules[i], m = rule.regex.exec(textAfter);
+          if (m && m[0]) {
+            if (rule.data.dedent && rule.data.dedentIfLineStart !== false) pos--;
+            if (rule.next || rule.push) rules = states[rule.next || rule.push];
+            textAfter = textAfter.slice(m[0].length);
+            continue scan;
+          }
+        }
+        break;
+      }
+      return pos < 0 ? 0 : state.indent[pos];
+    };
+  }
+});
diff --git a/static/js/lib/codemirror-4.5/addon/runmode/runmode-standalone.js b/static/js/lib/codemirror-4.5/addon/runmode/runmode-standalone.js
index 0dd0c28..f4f352c 100644
--- a/static/js/lib/codemirror-4.5/addon/runmode/runmode-standalone.js
+++ b/static/js/lib/codemirror-4.5/addon/runmode/runmode-standalone.js
@@ -74,7 +74,11 @@ CodeMirror.startState = function (mode, a1, a2) {
 };
 
 var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-CodeMirror.defineMode = function (name, mode) { modes[name] = mode; };
+CodeMirror.defineMode = function (name, mode) {
+  if (arguments.length > 2)
+    mode.dependencies = Array.prototype.slice.call(arguments, 2);
+  modes[name] = mode;
+};
 CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
 CodeMirror.resolveMode = function(spec) {
   if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
diff --git a/static/js/lib/codemirror-4.5/addon/runmode/runmode.node.js b/static/js/lib/codemirror-4.5/addon/runmode/runmode.node.js
index f64b8a1..8b8140b 100644
--- a/static/js/lib/codemirror-4.5/addon/runmode/runmode.node.js
+++ b/static/js/lib/codemirror-4.5/addon/runmode/runmode.node.js
@@ -74,10 +74,8 @@ exports.startState = function(mode, a1, a2) {
 
 var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
 exports.defineMode = function(name, mode) {
-  if (arguments.length > 2) {
-    mode.dependencies = [];
-    for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-  }
+  if (arguments.length > 2)
+    mode.dependencies = Array.prototype.slice.call(arguments, 2);
   modes[name] = mode;
 };
 exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
diff --git a/static/js/lib/codemirror-4.5/addon/search/match-highlighter.js b/static/js/lib/codemirror-4.5/addon/search/match-highlighter.js
index 14dd4d4..e9a2272 100644
--- a/static/js/lib/codemirror-4.5/addon/search/match-highlighter.js
+++ b/static/js/lib/codemirror-4.5/addon/search/match-highlighter.js
@@ -8,12 +8,15 @@
 // document.
 //
 // The option can be set to true to simply enable it, or to a
-// {minChars, style, showToken} object to explicitly configure it.
-// minChars is the minimum amount of characters that should be
+// {minChars, style, wordsOnly, showToken, delay} object to explicitly
+// configure it. minChars is the minimum amount of characters that should be
 // selected for the behavior to occur, and style is the token style to
 // apply to the matches. This will be prefixed by "cm-" to create an
-// actual CSS class name. showToken, when enabled, will cause the
-// current token to be highlighted when nothing is selected.
+// actual CSS class name. If wordsOnly is enabled, the matches will be
+// highlighted only if the selected text is a word. showToken, when enabled,
+// will cause the current token to be highlighted when nothing is selected.
+// delay is used to specify how much time to wait, in milliseconds, before
+// highlighting the matches.
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -28,6 +31,7 @@
   var DEFAULT_MIN_CHARS = 2;
   var DEFAULT_TOKEN_STYLE = "matchhighlight";
   var DEFAULT_DELAY = 100;
+  var DEFAULT_WORDS_ONLY = false;
 
   function State(options) {
     if (typeof options == "object") {
@@ -35,10 +39,12 @@
       this.style = options.style;
       this.showToken = options.showToken;
       this.delay = options.delay;
+      this.wordsOnly = options.wordsOnly;
     }
     if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
     if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
     if (this.delay == null) this.delay = DEFAULT_DELAY;
+    if (this.wordsOnly == null) this.wordsOnly = DEFAULT_WORDS_ONLY;
     this.overlay = this.timeout = null;
   }
 
@@ -81,12 +87,30 @@
       }
       var from = cm.getCursor("from"), to = cm.getCursor("to");
       if (from.line != to.line) return;
+      if (state.wordsOnly && !isWord(cm, from, to)) return;
       var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
       if (selection.length >= state.minChars)
         cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
     });
   }
 
+  function isWord(cm, from, to) {
+    var str = cm.getRange(from, to);
+    if (str.match(/^\w+$/) !== null) {
+        if (from.ch > 0) {
+            var pos = {line: from.line, ch: from.ch - 1};
+            var chr = cm.getRange(pos, from);
+            if (chr.match(/\W/) === null) return false;
+        }
+        if (to.ch < cm.getLine(from.line).length) {
+            var pos = {line: to.line, ch: to.ch + 1};
+            var chr = cm.getRange(to, pos);
+            if (chr.match(/\W/) === null) return false;
+        }
+        return true;
+    } else return false;
+  }
+
   function boundariesAround(stream, re) {
     return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
       (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));
diff --git a/static/js/lib/codemirror-4.5/codemirror.css b/static/js/lib/codemirror-4.5/codemirror.css
index c089777..68c67b1 100644
--- a/static/js/lib/codemirror-4.5/codemirror.css
+++ b/static/js/lib/codemirror-4.5/codemirror.css
@@ -57,6 +57,10 @@
   border: 0;
   background: #7e7;
 }
+.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+
 .cm-animate-fat-cursor {
   width: auto;
   border: 0;
@@ -83,7 +87,7 @@
 /* Can style cursor different in overwrite (non-insert) mode */
 div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
-.cm-tab { display: inline-block; }
+.cm-tab { display: inline-block; text-decoration: inherit; }
 
 .CodeMirror-ruler {
   border-left: 1px solid #ccc;
@@ -213,6 +217,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-lines {
   cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
 }
 .CodeMirror pre {
   /* Reset some styles that the rest of the page might have set */
@@ -272,7 +277,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 div.CodeMirror-cursors {
   visibility: hidden;
   position: relative;
-  z-index: 1;
+  z-index: 3;
 }
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
@@ -299,3 +304,6 @@ div.CodeMirror-cursors {
     visibility: hidden;
   }
 }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
diff --git a/static/js/lib/codemirror-4.5/codemirror.js b/static/js/lib/codemirror-4.5/codemirror.js
index 61e8c41..4f8a23b 100644
--- a/static/js/lib/codemirror-4.5/codemirror.js
+++ b/static/js/lib/codemirror-4.5/codemirror.js
@@ -61,7 +61,7 @@
   function CodeMirror(place, options) {
     if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
 
-    this.options = options = options || {};
+    this.options = options = options ? copyObj(options) : {};
     // Determine effective options based on given values and defaults.
     copyObj(defaults, options, false);
     setGuttersForLineNumbers(options);
@@ -96,21 +96,20 @@
     registerEventHandlers(this);
     ensureGlobalHandlers();
 
-    var cm = this;
-    runInOp(this, function() {
-      cm.curOp.forceUpdate = true;
-      attachDoc(cm, doc);
+    startOperation(this);
+    this.curOp.forceUpdate = true;
+    attachDoc(this, doc);
 
-      if ((options.autofocus && !mobile) || activeElt() == display.input)
-        setTimeout(bind(onFocus, cm), 20);
-      else
-        onBlur(cm);
+    if ((options.autofocus && !mobile) || activeElt() == display.input)
+      setTimeout(bind(onFocus, this), 20);
+    else
+      onBlur(this);
 
-      for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-        optionHandlers[opt](cm, options[opt], Init);
-      maybeUpdateLineNumberWidth(cm);
-      for (var i = 0; i < initHooks.length; ++i) initHooks[i](cm);
-    });
+    for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
+      optionHandlers[opt](this, options[opt], Init);
+    maybeUpdateLineNumberWidth(this);
+    for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
+    endOperation(this);
   }
 
   // DISPLAY CONSTRUCTOR
@@ -723,9 +722,10 @@
   // view, so that we don't interleave reading and writing to the DOM.
   function getDimensions(cm) {
     var d = cm.display, left = {}, width = {};
+    var gutterLeft = d.gutters.clientLeft;
     for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-      left[cm.options.gutters[i]] = n.offsetLeft;
-      width[cm.options.gutters[i]] = n.offsetWidth;
+      left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
+      width[cm.options.gutters[i]] = n.clientWidth;
     }
     return {fixedPos: compensateForHScroll(d),
             gutterTotalWidth: d.gutters.offsetWidth,
@@ -1646,7 +1646,7 @@
 
     var rect;
     if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-      for (;;) {
+      for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
         while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
         while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
         if (ie && ie_version < 9 && start == 0 && end == mEnd - mStart) {
@@ -1665,6 +1665,7 @@
         start = start - 1;
         collapse = "right";
       }
+      if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
     } else { // If it is a widget, simply get the box for the whole widget.
       if (start > 0) collapse = bias = "right";
       var rects;
@@ -1681,8 +1682,6 @@
         rect = nullRect;
     }
 
-    if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
-
     var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
     var mid = (rtop + rbot) / 2;
     var heights = prepared.view.measure.heights;
@@ -2090,11 +2089,11 @@
       display.wheelStartX = display.wheelStartY = null;
 
     // Propagate the scroll position to the actual DOM scroller
-    if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {
+    if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
       var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
       display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
     }
-    if (op.scrollLeft != null && display.scroller.scrollLeft != op.scrollLeft) {
+    if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
       var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
       display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
       alignHorizontally(cm);
@@ -2457,16 +2456,16 @@
           cm.options.smartIndent && range.head.ch < 100 &&
           (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
         var mode = cm.getModeAt(range.head);
+        var end = changeEnd(changeEvent);
         if (mode.electricChars) {
           for (var j = 0; j < mode.electricChars.length; j++)
             if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-              indentLine(cm, range.head.line, "smart");
+              indentLine(cm, end.line, "smart");
               break;
             }
         } else if (mode.electricInput) {
-          var end = changeEnd(changeEvent);
           if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
-            indentLine(cm, range.head.line, "smart");
+            indentLine(cm, end.line, "smart");
         }
       }
     }
@@ -2528,7 +2527,7 @@
         var pos = posFromMouse(cm, e);
         if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
         e_preventDefault(e);
-        var word = findWordAt(cm, pos);
+        var word = cm.findWordAt(pos);
         extendSelection(cm.doc, word.anchor, word.head);
       }));
     else
@@ -2807,7 +2806,7 @@
       start = posFromMouse(cm, e, true, true);
       ourIndex = -1;
     } else if (type == "double") {
-      var word = findWordAt(cm, start);
+      var word = cm.findWordAt(start);
       if (cm.display.shift || doc.extend)
         ourRange = extendRange(doc, ourRange, word.anchor, word.head);
       else
@@ -2861,7 +2860,7 @@
         var anchor = oldRange.anchor, head = pos;
         if (type != "single") {
           if (type == "double")
-            var range = findWordAt(cm, pos);
+            var range = cm.findWordAt(pos);
           else
             var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
           if (cmp(range.anchor, anchor) > 0) {
@@ -3721,7 +3720,7 @@
   // measured, the position of something may 'drift' during drawing).
   function scrollPosIntoView(cm, pos, end, margin) {
     if (margin == null) margin = 0;
-    for (;;) {
+    for (var limit = 0; limit < 5; limit++) {
       var changed = false, coords = cursorCoords(cm, pos);
       var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
       var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
@@ -3770,7 +3769,7 @@
     var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
     var screenw = display.scroller.clientWidth - scrollerCutOff - display.gutters.offsetWidth;
     var tooWide = x2 - x1 > screenw;
-    if (tooWide) x2 = y1 + screen;
+    if (tooWide) x2 = x1 + screenw;
     if (x1 < 10)
       result.scrollLeft = 0;
     else if (x1 < screenleft)
@@ -3999,24 +3998,6 @@
     return target;
   }
 
-  // Find the word at the given position (as returned by coordsChar).
-  function findWordAt(cm, pos) {
-    var doc = cm.doc, line = getLine(doc, pos.line).text;
-    var start = pos.ch, end = pos.ch;
-    if (line) {
-      var helper = cm.getHelper(pos, "wordChars");
-      if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-      var startChar = line.charAt(start);
-      var check = isWordChar(startChar, helper)
-        ? function(ch) { return isWordChar(ch, helper); }
-        : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-        : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-      while (start > 0 && check(line.charAt(start - 1))) --start;
-      while (end < line.length && check(line.charAt(end))) ++end;
-    }
-    return new Range(Pos(pos.line, start), Pos(pos.line, end));
-  }
-
   // EDITOR METHODS
 
   // The publicly visible API. Note that methodOp(f) means
@@ -4358,6 +4339,24 @@
         doc.sel.ranges[i].goalColumn = goals[i];
     }),
 
+    // Find the word at the given position (as returned by coordsChar).
+    findWordAt: function(pos) {
+      var doc = this.doc, line = getLine(doc, pos.line).text;
+      var start = pos.ch, end = pos.ch;
+      if (line) {
+        var helper = this.getHelper(pos, "wordChars");
+        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
+        var startChar = line.charAt(start);
+        var check = isWordChar(startChar, helper)
+          ? function(ch) { return isWordChar(ch, helper); }
+          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
+          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
+        while (start > 0 && check(line.charAt(start - 1))) --start;
+        while (end < line.length && check(line.charAt(end))) ++end;
+      }
+      return new Range(Pos(pos.line, start), Pos(pos.line, end));
+    },
+
     toggleOverwrite: function(value) {
       if (value != null && value == this.state.overwrite) return;
       if (this.state.overwrite = !this.state.overwrite)
@@ -4444,6 +4443,7 @@
       clearCaches(this);
       resetInput(this);
       this.scrollTo(doc.scrollLeft, doc.scrollTop);
+      this.curOp.forceScroll = true;
       signalLater(this, "swapDoc", this, old);
       return old;
     }),
@@ -4570,10 +4570,8 @@
   // load a mode. (Preferred mechanism is the require/define calls.)
   CodeMirror.defineMode = function(name, mode) {
     if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2) {
-      mode.dependencies = [];
-      for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-    }
+    if (arguments.length > 2)
+      mode.dependencies = Array.prototype.slice.call(arguments, 2);
     modes[name] = mode;
   };
 
@@ -4865,7 +4863,7 @@
   // are simply ignored.
   keyMap.pcDefault = {
     "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Ctrl-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
+    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
     "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
     "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
     "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
@@ -4880,7 +4878,7 @@
     "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
     "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
     "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
-    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection",
+    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
     fallthrough: ["basic", "emacsy"]
   };
   // Very basic readline/emacs-style bindings, which are standard on Mac.
@@ -4988,6 +4986,7 @@
     cm.save = save;
     cm.getTextArea = function() { return textarea; };
     cm.toTextArea = function() {
+      cm.toTextArea = isNaN; // Prevent this from being ran twice
       save();
       textarea.parentNode.removeChild(cm.getWrapperElement());
       textarea.style.display = "";
@@ -7295,7 +7294,7 @@
     return function(){return f.apply(null, args);};
   }
 
-  var nonASCIISingleCaseWordChar = /[\u00df\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+  var nonASCIISingleCaseWordChar = /[\u00df\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
   var isWordCharBasic = CodeMirror.isWordChar = function(ch) {
     return /\w/.test(ch) || ch > "\x80" &&
       (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
@@ -7462,7 +7461,7 @@
     if (badBidiRects != null) return badBidiRects;
     var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
     var r0 = range(txt, 0, 1).getBoundingClientRect();
-    if (r0.left == r0.right) return false;
+    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
     var r1 = range(txt, 1, 2).getBoundingClientRect();
     return badBidiRects = (r1.right - r0.right < 3);
   }
@@ -7825,7 +7824,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.5.0";
+  CodeMirror.version = "4.7.0";
 
   return CodeMirror;
 });
diff --git a/static/js/lib/codemirror-4.5/keymap/vim.js b/static/js/lib/codemirror-4.5/keymap/vim.js
index 0bf2c78..a0a01e0 100644
--- a/static/js/lib/codemirror-4.5/keymap/vim.js
+++ b/static/js/lib/codemirror-4.5/keymap/vim.js
@@ -72,290 +72,205 @@
   var defaultKeymap = [
     // Key to key mapping. This goes first to make it possible to override
     // existing mappings.
-    { keys: ['<Left>'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['<Right>'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['<Up>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['<Down>'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['<Space>'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['<BS>'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['<C-Space>'], type: 'keyToKey', toKeys: ['W'] },
-    { keys: ['<C-BS>'], type: 'keyToKey', toKeys: ['B'] },
-    { keys: ['<S-Space>'], type: 'keyToKey', toKeys: ['w'] },
-    { keys: ['<S-BS>'], type: 'keyToKey', toKeys: ['b'] },
-    { keys: ['<C-n>'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['<C-p>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['<C-[>'], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['<C-c>'], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'], context: 'normal' },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['x', 'i'], context: 'visual'},
-    { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'], context: 'normal' },
-    { keys: ['S'], type: 'keyToKey', toKeys: ['d', 'c', 'c'], context: 'visual' },
-    { keys: ['<Home>'], type: 'keyToKey', toKeys: ['0'] },
-    { keys: ['<End>'], type: 'keyToKey', toKeys: ['$'] },
-    { keys: ['<PageUp>'], type: 'keyToKey', toKeys: ['<C-b>'] },
-    { keys: ['<PageDown>'], type: 'keyToKey', toKeys: ['<C-f>'] },
-    { keys: ['<CR>'], type: 'keyToKey', toKeys: ['j', '^'], context: 'normal' },
+    { keys: '<Left>', type: 'keyToKey', toKeys: 'h' },
+    { keys: '<Right>', type: 'keyToKey', toKeys: 'l' },
+    { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
+    { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
+    { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
+    { keys: '<BS>', type: 'keyToKey', toKeys: 'h' },
+    { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
+    { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B' },
+    { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
+    { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b' },
+    { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' },
+    { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' },
+    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
+    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
+    { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
+    { keys: 's', type: 'keyToKey', toKeys: 'xi', context: 'visual'},
+    { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
+    { keys: 'S', type: 'keyToKey', toKeys: 'dcc', context: 'visual' },
+    { keys: '<Home>', type: 'keyToKey', toKeys: '0' },
+    { keys: '<End>', type: 'keyToKey', toKeys: '$' },
+    { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
+    { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
+    { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
     // Motions
-    { keys: ['H'], type: 'motion',
-        motion: 'moveToTopLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['M'], type: 'motion',
-        motion: 'moveToMiddleLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['L'], type: 'motion',
-        motion: 'moveToBottomLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['h'], type: 'motion',
-        motion: 'moveByCharacters',
-        motionArgs: { forward: false }},
-    { keys: ['l'], type: 'motion',
-        motion: 'moveByCharacters',
-        motionArgs: { forward: true }},
-    { keys: ['j'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, linewise: true }},
-    { keys: ['k'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: false, linewise: true }},
-    { keys: ['g','j'], type: 'motion',
-        motion: 'moveByDisplayLines',
-        motionArgs: { forward: true }},
-    { keys: ['g','k'], type: 'motion',
-        motion: 'moveByDisplayLines',
-        motionArgs: { forward: false }},
-    { keys: ['w'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: false }},
-    { keys: ['W'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: false, bigWord: true }},
-    { keys: ['e'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: true, inclusive: true }},
-    { keys: ['E'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: true, bigWord: true,
-            inclusive: true }},
-    { keys: ['b'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: false }},
-    { keys: ['B'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: false, bigWord: true }},
-    { keys: ['g', 'e'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: true, inclusive: true }},
-    { keys: ['g', 'E'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: true, bigWord: true,
-            inclusive: true }},
-    { keys: ['{'], type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: false, toJumplist: true }},
-    { keys: ['}'], type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['<C-f>'], type: 'motion',
-        motion: 'moveByPage', motionArgs: { forward: true }},
-    { keys: ['<C-b>'], type: 'motion',
-        motion: 'moveByPage', motionArgs: { forward: false }},
-    { keys: ['<C-d>'], type: 'motion',
-        motion: 'moveByScroll',
-        motionArgs: { forward: true, explicitRepeat: true }},
-    { keys: ['<C-u>'], type: 'motion',
-        motion: 'moveByScroll',
-        motionArgs: { forward: false, explicitRepeat: true }},
-    { keys: ['g', 'g'], type: 'motion',
-        motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: ['G'], type: 'motion',
-        motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: ['0'], type: 'motion', motion: 'moveToStartOfLine' },
-    { keys: ['^'], type: 'motion',
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['+'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, toFirstChar:true }},
-    { keys: ['-'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: false, toFirstChar:true }},
-    { keys: ['_'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
-    { keys: ['$'], type: 'motion',
-        motion: 'moveToEol',
-        motionArgs: { inclusive: true }},
-    { keys: ['%'], type: 'motion',
-        motion: 'moveToMatchedSymbol',
-        motionArgs: { inclusive: true, toJumplist: true }},
-    { keys: ['f', 'character'], type: 'motion',
-        motion: 'moveToCharacter',
-        motionArgs: { forward: true , inclusive: true }},
-    { keys: ['F', 'character'], type: 'motion',
-        motion: 'moveToCharacter',
-        motionArgs: { forward: false }},
-    { keys: ['t', 'character'], type: 'motion',
-        motion: 'moveTillCharacter',
-        motionArgs: { forward: true, inclusive: true }},
-    { keys: ['T', 'character'], type: 'motion',
-        motion: 'moveTillCharacter',
-        motionArgs: { forward: false }},
-    { keys: [';'], type: 'motion', motion: 'repeatLastCharacterSearch',
-        motionArgs: { forward: true }},
-    { keys: [','], type: 'motion', motion: 'repeatLastCharacterSearch',
-        motionArgs: { forward: false }},
-    { keys: ['\'', 'character'], type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true, linewise: true}},
-    { keys: ['`', 'character'], type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true}},
-    { keys: [']', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
-    { keys: ['[', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
-    { keys: [']', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
-    { keys: ['[', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
+    { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
+    { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
+    { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
+    { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
+    { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
+    { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
+    { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
+    { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
+    { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
+    { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
+    { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
+    { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
+    { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
+    { keys: '<C-f>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
+    { keys: '<C-b>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
+    { keys: '<C-d>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
+    { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
+    { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
+    { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
+    { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
+    { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
+    { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
+    { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
+    { keys: 'f<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
+    { keys: 'F<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
+    { keys: 't<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
+    { keys: 'T<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
+    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
+    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
+    { keys: '\'<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
+    { keys: '`<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
+    { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
+    { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
+    { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
+    { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
     // the next two aren't motions but must come before more general motion declarations
-    { keys: [']', 'p'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: true, isEdit: true, matchIndent: true}},
-    { keys: ['[', 'p'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: false, isEdit: true, matchIndent: true}},
-    { keys: [']', 'character'], type: 'motion',
-        motion: 'moveToSymbol',
-        motionArgs: { forward: true, toJumplist: true}},
-    { keys: ['[', 'character'], type: 'motion',
-        motion: 'moveToSymbol',
-        motionArgs: { forward: false, toJumplist: true}},
-    { keys: ['|'], type: 'motion',
-        motion: 'moveToColumn',
-        motionArgs: { }},
-    { keys: ['o'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: { }, context:'visual'},
-    { keys: ['O'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
+    { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
+    { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
+    { keys: ']<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
+    { keys: '[<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
+    { keys: '|', type: 'motion', motion: 'moveToColumn'},
+    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
+    { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
     // Operators
-    { keys: ['d'], type: 'operator', operator: 'delete' },
-    { keys: ['y'], type: 'operator', operator: 'yank' },
-    { keys: ['c'], type: 'operator', operator: 'change' },
-    { keys: ['>'], type: 'operator', operator: 'indent',
-        operatorArgs: { indentRight: true }},
-    { keys: ['<'], type: 'operator', operator: 'indent',
-        operatorArgs: { indentRight: false }},
-    { keys: ['g', '~'], type: 'operator', operator: 'swapcase' },
-    { keys: ['n'], type: 'motion', motion: 'findNext',
-        motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['N'], type: 'motion', motion: 'findNext',
-        motionArgs: { forward: false, toJumplist: true }},
+    { keys: 'd', type: 'operator', operator: 'delete' },
+    { keys: 'y', type: 'operator', operator: 'yank' },
+    { keys: 'c', type: 'operator', operator: 'change' },
+    { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
+    { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
+    { keys: 'g~', type: 'operator', operator: 'swapcase' },
+    { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
+    { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
     // Operator-Motion dual commands
-    { keys: ['x'], type: 'operatorMotion', operator: 'delete',
-        motion: 'moveByCharacters', motionArgs: { forward: true },
-        operatorMotionArgs: { visualLine: false }},
-    { keys: ['X'], type: 'operatorMotion', operator: 'delete',
-        motion: 'moveByCharacters', motionArgs: { forward: false },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['D'], type: 'operatorMotion', operator: 'delete',
-      motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['Y'], type: 'operatorMotion', operator: 'yank',
-        motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['C'], type: 'operatorMotion',
-        operator: 'change',
-        motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['~'], type: 'operatorMotion',
-        operator: 'swapcase', operatorArgs: { shouldMoveCursor: true },
-        motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
+    { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
+    { keys: '~', type: 'operatorMotion', operator: 'swapcase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
     // Actions
-    { keys: ['<C-i>'], type: 'action', action: 'jumpListWalk',
-        actionArgs: { forward: true }},
-    { keys: ['<C-o>'], type: 'action', action: 'jumpListWalk',
-        actionArgs: { forward: false }},
-    { keys: ['<C-e>'], type: 'action',
-        action: 'scroll',
-        actionArgs: { forward: true, linewise: true }},
-    { keys: ['<C-y>'], type: 'action',
-        action: 'scroll',
-        actionArgs: { forward: false, linewise: true }},
-    { keys: ['a'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'charAfter' }},
-    { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'eol' }},
-    { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
-    { keys: ['i'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'inplace' }},
-    { keys: ['I'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'firstNonBlank' }},
-    { keys: ['o'], type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true, interlaceInsertRepeat: true,
-        actionArgs: { after: true }},
-    { keys: ['O'], type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true, interlaceInsertRepeat: true,
-        actionArgs: { after: false }},
-    { keys: ['v'], type: 'action', action: 'toggleVisualMode' },
-    { keys: ['V'], type: 'action', action: 'toggleVisualMode',
-        actionArgs: { linewise: true }},
-    { keys: ['<C-v>'], type: 'action', action: 'toggleVisualMode',
-        actionArgs: { blockwise: true }},
-    { keys: ['g', 'v'], type: 'action', action: 'reselectLastSelection' },
-    { keys: ['J'], type: 'action', action: 'joinLines', isEdit: true },
-    { keys: ['p'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: true, isEdit: true }},
-    { keys: ['P'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: false, isEdit: true }},
-    { keys: ['r', 'character'], type: 'action', action: 'replace', isEdit: true },
-    { keys: ['@', 'character'], type: 'action', action: 'replayMacro' },
-    { keys: ['q', 'character'], type: 'action', action: 'enterMacroRecordMode' },
+    { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
+    { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
+    { keys: '<C-e>', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
+    { keys: '<C-y>', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
+    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
+    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank' }},
+    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
+    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
+    { keys: 'v', type: 'action', action: 'toggleVisualMode' },
+    { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
+    { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
+    { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
+    { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
+    { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
+    { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
+    { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true },
+    { keys: '@<character>', type: 'action', action: 'replayMacro' },
+    { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
     // Handle Replace-mode as a special case of insert mode.
-    { keys: ['R'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { replace: true }},
-    { keys: ['u'], type: 'action', action: 'undo' },
-    { keys: ['u'], type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
-    { keys: ['U'],type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
-    { keys: ['<C-r>'], type: 'action', action: 'redo' },
-    { keys: ['m', 'character'], type: 'action', action: 'setMark' },
-    { keys: ['"', 'character'], type: 'action', action: 'setRegister' },
-    { keys: ['z', 'z'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'center' }},
-    { keys: ['z', '.'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'center' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['z', 't'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'top' }},
-    { keys: ['z', '<CR>'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'top' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['z', '-'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'bottom' }},
-    { keys: ['z', 'b'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'bottom' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['.'], type: 'action', action: 'repeatLastEdit' },
-    { keys: ['<C-a>'], type: 'action', action: 'incrementNumberToken',
-        isEdit: true,
-        actionArgs: {increase: true, backtrack: false}},
-    { keys: ['<C-x>'], type: 'action', action: 'incrementNumberToken',
-        isEdit: true,
-        actionArgs: {increase: false, backtrack: false}},
+    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
+    { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
+    { keys: 'u', type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
+    { keys: 'U',type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
+    { keys: '<C-r>', type: 'action', action: 'redo' },
+    { keys: 'm<character>', type: 'action', action: 'setMark' },
+    { keys: '"<character>', type: 'action', action: 'setRegister' },
+    { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
+    { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
+    { keys: 'z<CR>', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
+    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '.', type: 'action', action: 'repeatLastEdit' },
+    { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
+    { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
     // Text object motions
-    { keys: ['a', 'character'], type: 'motion',
-        motion: 'textObjectManipulation' },
-    { keys: ['i', 'character'], type: 'motion',
-        motion: 'textObjectManipulation',
-        motionArgs: { textObjectInner: true }},
+    { keys: 'a<character>', type: 'motion', motion: 'textObjectManipulation' },
+    { keys: 'i<character>', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
     // Search
-    { keys: ['/'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
-    { keys: ['?'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
-    { keys: ['*'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: ['#'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: ['g', '*'], type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
-    { keys: ['g', '#'], type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
+    { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
+    { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
     // Ex command
-    { keys: [':'], type: 'ex' }
+    { keys: ':', type: 'ex' }
   ];
 
   var Pos = CodeMirror.Pos;
 
+  var modifierCodes = [16, 17, 18, 91];
+  var specialKey = {Enter:'CR',Backspace:'BS',Delete:'Del'};
+  var mac = /Mac/.test(navigator.platform);
   var Vim = function() {
     CodeMirror.defineOption('vimMode', false, function(cm, val) {
+      function lookupKey(e) {
+        var keyCode = e.keyCode;
+        if (modifierCodes.indexOf(keyCode) != -1) { return; }
+        var hasModifier = e.ctrlKey || e.metaKey;
+        var key = CodeMirror.keyNames[keyCode];
+        key = specialKey[key] || key;
+        var name = '';
+        if (e.ctrlKey) { name += 'C-'; }
+        if (e.altKey) { name += 'A-'; }
+        if (mac && e.metaKey || (!hasModifier && e.shiftKey) && key.length < 2) {
+          // Shift key bindings can only specified for special characters.
+          return;
+        } else if (e.shiftKey && !/^[A-Za-z]$/.test(key)) {
+          name += 'S-';
+        }
+        if (key.length == 1) { key = key.toLowerCase(); }
+        name += key;
+        if (name.length > 1) { name = '<' + name + '>'; }
+        return name;
+      }
+      // Keys with modifiers are handled using keydown due to limitations of
+      // keypress event.
+      function handleKeyDown(cm, e) {
+        var name = lookupKey(e);
+        if (!name) { return; }
+
+        CodeMirror.signal(cm, 'vim-keypress', name);
+        if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
+          CodeMirror.e_stop(e);
+        }
+      }
+      // Keys without modifiers are handled using keypress to work best with
+      // non-standard keyboard layouts.
+      function handleKeyPress(cm, e) {
+        var code = e.charCode || e.keyCode;
+        if (e.ctrlKey || e.metaKey || e.altKey ||
+            e.shiftKey && code < 32) { return; }
+        var name = String.fromCharCode(code);
+
+        CodeMirror.signal(cm, 'vim-keypress', name);
+        if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
+          CodeMirror.e_stop(e);
+        }
+      }
       if (val) {
         cm.setOption('keyMap', 'vim');
         cm.setOption('disableInput', true);
@@ -364,12 +279,16 @@
         cm.on('cursorActivity', onCursorActivity);
         maybeInitVimState(cm);
         CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
+        cm.on('keypress', handleKeyPress);
+        cm.on('keydown', handleKeyDown);
       } else if (cm.state.vim) {
         cm.setOption('keyMap', 'default');
         cm.setOption('disableInput', false);
         cm.off('cursorActivity', onCursorActivity);
         CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
         cm.state.vim = null;
+        cm.off('keypress', handleKeyPress);
+        cm.off('keydown', handleKeyDown);
       }
     });
     function getOnPasteFn(cm) {
@@ -397,9 +316,6 @@
     var upperCaseAlphabet = makeKeyRange(65, 26);
     var lowerCaseAlphabet = makeKeyRange(97, 26);
     var numbers = makeKeyRange(48, 10);
-    var specialSymbols = '~`!@#$%^&*()_-+=[{}]\\|/?.,<>:;"\''.split('');
-    var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
-        'Esc', 'Home', 'End', 'PageUp', 'PageDown', 'Enter'];
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
     var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
 
@@ -648,6 +564,7 @@
       }
     }
 
+    var lastInsertModeKeyTimer;
     var vimApi= {
       buildKeyMap: function() {
         // TODO: Convert keymap into dictionary format for fast lookup.
@@ -685,58 +602,111 @@
       },
       // This is the outermost function called by CodeMirror, after keys have
       // been mapped to their Vim equivalents.
-      handleKey: function(cm, key) {
-        var command;
+      handleKey: function(cm, key, origin) {
         var vim = maybeInitVimState(cm);
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.isRecording) {
-          if (key == 'q') {
-            macroModeState.exitMacroRecordMode();
+        function handleMacroRecording() {
+          var macroModeState = vimGlobalState.macroModeState;
+          if (macroModeState.isRecording) {
+            if (key == 'q') {
+              macroModeState.exitMacroRecordMode();
+              clearInputState(cm);
+              return true;
+            }
+            if (origin != 'mapping') {
+              logKey(macroModeState, key);
+            }
+          }
+        }
+        function handleEsc() {
+          if (key == '<Esc>') {
+            // Clear input state and get back to normal mode.
             clearInputState(cm);
-            return;
+            if (vim.visualMode) {
+              exitVisualMode(cm);
+            } else if (vim.insertMode) {
+              exitInsertMode(cm);
+            }
+            return true;
           }
         }
-        if (key == '<Esc>') {
-          // Clear input state and get back to normal mode.
-          clearInputState(cm);
-          if (vim.visualMode) {
-            exitVisualMode(cm);
-          }
-          return;
-        }
-        // Enter visual mode when the mouse selects text.
-        if (!vim.visualMode &&
-            !cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
-          vim.visualMode = true;
-          vim.visualLine = false;
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-          cm.on('mousedown', exitVisualMode);
-        }
-        if (key != '0' || (key == '0' && vim.inputState.getRepeat() === 0)) {
-          // Have to special case 0 since it's both a motion and a number.
-          command = commandDispatcher.matchCommand(key, defaultKeymap, vim);
-        }
-        if (!command) {
-          if (isNumber(key)) {
-            // Increment count unless count is 0 and key is 0.
-            vim.inputState.pushRepeatDigit(key);
-          }
-          if (macroModeState.isRecording) {
-            logKey(macroModeState, key);
-          }
-          return;
-        }
-        if (command.type == 'keyToKey') {
+        function doKeyToKey(keys) {
           // TODO: prevent infinite recursion.
-          for (var i = 0; i < command.toKeys.length; i++) {
-            this.handleKey(cm, command.toKeys[i]);
+          var match;
+          while (keys) {
+            // Pull off one command key, which is either a single character
+            // or a special sequence wrapped in '<' and '>', e.g. '<Space>'.
+            match = (/<\w+-.+?>|<\w+>|./).exec(keys);
+            key = match[0];
+            keys = keys.substring(match.index + key.length);
+            CodeMirror.Vim.handleKey(cm, key, 'mapping');
           }
-        } else {
-          if (macroModeState.isRecording) {
-            logKey(macroModeState, key);
-          }
-          commandDispatcher.processCommand(cm, vim, command);
         }
+
+        function handleKeyInsertMode() {
+          if (handleEsc()) { return true; }
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          var keysAreChars = key.length == 1;
+          var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+          // Need to check all key substrings in insert mode.
+          while (keys.length > 1 && match.type != 'full') {
+            var keys = vim.inputState.keyBuffer = keys.slice(1);
+            var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+            if (thisMatch.type != 'none') { match = thisMatch; }
+          }
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') {
+            if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+            lastInsertModeKeyTimer = window.setTimeout(
+              function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
+              getOption('insertModeEscKeysTimeout'));
+            return !keysAreChars;
+          }
+
+          if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+          if (keysAreChars) {
+            var here = cm.getCursor();
+            cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
+          }
+          clearInputState(cm);
+          var command = match.command;
+          if (command.type == 'keyToKey') {
+            doKeyToKey(command.toKeys);
+          } else {
+            commandDispatcher.processCommand(cm, vim, command);
+          }
+          return !keysAreChars;
+        }
+
+        function handleKeyNonInsertMode() {
+          if (handleMacroRecording() || handleEsc()) { return true; };
+
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          if (/^[1-9]\d*$/.test(keys)) { return true; }
+
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (!keysMatcher) { clearInputState(cm); return false; }
+          var context = vim.visualMode ? 'visual' :
+                                         'normal';
+          var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') { return true; }
+
+          vim.inputState.keyBuffer = '';
+          var command = match.command;
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (keysMatcher[1] && keysMatcher[1] != '0') {
+            vim.inputState.pushRepeatDigit(keysMatcher[1]);
+          }
+          if (command.type == 'keyToKey') {
+            doKeyToKey(command.toKeys);
+          } else {
+            commandDispatcher.processCommand(cm, vim, command);
+          }
+          return true;
+        }
+
+        if (vim.insertMode) { return handleKeyInsertMode(); }
+        else { return handleKeyNonInsertMode(); }
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
@@ -953,83 +923,25 @@
       }
     };
     var commandDispatcher = {
-      matchCommand: function(key, keyMap, vim) {
-        var inputState = vim.inputState;
-        var keys = inputState.keyBuffer.concat(key);
-        var matchedCommands = [];
-        var selectedCharacter;
-        for (var i = 0; i < keyMap.length; i++) {
-          var command = keyMap[i];
-          if (matchKeysPartial(keys, command.keys)) {
-            if (inputState.operator && command.type == 'action') {
-              // Ignore matched action commands after an operator. Operators
-              // only operate on motions. This check is really for text
-              // objects since aW, a[ etcs conflicts with a.
-              continue;
-            }
-            // Match commands that take <character> as an argument.
-            if (command.keys[keys.length - 1] == 'character') {
-              selectedCharacter = keys[keys.length - 1];
-              if (selectedCharacter.length>1){
-                switch(selectedCharacter){
-                  case '<CR>':
-                    selectedCharacter='\n';
-                    break;
-                  case '<Space>':
-                    selectedCharacter=' ';
-                    break;
-                  default:
-                    continue;
-                }
-              }
-            }
-            // Add the command to the list of matched commands. Choose the best
-            // command later.
-            matchedCommands.push(command);
-          }
+      matchCommand: function(keys, keyMap, inputState, context) {
+        var matches = commandMatches(keys, keyMap, context, inputState);
+        if (!matches.full && !matches.partial) {
+          return {type: 'none'};
+        } else if (!matches.full && matches.partial) {
+          return {type: 'partial'};
         }
 
-        // Returns the command if it is a full match, or null if not.
-        function getFullyMatchedCommandOrNull(command) {
-          if (keys.length < command.keys.length) {
-            // Matches part of a multi-key command. Buffer and wait for next
-            // stroke.
-            inputState.keyBuffer.push(key);
-            return null;
-          } else {
-            if (command.keys[keys.length - 1] == 'character') {
-              inputState.selectedCharacter = selectedCharacter;
-            }
-            // Clear the buffer since a full match was found.
-            inputState.keyBuffer = [];
-            return command;
+        var bestMatch;
+        for (var i = 0; i < matches.full.length; i++) {
+          var match = matches.full[i];
+          if (!bestMatch) {
+            bestMatch = match;
           }
         }
-
-        if (!matchedCommands.length) {
-          // Clear the buffer since there were no matches.
-          inputState.keyBuffer = [];
-          return null;
-        } else if (matchedCommands.length == 1) {
-          return getFullyMatchedCommandOrNull(matchedCommands[0]);
-        } else {
-          // Find the best match in the list of matchedCommands.
-          var context = vim.visualMode ? 'visual' : 'normal';
-          var bestMatch; // Default to first in the list.
-          for (var i = 0; i < matchedCommands.length; i++) {
-            var current = matchedCommands[i];
-            if (current.context == context) {
-              bestMatch = current;
-              break;
-            } else if (!bestMatch && !current.context) {
-              // Only set an imperfect match to best match if no best match is
-              // set and the imperfect match is not restricted to another
-              // context.
-              bestMatch = current;
-            }
-          }
-          return getFullyMatchedCommandOrNull(bestMatch);
+        if (bestMatch.keys.slice(-11) == '<character>') {
+          inputState.selectedCharacter = lastChar(keys);
         }
+        return {type: 'full', command: bestMatch};
       },
       processCommand: function(cm, vim, command) {
         vim.inputState.repeatOverride = command.repeatOverride;
@@ -1584,8 +1496,8 @@
 
             var equal = cursorEqual(cursor, best);
             var between = (motionArgs.forward) ?
-              cusrorIsBetween(cursor, mark, best) :
-              cusrorIsBetween(best, mark, cursor);
+              cursorIsBetween(cursor, mark, best) :
+              cursorIsBetween(best, mark, cursor);
 
             if (equal || between) {
               best = mark;
@@ -1837,7 +1749,11 @@
           return null;
         }
 
-        return [tmp.start, tmp.end];
+        if (!cm.state.vim.visualMode) {
+          return [tmp.start, tmp.end];
+        } else {
+          return expandSelection(cm, tmp.start, tmp.end);
+        }
       },
 
       repeatLastCharacterSearch: function(cm, motionArgs) {
@@ -1944,10 +1860,15 @@
         // including the trailing \n, include the \n before the starting line
         if (operatorArgs.linewise &&
             curEnd.line == cm.lastLine() && curStart.line == curEnd.line) {
-          var tmp = copyCursor(curEnd);
-          curStart.line--;
-          curStart.ch = lineLength(cm, curStart.line);
-          curEnd = tmp;
+          if (curEnd.line == 0) {
+            curStart.ch = 0;
+          }
+          else {
+            var tmp = copyCursor(curEnd);
+            curStart.line--;
+            curStart.ch = lineLength(cm, curStart.line);
+            curEnd = tmp;
+          }
           cm.replaceRange('', curStart, curEnd);
         } else {
           cm.replaceSelections(replacement);
@@ -2604,7 +2525,8 @@
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
-      }
+      },
+      exitInsertMode: exitInsertMode
     };
 
     /*
@@ -2634,14 +2556,54 @@
     function offsetCursor(cur, offsetLine, offsetCh) {
       return Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
-    function matchKeysPartial(pressed, mapped) {
-      for (var i = 0; i < pressed.length; i++) {
-        // 'character' means any character. For mark, register commads, etc.
-        if (pressed[i] != mapped[i] && mapped[i] != 'character') {
-          return false;
+    function commandMatches(keys, keyMap, context, inputState) {
+      // Partial matches are not applied. They inform the key handler
+      // that the current key sequence is a subsequence of a valid key
+      // sequence, so that the key buffer is not cleared.
+      var match, partial = [], full = [];
+      for (var i = 0; i < keyMap.length; i++) {
+        var command = keyMap[i];
+        if (context == 'insert' && command.context != 'insert' ||
+            command.context && command.context != context ||
+            inputState.operator && command.type == 'action' ||
+            !(match = commandMatch(keys, command.keys))) { continue; }
+        if (match == 'partial') { partial.push(command); }
+        if (match == 'full') { full.push(command); }
+      }
+      return {
+        partial: partial.length && partial,
+        full: full.length && full
+      };
+    }
+    function commandMatch(pressed, mapped) {
+      if (mapped.slice(-11) == '<character>') {
+        // Last character matches anything.
+        var prefixLen = mapped.length - 11;
+        var pressedPrefix = pressed.slice(0, prefixLen);
+        var mappedPrefix = mapped.slice(0, prefixLen);
+        return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
+               mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
+      } else {
+        return pressed == mapped ? 'full' :
+               mapped.indexOf(pressed) == 0 ? 'partial' : false;
+      }
+    }
+    function lastChar(keys) {
+      var match = /^.*(<[\w\-]+>)$/.exec(keys);
+      var selectedCharacter = match ? match[1] : keys.slice(-1);
+      if (selectedCharacter.length > 1){
+        switch(selectedCharacter){
+          case '<CR>':
+            selectedCharacter='\n';
+            break;
+          case '<Space>':
+            selectedCharacter=' ';
+            break;
+          default:
+            break;
         }
       }
-      return true;
+      return selectedCharacter;
     }
     function repeatFn(cm, fn, repeat) {
       return function() {
@@ -2665,7 +2627,13 @@
       }
       return false;
     }
-    function cusrorIsBetween(cur1, cur2, cur3) {
+    function cursorMin(cur1, cur2) {
+      return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
+    }
+    function cursorMax(cur1, cur2) {
+      return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
+    }
+    function cursorIsBetween(cur1, cur2, cur3) {
       // returns true if cur2 is between cur1 and cur3.
       var cur1before2 = cursorIsBefore(cur1, cur2);
       var cur2before3 = cursorIsBefore(cur2, cur3);
@@ -2892,6 +2860,33 @@
                            'visualLine': vim.visualLine,
                            'visualBlock': block};
     }
+    function expandSelection(cm, start, end) {
+      var head = cm.getCursor('head');
+      var anchor = cm.getCursor('anchor');
+      var tmp;
+      if (cursorIsBefore(end, start)) {
+        tmp = end;
+        end = start;
+        start = tmp;
+      }
+      if (cursorIsBefore(head, anchor)) {
+        head = cursorMin(start, head);
+        anchor = cursorMax(anchor, end);
+      } else {
+        anchor = cursorMin(start, anchor);
+        head = cursorMax(head, end);
+      }
+      return [anchor, head];
+    }
+    function getHead(cm) {
+      var cur = cm.getCursor('head');
+      if (cm.getSelection().length == 1) {
+        // Small corner case when only 1 character is selected. The "real"
+        // head is the left of head and anchor.
+        cur = cursorMin(cur, cm.getCursor('anchor'));
+      }
+      return cur;
+    }
 
     function exitVisualMode(cm) {
       cm.off('mousedown', exitVisualMode);
@@ -2964,7 +2959,7 @@
     }
 
     function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
-      var cur = cm.getCursor();
+      var cur = getHead(cm);
       var line = cm.getLine(cur.line);
       var idx = cur.ch;
 
@@ -3350,7 +3345,7 @@
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
     function selectCompanionObject(cm, symb, inclusive) {
-      var cur = cm.getCursor(), start, end;
+      var cur = getHead(cm), start, end;
 
       var bracketRegexp = ({
         '(': /[()]/, ')': /[()]/,
@@ -3395,7 +3390,7 @@
     // have identical opening and closing symbols
     // TODO support across multiple lines
     function findBeginningAndEnd(cm, symb, inclusive) {
-      var cur = copyCursor(cm.getCursor());
+      var cur = copyCursor(getHead(cm));
       var line = cm.getLine(cur.line);
       var chars = line.split('');
       var start, end, i, len;
@@ -3828,6 +3823,7 @@
     // shortNames must not match the prefix of the other command.
     var defaultExCommandMap = [
       { name: 'map' },
+      { name: 'imap', shortName: 'im' },
       { name: 'nmap', shortName: 'nm' },
       { name: 'vmap', shortName: 'vm' },
       { name: 'unmap' },
@@ -3882,7 +3878,7 @@
             if (command.type == 'exToKey') {
               // Handle Ex to Key mapping.
               for (var i = 0; i < command.toKeys.length; i++) {
-                CodeMirror.Vim.handleKey(cm, command.toKeys[i]);
+                CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
               }
               return;
             } else if (command.type == 'exToEx') {
@@ -4006,7 +4002,7 @@
             this.commandMap_[commandName] = {
               name: commandName,
               type: 'exToKey',
-              toKeys: parseKeyString(rhs),
+              toKeys: rhs,
               user: true
             };
           }
@@ -4014,7 +4010,7 @@
           if (rhs != ':' && rhs.charAt(0) == ':') {
             // Key to Ex mapping.
             var mapping = {
-              keys: parseKeyString(lhs),
+              keys: lhs,
               type: 'keyToEx',
               exArgs: { input: rhs.substring(1) },
               user: true};
@@ -4023,9 +4019,9 @@
           } else {
             // Key to key mapping
             var mapping = {
-              keys: parseKeyString(lhs),
+              keys: lhs,
               type: 'keyToKey',
-              toKeys: parseKeyString(rhs),
+              toKeys: rhs,
               user: true
             };
             if (ctx) { mapping.context = ctx; }
@@ -4034,15 +4030,6 @@
         }
       },
       unmap: function(lhs, ctx) {
-        var arrayEquals = function(a, b) {
-          if (a === b) return true;
-          if (a == null || b == null) return true;
-          if (a.length != b.length) return false;
-          for (var i = 0; i < a.length; i++) {
-            if (a[i] !== b[i]) return false;
-          }
-          return true;
-        };
         if (lhs != ':' && lhs.charAt(0) == ':') {
           // Ex to Ex or Ex to key mapping
           if (ctx) { throw Error('Mode not supported for ex mappings'); }
@@ -4053,9 +4040,9 @@
           }
         } else {
           // Key to Ex or key to key mapping
-          var keys = parseKeyString(lhs);
+          var keys = lhs;
           for (var i = 0; i < defaultKeymap.length; i++) {
-            if (arrayEquals(keys, defaultKeymap[i].keys)
+            if (keys == defaultKeymap[i].keys
                 && defaultKeymap[i].context === ctx
                 && defaultKeymap[i].user) {
               defaultKeymap.splice(i, 1);
@@ -4067,21 +4054,6 @@
       }
     };
 
-    // Converts a key string sequence of the form a<C-w>bd<Left> into Vim's
-    // keymap representation.
-    function parseKeyString(str) {
-      var key, match;
-      var keys = [];
-      while (str) {
-        match = (/<\w+-.+?>|<\w+>|./).exec(str);
-        if (match === null)break;
-        key = match[0];
-        str = str.substring(match.index + key.length);
-        keys.push(key);
-      }
-      return keys;
-    }
-
     var exCommands = {
       map: function(cm, params, ctx) {
         var mapArgs = params.args;
@@ -4093,6 +4065,7 @@
         }
         exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
       },
+      imap: function(cm, params) { this.map(cm, params, 'insert'); },
       nmap: function(cm, params) { this.map(cm, params, 'normal'); },
       vmap: function(cm, params) { this.map(cm, params, 'visual'); },
       unmap: function(cm, params, ctx) {
@@ -4574,65 +4547,10 @@
       });
     }
 
-    // Register Vim with CodeMirror
-    function buildVimKeyMap() {
-      /**
-       * Handle the raw key event from CodeMirror. Translate the
-       * Shift + key modifier to the resulting letter, while preserving other
-       * modifers.
-       */
-      function cmKeyToVimKey(key, modifier) {
-        var vimKey = key;
-        if (isUpperCase(vimKey) && modifier == 'Ctrl') {
-            vimKey = vimKey.toLowerCase();
-        }
-        if (modifier) {
-          // Vim will parse modifier+key combination as a single key.
-          vimKey = modifier.charAt(0) + '-' + vimKey;
-        }
-        var specialKey = ({Enter:'CR',Backspace:'BS',Delete:'Del'})[vimKey];
-        vimKey = specialKey ? specialKey : vimKey;
-        vimKey = vimKey.length > 1 ? '<'+ vimKey + '>' : vimKey;
-        return vimKey;
-      }
-
-      // Closure to bind CodeMirror, key, modifier.
-      function keyMapper(vimKey) {
-        return function(cm) {
-          CodeMirror.signal(cm, 'vim-keypress', vimKey);
-          CodeMirror.Vim.handleKey(cm, vimKey);
-        };
-      }
-
-      var cmToVimKeymap = {
+    CodeMirror.keyMap.vim = {
         'nofallthrough': true,
         'style': 'fat-cursor'
       };
-      function bindKeys(keys, modifier) {
-        for (var i = 0; i < keys.length; i++) {
-          var key = keys[i];
-          if (!modifier && key.length == 1) {
-            // Wrap all keys without modifiers with '' to identify them by their
-            // key characters instead of key identifiers.
-            key = "'" + key + "'";
-          }
-          var vimKey = cmKeyToVimKey(keys[i], modifier);
-          var cmKey = modifier ? modifier + '-' + key : key;
-          cmToVimKeymap[cmKey] = keyMapper(vimKey);
-        }
-      }
-      bindKeys(upperCaseAlphabet);
-      bindKeys(lowerCaseAlphabet);
-      bindKeys(upperCaseAlphabet, 'Ctrl');
-      bindKeys(specialSymbols);
-      bindKeys(specialSymbols, 'Ctrl');
-      bindKeys(numbers);
-      bindKeys(numbers, 'Ctrl');
-      bindKeys(specialKeys);
-      bindKeys(specialKeys, 'Ctrl');
-      return cmToVimKeymap;
-    }
-    CodeMirror.keyMap.vim = buildVimKeyMap();
 
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
@@ -4688,63 +4606,13 @@
       }
     }
 
-    defineOption('enableInsertModeEscKeys', false, 'boolean');
-    // Use this option to customize the two-character ESC keymap.
-    // If you want to use characters other than i j or k you'll have to add
-    // lines to the vim-insert and await-second keymaps later in this file.
-    defineOption('insertModeEscKeys', 'kj', 'string');
     // The timeout in milliseconds for the two-character ESC keymap should be
     // adjusted according to your typing speed to prevent false positives.
     defineOption('insertModeEscKeysTimeout', 200, 'number');
-    function firstEscCharacterHandler(ch) {
-      return function(cm){
-        var keys = getOption('insertModeEscKeys');
-        var firstEscCharacter = keys && keys.length > 1 && keys.charAt(0);
-        if (!getOption('enableInsertModeEscKeys')|| firstEscCharacter !== ch) {
-          return CodeMirror.Pass;
-        } else {
-          cm.replaceRange(ch, cm.getCursor(), cm.getCursor(), "+input");
-          cm.setOption('keyMap', 'await-second');
-          cm.state.vim.awaitingEscapeSecondCharacter = true;
-          setTimeout(
-              function(){
-                if(cm.state.vim.awaitingEscapeSecondCharacter) {
-                    cm.state.vim.awaitingEscapeSecondCharacter = false;
-                    cm.setOption('keyMap', 'vim-insert');
-                }
-              },
-              getOption('insertModeEscKeysTimeout'));
-        }
-      };
-    }
-    function secondEscCharacterHandler(ch){
-      return function(cm) {
-        var keys = getOption('insertModeEscKeys');
-        var secondEscCharacter = keys && keys.length > 1 && keys.charAt(1);
-        if (!getOption('enableInsertModeEscKeys')|| secondEscCharacter !== ch) {
-          return CodeMirror.Pass;
-          // This is not the handler you're looking for. Just insert as usual.
-        } else {
-          if (cm.state.vim.insertMode) {
-            var lastChange = vimGlobalState.macroModeState.lastInsertModeChanges;
-            if (lastChange && lastChange.changes.length) {
-              lastChange.changes.pop();
-            }
-          }
-          cm.state.vim.awaitingEscapeSecondCharacter = false;
-          cm.replaceRange('', {ch: cm.getCursor().ch - 1, line: cm.getCursor().line},
-                          cm.getCursor(), "+input");
-          exitInsertMode(cm);
-        }
-      };
-    }
 
     CodeMirror.keyMap['vim-insert'] = {
       // TODO: override navigation keys so that Esc will cancel automatic
       // indentation from o, O, i_<CR>
-      'Esc': exitInsertMode,
-      'Ctrl-[': exitInsertMode,
-      'Ctrl-C': exitInsertMode,
       'Ctrl-N': 'autocomplete',
       'Ctrl-P': 'autocomplete',
       'Enter': function(cm) {
@@ -4752,20 +4620,10 @@
             CodeMirror.commands.newlineAndIndent;
         fn(cm);
       },
-      // The next few lines are where you'd add additional handlers if
-      // you wanted to use keys other than i j and k for two-character
-      // escape sequences. Don't forget to add them in the await-second
-      // section as well.
-      "'i'": firstEscCharacterHandler('i'),
-      "'j'": firstEscCharacterHandler('j'),
-      "'k'": firstEscCharacterHandler('k'),
       fallthrough: ['default']
     };
 
     CodeMirror.keyMap['await-second'] = {
-      "'i'": secondEscCharacterHandler('i'),
-      "'j'": secondEscCharacterHandler('j'),
-      "'k'": secondEscCharacterHandler('k'),
       fallthrough: ['vim-insert']
     };
 
@@ -4789,7 +4647,7 @@
           match = (/<\w+-.+?>|<\w+>|./).exec(text);
           key = match[0];
           text = text.substring(match.index + key.length);
-          CodeMirror.Vim.handleKey(cm, key);
+          CodeMirror.Vim.handleKey(cm, key, 'macro');
           if (vim.insertMode) {
             var changes = register.insertModeChanges[imc++].changes;
             vimGlobalState.macroModeState.lastInsertModeChanges.changes =
@@ -4869,10 +4727,7 @@
       } else if (cm.doc.history.lastSelOrigin == '*mouse') {
         // Reset lastHPos if mouse click was done in normal mode.
         vim.lastHPos = cm.doc.getCursor().ch;
-        if (cm.somethingSelected()) {
-          // If something is still selected, enter visual mode.
-          vim.visualMode = true;
-        }
+        handleExternalSelection(cm, vim);
       }
       if (vim.visualMode) {
         var from, head;
@@ -4891,6 +4746,22 @@
       }
     }
 
+    function handleExternalSelection(cm, vim) {
+      var anchor = cm.getCursor('anchor');
+      var head = cm.getCursor('head');
+      // Enter visual mode when the mouse selects text.
+      if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+        vim.visualMode = true;
+        vim.visualLine = false;
+        CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
+        cm.on('mousedown', exitVisualMode);
+      }
+      if (vim.visualMode) {
+        updateMark(cm, vim, '<', cursorMin(head, anchor));
+        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      }
+    }
+
     /** Wrapper for special keys pressed in insert mode */
     function InsertModeKey(keyName) {
       this.keyName = keyName;
diff --git a/static/js/lib/codemirror-4.5/mode/apl/index.html b/static/js/lib/codemirror-4.5/mode/apl/index.html
index f8282ac..53dda6b 100644
--- a/static/js/lib/codemirror-4.5/mode/apl/index.html
+++ b/static/js/lib/codemirror-4.5/mode/apl/index.html
@@ -12,12 +12,12 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/asterisk/index.html b/static/js/lib/codemirror-4.5/mode/asterisk/index.html
index 6abdecb..257bd39 100644
--- a/static/js/lib/codemirror-4.5/mode/asterisk/index.html
+++ b/static/js/lib/codemirror-4.5/mode/asterisk/index.html
@@ -12,12 +12,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/clike/clike.js b/static/js/lib/codemirror-4.5/mode/clike/clike.js
index ee2c77a..0f24bb8 100644
--- a/static/js/lib/codemirror-4.5/mode/clike/clike.js
+++ b/static/js/lib/codemirror-4.5/mode/clike/clike.js
@@ -20,7 +20,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       blockKeywords = parserConfig.blockKeywords || {},
       atoms = parserConfig.atoms || {},
       hooks = parserConfig.hooks || {},
-      multiLineStrings = parserConfig.multiLineStrings;
+      multiLineStrings = parserConfig.multiLineStrings,
+      indentStatements = parserConfig.indentStatements !== false;
   var isOperatorChar = /[+\-*&%=<>!?|\/]/;
 
   var curPunc;
@@ -57,7 +58,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       stream.eatWhile(isOperatorChar);
       return "operator";
     }
-    stream.eatWhile(/[\w\$_]/);
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
@@ -151,7 +152,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         while (ctx.type == "statement") ctx = popContext(state);
       }
       else if (curPunc == ctx.type) popContext(state);
-      else if (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || (ctx.type == "statement" && curPunc == "newstatement"))
+      else if (indentStatements &&
+               (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') ||
+                (ctx.type == "statement" && curPunc == "newstatement")))
         pushContext(state, stream.column(), "statement");
       state.startOfLine = false;
       return style;
@@ -298,6 +301,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     },
     modeProps: {fold: ["brace", "include"]}
   });
+
   def("text/x-java", {
     name: "clike",
     keywords: words("abstract assert boolean break byte case catch char class const continue default " +
@@ -315,6 +319,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     },
     modeProps: {fold: ["brace", "import"]}
   });
+
   def("text/x-csharp", {
     name: "clike",
     keywords: words("abstract as base break case catch checked class const continue" +
@@ -341,6 +346,19 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
     }
   });
+
+  function tokenTripleString(stream, state) {
+    var escaped = false;
+    while (!stream.eol()) {
+      if (!escaped && stream.match('"""')) {
+        state.tokenize = null;
+        break;
+      }
+      escaped = stream.next() != "\\" && !escaped;
+    }
+    return "string";
+  }
+
   def("text/x-scala", {
     name: "clike",
     keywords: words(
@@ -366,19 +384,24 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
       "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
       "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
-
-
     ),
     multiLineStrings: true,
     blockKeywords: words("catch class do else finally for forSome if match switch try while"),
     atoms: words("true false null"),
+    indentStatements: false,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);
         return "meta";
+      },
+      '"': function(stream, state) {
+        if (!stream.match('""')) return false;
+        state.tokenize = tokenTripleString;
+        return state.tokenize(stream, state);
       }
     }
   });
+
   def(["x-shader/x-vertex", "x-shader/x-fragment"], {
     name: "clike",
     keywords: words("float int bool void " +
diff --git a/static/js/lib/codemirror-4.5/mode/clike/index.html b/static/js/lib/codemirror-4.5/mode/clike/index.html
index d1abf93..639ac39 100644
--- a/static/js/lib/codemirror-4.5/mode/clike/index.html
+++ b/static/js/lib/codemirror-4.5/mode/clike/index.html
@@ -12,12 +12,12 @@
 <script src="clike.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
@@ -169,6 +169,21 @@ public class Class<T, V> implements MyInterface {
     member = value;
   }
 }
+</textarea></div>
+
+<h2>Scala example</h2>
+
+<div><textarea id="scala-code">
+object FilterTest extends App {
+  def filter(xs: List[Int], threshold: Int) = {
+    def process(ys: List[Int]): List[Int] =
+      if (ys.isEmpty) ys
+      else if (ys.head < threshold) ys.head :: process(ys.tail)
+      else process(ys.tail)
+    process(xs)
+  }
+  println(filter(List(1, 9, 2, 8, 3, 7, 4), 5))
+}
 </textarea></div>
 
     <script>
@@ -187,6 +202,11 @@ public class Class<T, V> implements MyInterface {
         matchBrackets: true,
         mode: "text/x-java"
       });
+      var scalaEditor = CodeMirror.fromTextArea(document.getElementById("scala-code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-scala"
+      });
       var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
       CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
     </script>
@@ -198,7 +218,8 @@ public class Class<T, V> implements MyInterface {
     directives are recognized.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-csrc</code>
-    (C code), <code>text/x-c++src</code> (C++
-    code), <code>text/x-java</code> (Java
-    code), <code>text/x-csharp</code> (C#).</p>
+    (C), <code>text/x-c++src</code> (C++), <code>text/x-java</code>
+    (Java), <code>text/x-csharp</code> (C#),
+    <code>text/x-scala</code> (Scala), <code>text/x-vertex</code>
+    and <code>x-shader/x-fragment</code> (shader programs).</p>
 </article>
diff --git a/static/js/lib/codemirror-4.5/mode/clike/scala.html b/static/js/lib/codemirror-4.5/mode/clike/scala.html
index e9acc04..aa04cf0 100644
--- a/static/js/lib/codemirror-4.5/mode/clike/scala.html
+++ b/static/js/lib/codemirror-4.5/mode/clike/scala.html
@@ -10,12 +10,12 @@
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clike.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/clojure/clojure.js b/static/js/lib/codemirror-4.5/mode/clojure/clojure.js
index 73bfcd3..c334de7 100644
--- a/static/js/lib/codemirror-4.5/mode/clojure/clojure.js
+++ b/static/js/lib/codemirror-4.5/mode/clojure/clojure.js
@@ -18,7 +18,7 @@
 
 CodeMirror.defineMode("clojure", function (options) {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
+        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword", VAR = "variable";
     var INDENT_WORD_SKIP = options.indentUnit || 2;
     var NORMAL_INDENT_UNIT = options.indentUnit || 2;
 
@@ -59,7 +59,7 @@ CodeMirror.defineMode("clojure", function (options) {
         sign: /[+-]/,
         exponent: /e/i,
         keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:<>\/]/
+        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/
     };
 
     function stateStack(indent, type, prev) { // represents a state stack object
@@ -220,7 +220,9 @@ CodeMirror.defineMode("clojure", function (options) {
                             returnType = BUILTIN;
                         } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
                             returnType = ATOM;
-                        } else returnType = null;
+                        } else {
+                          returnType = VAR;
+                        }
                     }
             }
 
diff --git a/static/js/lib/codemirror-4.5/mode/clojure/index.html b/static/js/lib/codemirror-4.5/mode/clojure/index.html
index 5a50c56..3ecf4c4 100644
--- a/static/js/lib/codemirror-4.5/mode/clojure/index.html
+++ b/static/js/lib/codemirror-4.5/mode/clojure/index.html
@@ -9,12 +9,12 @@
 <script src="clojure.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/cobol/index.html b/static/js/lib/codemirror-4.5/mode/cobol/index.html
index a6c5c33..4352419 100644
--- a/static/js/lib/codemirror-4.5/mode/cobol/index.html
+++ b/static/js/lib/codemirror-4.5/mode/cobol/index.html
@@ -39,12 +39,12 @@
         .CodeMirror-activeline-background {background: #555555 !important;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/coffeescript/coffeescript.js b/static/js/lib/codemirror-4.5/mode/coffeescript/coffeescript.js
index 1695650..ae460e0 100644
--- a/static/js/lib/codemirror-4.5/mode/coffeescript/coffeescript.js
+++ b/static/js/lib/codemirror-4.5/mode/coffeescript/coffeescript.js
@@ -22,7 +22,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?)/;
+  var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/;
   var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
   var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
   var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
@@ -34,7 +34,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
                         "switch", "try", "catch", "finally", "class"];
   var commonKeywords = ["break", "by", "continue", "debugger", "delete",
                         "do", "in", "of", "new", "return", "then",
-                        "this", "throw", "when", "until"];
+                        "this", "@", "throw", "when", "until", "extends"];
 
   var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
 
@@ -217,7 +217,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     type = type || "coffee";
     var offset = 0, align = false, alignOffset = null;
     for (var scope = state.scope; scope; scope = scope.prev) {
-      if (scope.type === "coffee") {
+      if (scope.type === "coffee" || scope.type == "}") {
         offset = scope.offset + conf.indentUnit;
         break;
       }
@@ -278,7 +278,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
 
     // Handle scope changes.
     if (current === "return") {
-      state.dedent += 1;
+      state.dedent = true;
     }
     if (((current === "->" || current === "=>") &&
          !state.lambda &&
@@ -310,9 +310,10 @@ CodeMirror.defineMode("coffeescript", function(conf) {
       if (state.scope.type == current)
         state.scope = state.scope.prev;
     }
-    if (state.dedent > 0 && stream.eol() && state.scope.type == "coffee") {
-      if (state.scope.prev) state.scope = state.scope.prev;
-      state.dedent -= 1;
+    if (state.dedent && stream.eol()) {
+      if (state.scope.type == "coffee" && state.scope.prev)
+        state.scope = state.scope.prev;
+      state.dedent = false;
     }
 
     return style;
diff --git a/static/js/lib/codemirror-4.5/mode/coffeescript/index.html b/static/js/lib/codemirror-4.5/mode/coffeescript/index.html
index fc0a770..93a5f4f 100644
--- a/static/js/lib/codemirror-4.5/mode/coffeescript/index.html
+++ b/static/js/lib/codemirror-4.5/mode/coffeescript/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/commonlisp/index.html b/static/js/lib/codemirror-4.5/mode/commonlisp/index.html
index d48be8d..f2bf452 100644
--- a/static/js/lib/codemirror-4.5/mode/commonlisp/index.html
+++ b/static/js/lib/codemirror-4.5/mode/commonlisp/index.html
@@ -9,12 +9,12 @@
 <script src="commonlisp.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/css/index.html b/static/js/lib/codemirror-4.5/mode/css/index.html
index 80ef518..3d2c127 100644
--- a/static/js/lib/codemirror-4.5/mode/css/index.html
+++ b/static/js/lib/codemirror-4.5/mode/css/index.html
@@ -9,12 +9,12 @@
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/css/less.html b/static/js/lib/codemirror-4.5/mode/css/less.html
index 1030ca4..6ccb721 100644
--- a/static/js/lib/codemirror-4.5/mode/css/less.html
+++ b/static/js/lib/codemirror-4.5/mode/css/less.html
@@ -10,12 +10,12 @@
 <script src="css.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/css/scss.html b/static/js/lib/codemirror-4.5/mode/css/scss.html
index 0677d08..21f20e0 100644
--- a/static/js/lib/codemirror-4.5/mode/css/scss.html
+++ b/static/js/lib/codemirror-4.5/mode/css/scss.html
@@ -9,12 +9,12 @@
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/cypher/index.html b/static/js/lib/codemirror-4.5/mode/cypher/index.html
index 2b765fe..b8bd75c 100644
--- a/static/js/lib/codemirror-4.5/mode/cypher/index.html
+++ b/static/js/lib/codemirror-4.5/mode/cypher/index.html
@@ -15,12 +15,12 @@
 }
         </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/d/d.js b/static/js/lib/codemirror-4.5/mode/d/d.js
index 2a06312..c927a7e 100644
--- a/static/js/lib/codemirror-4.5/mode/d/d.js
+++ b/static/js/lib/codemirror-4.5/mode/d/d.js
@@ -60,7 +60,7 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
       stream.eatWhile(isOperatorChar);
       return "operator";
     }
-    stream.eatWhile(/[\w\$_]/);
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
diff --git a/static/js/lib/codemirror-4.5/mode/d/index.html b/static/js/lib/codemirror-4.5/mode/d/index.html
index 8b25fcc..08cabd8 100644
--- a/static/js/lib/codemirror-4.5/mode/d/index.html
+++ b/static/js/lib/codemirror-4.5/mode/d/index.html
@@ -10,12 +10,12 @@
 <script src="d.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/diff/index.html b/static/js/lib/codemirror-4.5/mode/diff/index.html
index 6ceae8b..0af611f 100644
--- a/static/js/lib/codemirror-4.5/mode/diff/index.html
+++ b/static/js/lib/codemirror-4.5/mode/diff/index.html
@@ -15,12 +15,12 @@
       span.cm-error.cm-tag { background-color: #2b2; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/django/index.html b/static/js/lib/codemirror-4.5/mode/django/index.html
index 07963bc..79d9a6a 100644
--- a/static/js/lib/codemirror-4.5/mode/django/index.html
+++ b/static/js/lib/codemirror-4.5/mode/django/index.html
@@ -12,12 +12,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/dtd/dtd.js b/static/js/lib/codemirror-4.5/mode/dtd/dtd.js
index 1df9fc8..f37029a 100644
--- a/static/js/lib/codemirror-4.5/mode/dtd/dtd.js
+++ b/static/js/lib/codemirror-4.5/mode/dtd/dtd.js
@@ -4,7 +4,7 @@
 /*
   DTD mode
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
   GitHub: @peterkroon
 */
 
diff --git a/static/js/lib/codemirror-4.5/mode/dtd/index.html b/static/js/lib/codemirror-4.5/mode/dtd/index.html
index 076d827..e6798a7 100644
--- a/static/js/lib/codemirror-4.5/mode/dtd/index.html
+++ b/static/js/lib/codemirror-4.5/mode/dtd/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/dylan/index.html b/static/js/lib/codemirror-4.5/mode/dylan/index.html
index 049f93c..ddf5ad0 100644
--- a/static/js/lib/codemirror-4.5/mode/dylan/index.html
+++ b/static/js/lib/codemirror-4.5/mode/dylan/index.html
@@ -12,12 +12,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/ecl/index.html b/static/js/lib/codemirror-4.5/mode/ecl/index.html
index f4b612d..2306860 100644
--- a/static/js/lib/codemirror-4.5/mode/ecl/index.html
+++ b/static/js/lib/codemirror-4.5/mode/ecl/index.html
@@ -9,12 +9,12 @@
 <script src="ecl.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/eiffel/index.html b/static/js/lib/codemirror-4.5/mode/eiffel/index.html
index 95c5f88..108a71b 100644
--- a/static/js/lib/codemirror-4.5/mode/eiffel/index.html
+++ b/static/js/lib/codemirror-4.5/mode/eiffel/index.html
@@ -13,12 +13,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/erlang/index.html b/static/js/lib/codemirror-4.5/mode/erlang/index.html
index 9cacb75..6d06a89 100644
--- a/static/js/lib/codemirror-4.5/mode/erlang/index.html
+++ b/static/js/lib/codemirror-4.5/mode/erlang/index.html
@@ -11,12 +11,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/fortran/index.html b/static/js/lib/codemirror-4.5/mode/fortran/index.html
index efa55ec..102e8f8 100644
--- a/static/js/lib/codemirror-4.5/mode/fortran/index.html
+++ b/static/js/lib/codemirror-4.5/mode/fortran/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/gas/index.html b/static/js/lib/codemirror-4.5/mode/gas/index.html
index cd8a2ff..df75ca2 100644
--- a/static/js/lib/codemirror-4.5/mode/gas/index.html
+++ b/static/js/lib/codemirror-4.5/mode/gas/index.html
@@ -9,12 +9,12 @@
 <script src="gas.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/gfm/index.html b/static/js/lib/codemirror-4.5/mode/gfm/index.html
index b71cd5c..a35e568 100644
--- a/static/js/lib/codemirror-4.5/mode/gfm/index.html
+++ b/static/js/lib/codemirror-4.5/mode/gfm/index.html
@@ -16,12 +16,12 @@
 <script src="../clike/clike.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/gfm/test.js b/static/js/lib/codemirror-4.5/mode/gfm/test.js
index 78ffff2..b9af5e8 100644
--- a/static/js/lib/codemirror-4.5/mode/gfm/test.js
+++ b/static/js/lib/codemirror-4.5/mode/gfm/test.js
@@ -150,4 +150,15 @@
      "[comment `foo]",
      "",
      "[link http://www.example.com/]");
+
+  MT("headerCodeBlockGithub",
+     "[header&header-1 # heading]",
+     "",
+     "[comment ```]",
+     "[comment code]",
+     "[comment ```]",
+     "",
+     "Commit: [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2]",
+     "Issue: [link #1]",
+     "Link: [link http://www.example.com/]");
 })();
diff --git a/static/js/lib/codemirror-4.5/mode/gherkin/gherkin.js b/static/js/lib/codemirror-4.5/mode/gherkin/gherkin.js
index ed7ba79..fc2ebee 100644
--- a/static/js/lib/codemirror-4.5/mode/gherkin/gherkin.js
+++ b/static/js/lib/codemirror-4.5/mode/gherkin/gherkin.js
@@ -3,7 +3,7 @@
 
 /*
 Gherkin mode - http://www.cukes.info/
-Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
 */
 
 // Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
diff --git a/static/js/lib/codemirror-4.5/mode/gherkin/index.html b/static/js/lib/codemirror-4.5/mode/gherkin/index.html
index b76877a..af8184c 100644
--- a/static/js/lib/codemirror-4.5/mode/gherkin/index.html
+++ b/static/js/lib/codemirror-4.5/mode/gherkin/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/go/go.js b/static/js/lib/codemirror-4.5/mode/go/go.js
index 51b07c7..173e034 100644
--- a/static/js/lib/codemirror-4.5/mode/go/go.js
+++ b/static/js/lib/codemirror-4.5/mode/go/go.js
@@ -71,7 +71,7 @@ CodeMirror.defineMode("go", function(config) {
       stream.eatWhile(isOperatorChar);
       return "operator";
     }
-    stream.eatWhile(/[\w\$_]/);
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
       if (cur == "case" || cur == "default") curPunc = "case";
diff --git a/static/js/lib/codemirror-4.5/mode/go/index.html b/static/js/lib/codemirror-4.5/mode/go/index.html
index 3673fa0..72e3b36 100644
--- a/static/js/lib/codemirror-4.5/mode/go/index.html
+++ b/static/js/lib/codemirror-4.5/mode/go/index.html
@@ -11,12 +11,12 @@
 <script src="go.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/groovy/index.html b/static/js/lib/codemirror-4.5/mode/groovy/index.html
index f5efdf7..bb0df07 100644
--- a/static/js/lib/codemirror-4.5/mode/groovy/index.html
+++ b/static/js/lib/codemirror-4.5/mode/groovy/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/haml/index.html b/static/js/lib/codemirror-4.5/mode/haml/index.html
index a737875..2894a93 100644
--- a/static/js/lib/codemirror-4.5/mode/haml/index.html
+++ b/static/js/lib/codemirror-4.5/mode/haml/index.html
@@ -13,12 +13,12 @@
 <script src="haml.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/haskell/haskell.js b/static/js/lib/codemirror-4.5/mode/haskell/haskell.js
index 6602078..fe0bab6 100644
--- a/static/js/lib/codemirror-4.5/mode/haskell/haskell.js
+++ b/static/js/lib/codemirror-4.5/mode/haskell/haskell.js
@@ -24,7 +24,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
   var digitRE = /\d/;
   var hexitRE = /[0-9A-Fa-f]/;
   var octitRE = /[0-7]/;
-  var idRE = /[a-z_A-Z0-9']/;
+  var idRE = /[a-z_A-Z0-9'\xa1-\uffff]/;
   var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:]/;
   var specialRE = /[(),;[\]`{}]/;
   var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
diff --git a/static/js/lib/codemirror-4.5/mode/haskell/index.html b/static/js/lib/codemirror-4.5/mode/haskell/index.html
index 056b01d..42240b0 100644
--- a/static/js/lib/codemirror-4.5/mode/haskell/index.html
+++ b/static/js/lib/codemirror-4.5/mode/haskell/index.html
@@ -11,12 +11,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/haxe/index.html b/static/js/lib/codemirror-4.5/mode/haxe/index.html
index 4c3b978..d415b5e 100644
--- a/static/js/lib/codemirror-4.5/mode/haxe/index.html
+++ b/static/js/lib/codemirror-4.5/mode/haxe/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/htmlembedded/index.html b/static/js/lib/codemirror-4.5/mode/htmlembedded/index.html
index fee1196..93d01c4 100644
--- a/static/js/lib/codemirror-4.5/mode/htmlembedded/index.html
+++ b/static/js/lib/codemirror-4.5/mode/htmlembedded/index.html
@@ -13,12 +13,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/htmlmixed/htmlmixed.js b/static/js/lib/codemirror-4.5/mode/htmlmixed/htmlmixed.js
index dc48978..250ef8c 100644
--- a/static/js/lib/codemirror-4.5/mode/htmlmixed/htmlmixed.js
+++ b/static/js/lib/codemirror-4.5/mode/htmlmixed/htmlmixed.js
@@ -30,6 +30,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
 
   function html(stream, state) {
     var tagName = state.htmlState.tagName;
+    if (tagName) tagName = tagName.toLowerCase();
     var style = htmlMode.token(stream, state.htmlState);
     if (tagName == "script" && /\btag\b/.test(style) && stream.current() == ">") {
       // Script block: mode to change to depends on type attribute
diff --git a/static/js/lib/codemirror-4.5/mode/htmlmixed/index.html b/static/js/lib/codemirror-4.5/mode/htmlmixed/index.html
index bd06bb5..6163029 100644
--- a/static/js/lib/codemirror-4.5/mode/htmlmixed/index.html
+++ b/static/js/lib/codemirror-4.5/mode/htmlmixed/index.html
@@ -13,12 +13,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/http/index.html b/static/js/lib/codemirror-4.5/mode/http/index.html
index 705085e..0b8d531 100644
--- a/static/js/lib/codemirror-4.5/mode/http/index.html
+++ b/static/js/lib/codemirror-4.5/mode/http/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/index.html b/static/js/lib/codemirror-4.5/mode/index.html
index 1c106ae..bb656d2 100644
--- a/static/js/lib/codemirror-4.5/mode/index.html
+++ b/static/js/lib/codemirror-4.5/mode/index.html
@@ -5,12 +5,12 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Language modes</a>
@@ -71,6 +71,7 @@ option.</p>
       <li><a href="lua/index.html">Lua</a></li>
       <li><a href="markdown/index.html">Markdown</a> (<a href="gfm/index.html">GitHub-flavour</a>)</li>
       <li><a href="mirc/index.html">mIRC</a></li>
+      <li><a href="modelica/index.html">Modelica</a></li>
       <li><a href="nginx/index.html">Nginx</a></li>
       <li><a href="ntriples/index.html">NTriples</a></li>
       <li><a href="mllike/index.html">OCaml</a></li>
@@ -104,9 +105,11 @@ option.</p>
       <li><a href="sparql/index.html">SPARQL</a></li>
       <li><a href="stex/index.html">sTeX, LaTeX</a></li>
       <li><a href="tcl/index.html">Tcl</a></li>
+      <li><a href="textile/index.html">Textile</a></li>
       <li><a href="tiddlywiki/index.html">Tiddlywiki</a></li>
       <li><a href="tiki/index.html">Tiki wiki</a></li>
       <li><a href="toml/index.html">TOML</a></li>
+      <li><a href="tornado/index.html">Tornado</a> (templating language)</li>
       <li><a href="turtle/index.html">Turtle</a></li>
       <li><a href="vb/index.html">VB.NET</a></li>
       <li><a href="vbscript/index.html">VBScript</a></li>
diff --git a/static/js/lib/codemirror-4.5/mode/jade/index.html b/static/js/lib/codemirror-4.5/mode/jade/index.html
index 8bfd562..e534981 100644
--- a/static/js/lib/codemirror-4.5/mode/jade/index.html
+++ b/static/js/lib/codemirror-4.5/mode/jade/index.html
@@ -13,12 +13,12 @@
 <script src="jade.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/javascript/index.html b/static/js/lib/codemirror-4.5/mode/javascript/index.html
index 59e3924..592a133 100644
--- a/static/js/lib/codemirror-4.5/mode/javascript/index.html
+++ b/static/js/lib/codemirror-4.5/mode/javascript/index.html
@@ -12,12 +12,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/javascript/javascript.js b/static/js/lib/codemirror-4.5/mode/javascript/javascript.js
index 46616bc..b0ba8d0 100644
--- a/static/js/lib/codemirror-4.5/mode/javascript/javascript.js
+++ b/static/js/lib/codemirror-4.5/mode/javascript/javascript.js
@@ -19,7 +19,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var jsonldMode = parserConfig.jsonld;
   var jsonMode = parserConfig.json || jsonldMode;
   var isTS = parserConfig.typescript;
-  var wordRE = parserConfig.wordCharacters || /[\w$]/;
+  var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
 
   // Tokenizer
 
@@ -391,7 +391,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeoperatorNoComma(type, value, noComma) {
     var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
     var expr = noComma == false ? expression : expressionNoComma;
-    if (value == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
+    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
       if (/\+\+|--/.test(value)) return cont(me);
       if (value == "?") return cont(expression, expect(":"), expr);
@@ -417,13 +417,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function arrowBody(type) {
     findFatArrow(cx.stream, cx.state);
-    if (type == "{") return pass(statement);
-    return pass(expression);
+    return pass(type == "{" ? statement : expression);
   }
   function arrowBodyNoComma(type) {
     findFatArrow(cx.stream, cx.state);
-    if (type == "{") return pass(statement);
-    return pass(expressionNoComma);
+    return pass(type == "{" ? statement : expressionNoComma);
   }
   function maybelabel(type) {
     if (type == ":") return cont(poplex, statement);
@@ -592,7 +590,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function maybeArrayComprehension(type) {
     if (type == "for") return pass(comprehension, expect("]"));
-    if (type == ",") return cont(commasep(expressionNoComma, "]"));
+    if (type == ",") return cont(commasep(maybeexpressionNoComma, "]"));
     return pass(commasep(expressionNoComma, "]"));
   }
   function comprehension(type) {
@@ -658,7 +656,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       else return lexical.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: ":{}",
+    electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
     blockCommentStart: jsonMode ? null : "/*",
     blockCommentEnd: jsonMode ? null : "*/",
     lineComment: jsonMode ? null : "//",
diff --git a/static/js/lib/codemirror-4.5/mode/javascript/json-ld.html b/static/js/lib/codemirror-4.5/mode/javascript/json-ld.html
index 256bb0f..3a37f0b 100644
--- a/static/js/lib/codemirror-4.5/mode/javascript/json-ld.html
+++ b/static/js/lib/codemirror-4.5/mode/javascript/json-ld.html
@@ -12,12 +12,12 @@
 <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"><img id=logo src="../../doc/logo.png"/></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/javascript/test.js b/static/js/lib/codemirror-4.5/mode/javascript/test.js
index 77cc695..aaeb8e0 100644
--- a/static/js/lib/codemirror-4.5/mode/javascript/test.js
+++ b/static/js/lib/codemirror-4.5/mode/javascript/test.js
@@ -147,6 +147,13 @@
   MT("scary_regexp",
      "[string-2 /foo[[/]]bar/];");
 
+  MT("indent_strange_array",
+     "[keyword var] [variable x] [operator =] [[",
+     "  [number 1],,",
+     "  [number 2],",
+     "]];",
+     "[number 10];");
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}
diff --git a/static/js/lib/codemirror-4.5/mode/javascript/typescript.html b/static/js/lib/codemirror-4.5/mode/javascript/typescript.html
index 9cc5f49..2cfc538 100644
--- a/static/js/lib/codemirror-4.5/mode/javascript/typescript.html
+++ b/static/js/lib/codemirror-4.5/mode/javascript/typescript.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/jinja2/index.html b/static/js/lib/codemirror-4.5/mode/jinja2/index.html
index c99daf6..5a70e91 100644
--- a/static/js/lib/codemirror-4.5/mode/jinja2/index.html
+++ b/static/js/lib/codemirror-4.5/mode/jinja2/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/julia/index.html b/static/js/lib/codemirror-4.5/mode/julia/index.html
index 945e1a9..e1492c2 100644
--- a/static/js/lib/codemirror-4.5/mode/julia/index.html
+++ b/static/js/lib/codemirror-4.5/mode/julia/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
@@ -51,6 +51,14 @@ a
 as123
 function_name!
 
+#unicode identifiers
+# a = x\ddot
+a⃗ = ẍ
+# a = v\dot
+a⃗ = v̇
+#F\vec = m \cdotp a\vec
+F⃗ = m·a⃗
+
 #literal identifier multiples
 3x
 4[1, 2, 3]
@@ -60,6 +68,7 @@ x=[1, 2, 3]
 x[end-1]
 x={"julia"=>"language of technical computing"}
 
+
 #exception handling
 try
   f()
diff --git a/static/js/lib/codemirror-4.5/mode/julia/julia.js b/static/js/lib/codemirror-4.5/mode/julia/julia.js
index 5dd1afc..e854988 100644
--- a/static/js/lib/codemirror-4.5/mode/julia/julia.js
+++ b/static/js/lib/codemirror-4.5/mode/julia/julia.js
@@ -20,7 +20,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
   var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/;
+  var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
   var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
diff --git a/static/js/lib/codemirror-4.5/mode/kotlin/index.html b/static/js/lib/codemirror-4.5/mode/kotlin/index.html
index 38700f3..859e109 100644
--- a/static/js/lib/codemirror-4.5/mode/kotlin/index.html
+++ b/static/js/lib/codemirror-4.5/mode/kotlin/index.html
@@ -9,12 +9,12 @@
 <script src="kotlin.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/livescript/index.html b/static/js/lib/codemirror-4.5/mode/livescript/index.html
index 3ce8974..f415479 100644
--- a/static/js/lib/codemirror-4.5/mode/livescript/index.html
+++ b/static/js/lib/codemirror-4.5/mode/livescript/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/lua/index.html b/static/js/lib/codemirror-4.5/mode/lua/index.html
index 7f4eb2c..fc98b94 100644
--- a/static/js/lib/codemirror-4.5/mode/lua/index.html
+++ b/static/js/lib/codemirror-4.5/mode/lua/index.html
@@ -11,12 +11,12 @@
 <script src="lua.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/markdown/index.html b/static/js/lib/codemirror-4.5/mode/markdown/index.html
index a6b541e..c3bb8df 100644
--- a/static/js/lib/codemirror-4.5/mode/markdown/index.html
+++ b/static/js/lib/codemirror-4.5/mode/markdown/index.html
@@ -16,12 +16,12 @@
       .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/markdown/markdown.js b/static/js/lib/codemirror-4.5/mode/markdown/markdown.js
index 81ed24e..3eb7747 100644
--- a/static/js/lib/codemirror-4.5/mode/markdown/markdown.js
+++ b/static/js/lib/codemirror-4.5/mode/markdown/markdown.js
@@ -360,15 +360,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     var ch = stream.next();
 
-    if (state.escape) {
-      state.escape = false;
-      return getType(state);
-    }
-
     if (ch === '\\') {
-      if (modeCfg.highlightFormatting) state.formatting = "escape";
-      state.escape = true;
-      return getType(state);
+      stream.next();
+      if (modeCfg.highlightFormatting) {
+        var type = getType(state);
+        return type ? type + " formatting-escape" : "formatting-escape";
+      }
     }
 
     // Matches link titles present on next line
@@ -650,7 +647,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         inline: inlineNormal,
         text: handleText,
 
-        escape: false,
         formatting: false,
         linkText: false,
         linkHref: false,
@@ -683,7 +679,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         inline: s.inline,
         text: s.text,
-        escape: false,
         formatting: false,
         linkTitle: s.linkTitle,
         em: s.em,
@@ -705,22 +700,20 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.formatting = false;
 
       if (stream.sol()) {
-        var forceBlankLine = stream.match(/^\s*$/, true) || state.header;
+        var forceBlankLine = !!state.header;
 
         // Reset state.header
         state.header = 0;
 
-        if (forceBlankLine) {
+        if (stream.match(/^\s*$/, true) || forceBlankLine) {
           state.prevLineHasContent = false;
-          return blankLine(state);
+          blankLine(state);
+          return forceBlankLine ? this.token(stream, state) : null;
         } else {
           state.prevLineHasContent = state.thisLineHasContent;
           state.thisLineHasContent = true;
         }
 
-        // Reset state.escape
-        state.escape = false;
-
         // Reset state.taskList
         state.taskList = false;
 
diff --git a/static/js/lib/codemirror-4.5/mode/markdown/test.js b/static/js/lib/codemirror-4.5/mode/markdown/test.js
index 77a3b65..96ca1ae 100644
--- a/static/js/lib/codemirror-4.5/mode/markdown/test.js
+++ b/static/js/lib/codemirror-4.5/mode/markdown/test.js
@@ -54,7 +54,7 @@
      "[link&formatting&formatting-link <][link user@example.com][link&formatting&formatting-link >]");
 
   FT("formatting_escape",
-     "[formatting&formatting-escape \\]*");
+     "[formatting-escape \\*]");
 
   MT("plainText",
      "foo");
diff --git a/static/js/lib/codemirror-4.5/mode/meta.js b/static/js/lib/codemirror-4.5/mode/meta.js
index e3c32b6..cee33e5 100644
--- a/static/js/lib/codemirror-4.5/mode/meta.js
+++ b/static/js/lib/codemirror-4.5/mode/meta.js
@@ -11,105 +11,134 @@
 })(function(CodeMirror) {
   "use strict";
 
-CodeMirror.modeInfo = [
-  {name: "APL", mime: "text/apl", mode: "apl"},
-  {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"},
-  {name: "C", mime: "text/x-csrc", mode: "clike"},
-  {name: "C++", mime: "text/x-c++src", mode: "clike"},
-  {name: "Cobol", mime: "text/x-cobol", mode: "cobol"},
-  {name: "Java", mime: "text/x-java", mode: "clike"},
-  {name: "C#", mime: "text/x-csharp", mode: "clike"},
-  {name: "Scala", mime: "text/x-scala", mode: "clike"},
-  {name: "Clojure", mime: "text/x-clojure", mode: "clojure"},
-  {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript"},
-  {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp"},
-  {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"},
-  {name: "CSS", mime: "text/css", mode: "css"},
-  {name: "D", mime: "text/x-d", mode: "d"},
-  {name: "diff", mime: "text/x-diff", mode: "diff"},
-  {name: "DTD", mime: "application/xml-dtd", mode: "dtd"},
-  {name: "Dylan", mime: "text/x-dylan", mode: "dylan"},
-  {name: "ECL", mime: "text/x-ecl", mode: "ecl"},
-  {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel"},
-  {name: "Erlang", mime: "text/x-erlang", mode: "erlang"},
-  {name: "Fortran", mime: "text/x-fortran", mode: "fortran"},
-  {name: "F#", mime: "text/x-fsharp", mode: "mllike"},
-  {name: "Gas", mime: "text/x-gas", mode: "gas"},
-  {name: "Gherkin", mime: "text/x-feature", mode: "gherkin"},
-  {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"},
-  {name: "Go", mime: "text/x-go", mode: "go"},
-  {name: "Groovy", mime: "text/x-groovy", mode: "groovy"},
-  {name: "HAML", mime: "text/x-haml", mode: "haml"},
-  {name: "Haskell", mime: "text/x-haskell", mode: "haskell"},
-  {name: "Haxe", mime: "text/x-haxe", mode: "haxe"},
-  {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded"},
-  {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded"},
-  {name: "JavaServer Pages", mime: "application/x-jsp", mode: "htmlembedded"},
-  {name: "HTML", mime: "text/html", mode: "htmlmixed"},
-  {name: "HTTP", mime: "message/http", mode: "http"},
-  {name: "Jade", mime: "text/x-jade", mode: "jade"},
-  {name: "JavaScript", mime: "text/javascript", mode: "javascript"},
-  {name: "JavaScript", mime: "application/javascript", mode: "javascript"},
-  {name: "JSON", mime: "application/x-json", mode: "javascript"},
-  {name: "JSON", mime: "application/json", mode: "javascript"},
-  {name: "JSON-LD", mime: "application/ld+json", mode: "javascript"},
-  {name: "TypeScript", mime: "application/typescript", mode: "javascript"},
-  {name: "Jinja2", mime: null, mode: "jinja2"},
-  {name: "Julia", mime: "text/x-julia", mode: "julia"},
-  {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin"},
-  {name: "LESS", mime: "text/x-less", mode: "css"},
-  {name: "LiveScript", mime: "text/x-livescript", mode: "livescript"},
-  {name: "Lua", mime: "text/x-lua", mode: "lua"},
-  {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown"},
-  {name: "mIRC", mime: "text/mirc", mode: "mirc"},
-  {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx"},
-  {name: "NTriples", mime: "text/n-triples", mode: "ntriples"},
-  {name: "OCaml", mime: "text/x-ocaml", mode: "mllike"},
-  {name: "Octave", mime: "text/x-octave", mode: "octave"},
-  {name: "Pascal", mime: "text/x-pascal", mode: "pascal"},
-  {name: "PEG.js", mime: null, mode: "pegjs"},
-  {name: "Perl", mime: "text/x-perl", mode: "perl"},
-  {name: "PHP", mime: "text/x-php", mode: "php"},
-  {name: "PHP(HTML)", mime: "application/x-httpd-php", mode: "php"},
-  {name: "Pig", mime: "text/x-pig", mode: "pig"},
-  {name: "Plain Text", mime: "text/plain", mode: "null"},
-  {name: "Properties files", mime: "text/x-properties", mode: "properties"},
-  {name: "Python", mime: "text/x-python", mode: "python"},
-  {name: "Puppet", mime: "text/x-puppet", mode: "puppet"},
-  {name: "Cython", mime: "text/x-cython", mode: "python"},
-  {name: "R", mime: "text/x-rsrc", mode: "r"},
-  {name: "reStructuredText", mime: "text/x-rst", mode: "rst"},
-  {name: "Ruby", mime: "text/x-ruby", mode: "ruby"},
-  {name: "Rust", mime: "text/x-rustsrc", mode: "rust"},
-  {name: "Sass", mime: "text/x-sass", mode: "sass"},
-  {name: "Scheme", mime: "text/x-scheme", mode: "scheme"},
-  {name: "SCSS", mime: "text/x-scss", mode: "css"},
-  {name: "Shell", mime: "text/x-sh", mode: "shell"},
-  {name: "Sieve", mime: "application/sieve", mode: "sieve"},
-  {name: "Slim", mime: "text/x-slim", mode: "slim"},
-  {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk"},
-  {name: "Smarty", mime: "text/x-smarty", mode: "smarty"},
-  {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
-  {name: "Solr", mime: "text/x-solr", mode: "solr"},
-  {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql"},
-  {name: "SQL", mime: "text/x-sql", mode: "sql"},
-  {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
-  {name: "sTeX", mime: "text/x-stex", mode: "stex"},
-  {name: "LaTeX", mime: "text/x-latex", mode: "stex"},
-  {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog"},
-  {name: "Tcl", mime: "text/x-tcl", mode: "tcl"},
-  {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
-  {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
-  {name: "TOML", mime: "text/x-toml", mode: "toml"},
-  {name: "Turtle", mime: "text/turtle", mode: "turtle"},
-  {name: "VB.NET", mime: "text/x-vb", mode: "vb"},
-  {name: "VBScript", mime: "text/vbscript", mode: "vbscript"},
-  {name: "Velocity", mime: "text/velocity", mode: "velocity"},
-  {name: "Verilog", mime: "text/x-verilog", mode: "verilog"},
-  {name: "XML", mime: "application/xml", mode: "xml"},
-  {name: "XQuery", mime: "application/xquery", mode: "xquery"},
-  {name: "YAML", mime: "text/x-yaml", mode: "yaml"},
-  {name: "Z80", mime: "text/x-z80", mode: "z80"}
-];
+  CodeMirror.modeInfo = [
+    {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
+    {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"},
+    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
+    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "hpp", "h++"]},
+    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"]},
+    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"]},
+    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"]},
+    {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"},
+    {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
+    {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
+    {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
+    {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
+    {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
+    {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
+    {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
+    {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
+    {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
+    {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
+    {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+    {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
+    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"]},
+    {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
+    {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
+    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"},
+    {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
+    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
+    {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
+    {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
+    {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
+    {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
+    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"]},
+    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"]},
+    {name: "HTTP", mime: "message/http", mode: "http"},
+    {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
+    {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
+    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"]},
+    {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
+     mode: "javascript", ext: ["js"]},
+    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"]},
+    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript"},
+    {name: "Jinja2", mime: "null", mode: "jinja2"},
+    {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
+    {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
+    {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
+    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"]},
+    {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
+    {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
+    {name: "mIRC", mime: "text/mirc", mode: "mirc"},
+    {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
+    {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
+    {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
+    {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
+    {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx"},
+    {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
+    {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
+    {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
+    {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
+    {name: "PEG.js", mime: "null", mode: "pegjs"},
+    {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
+    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
+    {name: "Pig", mime: "text/x-pig", mode: "pig"},
+    {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
+    {name: "PLSQL", mime: "text/x-plsql", mode: "sql"},
+    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"]},
+    {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
+    {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
+    {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
+    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"]},
+    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"]},
+    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"]},
+    {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
+    {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
+    {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
+    {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
+    {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
+    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"]},
+    {name: "Sieve", mime: "application/sieve", mode: "sieve"},
+    {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim"},
+    {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
+    {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
+    {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
+    {name: "Solr", mime: "text/x-solr", mode: "solr"},
+    {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql", ext: ["sparql"]},
+    {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
+    {name: "sTeX", mime: "text/x-stex", mode: "stex"},
+    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"]},
+    {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
+    {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
+    {name: "Textile", mime: "text/x-textile", mode: "textile"},
+    {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
+    {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
+    {name: "TOML", mime: "text/x-toml", mode: "toml"},
+    {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
+    {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
+    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"]},
+    {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
+    {name: "VBScript", mime: "text/vbscript", mode: "vbscript"},
+    {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
+    {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
+    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"]},
+    {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
+    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml"]},
+    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]}
+  ];
+  // Ensure all modes have a mime property for backwards compatibility
+  for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+    var info = CodeMirror.modeInfo[i];
+    if (info.mimes) info.mime = info.mimes[0];
+  }
 
+  CodeMirror.findModeByMIME = function(mime) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.mime == mime) return info;
+      if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
+        if (info.mimes[j] == mime) return info;
+    }
+  };
+
+  CodeMirror.findModeByExtension = function(ext) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.ext) for (var j = 0; j < info.ext.length; j++)
+        if (info.ext[j] == ext) return info;
+    }
+  };
 });
diff --git a/static/js/lib/codemirror-4.5/mode/mirc/index.html b/static/js/lib/codemirror-4.5/mode/mirc/index.html
index c346f1c..fd2f34e 100644
--- a/static/js/lib/codemirror-4.5/mode/mirc/index.html
+++ b/static/js/lib/codemirror-4.5/mode/mirc/index.html
@@ -10,12 +10,12 @@
 <script src="mirc.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/mllike/index.html b/static/js/lib/codemirror-4.5/mode/mllike/index.html
index 67bfef8..5923af8 100644
--- a/static/js/lib/codemirror-4.5/mode/mllike/index.html
+++ b/static/js/lib/codemirror-4.5/mode/mllike/index.html
@@ -12,12 +12,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/modelica/index.html b/static/js/lib/codemirror-4.5/mode/modelica/index.html
new file mode 100644
index 0000000..408c3b1
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/mode/modelica/index.html
@@ -0,0 +1,67 @@
+<!doctype html>
+
+<title>CodeMirror: Modelica mode</title>
+<meta charset="utf-8"/>
+<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>
+<link rel="stylesheet" href="../../addon/hint/show-hint.css">
+<script src="../../addon/hint/show-hint.js"></script>
+<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>
+
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Modelica</a>
+  </ul>
+</div>
+
+<article>
+<h2>Modelica mode</h2>
+
+<div><textarea id="modelica">
+model BouncingBall
+  parameter Real e = 0.7;
+  parameter Real g = 9.81;
+  Real h(start=1);
+  Real v;
+  Boolean flying(start=true);
+  Boolean impact;
+  Real v_new;
+equation
+  impact = h <= 0.0;
+  der(v) = if flying then -g else 0;
+  der(h) = v;
+  when {h <= 0.0 and v <= 0.0, impact} then
+    v_new = if edge(impact) then -e*pre(v) else 0;
+    flying = v_new > 0;
+    reinit(v, v_new);
+  end when;
+  annotation (uses(Modelica(version="3.2")));
+end BouncingBall;
+</textarea></div>
+
+    <script>
+      var modelicaEditor = CodeMirror.fromTextArea(document.getElementById("modelica"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-modelica"
+      });
+      var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
+      CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
+    </script>
+
+    <p>Simple mode that tries to handle Modelica as well as it can.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-modelica</code>
+    (Modlica code).</p>
+</article>
diff --git a/static/js/lib/codemirror-4.5/mode/modelica/modelica.js b/static/js/lib/codemirror-4.5/mode/modelica/modelica.js
new file mode 100644
index 0000000..77ec7a3
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/mode/modelica/modelica.js
@@ -0,0 +1,245 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Modelica support for CodeMirror, copyright (c) by Lennart Ochel
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})
+
+(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("modelica", function(config, parserConfig) {
+
+    var indentUnit = config.indentUnit;
+    var keywords = parserConfig.keywords || {};
+    var builtin = parserConfig.builtin || {};
+    var atoms = parserConfig.atoms || {};
+
+    var isSingleOperatorChar = /[;=\(:\),{}.*<>+\-\/^\[\]]/;
+    var isDoubleOperatorChar = /(:=|<=|>=|==|<>|\.\+|\.\-|\.\*|\.\/|\.\^)/;
+    var isDigit = /[0-9]/;
+    var isNonDigit = /[_a-zA-Z]/;
+
+    function tokenLineComment(stream, state) {
+      stream.skipToEnd();
+      state.tokenize = null;
+      return "comment";
+    }
+
+    function tokenBlockComment(stream, state) {
+      var maybeEnd = false, ch;
+      while (ch = stream.next()) {
+        if (maybeEnd && ch == "/") {
+          state.tokenize = null;
+          break;
+        }
+        maybeEnd = (ch == "*");
+      }
+      return "comment";
+    }
+
+    function tokenString(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == '"' && !escaped) {
+          state.tokenize = null;
+          state.sol = false;
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+
+      return "string";
+    }
+
+    function tokenIdent(stream, state) {
+      stream.eatWhile(isDigit);
+      while (stream.eat(isDigit) || stream.eat(isNonDigit)) { }
+
+
+      var cur = stream.current();
+
+      if(state.sol && (cur == "package" || cur == "model" || cur == "when" || cur == "connector")) state.level++;
+      else if(state.sol && cur == "end" && state.level > 0) state.level--;
+
+      state.tokenize = null;
+      state.sol = false;
+
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      else if (builtin.propertyIsEnumerable(cur)) return "builtin";
+      else if (atoms.propertyIsEnumerable(cur)) return "atom";
+      else return "variable";
+    }
+
+    function tokenQIdent(stream, state) {
+      while (stream.eat(/[^']/)) { }
+
+      state.tokenize = null;
+      state.sol = false;
+
+      if(stream.eat("'"))
+        return "variable";
+      else
+        return "error";
+    }
+
+    function tokenUnsignedNuber(stream, state) {
+      stream.eatWhile(isDigit);
+      if (stream.eat('.')) {
+        stream.eatWhile(isDigit);
+      }
+      if (stream.eat('e') || stream.eat('E')) {
+        if (!stream.eat('-'))
+          stream.eat('+');
+        stream.eatWhile(isDigit);
+      }
+
+      state.tokenize = null;
+      state.sol = false;
+      return "number";
+    }
+
+    // Interface
+    return {
+      startState: function() {
+        return {
+          tokenize: null,
+          level: 0,
+          sol: true
+        };
+      },
+
+      token: function(stream, state) {
+        if(state.tokenize != null) {
+          return state.tokenize(stream, state);
+        }
+
+        if(stream.sol()) {
+          state.sol = true;
+        }
+
+        // WHITESPACE
+        if(stream.eatSpace()) {
+          state.tokenize = null;
+          return null;
+        }
+
+        var ch = stream.next();
+
+        // LINECOMMENT
+        if(ch == '/' && stream.eat('/')) {
+          state.tokenize = tokenLineComment;
+        }
+        // BLOCKCOMMENT
+        else if(ch == '/' && stream.eat('*')) {
+          state.tokenize = tokenBlockComment;
+        }
+        // TWO SYMBOL TOKENS
+        else if(isDoubleOperatorChar.test(ch+stream.peek())) {
+          stream.next();
+          state.tokenize = null;
+          return "operator";
+        }
+        // SINGLE SYMBOL TOKENS
+        else if(isSingleOperatorChar.test(ch)) {
+          state.tokenize = null;
+          return "operator";
+        }
+        // IDENT
+        else if(isNonDigit.test(ch)) {
+          state.tokenize = tokenIdent;
+        }
+        // Q-IDENT
+        else if(ch == "'" && stream.peek() && stream.peek() != "'") {
+          state.tokenize = tokenQIdent;
+        }
+        // STRING
+        else if(ch == '"') {
+          state.tokenize = tokenString;
+        }
+        // UNSIGNED_NUBER
+        else if(isDigit.test(ch)) {
+          state.tokenize = tokenUnsignedNuber;
+        }
+        // ERROR
+        else {
+          state.tokenize = null;
+          return "error";
+        }
+
+        return state.tokenize(stream, state);
+      },
+
+      indent: function(state, textAfter) {
+        if (state.tokenize != null) return CodeMirror.Pass;
+
+        var level = state.level;
+        if(/(algorithm)/.test(textAfter)) level--;
+        if(/(equation)/.test(textAfter)) level--;
+        if(/(initial algorithm)/.test(textAfter)) level--;
+        if(/(initial equation)/.test(textAfter)) level--;
+        if(/(end)/.test(textAfter)) level--;
+
+        if(level > 0)
+          return indentUnit*level;
+        else
+          return 0;
+      },
+
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      lineComment: "//"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i=0; i<words.length; ++i)
+      obj[words[i]] = true;
+    return obj;
+  }
+
+  var modelicaKeywords = "algorithm and annotation assert block break class connect connector constant constrainedby der discrete each else elseif elsewhen encapsulated end enumeration equation expandable extends external false final flow for function if import impure in initial inner input loop model not operator or outer output package parameter partial protected public pure record redeclare replaceable return stream then true type when while within";
+  var modelicaBuiltin = "abs acos actualStream asin atan atan2 cardinality ceil cos cosh delay div edge exp floor getInstanceName homotopy inStream integer log log10 mod pre reinit rem semiLinear sign sin sinh spatialDistribution sqrt tan tanh";
+  var modelicaAtoms = "Real Boolean Integer String";
+
+  function def(mimes, mode) {
+    if (typeof mimes == "string")
+      mimes = [mimes];
+
+    var words = [];
+
+    function add(obj) {
+      if (obj)
+        for (var prop in obj)
+          if (obj.hasOwnProperty(prop))
+            words.push(prop);
+    }
+
+    add(mode.keywords);
+    add(mode.builtin);
+    add(mode.atoms);
+
+    if (words.length) {
+      mode.helperType = mimes[0];
+      CodeMirror.registerHelper("hintWords", mimes[0], words);
+    }
+
+    for (var i=0; i<mimes.length; ++i)
+      CodeMirror.defineMIME(mimes[i], mode);
+  }
+
+  def(["text/x-modelica"], {
+    name: "modelica",
+    keywords: words(modelicaKeywords),
+    builtin: words(modelicaBuiltin),
+    atoms: words(modelicaAtoms)
+  });
+});
diff --git a/static/js/lib/codemirror-4.5/mode/nginx/index.html b/static/js/lib/codemirror-4.5/mode/nginx/index.html
index 16be1eb..5ffdc08 100644
--- a/static/js/lib/codemirror-4.5/mode/nginx/index.html
+++ b/static/js/lib/codemirror-4.5/mode/nginx/index.html
@@ -21,12 +21,12 @@
     }
   </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/ntriples/index.html b/static/js/lib/codemirror-4.5/mode/ntriples/index.html
index c8a6791..1355e71 100644
--- a/static/js/lib/codemirror-4.5/mode/ntriples/index.html
+++ b/static/js/lib/codemirror-4.5/mode/ntriples/index.html
@@ -13,12 +13,12 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/octave/index.html b/static/js/lib/codemirror-4.5/mode/octave/index.html
index 573ce42..79df581 100644
--- a/static/js/lib/codemirror-4.5/mode/octave/index.html
+++ b/static/js/lib/codemirror-4.5/mode/octave/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/octave/octave.js b/static/js/lib/codemirror-4.5/mode/octave/octave.js
index 94314c4..a7bec03 100644
--- a/static/js/lib/codemirror-4.5/mode/octave/octave.js
+++ b/static/js/lib/codemirror-4.5/mode/octave/octave.js
@@ -22,7 +22,7 @@ CodeMirror.defineMode("octave", function() {
   var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
   var tripleDelimiters = new RegExp("^((>>=)|(<<=))");
   var expressionEnd = new RegExp("^[\\]\\)]");
-  var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+  var identifiers = new RegExp("^[_A-Za-z\xa1-\uffff][_A-Za-z0-9\xa1-\uffff]*");
 
   var builtins = wordRegexp([
     'error', 'eval', 'function', 'abs', 'acos', 'atan', 'asin', 'cos',
diff --git a/static/js/lib/codemirror-4.5/mode/pascal/index.html b/static/js/lib/codemirror-4.5/mode/pascal/index.html
index bf8ff0d..f8a99ad 100644
--- a/static/js/lib/codemirror-4.5/mode/pascal/index.html
+++ b/static/js/lib/codemirror-4.5/mode/pascal/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/pegjs/index.html b/static/js/lib/codemirror-4.5/mode/pegjs/index.html
index 678b714..0c74604 100644
--- a/static/js/lib/codemirror-4.5/mode/pegjs/index.html
+++ b/static/js/lib/codemirror-4.5/mode/pegjs/index.html
@@ -13,12 +13,12 @@
   </head>
   <body>
     <div id=nav>
-      <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+      <a href="http://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>
-        <li><a href="https://github.com/marijnh/codemirror">Code</a>
+        <li><a href="https://github.com/codemirror/codemirror">Code</a>
       </ul>
       <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/perl/index.html b/static/js/lib/codemirror-4.5/mode/perl/index.html
index 2b7578e..8c1021c 100644
--- a/static/js/lib/codemirror-4.5/mode/perl/index.html
+++ b/static/js/lib/codemirror-4.5/mode/perl/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/perl/perl.js b/static/js/lib/codemirror-4.5/mode/perl/perl.js
index c12677d..311574e 100644
--- a/static/js/lib/codemirror-4.5/mode/perl/perl.js
+++ b/static/js/lib/codemirror-4.5/mode/perl/perl.js
@@ -788,8 +788,8 @@ CodeMirror.defineMode("perl",function(){
                                 style:null,
                                 tail:null};},
                 token:function(stream,state){
-                        return (state.tokenize||tokenPerl)(stream,state);},
-                electricChars:"{}"};});
+                        return (state.tokenize||tokenPerl)(stream,state);}
+                };});
 
 CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);
 
diff --git a/static/js/lib/codemirror-4.5/mode/php/index.html b/static/js/lib/codemirror-4.5/mode/php/index.html
index dd25a5e..adf6b1b 100644
--- a/static/js/lib/codemirror-4.5/mode/php/index.html
+++ b/static/js/lib/codemirror-4.5/mode/php/index.html
@@ -15,12 +15,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/php/php.js b/static/js/lib/codemirror-4.5/mode/php/php.js
index f8821ed..e112d91 100644
--- a/static/js/lib/codemirror-4.5/mode/php/php.js
+++ b/static/js/lib/codemirror-4.5/mode/php/php.js
@@ -16,32 +16,24 @@
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
-  function heredoc(delim) {
-    return function(stream, state) {
-      if (stream.match(delim)) state.tokenize = null;
-      else stream.skipToEnd();
-      return "string";
-    };
-  }
 
   // Helper for stringWithEscapes
-  function matchSequence(list) {
-    if (list.length == 0) return stringWithEscapes;
+  function matchSequence(list, end) {
+    if (list.length == 0) return stringWithEscapes(end);
     return function (stream, state) {
       var patterns = list[0];
       for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) {
-        state.tokenize = matchSequence(list.slice(1));
+        state.tokenize = matchSequence(list.slice(1), end);
         return patterns[i][1];
       }
-      state.tokenize = stringWithEscapes;
+      state.tokenize = stringWithEscapes(end);
       return "string";
     };
   }
-  function stringWithEscapes(stream, state) {
-    var escaped = false, next, end = false;
-
-    if (stream.current() == '"') return "string";
-
+  function stringWithEscapes(closing) {
+    return function(stream, state) { return stringWithEscapes_(stream, state, closing); };
+  }
+  function stringWithEscapes_(stream, state, closing) {
     // "Complex" syntax
     if (stream.match("${", false) || stream.match("{$", false)) {
       state.tokenize = null;
@@ -49,7 +41,7 @@
     }
 
     // Simple syntax
-    if (stream.match(/\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
+    if (stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
       // After the variable name there may appear array or object operator.
       if (stream.match("[", false)) {
         // Match array operator
@@ -59,31 +51,29 @@
            [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
            [/[\w\$]+/, "variable"]],
           [["]", null]]
-        ]);
+        ], closing);
       }
       if (stream.match(/\-\>\w/, false)) {
         // Match object operator
         state.tokenize = matchSequence([
           [["->", null]],
           [[/[\w]+/, "variable"]]
-        ]);
+        ], closing);
       }
       return "variable-2";
     }
 
+    var escaped = false;
     // Normal string
-    while (
-      !stream.eol() &&
-      (!stream.match("{$", false)) &&
-      (!stream.match(/(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false) || escaped)
-    ) {
-      next = stream.next();
-      if (!escaped && next == '"') { end = true; break; }
-      escaped = !escaped && next == "\\";
-    }
-    if (end) {
-      state.tokenize = null;
-      state.phpEncapsStack.pop();
+    while (!stream.eol() &&
+           (escaped || (!stream.match("{$", false) &&
+                        !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) {
+      if (!escaped && stream.match(closing)) {
+        state.tokenize = null;
+        state.tokStack.pop(); state.tokStack.pop();
+        break;
+      }
+      escaped = stream.next() == "\\" && !escaped;
     }
     return "string";
   }
@@ -115,8 +105,12 @@
       "<": function(stream, state) {
         if (stream.match(/<</)) {
           stream.eatWhile(/[\w\.]/);
-          state.tokenize = heredoc(stream.current().slice(3));
-          return state.tokenize(stream, state);
+          var delim = stream.current().slice(3);
+          if (delim) {
+            (state.tokStack || (state.tokStack = [])).push(delim, 0);
+            state.tokenize = stringWithEscapes(delim);
+            return "string";
+          }
         }
         return false;
       },
@@ -131,22 +125,21 @@
         }
         return false;
       },
-      '"': function(stream, state) {
-        if (!state.phpEncapsStack)
-          state.phpEncapsStack = [];
-        state.phpEncapsStack.push(0);
-        state.tokenize = stringWithEscapes;
-        return state.tokenize(stream, state);
+      '"': function(_stream, state) {
+        (state.tokStack || (state.tokStack = [])).push('"', 0);
+        state.tokenize = stringWithEscapes('"');
+        return "string";
       },
       "{": function(_stream, state) {
-        if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
-          state.phpEncapsStack[state.phpEncapsStack.length - 1]++;
+        if (state.tokStack && state.tokStack.length)
+          state.tokStack[state.tokStack.length - 1]++;
         return false;
       },
       "}": function(_stream, state) {
-        if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
-          if (--state.phpEncapsStack[state.phpEncapsStack.length - 1] == 0)
-            state.tokenize = stringWithEscapes;
+        if (state.tokStack && state.tokStack.length > 0 &&
+            !--state.tokStack[state.tokStack.length - 1]) {
+          state.tokenize = stringWithEscapes(state.tokStack[state.tokStack.length - 2]);
+        }
         return false;
       }
     }
diff --git a/static/js/lib/codemirror-4.5/mode/php/test.js b/static/js/lib/codemirror-4.5/mode/php/test.js
index 8305496..e2ecefc 100644
--- a/static/js/lib/codemirror-4.5/mode/php/test.js
+++ b/static/js/lib/codemirror-4.5/mode/php/test.js
@@ -145,4 +145,10 @@
      '[keyword echo] ' + m3[2] + ';',
      '[keyword echo] [string "end"];',
      '[meta ?>]');
+
+  MT("variable_interpolation_heredoc",
+     "[meta <?php]",
+     "[string <<<here]",
+     "[string doc ][variable-2 $]{[variable yay]}[string more]",
+     "[string here]; [comment // normal]");
 })();
diff --git a/static/js/lib/codemirror-4.5/mode/pig/index.html b/static/js/lib/codemirror-4.5/mode/pig/index.html
index 93744ae..984c9a1 100644
--- a/static/js/lib/codemirror-4.5/mode/pig/index.html
+++ b/static/js/lib/codemirror-4.5/mode/pig/index.html
@@ -9,12 +9,12 @@
 <script src="pig.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/properties/index.html b/static/js/lib/codemirror-4.5/mode/properties/index.html
index 40ee1a3..f885302 100644
--- a/static/js/lib/codemirror-4.5/mode/properties/index.html
+++ b/static/js/lib/codemirror-4.5/mode/properties/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/puppet/index.html b/static/js/lib/codemirror-4.5/mode/puppet/index.html
index f307636..5614c36 100644
--- a/static/js/lib/codemirror-4.5/mode/puppet/index.html
+++ b/static/js/lib/codemirror-4.5/mode/puppet/index.html
@@ -13,12 +13,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/python/index.html b/static/js/lib/codemirror-4.5/mode/python/index.html
index a1d6d2d..86eb3d5 100644
--- a/static/js/lib/codemirror-4.5/mode/python/index.html
+++ b/static/js/lib/codemirror-4.5/mode/python/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
@@ -65,13 +65,25 @@ __a__
 a.b
 a.b.c
 
+#Unicode identifiers on Python3
+# a = x\ddot
+a⃗ = ẍ
+# a = v\dot
+a⃗ = v̇
+
+#F\vec = m \cdot a\vec
+F⃗ = m•a⃗ 
+
 # Operators
 + - * / % & | ^ ~ < >
 == != <= >= <> << >> // **
 and or not in is
 
+#infix matrix multiplication operator (PEP 465)
+A @ B
+
 # Delimiters
-() [] {} , : ` = ; @ .  # Note that @ and . require the proper context.
+() [] {} , : ` = ; @ .  # Note that @ and . require the proper context on Python 2.
 += -= *= /= %= &= |= ^=
 //= >>= <<= **=
 
@@ -146,7 +158,7 @@ def pairwise_cython(double[:, ::1] X):
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: {name: "python",
-               version: 2,
+               version: 3,
                singleLineStringErrors: false},
         lineNumbers: true,
         indentUnit: 4,
@@ -171,12 +183,12 @@ def pairwise_cython(double[:, ::1] X):
     <h2>Advanced Configuration Options:</h2>
     <p>Usefull for superset of python syntax like Enthought enaml, IPython magics and  questionmark help</p>
     <ul>
-      <li>singleOperators - RegEx - Regular Expression for single operator matching,  default : <pre>^[\\+\\-\\*/%&amp;|\\^~&lt;&gt;!]</pre></li>
+      <li>singleOperators - RegEx - Regular Expression for single operator matching,  default : <pre>^[\\+\\-\\*/%&amp;|\\^~&lt;&gt;!]</pre> including <pre>@</pre> on Python 3</li>
       <li>singleDelimiters - RegEx - Regular Expression for single delimiter matching, default :  <pre>^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]</pre></li>
       <li>doubleOperators - RegEx - Regular Expression for double operators matching, default : <pre>^((==)|(!=)|(&lt;=)|(&gt;=)|(&lt;&gt;)|(&lt;&lt;)|(&gt;&gt;)|(//)|(\\*\\*))</pre></li>
       <li>doubleDelimiters - RegEx - Regular Expressoin for double delimiters matching, default : <pre>^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&amp;=)|(\\|=)|(\\^=))</pre></li>
       <li>tripleDelimiters - RegEx - Regular Expression for triple delimiters matching, default : <pre>^((//=)|(&gt;&gt;=)|(&lt;&lt;=)|(\\*\\*=))</pre></li>
-      <li>identifiers - RegEx - Regular Expression for identifier, default : <pre>^[_A-Za-z][_A-Za-z0-9]*</pre></li>
+      <li>identifiers - RegEx - Regular Expression for identifier, default : <pre>^[_A-Za-z][_A-Za-z0-9]*</pre> on Python 2 and <pre>^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*</pre> on Python 3.</li>
       <li>extra_keywords - list of string - List of extra words ton consider as keywords</li>
       <li>extra_builtins - list of string - List of extra words ton consider as builtins</li>
     </ul>
diff --git a/static/js/lib/codemirror-4.5/mode/python/python.js b/static/js/lib/codemirror-4.5/mode/python/python.js
index 45dd63b..98c0409 100644
--- a/static/js/lib/codemirror-4.5/mode/python/python.js
+++ b/static/js/lib/codemirror-4.5/mode/python/python.js
@@ -15,12 +15,12 @@
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var wordOperators = wordRegexp(["and", "or", "not", "is", "in"]);
+  var wordOperators = wordRegexp(["and", "or", "not", "is"]);
   var commonKeywords = ["as", "assert", "break", "class", "continue",
                         "def", "del", "elif", "else", "except", "finally",
                         "for", "from", "global", "if", "import",
                         "lambda", "pass", "raise", "return",
-                        "try", "while", "with", "yield"];
+                        "try", "while", "with", "yield", "in"];
   var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
                         "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
                         "enumerate", "eval", "filter", "float", "format", "frozenset",
@@ -48,12 +48,20 @@
   CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = "error";
 
-    var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
     var singleDelimiters = parserConf.singleDelimiters || new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]");
     var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
     var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
     var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
-    var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+
+    if (parserConf.version && parseInt(parserConf.version, 10) == 3){
+        // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
+        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!@]");
+        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
+    } else {
+        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
+        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+    }
+
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
 
     var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
@@ -252,8 +260,13 @@
       }
 
       // Handle decorators
-      if (current == "@")
-        return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
+      if (current == "@"){
+        if(parserConf.version && parseInt(parserConf.version, 10) == 3){
+            return stream.match(identifiers, false) ? "meta" : "operator";
+        } else {
+            return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
+        }
+      }
 
       if ((style == "variable" || style == "builtin")
           && state.lastStyle == "meta")
diff --git a/static/js/lib/codemirror-4.5/mode/q/index.html b/static/js/lib/codemirror-4.5/mode/q/index.html
index 78ed3d8..72785ba 100644
--- a/static/js/lib/codemirror-4.5/mode/q/index.html
+++ b/static/js/lib/codemirror-4.5/mode/q/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/r/index.html b/static/js/lib/codemirror-4.5/mode/r/index.html
index 6e1d371..6dd9634 100644
--- a/static/js/lib/codemirror-4.5/mode/r/index.html
+++ b/static/js/lib/codemirror-4.5/mode/r/index.html
@@ -15,12 +15,12 @@
       .cm-s-default span.cm-arg-is { color: brown; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/rpm/changes/index.html b/static/js/lib/codemirror-4.5/mode/rpm/changes/index.html
index 0ade017..6e5031b 100644
--- a/static/js/lib/codemirror-4.5/mode/rpm/changes/index.html
+++ b/static/js/lib/codemirror-4.5/mode/rpm/changes/index.html
@@ -11,12 +11,12 @@
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/rpm/index.html b/static/js/lib/codemirror-4.5/mode/rpm/index.html
index e0f501b..9a34e6d 100644
--- a/static/js/lib/codemirror-4.5/mode/rpm/index.html
+++ b/static/js/lib/codemirror-4.5/mode/rpm/index.html
@@ -11,12 +11,12 @@
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/rst/index.html b/static/js/lib/codemirror-4.5/mode/rst/index.html
index cb82697..2902dea 100644
--- a/static/js/lib/codemirror-4.5/mode/rst/index.html
+++ b/static/js/lib/codemirror-4.5/mode/rst/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/rst/rst.js b/static/js/lib/codemirror-4.5/mode/rst/rst.js
index 2a1e28b..bcf110c 100644
--- a/static/js/lib/codemirror-4.5/mode/rst/rst.js
+++ b/static/js/lib/codemirror-4.5/mode/rst/rst.js
@@ -80,19 +80,6 @@ CodeMirror.defineMode('rst-base', function (config) {
     });
   }
 
-  function AssertException(message) {
-    this.message = message;
-  }
-
-  AssertException.prototype.toString = function () {
-    return 'AssertException: ' + this.message;
-  };
-
-  function assert(expression, message) {
-    if (!expression) throw new AssertException(message);
-    return expression;
-  }
-
   ///////////////////////////////////////////////////////////////////////////
   ///////////////////////////////////////////////////////////////////////////
 
@@ -185,12 +172,12 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_normal, context(rx_role_pre, 1));
-        assert(stream.match(/^:/));
+        stream.match(/^:/);
         token = 'meta';
         break;
       case 1:
         change(state, to_normal, context(rx_role_pre, 2));
-        assert(stream.match(rx_NAME));
+        stream.match(rx_NAME);
         token = 'keyword';
 
         if (stream.current().match(/^(?:math|latex)/)) {
@@ -199,7 +186,7 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       case 2:
         change(state, to_normal, context(rx_role_pre, 3));
-        assert(stream.match(/^:`/));
+        stream.match(/^:`/);
         token = 'meta';
         break;
       case 3:
@@ -221,21 +208,20 @@ CodeMirror.defineMode('rst-base', function (config) {
         }
 
         change(state, to_normal, context(rx_role_pre, 4));
-        assert(stream.match(rx_TEXT2));
+        stream.match(rx_TEXT2);
         token = 'string';
         break;
       case 4:
         change(state, to_normal, context(rx_role_pre, 5));
-        assert(stream.match(/^`/));
+        stream.match(/^`/);
         token = 'meta';
         break;
       case 5:
         change(state, to_normal, context(rx_role_pre, 6));
-        assert(stream.match(rx_TAIL));
+        stream.match(rx_TAIL);
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_role_suf ||
                stream.match(rx_role_suf, false)) {
@@ -243,62 +229,60 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_normal, context(rx_role_suf, 1));
-        assert(stream.match(/^`/));
+        stream.match(/^`/);
         token = 'meta';
         break;
       case 1:
         change(state, to_normal, context(rx_role_suf, 2));
-        assert(stream.match(rx_TEXT2));
+        stream.match(rx_TEXT2);
         token = 'string';
         break;
       case 2:
         change(state, to_normal, context(rx_role_suf, 3));
-        assert(stream.match(/^`:/));
+        stream.match(/^`:/);
         token = 'meta';
         break;
       case 3:
         change(state, to_normal, context(rx_role_suf, 4));
-        assert(stream.match(rx_NAME));
+        stream.match(rx_NAME);
         token = 'keyword';
         break;
       case 4:
         change(state, to_normal, context(rx_role_suf, 5));
-        assert(stream.match(/^:/));
+        stream.match(/^:/);
         token = 'meta';
         break;
       case 5:
         change(state, to_normal, context(rx_role_suf, 6));
-        assert(stream.match(rx_TAIL));
+        stream.match(rx_TAIL);
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_role || stream.match(rx_role, false)) {
 
       switch (stage(state)) {
       case 0:
         change(state, to_normal, context(rx_role, 1));
-        assert(stream.match(/^:/));
+        stream.match(/^:/);
         token = 'meta';
         break;
       case 1:
         change(state, to_normal, context(rx_role, 2));
-        assert(stream.match(rx_NAME));
+        stream.match(rx_NAME);
         token = 'keyword';
         break;
       case 2:
         change(state, to_normal, context(rx_role, 3));
-        assert(stream.match(/^:/));
+        stream.match(/^:/);
         token = 'meta';
         break;
       case 3:
         change(state, to_normal, context(rx_role, 4));
-        assert(stream.match(rx_TAIL));
+        stream.match(rx_TAIL);
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_substitution_ref ||
                stream.match(rx_substitution_ref, false)) {
@@ -306,7 +290,7 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_normal, context(rx_substitution_ref, 1));
-        assert(stream.match(rx_substitution_text));
+        stream.match(rx_substitution_text);
         token = 'variable-2';
         break;
       case 1:
@@ -315,7 +299,6 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (stream.match(rx_footnote_ref)) {
       change(state, to_normal);
@@ -341,21 +324,20 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       case 1:
         change(state, to_normal, context(rx_link_ref2, 2));
-        assert(stream.match(/^`/));
+        stream.match(/^`/);
         token = 'link';
         break;
       case 2:
         change(state, to_normal, context(rx_link_ref2, 3));
-        assert(stream.match(rx_TEXT2));
+        stream.match(rx_TEXT2);
         break;
       case 3:
         change(state, to_normal, context(rx_link_ref2, 4));
-        assert(stream.match(/^`_/));
+        stream.match(/^`_/);
         token = 'link';
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (stream.match(rx_verbatim)) {
       change(state, to_verbatim);
@@ -380,26 +362,25 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_explicit, context(rx_substitution, 1));
-        assert(stream.match(rx_substitution_text));
+        stream.match(rx_substitution_text);
         token = 'variable-2';
         break;
       case 1:
         change(state, to_explicit, context(rx_substitution, 2));
-        assert(stream.match(rx_substitution_sepa));
+        stream.match(rx_substitution_sepa);
         break;
       case 2:
         change(state, to_explicit, context(rx_substitution, 3));
-        assert(stream.match(rx_substitution_name));
+        stream.match(rx_substitution_name);
         token = 'keyword';
         break;
       case 3:
         change(state, to_explicit, context(rx_substitution, 4));
-        assert(stream.match(rx_substitution_tail));
+        stream.match(rx_substitution_tail);
         token = 'meta';
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_directive ||
                stream.match(rx_directive, false)) {
@@ -407,7 +388,7 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_explicit, context(rx_directive, 1));
-        assert(stream.match(rx_directive_name));
+        stream.match(rx_directive_name);
         token = 'keyword';
 
         if (stream.current().match(/^(?:math|latex)/))
@@ -417,7 +398,7 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       case 1:
         change(state, to_explicit, context(rx_directive, 2));
-        assert(stream.match(rx_directive_tail));
+        stream.match(rx_directive_tail);
         token = 'meta';
 
         if (stream.match(/^latex\s*$/) || state.tmp_stex) {
@@ -436,25 +417,23 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
 
       switch (stage(state)) {
       case 0:
         change(state, to_explicit, context(rx_link, 1));
-        assert(stream.match(rx_link_head));
-        assert(stream.match(rx_link_name));
+        stream.match(rx_link_head);
+        stream.match(rx_link_name);
         token = 'link';
         break;
       case 1:
         change(state, to_explicit, context(rx_link, 2));
-        assert(stream.match(rx_link_tail));
+        stream.match(rx_link_tail);
         token = 'meta';
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (stream.match(rx_footnote)) {
       change(state, to_normal);
diff --git a/static/js/lib/codemirror-4.5/mode/ruby/index.html b/static/js/lib/codemirror-4.5/mode/ruby/index.html
index 8f0ebca..1197ab0 100644
--- a/static/js/lib/codemirror-4.5/mode/ruby/index.html
+++ b/static/js/lib/codemirror-4.5/mode/ruby/index.html
@@ -13,12 +13,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/ruby/ruby.js b/static/js/lib/codemirror-4.5/mode/ruby/ruby.js
index 6c9977b..eab9d9d 100644
--- a/static/js/lib/codemirror-4.5/mode/ruby/ruby.js
+++ b/static/js/lib/codemirror-4.5/mode/ruby/ruby.js
@@ -107,16 +107,16 @@ CodeMirror.defineMode("ruby", function(config) {
       }
 
       // Symbols can't start by a digit
-      if (stream.eat(/[a-zA-Z$@_]/)) {
-        stream.eatWhile(/[\w]/);
+      if (stream.eat(/[a-zA-Z$@_\xa1-\uffff]/)) {
+        stream.eatWhile(/[\w$\xa1-\uffff]/);
         // Only one ? ! = is allowed and only as the last character
         stream.eat(/[\?\!\=]/);
         return "atom";
       }
       return "operator";
-    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_]/)) {
+    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_\xa1-\uffff]/)) {
       stream.eat("@");
-      stream.eatWhile(/[\w]/);
+      stream.eatWhile(/[\w\xa1-\uffff]/);
       return "variable-2";
     } else if (ch == "$") {
       if (stream.eat(/[a-zA-Z_]/)) {
@@ -127,8 +127,8 @@ CodeMirror.defineMode("ruby", function(config) {
         stream.next(); // Must be a special global like $: or $!
       }
       return "variable-3";
-    } else if (/[a-zA-Z_]/.test(ch)) {
-      stream.eatWhile(/[\w]/);
+    } else if (/[a-zA-Z_\xa1-\uffff]/.test(ch)) {
+      stream.eatWhile(/[\w\xa1-\uffff]/);
       stream.eat(/[\?\!]/);
       if (stream.eat(":")) return "atom";
       return "ident";
@@ -149,17 +149,18 @@ CodeMirror.defineMode("ruby", function(config) {
     }
   }
 
-  function tokenBaseUntilBrace() {
-    var depth = 1;
+  function tokenBaseUntilBrace(depth) {
+    if (!depth) depth = 1;
     return function(stream, state) {
       if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
+        if (depth == 1) {
           state.tokenize.pop();
           return state.tokenize[state.tokenize.length-1](stream, state);
+        } else {
+          state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth - 1);
         }
       } else if (stream.peek() == "{") {
-        depth++;
+        state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth + 1);
       }
       return tokenBase(stream, state);
     };
diff --git a/static/js/lib/codemirror-4.5/mode/rust/index.html b/static/js/lib/codemirror-4.5/mode/rust/index.html
index 4fc0999..407e84f 100644
--- a/static/js/lib/codemirror-4.5/mode/rust/index.html
+++ b/static/js/lib/codemirror-4.5/mode/rust/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/rust/rust.js b/static/js/lib/codemirror-4.5/mode/rust/rust.js
index 4ca1a76..2bffa9a 100644
--- a/static/js/lib/codemirror-4.5/mode/rust/rust.js
+++ b/static/js/lib/codemirror-4.5/mode/rust/rust.js
@@ -14,7 +14,7 @@
 CodeMirror.defineMode("rust", function() {
   var indentUnit = 4, altIndentUnit = 2;
   var valKeywords = {
-    "if": "if-style", "while": "if-style", "else": "else-style",
+    "if": "if-style", "while": "if-style", "loop": "else-style", "else": "else-style",
     "do": "else-style", "ret": "else-style", "fail": "else-style",
     "break": "atom", "cont": "atom", "const": "let", "resource": "fn",
     "let": "let", "fn": "fn", "for": "for", "alt": "alt", "iface": "iface",
@@ -22,7 +22,7 @@ CodeMirror.defineMode("rust", function() {
     "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
     "claim": "op", "native": "ignore", "unsafe": "ignore", "import": "else-style",
     "export": "else-style", "copy": "op", "log": "op", "log_err": "op",
-    "use": "op", "bind": "op", "self": "atom"
+    "use": "op", "bind": "op", "self": "atom", "struct": "enum"
   };
   var typeKeywords = function() {
     var keywords = {"fn": "fn", "block": "fn", "obj": "obj"};
diff --git a/static/js/lib/codemirror-4.5/mode/sass/index.html b/static/js/lib/codemirror-4.5/mode/sass/index.html
index 66d4677..9f4a790 100644
--- a/static/js/lib/codemirror-4.5/mode/sass/index.html
+++ b/static/js/lib/codemirror-4.5/mode/sass/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/sass/sass.js b/static/js/lib/codemirror-4.5/mode/sass/sass.js
index 68df323..b792a02 100644
--- a/static/js/lib/codemirror-4.5/mode/sass/sass.js
+++ b/static/js/lib/codemirror-4.5/mode/sass/sass.js
@@ -303,6 +303,7 @@ CodeMirror.defineMode("sass", function(config) {
       return {
         tokenizer: tokenBase,
         scopes: [{offset: 0, type: "sass"}],
+        indentCount: 0,
         definedVars: [],
         definedMixins: []
       };
diff --git a/static/js/lib/codemirror-4.5/mode/scheme/index.html b/static/js/lib/codemirror-4.5/mode/scheme/index.html
index 164d5da..04d5c6a 100644
--- a/static/js/lib/codemirror-4.5/mode/scheme/index.html
+++ b/static/js/lib/codemirror-4.5/mode/scheme/index.html
@@ -9,12 +9,12 @@
 <script src="scheme.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/shell/index.html b/static/js/lib/codemirror-4.5/mode/shell/index.html
index cf415e8..0b56300 100644
--- a/static/js/lib/codemirror-4.5/mode/shell/index.html
+++ b/static/js/lib/codemirror-4.5/mode/shell/index.html
@@ -12,12 +12,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/shell/shell.js b/static/js/lib/codemirror-4.5/mode/shell/shell.js
index 77be75b..8e31f6f 100644
--- a/static/js/lib/codemirror-4.5/mode/shell/shell.js
+++ b/static/js/lib/codemirror-4.5/mode/shell/shell.js
@@ -128,7 +128,8 @@ CodeMirror.defineMode('shell', function() {
     startState: function() {return {tokens:[]};},
     token: function(stream, state) {
       return tokenize(stream, state);
-    }
+    },
+    lineComment: '#'
   };
 });
 
diff --git a/static/js/lib/codemirror-4.5/mode/sieve/index.html b/static/js/lib/codemirror-4.5/mode/sieve/index.html
index 9d814a9..6f029b6 100644
--- a/static/js/lib/codemirror-4.5/mode/sieve/index.html
+++ b/static/js/lib/codemirror-4.5/mode/sieve/index.html
@@ -9,12 +9,12 @@
 <script src="sieve.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/slim/index.html b/static/js/lib/codemirror-4.5/mode/slim/index.html
index 1a3b6ac..7fa4e50 100644
--- a/static/js/lib/codemirror-4.5/mode/slim/index.html
+++ b/static/js/lib/codemirror-4.5/mode/slim/index.html
@@ -20,12 +20,12 @@
 <script src="slim.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/smalltalk/index.html b/static/js/lib/codemirror-4.5/mode/smalltalk/index.html
index 0d2b172..2155ebc 100644
--- a/static/js/lib/codemirror-4.5/mode/smalltalk/index.html
+++ b/static/js/lib/codemirror-4.5/mode/smalltalk/index.html
@@ -14,12 +14,12 @@
       .CodeMirror-gutter pre {color: white; font-weight: bold;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/smalltalk/smalltalk.js b/static/js/lib/codemirror-4.5/mode/smalltalk/smalltalk.js
index 50f41cc..bb510ba 100644
--- a/static/js/lib/codemirror-4.5/mode/smalltalk/smalltalk.js
+++ b/static/js/lib/codemirror-4.5/mode/smalltalk/smalltalk.js
@@ -53,7 +53,7 @@ CodeMirror.defineMode('smalltalk', function(config) {
         stream.next();
         token = nextSymbol(stream, new Context(nextSymbol, context));
       } else {
-        if (stream.eatWhile(/[^ .{}\[\]()]/))
+        if (stream.eatWhile(/[^\s.{}\[\]()]/))
           token.name = 'string-2';
         else
           token.name = 'meta';
@@ -61,7 +61,7 @@ CodeMirror.defineMode('smalltalk', function(config) {
 
     } else if (aChar === '$') {
       if (stream.next() === '<') {
-        stream.eatWhile(/[^ >]/);
+        stream.eatWhile(/[^\s>]/);
         stream.next();
       }
       token.name = 'string-2';
diff --git a/static/js/lib/codemirror-4.5/mode/smarty/index.html b/static/js/lib/codemirror-4.5/mode/smarty/index.html
index d458aef..8d88c9a 100644
--- a/static/js/lib/codemirror-4.5/mode/smarty/index.html
+++ b/static/js/lib/codemirror-4.5/mode/smarty/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/smartymixed/index.html b/static/js/lib/codemirror-4.5/mode/smartymixed/index.html
index 47c805f..3a216ab 100644
--- a/static/js/lib/codemirror-4.5/mode/smartymixed/index.html
+++ b/static/js/lib/codemirror-4.5/mode/smartymixed/index.html
@@ -13,12 +13,12 @@
 <script src="../../mode/smarty/smarty.js"></script>
 <script src="../../mode/smartymixed/smartymixed.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/smartymixed/smartymixed.js b/static/js/lib/codemirror-4.5/mode/smartymixed/smartymixed.js
index 3290d17..4fc7ca4 100644
--- a/static/js/lib/codemirror-4.5/mode/smartymixed/smartymixed.js
+++ b/static/js/lib/codemirror-4.5/mode/smartymixed/smartymixed.js
@@ -77,7 +77,11 @@ CodeMirror.defineMode("smartymixed", function(config) {
 
   var parsers = {
     html: function(stream, state) {
-      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && state.htmlMixedState.htmlState.tagName === null) {
+      var htmlTagName = state.htmlMixedState.htmlState.context && state.htmlMixedState.htmlState.context.tagName
+        ? state.htmlMixedState.htmlState.context.tagName
+        : null;
+
+      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && htmlTagName === null) {
         state.tokenize = parsers.smarty;
         state.localMode = smartyMode;
         state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
diff --git a/static/js/lib/codemirror-4.5/mode/solr/index.html b/static/js/lib/codemirror-4.5/mode/solr/index.html
index cb88024..4b18c25 100644
--- a/static/js/lib/codemirror-4.5/mode/solr/index.html
+++ b/static/js/lib/codemirror-4.5/mode/solr/index.html
@@ -18,12 +18,12 @@
   }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/sparql/index.html b/static/js/lib/codemirror-4.5/mode/sparql/index.html
index 5f19d64..6f24206 100644
--- a/static/js/lib/codemirror-4.5/mode/sparql/index.html
+++ b/static/js/lib/codemirror-4.5/mode/sparql/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/sql/index.html b/static/js/lib/codemirror-4.5/mode/sql/index.html
index 7dd5f30..a0d8d9e 100644
--- a/static/js/lib/codemirror-4.5/mode/sql/index.html
+++ b/static/js/lib/codemirror-4.5/mode/sql/index.html
@@ -17,12 +17,12 @@
 }
         </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/sql/sql.js b/static/js/lib/codemirror-4.5/mode/sql/sql.js
index 6c02f4e..799492f 100644
--- a/static/js/lib/codemirror-4.5/mode/sql/sql.js
+++ b/static/js/lib/codemirror-4.5/mode/sql/sql.js
@@ -213,7 +213,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     while ((ch = stream.next()) != null) {
       if (ch == "`" && !stream.eat("`")) return "variable-2";
     }
-    return null;
+    stream.backUp(stream.current().length - 1);
+    return stream.eatWhile(/\w/) ? "variable-2" : null;
   }
 
   // variable token
diff --git a/static/js/lib/codemirror-4.5/mode/stex/index.html b/static/js/lib/codemirror-4.5/mode/stex/index.html
index 28b8f64..14679da 100644
--- a/static/js/lib/codemirror-4.5/mode/stex/index.html
+++ b/static/js/lib/codemirror-4.5/mode/stex/index.html
@@ -9,12 +9,12 @@
 <script src="stex.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/stex/stex.js b/static/js/lib/codemirror-4.5/mode/stex/stex.js
index 09a33e5..14f6fcc 100644
--- a/static/js/lib/codemirror-4.5/mode/stex/stex.js
+++ b/static/js/lib/codemirror-4.5/mode/stex/stex.js
@@ -251,7 +251,8 @@ CodeMirror.defineMode("stex", function() {
         },
         token: function(stream, state) {
             return state.f(stream, state);
-        }
+        },
+        lineComment: "%"
     };
 });
 
diff --git a/static/js/lib/codemirror-4.5/mode/tcl/index.html b/static/js/lib/codemirror-4.5/mode/tcl/index.html
index c48e253..ce4ad34 100644
--- a/static/js/lib/codemirror-4.5/mode/tcl/index.html
+++ b/static/js/lib/codemirror-4.5/mode/tcl/index.html
@@ -10,12 +10,12 @@
 <script src="tcl.js"></script>
 <script src="../../addon/scroll/scrollpastend.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/tcl/tcl.js b/static/js/lib/codemirror-4.5/mode/tcl/tcl.js
index 7be7b9b..056accb 100644
--- a/static/js/lib/codemirror-4.5/mode/tcl/tcl.js
+++ b/static/js/lib/codemirror-4.5/mode/tcl/tcl.js
@@ -78,7 +78,7 @@ CodeMirror.defineMode("tcl", function() {
         return "comment";
       }
       else {
-        stream.eatWhile(/[\w\$_{}]/);
+        stream.eatWhile(/[\w\$_{}\xa1-\uffff]/);
         var word = stream.current().toLowerCase();
         if (keywords && keywords.propertyIsEnumerable(word))
           return "keyword";
diff --git a/static/js/lib/codemirror-4.5/mode/textile/index.html b/static/js/lib/codemirror-4.5/mode/textile/index.html
new file mode 100644
index 0000000..42b156b
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/mode/textile/index.html
@@ -0,0 +1,191 @@
+<!doctype html>
+
+<title>CodeMirror: Textile mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<script src="../../lib/codemirror.js"></script>
+<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>
+
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class="active" href="#">Textile</a>
+  </ul>
+</div>
+
+<article>
+    <h2>Textile mode</h2>
+    <form><textarea id="code" name="code">
+h1. Textile Mode
+
+A paragraph without formatting.
+
+p. A simple Paragraph.
+
+
+h2. Phrase Modifiers
+
+Here are some simple phrase modifiers: *strong*, _emphasis_, **bold**, and __italic__.
+
+A ??citation??, -deleted text-, +inserted text+, some ^superscript^, and some ~subscript~.
+
+A %span element% and @code element@
+
+A "link":http://example.com, a "link with (alt text)":urlAlias
+
+[urlAlias]http://example.com/
+
+An image: !http://example.com/image.png! and an image with a link: !http://example.com/image.png!:http://example.com
+
+A sentence with a footnote.[123]
+
+fn123. The footnote is defined here.
+
+Registered(r), Trademark(tm), and Copyright(c)
+
+
+h2. Headers
+
+h1. Top level
+h2. Second level
+h3. Third level
+h4. Fourth level
+h5. Fifth level
+h6. Lowest level
+
+
+h2.  Lists
+
+* An unordered list
+** foo bar
+*** foo bar
+**** foo bar
+** foo bar
+
+# An ordered list
+## foo bar
+### foo bar
+#### foo bar
+## foo bar
+
+- definition list := description
+- another item    := foo bar
+- spanning ines   :=
+                     foo bar
+
+                     foo bar =:
+
+
+h2. Attributes
+
+Layouts and phrase modifiers can be modified with various kinds of attributes: alignment, CSS ID, CSS class names, language, padding, and CSS styles.
+
+h3. Alignment
+
+div<. left align
+div>. right align
+
+h3. CSS ID and class name
+
+You are a %(my-id#my-classname) rad% person.
+
+h3. Language
+
+p[en_CA]. Strange weather, eh?
+
+h3. Horizontal Padding
+
+p(())). 2em left padding, 3em right padding
+
+h3. CSS styling
+
+p{background: red}. Fire!
+
+
+h2. Table
+
+|_.              Header 1               |_.      Header 2        |
+|{background:#ddd}. Cell with background|         Normal         |
+|\2.         Cell spanning 2 columns                             |
+|/2.         Cell spanning 2 rows       |(cell-class). one       |
+|                                                two             |
+|>.                  Right aligned cell |<. Left aligned cell    |
+
+
+h3. A table with attributes:
+
+table(#prices).
+|Adults|$5|
+|Children|$2|
+
+
+h2. Code blocks
+
+bc.
+function factorial(n) {
+    if (n === 0) {
+        return 1;
+    }
+    return n * factorial(n - 1);
+}
+
+pre..
+                ,,,,,,
+            o#'9MMHb':'-,o,
+         .oH":HH$' "' ' -*R&o,
+        dMMM*""'`'      .oM"HM?.
+       ,MMM'          "HLbd< ?&H\
+      .:MH ."\          ` MM  MM&b
+     . "*H    -        &MMMMMMMMMH:
+     .    dboo        MMMMMMMMMMMM.
+     .   dMMMMMMb      *MMMMMMMMMP.
+     .    MMMMMMMP        *MMMMMP .
+          `#MMMMM           MM6P ,
+       '    `MMMP"           HM*`,
+        '    :MM             .- ,
+         '.   `#?..  .       ..'
+            -.   .         .-
+              ''-.oo,oo.-''
+
+\. _(9>
+ \==_)
+  -'=
+
+h2. Temporarily disabling textile markup
+
+notextile. Don't __touch this!__
+
+Surround text with double-equals to disable textile inline. Example: Use ==*asterisks*== for *strong* text.
+
+
+h2. HTML
+
+Some block layouts are simply textile versions of HTML tags with the same name, like @div@, @pre@, and @p@. HTML tags can also exist on their own line:
+
+<section>
+  <h1>Title</h1>
+  <p>Hello!</p>
+</section>
+
+</textarea></form>
+    <script>
+        var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+            lineNumbers: true,
+            mode: "text/x-textile"
+        });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-textile</code>.</p>
+
+    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#textile_*">normal</a>,  <a href="../../test/index.html#verbose,textile_*">verbose</a>.</p>
+
+</article>
diff --git a/static/js/lib/codemirror-4.5/mode/textile/test.js b/static/js/lib/codemirror-4.5/mode/textile/test.js
new file mode 100644
index 0000000..206ff57
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/mode/textile/test.js
@@ -0,0 +1,406 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({tabSize: 4}, 'textile');
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT('simpleParagraphs',
+      'Some text.',
+      '',
+      'Some more text.');
+
+  /*
+   * Phrase Modifiers
+   */
+
+  MT('em',
+      'foo [em _bar_]');
+
+  MT('emBoogus',
+      'code_mirror');
+
+  MT('strong',
+      'foo [strong *bar*]');
+
+  MT('strongBogus',
+      '3 * 3 = 9');
+
+  MT('italic',
+      'foo [em __bar__]');
+
+  MT('italicBogus',
+      'code__mirror');
+
+  MT('bold',
+      'foo [strong **bar**]');
+
+  MT('boldBogus',
+      '3 ** 3 = 27');
+
+  MT('simpleLink',
+      '[link "CodeMirror":http://codemirror.net]');
+
+  MT('referenceLink',
+      '[link "CodeMirror":code_mirror]',
+      'Normal Text.',
+      '[link [[code_mirror]]http://codemirror.net]');
+
+  MT('footCite',
+      'foo bar[qualifier [[1]]]');
+
+  MT('footCiteBogus',
+      'foo bar[[1a2]]');
+
+  MT('special-characters',
+          'Registered [tag (r)], ' +
+          'Trademark [tag (tm)], and ' +
+          'Copyright [tag (c)] 2008');
+
+  MT('cite',
+      "A book is [keyword ??The Count of Monte Cristo??] by Dumas.");
+
+  MT('additionAndDeletion',
+      'The news networks declared [negative -Al Gore-] ' +
+        '[positive +George W. Bush+] the winner in Florida.');
+
+  MT('subAndSup',
+      'f(x, n) = log [builtin ~4~] x [builtin ^n^]');
+
+  MT('spanAndCode',
+      'A [quote %span element%] and [atom @code element@]');
+
+  MT('spanBogus',
+      'Percentage 25% is not a span.');
+
+  MT('citeBogus',
+      'Question? is not a citation.');
+
+  MT('codeBogus',
+      'user@example.com');
+
+  MT('subBogus',
+      '~username');
+
+  MT('supBogus',
+      'foo ^ bar');
+
+  MT('deletionBogus',
+      '3 - 3 = 0');
+
+  MT('additionBogus',
+      '3 + 3 = 6');
+
+  MT('image',
+      'An image: [string !http://www.example.com/image.png!]');
+
+  MT('imageWithAltText',
+      'An image: [string !http://www.example.com/image.png (Alt Text)!]');
+
+  MT('imageWithUrl',
+      'An image: [string !http://www.example.com/image.png!:http://www.example.com/]');
+
+  /*
+   * Headers
+   */
+
+  MT('h1',
+      '[header&header-1 h1. foo]');
+
+  MT('h2',
+      '[header&header-2 h2. foo]');
+
+  MT('h3',
+      '[header&header-3 h3. foo]');
+
+  MT('h4',
+      '[header&header-4 h4. foo]');
+
+  MT('h5',
+      '[header&header-5 h5. foo]');
+
+  MT('h6',
+      '[header&header-6 h6. foo]');
+
+  MT('h7Bogus',
+      'h7. foo');
+
+  MT('multipleHeaders',
+      '[header&header-1 h1. Heading 1]',
+      '',
+      'Some text.',
+      '',
+      '[header&header-2 h2. Heading 2]',
+      '',
+      'More text.');
+
+  MT('h1inline',
+      '[header&header-1 h1. foo ][header&header-1&em _bar_][header&header-1  baz]');
+
+  /*
+   * Lists
+   */
+
+  MT('ul',
+      'foo',
+      'bar',
+      '',
+      '[variable-2 * foo]',
+      '[variable-2 * bar]');
+
+  MT('ulNoBlank',
+      'foo',
+      'bar',
+      '[variable-2 * foo]',
+      '[variable-2 * bar]');
+
+  MT('ol',
+      'foo',
+      'bar',
+      '',
+      '[variable-2 # foo]',
+      '[variable-2 # bar]');
+
+  MT('olNoBlank',
+      'foo',
+      'bar',
+      '[variable-2 # foo]',
+      '[variable-2 # bar]');
+
+  MT('ulFormatting',
+      '[variable-2 * ][variable-2&em _foo_][variable-2 bar]',
+      '[variable-2 * ][variable-2&strong *][variable-2&em&strong _foo_]' +
+        '[variable-2&strong *][variable-2  bar]',
+      '[variable-2 * ][variable-2&strong *foo*][variable-2 bar]');
+
+  MT('olFormatting',
+      '[variable-2 # ][variable-2&em _foo_][variable-2 bar]',
+      '[variable-2 # ][variable-2&strong *][variable-2&em&strong _foo_]' +
+        '[variable-2&strong *][variable-2  bar]',
+      '[variable-2 # ][variable-2&strong *foo*][variable-2 bar]');
+
+  MT('ulNested',
+      '[variable-2 * foo]',
+      '[variable-3 ** bar]',
+      '[keyword *** bar]',
+      '[variable-2 **** bar]',
+      '[variable-3 ** bar]');
+
+  MT('olNested',
+      '[variable-2 # foo]',
+      '[variable-3 ## bar]',
+      '[keyword ### bar]',
+      '[variable-2 #### bar]',
+      '[variable-3 ## bar]');
+
+  MT('ulNestedWithOl',
+      '[variable-2 * foo]',
+      '[variable-3 ## bar]',
+      '[keyword *** bar]',
+      '[variable-2 #### bar]',
+      '[variable-3 ** bar]');
+
+  MT('olNestedWithUl',
+      '[variable-2 # foo]',
+      '[variable-3 ** bar]',
+      '[keyword ### bar]',
+      '[variable-2 **** bar]',
+      '[variable-3 ## bar]');
+
+  MT('definitionList',
+      '[number - coffee := Hot ][number&em _and_][number  black]',
+      '',
+      'Normal text.');
+
+  MT('definitionListSpan',
+      '[number - coffee :=]',
+      '',
+      '[number Hot ][number&em _and_][number  black =:]',
+      '',
+      'Normal text.');
+
+  MT('boo',
+      '[number - dog := woof woof]',
+      '[number - cat := meow meow]',
+      '[number - whale :=]',
+      '[number Whale noises.]',
+      '',
+      '[number Also, ][number&em _splashing_][number . =:]');
+
+  /*
+   * Attributes
+   */
+
+  MT('divWithAttribute',
+      '[punctuation div][punctuation&attribute (#my-id)][punctuation . foo bar]');
+
+  MT('divWithAttributeAnd2emRightPadding',
+      '[punctuation div][punctuation&attribute (#my-id)((][punctuation . foo bar]');
+
+  MT('divWithClassAndId',
+      '[punctuation div][punctuation&attribute (my-class#my-id)][punctuation . foo bar]');
+
+  MT('paragraphWithCss',
+      'p[attribute {color:red;}]. foo bar');
+
+  MT('paragraphNestedStyles',
+      'p. [strong *foo ][strong&em _bar_][strong *]');
+
+  MT('paragraphWithLanguage',
+      'p[attribute [[fr]]]. Parlez-vous français?');
+
+  MT('paragraphLeftAlign',
+      'p[attribute <]. Left');
+
+  MT('paragraphRightAlign',
+      'p[attribute >]. Right');
+
+  MT('paragraphRightAlign',
+      'p[attribute =]. Center');
+
+  MT('paragraphJustified',
+      'p[attribute <>]. Justified');
+
+  MT('paragraphWithLeftIndent1em',
+      'p[attribute (]. Left');
+
+  MT('paragraphWithRightIndent1em',
+      'p[attribute )]. Right');
+
+  MT('paragraphWithLeftIndent2em',
+      'p[attribute ((]. Left');
+
+  MT('paragraphWithRightIndent2em',
+      'p[attribute ))]. Right');
+
+  MT('paragraphWithLeftIndent3emRightIndent2em',
+      'p[attribute ((())]. Right');
+
+  MT('divFormatting',
+      '[punctuation div. ][punctuation&strong *foo ]' +
+        '[punctuation&strong&em _bar_][punctuation&strong *]');
+
+  MT('phraseModifierAttributes',
+      'p[attribute (my-class)]. This is a paragraph that has a class and' +
+      ' this [em _][em&attribute (#special-phrase)][em emphasized phrase_]' +
+      ' has an id.');
+
+  MT('linkWithClass',
+      '[link "(my-class). This is a link with class":http://redcloth.org]');
+
+  /*
+   * Layouts
+   */
+
+  MT('paragraphLayouts',
+      'p. This is one paragraph.',
+      '',
+      'p. This is another.');
+
+  MT('div',
+      '[punctuation div. foo bar]');
+
+  MT('pre',
+      '[operator pre. Text]');
+
+  MT('bq.',
+      '[bracket bq. foo bar]',
+      '',
+      'Normal text.');
+
+  MT('footnote',
+      '[variable fn123. foo ][variable&strong *bar*]');
+
+  /*
+   * Spanning Layouts
+   */
+
+  MT('bq..ThenParagraph',
+      '[bracket bq.. foo bar]',
+      '',
+      '[bracket More quote.]',
+      'p. Normal Text');
+
+  MT('bq..ThenH1',
+      '[bracket bq.. foo bar]',
+      '',
+      '[bracket More quote.]',
+      '[header&header-1 h1. Header Text]');
+
+  MT('bc..ThenParagraph',
+      '[atom bc.. # Some ruby code]',
+      '[atom obj = {foo: :bar}]',
+      '[atom puts obj]',
+      '',
+      '[atom obj[[:love]] = "*love*"]',
+      '[atom puts obj.love.upcase]',
+      '',
+      'p. Normal text.');
+
+  MT('fn1..ThenParagraph',
+      '[variable fn1.. foo bar]',
+      '',
+      '[variable More.]',
+      'p. Normal Text');
+
+  MT('pre..ThenParagraph',
+      '[operator pre.. foo bar]',
+      '',
+      '[operator More.]',
+      'p. Normal Text');
+
+  /*
+   * Tables
+   */
+
+  MT('table',
+      '[variable-3&operator |_. name |_. age|]',
+      '[variable-3 |][variable-3&strong *Walter*][variable-3 |   5  |]',
+      '[variable-3 |Florence|   6  |]',
+      '',
+      'p. Normal text.');
+
+  MT('tableWithAttributes',
+      '[variable-3&operator |_. name |_. age|]',
+      '[variable-3 |][variable-3&attribute /2.][variable-3  Jim |]',
+      '[variable-3 |][variable-3&attribute \\2{color: red}.][variable-3  Sam |]');
+
+  /*
+   * HTML
+   */
+
+  MT('html',
+      '[comment <div id="wrapper">]',
+      '[comment <section id="introduction">]',
+      '',
+      '[header&header-1 h1. Welcome]',
+      '',
+      '[variable-2 * Item one]',
+      '[variable-2 * Item two]',
+      '',
+      '[comment <a href="http://example.com">Example</a>]',
+      '',
+      '[comment </section>]',
+      '[comment </div>]');
+
+  MT('inlineHtml',
+      'I can use HTML directly in my [comment <span class="youbetcha">Textile</span>].');
+
+  /*
+   * No-Textile
+   */
+
+  MT('notextile',
+    '[string-2 notextile. *No* formatting]');
+
+  MT('notextileInline',
+      'Use [string-2 ==*asterisks*==] for [strong *strong*] text.');
+
+  MT('notextileWithPre',
+      '[operator pre. *No* formatting]');
+
+  MT('notextileWithSpanningPre',
+      '[operator pre.. *No* formatting]',
+      '',
+      '[operator *No* formatting]');
+})();
diff --git a/static/js/lib/codemirror-4.5/mode/textile/textile.js b/static/js/lib/codemirror-4.5/mode/textile/textile.js
new file mode 100644
index 0000000..b1511a5
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/mode/textile/textile.js
@@ -0,0 +1,553 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == 'object' && typeof module == 'object') { // CommonJS
+    mod(require('../../lib/codemirror'));
+  } else if (typeof define == 'function' && define.amd) { // AMD
+    define(['../../lib/codemirror'], mod);
+  } else { // Plain browser env
+    mod(CodeMirror);
+  }
+})(function(CodeMirror) {
+'use strict';
+
+var TOKEN_STYLES = {
+  addition: 'positive',
+  attributes: 'attribute',
+  bold: 'strong',
+  cite: 'keyword',
+  code: 'atom',
+  definitionList: 'number',
+  deletion: 'negative',
+  div: 'punctuation',
+  em: 'em',
+  footnote: 'variable',
+  footCite: 'qualifier',
+  header: 'header',
+  html: 'comment',
+  image: 'string',
+  italic: 'em',
+  link: 'link',
+  linkDefinition: 'link',
+  list1: 'variable-2',
+  list2: 'variable-3',
+  list3: 'keyword',
+  notextile: 'string-2',
+  pre: 'operator',
+  p: 'property',
+  quote: 'bracket',
+  span: 'quote',
+  specialChar: 'tag',
+  strong: 'strong',
+  sub: 'builtin',
+  sup: 'builtin',
+  table: 'variable-3',
+  tableHeading: 'operator'
+};
+
+function Parser(regExpFactory, state, stream) {
+  this.regExpFactory = regExpFactory;
+  this.state = state;
+  this.stream = stream;
+  this.styles = TOKEN_STYLES;
+
+  this.state.specialChar = null;
+}
+
+Parser.prototype.eat = function(name) {
+  return this.stream.match(this.regExpFactory.pattern(name), true);
+};
+
+Parser.prototype.check = function(name) {
+  return this.stream.match(this.regExpFactory.pattern(name), false);
+};
+
+Parser.prototype.setModeForNextToken = function(mode) {
+  return this.state.mode = mode;
+};
+
+Parser.prototype.execMode = function(newMode) {
+  return this.setModeForNextToken(newMode).call(this);
+};
+
+Parser.prototype.startNewLine = function() {
+  this.setModeForNextToken(Modes.newLayout);
+  this.state.tableHeading = false;
+
+  if (this.state.layoutType === 'definitionList' && this.state.spanningLayout) {
+    if (this.check('definitionListEnd')) {
+      this.state.spanningLayout = false;
+    }
+  }
+};
+
+Parser.prototype.nextToken = function() {
+  return this.state.mode.call(this);
+};
+
+Parser.prototype.styleFor = function(token) {
+  if (this.styles.hasOwnProperty(token)) {
+    return this.styles[token];
+  }
+  throw 'unknown token';
+};
+
+Parser.prototype.handlePhraseModifier = function(ch) {
+  if (ch === '_') {
+    if (this.stream.eat('_')) {
+      return this.togglePhraseModifier('italic', /^.*__/);
+    }
+    return this.togglePhraseModifier('em', /^.*_/);
+  }
+
+  if (ch === '*') {
+    if (this.stream.eat('*')) {
+      return this.togglePhraseModifier('bold', /^.*\*\*/);
+    }
+    return this.togglePhraseModifier('strong', /^.*\*/);
+  }
+
+  if (ch === '[') {
+    if (this.stream.match(/\d+\]/)) {
+      this.state.footCite = true;
+    }
+    return this.tokenStyles();
+  }
+
+  if (ch === '(') {
+    if (this.stream.match('r)')) {
+      this.state.specialChar = 'r';
+    } else if (this.stream.match('tm)')) {
+      this.state.specialChar = 'tm';
+    } else if (this.stream.match('c)')) {
+      this.state.specialChar = 'c';
+    }
+    return this.tokenStyles();
+  }
+
+  if (ch === '<') {
+    if (this.stream.match(/(\w+)[^>]+>[^<]+<\/\1>/)) {
+      return this.tokenStylesWith(this.styleFor('html'));
+    }
+  }
+
+  if (ch === '?' && this.stream.eat('?')) {
+    return this.togglePhraseModifier('cite', /^.*\?\?/);
+  }
+  if (ch === '=' && this.stream.eat('=')) {
+    return this.togglePhraseModifier('notextile', /^.*==/);
+  }
+  if (ch === '-') {
+    return this.togglePhraseModifier('deletion', /^.*-/);
+  }
+  if (ch === '+') {
+    return this.togglePhraseModifier('addition', /^.*\+/);
+  }
+  if (ch === '~') {
+    return this.togglePhraseModifier('sub', /^.*~/);
+  }
+  if (ch === '^') {
+    return this.togglePhraseModifier('sup', /^.*\^/);
+  }
+  if (ch === '%') {
+    return this.togglePhraseModifier('span', /^.*%/);
+  }
+  if (ch === '@') {
+    return this.togglePhraseModifier('code', /^.*@/);
+  }
+  if (ch === '!') {
+    var type = this.togglePhraseModifier('image', /^.*(?:\([^\)]+\))?!/);
+    this.stream.match(/^:\S+/); // optional Url portion
+    return type;
+  }
+  return this.tokenStyles();
+};
+
+Parser.prototype.togglePhraseModifier = function(phraseModifier, closeRE) {
+  if (this.state[phraseModifier]) { // remove phrase modifier
+    var type = this.tokenStyles();
+    this.state[phraseModifier] = false;
+    return type;
+  }
+  if (this.stream.match(closeRE, false)) { // add phrase modifier
+    this.state[phraseModifier] = true;
+    this.setModeForNextToken(Modes.attributes);
+  }
+  return this.tokenStyles();
+};
+
+Parser.prototype.tokenStyles = function() {
+  var disabled = this.textileDisabled(),
+      styles = [];
+
+  if (disabled) return disabled;
+
+  if (this.state.layoutType) {
+    styles.push(this.styleFor(this.state.layoutType));
+  }
+
+  styles = styles.concat(this.activeStyles('addition', 'bold', 'cite', 'code',
+      'deletion', 'em', 'footCite', 'image', 'italic', 'link', 'span', 'specialChar', 'strong',
+      'sub', 'sup', 'table', 'tableHeading'));
+
+  if (this.state.layoutType === 'header') {
+    styles.push(this.styleFor('header') + '-' + this.state.header);
+  }
+  return styles.length ? styles.join(' ') : null;
+};
+
+Parser.prototype.textileDisabled = function() {
+  var type = this.state.layoutType;
+
+  switch(type) {
+    case 'notextile':
+    case 'code':
+    case 'pre':
+      return this.styleFor(type);
+    default:
+      if (this.state.notextile) {
+        return this.styleFor('notextile') + (type ? (' ' + this.styleFor(type)) : '');
+      }
+
+      return null;
+  }
+};
+
+Parser.prototype.tokenStylesWith = function(extraStyles) {
+  var disabled = this.textileDisabled(),
+      type;
+
+  if (disabled) return disabled;
+
+  type = this.tokenStyles();
+  if(extraStyles) {
+    return type ? (type + ' ' + extraStyles) : extraStyles;
+  }
+  return type;
+};
+
+Parser.prototype.activeStyles = function() {
+  var styles = [],
+      i;
+  for (i = 0; i < arguments.length; ++i) {
+    if (this.state[arguments[i]]) {
+      styles.push(this.styleFor(arguments[i]));
+    }
+  }
+  return styles;
+};
+
+Parser.prototype.blankLine = function() {
+  var spanningLayout = this.state.spanningLayout,
+      type = this.state.layoutType,
+      key;
+
+  for (key in this.state) {
+    if (this.state.hasOwnProperty(key)) {
+      delete this.state[key];
+    }
+  }
+
+  this.setModeForNextToken(Modes.newLayout);
+  if (spanningLayout) {
+    this.state.layoutType = type;
+    this.state.spanningLayout = true;
+  }
+};
+
+
+function RegExpFactory() {
+  this.cache = {};
+  this.single = {
+    bc: 'bc',
+    bq: 'bq',
+    definitionList: /- [^(?::=)]+:=+/,
+    definitionListEnd: /.*=:\s*$/,
+    div: 'div',
+    drawTable: /\|.*\|/,
+    foot: /fn\d+/,
+    header: /h[1-6]/,
+    html: /\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,
+    link: /[^"]+":\S/,
+    linkDefinition: /\[[^\s\]]+\]\S+/,
+    list: /(?:#+|\*+)/,
+    notextile: 'notextile',
+    para: 'p',
+    pre: 'pre',
+    table: 'table',
+    tableCellAttributes: /[/\\]\d+/,
+    tableHeading: /\|_\./,
+    tableText: /[^"_\*\[\(\?\+~\^%@|-]+/,
+    text: /[^!"_=\*\[\(<\?\+~\^%@-]+/
+  };
+  this.attributes = {
+    align: /(?:<>|<|>|=)/,
+    selector: /\([^\(][^\)]+\)/,
+    lang: /\[[^\[\]]+\]/,
+    pad: /(?:\(+|\)+){1,2}/,
+    css: /\{[^\}]+\}/
+  };
+}
+
+RegExpFactory.prototype.pattern = function(name) {
+  return (this.cache[name] || this.createRe(name));
+};
+
+RegExpFactory.prototype.createRe = function(name) {
+  switch (name) {
+    case 'drawTable':
+      return this.makeRe('^', this.single.drawTable, '$');
+    case 'html':
+      return this.makeRe('^', this.single.html, '(?:', this.single.html, ')*', '$');
+    case 'linkDefinition':
+      return this.makeRe('^', this.single.linkDefinition, '$');
+    case 'listLayout':
+      return this.makeRe('^', this.single.list, this.pattern('allAttributes'), '*\\s+');
+    case 'tableCellAttributes':
+      return this.makeRe('^', this.choiceRe(this.single.tableCellAttributes,
+          this.pattern('allAttributes')), '+\\.');
+    case 'type':
+      return this.makeRe('^', this.pattern('allTypes'));
+    case 'typeLayout':
+      return this.makeRe('^', this.pattern('allTypes'), this.pattern('allAttributes'),
+          '*\\.\\.?', '(\\s+|$)');
+    case 'attributes':
+      return this.makeRe('^', this.pattern('allAttributes'), '+');
+
+    case 'allTypes':
+      return this.choiceRe(this.single.div, this.single.foot,
+          this.single.header, this.single.bc, this.single.bq,
+          this.single.notextile, this.single.pre, this.single.table,
+          this.single.para);
+
+    case 'allAttributes':
+      return this.choiceRe(this.attributes.selector, this.attributes.css,
+          this.attributes.lang, this.attributes.align, this.attributes.pad);
+
+    default:
+      return this.makeRe('^', this.single[name]);
+  }
+};
+
+
+RegExpFactory.prototype.makeRe = function() {
+  var pattern = '',
+      i,
+      arg;
+
+  for (i = 0; i < arguments.length; ++i) {
+    arg = arguments[i];
+    pattern += (typeof arg === 'string') ? arg : arg.source;
+  }
+  return new RegExp(pattern);
+};
+
+RegExpFactory.prototype.choiceRe = function() {
+  var parts = [arguments[0]],
+      i;
+
+  for (i = 1; i < arguments.length; ++i) {
+    parts[i * 2 - 1] = '|';
+    parts[i * 2] = arguments[i];
+  }
+
+  parts.unshift('(?:');
+  parts.push(')');
+  return this.makeRe.apply(this, parts);
+};
+
+
+var Modes = {
+  newLayout: function() {
+    if (this.check('typeLayout')) {
+      this.state.spanningLayout = false;
+      return this.execMode(Modes.blockType);
+    }
+    if (!this.textileDisabled()) {
+      if (this.check('listLayout')) {
+        return this.execMode(Modes.list);
+      } else if (this.check('drawTable')) {
+        return this.execMode(Modes.table);
+      } else if (this.check('linkDefinition')) {
+        return this.execMode(Modes.linkDefinition);
+      } else if (this.check('definitionList')) {
+        return this.execMode(Modes.definitionList);
+      } else if (this.check('html')) {
+        return this.execMode(Modes.html);
+      }
+    }
+    return this.execMode(Modes.text);
+  },
+
+  blockType: function() {
+    var match,
+        type;
+    this.state.layoutType = null;
+
+    if (match = this.eat('type')) {
+      type = match[0];
+    } else {
+      return this.execMode(Modes.text);
+    }
+
+    if(match = type.match(this.regExpFactory.pattern('header'))) {
+      this.state.layoutType = 'header';
+      this.state.header = parseInt(match[0][1]);
+    } else if (type.match(this.regExpFactory.pattern('bq'))) {
+      this.state.layoutType = 'quote';
+    } else if (type.match(this.regExpFactory.pattern('bc'))) {
+      this.state.layoutType = 'code';
+    } else if (type.match(this.regExpFactory.pattern('foot'))) {
+      this.state.layoutType = 'footnote';
+    } else if (type.match(this.regExpFactory.pattern('notextile'))) {
+      this.state.layoutType = 'notextile';
+    } else if (type.match(this.regExpFactory.pattern('pre'))) {
+      this.state.layoutType = 'pre';
+    } else if (type.match(this.regExpFactory.pattern('div'))) {
+      this.state.layoutType = 'div';
+    } else if (type.match(this.regExpFactory.pattern('table'))) {
+      this.state.layoutType = 'table';
+    }
+
+    this.setModeForNextToken(Modes.attributes);
+    return this.tokenStyles();
+  },
+
+  text: function() {
+    if (this.eat('text')) {
+      return this.tokenStyles();
+    }
+
+    var ch = this.stream.next();
+
+    if (ch === '"') {
+      return this.execMode(Modes.link);
+    }
+    return this.handlePhraseModifier(ch);
+  },
+
+  attributes: function() {
+    this.setModeForNextToken(Modes.layoutLength);
+
+    if (this.eat('attributes')) {
+      return this.tokenStylesWith(this.styleFor('attributes'));
+    }
+    return this.tokenStyles();
+  },
+
+  layoutLength: function() {
+    if (this.stream.eat('.') && this.stream.eat('.')) {
+      this.state.spanningLayout = true;
+    }
+
+    this.setModeForNextToken(Modes.text);
+    return this.tokenStyles();
+  },
+
+  list: function() {
+    var match = this.eat('list'),
+        listMod;
+    this.state.listDepth = match[0].length;
+    listMod = (this.state.listDepth - 1) % 3;
+    if (!listMod) {
+      this.state.layoutType = 'list1';
+    } else if (listMod === 1) {
+      this.state.layoutType = 'list2';
+    } else {
+      this.state.layoutType = 'list3';
+    }
+    this.setModeForNextToken(Modes.attributes);
+    return this.tokenStyles();
+  },
+
+  link: function() {
+    this.setModeForNextToken(Modes.text);
+    if (this.eat('link')) {
+      this.stream.match(/\S+/);
+      return this.tokenStylesWith(this.styleFor('link'));
+    }
+    return this.tokenStyles();
+  },
+
+  linkDefinition: function() {
+    this.stream.skipToEnd();
+    return this.tokenStylesWith(this.styleFor('linkDefinition'));
+  },
+
+  definitionList: function() {
+    this.eat('definitionList');
+
+    this.state.layoutType = 'definitionList';
+
+    if (this.stream.match(/\s*$/)) {
+      this.state.spanningLayout = true;
+    } else {
+      this.setModeForNextToken(Modes.attributes);
+    }
+    return this.tokenStyles();
+  },
+
+  html: function() {
+    this.stream.skipToEnd();
+    return this.tokenStylesWith(this.styleFor('html'));
+  },
+
+  table: function() {
+    this.state.layoutType = 'table';
+    return this.execMode(Modes.tableCell);
+  },
+
+  tableCell: function() {
+    if (this.eat('tableHeading')) {
+      this.state.tableHeading = true;
+    } else {
+      this.stream.eat('|');
+    }
+    this.setModeForNextToken(Modes.tableCellAttributes);
+    return this.tokenStyles();
+  },
+
+  tableCellAttributes: function() {
+    this.setModeForNextToken(Modes.tableText);
+
+    if (this.eat('tableCellAttributes')) {
+      return this.tokenStylesWith(this.styleFor('attributes'));
+    }
+    return this.tokenStyles();
+  },
+
+  tableText: function() {
+    if (this.eat('tableText')) {
+      return this.tokenStyles();
+    }
+
+    if (this.stream.peek() === '|') { // end of cell
+      this.setModeForNextToken(Modes.tableCell);
+      return this.tokenStyles();
+    }
+    return this.handlePhraseModifier(this.stream.next());
+  }
+};
+
+
+CodeMirror.defineMode('textile', function() {
+  var regExpFactory = new RegExpFactory();
+
+  return {
+    startState: function() {
+      return { mode: Modes.newLayout };
+    },
+    token: function(stream, state) {
+      var parser = new Parser(regExpFactory, state, stream);
+      if (stream.sol()) { parser.startNewLine(); }
+      return parser.nextToken();
+    },
+    blankLine: function(state) {
+      new Parser(regExpFactory, state).blankLine();
+    }
+  };
+});
+
+CodeMirror.defineMIME('text/x-textile', 'textile');
+});
diff --git a/static/js/lib/codemirror-4.5/mode/tiddlywiki/index.html b/static/js/lib/codemirror-4.5/mode/tiddlywiki/index.html
index 6ef64a4..77dd045 100644
--- a/static/js/lib/codemirror-4.5/mode/tiddlywiki/index.html
+++ b/static/js/lib/codemirror-4.5/mode/tiddlywiki/index.html
@@ -11,12 +11,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/tiki/index.html b/static/js/lib/codemirror-4.5/mode/tiki/index.html
index 5315dbf..091c5fb 100644
--- a/static/js/lib/codemirror-4.5/mode/tiki/index.html
+++ b/static/js/lib/codemirror-4.5/mode/tiki/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/toml/index.html b/static/js/lib/codemirror-4.5/mode/toml/index.html
index c59b4cc..90a2a02 100644
--- a/static/js/lib/codemirror-4.5/mode/toml/index.html
+++ b/static/js/lib/codemirror-4.5/mode/toml/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/tornado/index.html b/static/js/lib/codemirror-4.5/mode/tornado/index.html
new file mode 100644
index 0000000..8ee7ef5
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/mode/tornado/index.html
@@ -0,0 +1,63 @@
+<!doctype html>
+
+<title>CodeMirror: Tornado template mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/mode/overlay.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<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>
+
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Tornado</a>
+  </ul>
+</div>
+
+<article>
+<h2>Tornado template mode</h2>
+<form><textarea id="code" name="code">
+<!doctype html>
+<html>
+    <head>
+        <title>My Tornado web application</title>
+    </head>
+    <body>
+        <h1>
+            {{ title }}
+        </h1>
+        <ul class="my-list">
+            {% for item in items %}
+                <li>{% item.name %}</li>
+            {% empty %}
+                <li>You have no items in your list.</li>
+            {% end %}
+        </ul>
+    </body>
+</html>
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "tornado",
+        indentUnit: 4,
+        indentWithTabs: true
+      });
+    </script>
+
+    <p>Mode for HTML with embedded Tornado template markup.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-tornado</code></p>
+  </article>
diff --git a/static/js/lib/codemirror-4.5/mode/tornado/tornado.js b/static/js/lib/codemirror-4.5/mode/tornado/tornado.js
new file mode 100644
index 0000000..dbfbc34
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/mode/tornado/tornado.js
@@ -0,0 +1,68 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
+        require("../../addon/mode/overlay"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+            "../../addon/mode/overlay"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("tornado:inner", function() {
+    var keywords = ["and","as","assert","autoescape","block","break","class","comment","context",
+                    "continue","datetime","def","del","elif","else","end","escape","except",
+                    "exec","extends","false","finally","for","from","global","if","import","in",
+                    "include","is","json_encode","lambda","length","linkify","load","module",
+                    "none","not","or","pass","print","put","raise","raw","return","self","set",
+                    "squeeze","super","true","try","url_escape","while","with","without","xhtml_escape","yield"];
+    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+      stream.eatWhile(/[^\{]/);
+      var ch = stream.next();
+      if (ch == "{") {
+        if (ch = stream.eat(/\{|%|#/)) {
+          state.tokenize = inTag(ch);
+          return "tag";
+        }
+      }
+    }
+    function inTag (close) {
+      if (close == "{") {
+        close = "}";
+      }
+      return function (stream, state) {
+        var ch = stream.next();
+        if ((ch == close) && stream.eat("}")) {
+          state.tokenize = tokenBase;
+          return "tag";
+        }
+        if (stream.match(keywords)) {
+          return "keyword";
+        }
+        return close == "#" ? "comment" : "string";
+      };
+    }
+    return {
+      startState: function () {
+        return {tokenize: tokenBase};
+      },
+      token: function (stream, state) {
+        return state.tokenize(stream, state);
+      }
+    };
+  });
+
+  CodeMirror.defineMode("tornado", function(config) {
+    var htmlBase = CodeMirror.getMode(config, "text/html");
+    var tornadoInner = CodeMirror.getMode(config, "tornado:inner");
+    return CodeMirror.overlayMode(htmlBase, tornadoInner);
+  });
+
+  CodeMirror.defineMIME("text/x-tornado", "tornado");
+});
diff --git a/static/js/lib/codemirror-4.5/mode/turtle/index.html b/static/js/lib/codemirror-4.5/mode/turtle/index.html
index 27689c3..a4962b6 100644
--- a/static/js/lib/codemirror-4.5/mode/turtle/index.html
+++ b/static/js/lib/codemirror-4.5/mode/turtle/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/vb/index.html b/static/js/lib/codemirror-4.5/mode/vb/index.html
index 8b81a88..adcc44f 100644
--- a/static/js/lib/codemirror-4.5/mode/vb/index.html
+++ b/static/js/lib/codemirror-4.5/mode/vb/index.html
@@ -15,12 +15,12 @@
       .CodeMirror pre { font-family: Inconsolata; font-size: 14px}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/vbscript/index.html b/static/js/lib/codemirror-4.5/mode/vbscript/index.html
index 9b506b7..ad7532d 100644
--- a/static/js/lib/codemirror-4.5/mode/vbscript/index.html
+++ b/static/js/lib/codemirror-4.5/mode/vbscript/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/velocity/index.html b/static/js/lib/codemirror-4.5/mode/velocity/index.html
index bd38b88..2747878 100644
--- a/static/js/lib/codemirror-4.5/mode/velocity/index.html
+++ b/static/js/lib/codemirror-4.5/mode/velocity/index.html
@@ -10,12 +10,12 @@
 <script src="velocity.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/verilog/index.html b/static/js/lib/codemirror-4.5/mode/verilog/index.html
index 4c06cda..96b3d64 100644
--- a/static/js/lib/codemirror-4.5/mode/verilog/index.html
+++ b/static/js/lib/codemirror-4.5/mode/verilog/index.html
@@ -10,12 +10,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/verilog/test.js b/static/js/lib/codemirror-4.5/mode/verilog/test.js
index 376d198..9c8c094 100644
--- a/static/js/lib/codemirror-4.5/mode/verilog/test.js
+++ b/static/js/lib/codemirror-4.5/mode/verilog/test.js
@@ -225,15 +225,49 @@
       ""
   );
 
-  MT("export_function_does_not_indent",
+  MT("export_function_one_line_does_not_indent",
      "[keyword export] [string \"DPI-C\"] [keyword function] [variable helloFromSV];",
      ""
   );
 
-  MT("export_task_does_not_indent",
+  MT("export_task_one_line_does_not_indent",
      "[keyword export] [string \"DPI-C\"] [keyword task] [variable helloFromSV];",
      ""
   );
 
+  MT("export_function_two_lines_indents_properly",
+    "[keyword export]",
+    "    [string \"DPI-C\"] [keyword function] [variable helloFromSV];",
+    ""
+  );
+
+  MT("export_task_two_lines_indents_properly",
+    "[keyword export]",
+    "    [string \"DPI-C\"] [keyword task] [variable helloFromSV];",
+    ""
+  );
+
+  MT("import_function_one_line_does_not_indent",
+    "[keyword import] [string \"DPI-C\"] [keyword function] [variable helloFromC];",
+    ""
+  );
+
+  MT("import_task_one_line_does_not_indent",
+    "[keyword import] [string \"DPI-C\"] [keyword task] [variable helloFromC];",
+    ""
+  );
+
+  MT("import_package_single_line_does_not_indent",
+    "[keyword import] [variable p]::[variable x];",
+    "[keyword import] [variable p]::[variable y];",
+    ""
+  );
+
+  MT("covergoup_with_function_indents_properly",
+    "[keyword covergroup] [variable cg] [keyword with] [keyword function] [variable sample][bracket (][keyword bit] [variable b][bracket )];",
+    "    [variable c] : [keyword coverpoint] [variable c];",
+    "[keyword endgroup]: [variable cg]",
+    ""
+  );
 
 })();
diff --git a/static/js/lib/codemirror-4.5/mode/verilog/verilog.js b/static/js/lib/codemirror-4.5/mode/verilog/verilog.js
index 46209b2..8fc9ea4 100644
--- a/static/js/lib/codemirror-4.5/mode/verilog/verilog.js
+++ b/static/js/lib/codemirror-4.5/mode/verilog/verilog.js
@@ -80,7 +80,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   // Block openings which are closed by a matching keyword in the form of ("end" + keyword)
   // E.g. "task" => "endtask"
   var blockKeywords = words(
-    "case checker class clocking config function generate group interface module package" +
+    "case checker class clocking config function generate interface module package" +
     "primitive program property specify sequence table task"
   );
 
@@ -94,11 +94,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   openClose["casez"] = "endcase";
   openClose["do"   ] = "while";
   openClose["fork" ] = "join;join_any;join_none";
-
-  // This is a bit of a hack but will work to not indent after import/epxort statements
-  // as long as the function/task name is on the same line
-  openClose["import"] = "function;task";
-  openClose["export"] = "function;task";
+  openClose["covergroup"] = "endgroup";
 
   for (var i in noIndentKeywords) {
     var keyword = noIndentKeywords[i];
@@ -107,7 +103,8 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     }
   }
 
-  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else for foreach forever if initial repeat while");
+  // Keywords which open statements that are ended with a semi-colon
+  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");
 
   function tokenBase(stream, state) {
     var ch = stream.peek();
@@ -320,8 +317,16 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       else if (curPunc == "newstatement") {
         pushContext(state, stream.column(), "statement");
       } else if (curPunc == "newblock") {
-        var close = openClose[curKeyword];
-        pushContext(state, stream.column(), close);
+        if (curKeyword == "function" && ctx && (ctx.type == "statement" || ctx.type == "endgroup")) {
+          // The 'function' keyword can appear in some other contexts where it actually does not
+          // indicate a function (import/export DPI and covergroup definitions).
+          // Do nothing in this case
+        } else if (curKeyword == "task" && ctx && ctx.type == "statement") {
+          // Same thing for task
+        } else {
+          var close = openClose[curKeyword];
+          pushContext(state, stream.column(), close);
+        }
       }
 
       state.startOfLine = false;
diff --git a/static/js/lib/codemirror-4.5/mode/xml/index.html b/static/js/lib/codemirror-4.5/mode/xml/index.html
index 60ebd20..7149f06 100644
--- a/static/js/lib/codemirror-4.5/mode/xml/index.html
+++ b/static/js/lib/codemirror-4.5/mode/xml/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/xml/xml.js b/static/js/lib/codemirror-4.5/mode/xml/xml.js
index 786507d..2f3b8f8 100644
--- a/static/js/lib/codemirror-4.5/mode/xml/xml.js
+++ b/static/js/lib/codemirror-4.5/mode/xml/xml.js
@@ -21,7 +21,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
                       'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
                       'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true},
+                      'track': true, 'wbr': true, 'menuitem': true},
     implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
                        'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
                        'th': true, 'tr': true},
diff --git a/static/js/lib/codemirror-4.5/mode/xquery/index.html b/static/js/lib/codemirror-4.5/mode/xquery/index.html
index 3baf5e3..7ac5aae 100644
--- a/static/js/lib/codemirror-4.5/mode/xquery/index.html
+++ b/static/js/lib/codemirror-4.5/mode/xquery/index.html
@@ -15,12 +15,12 @@
 	}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/yaml/index.html b/static/js/lib/codemirror-4.5/mode/yaml/index.html
index bbb40a3..be9b632 100644
--- a/static/js/lib/codemirror-4.5/mode/yaml/index.html
+++ b/static/js/lib/codemirror-4.5/mode/yaml/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/mode/z80/index.html b/static/js/lib/codemirror-4.5/mode/z80/index.html
index b63c962..1ad3ace 100644
--- a/static/js/lib/codemirror-4.5/mode/z80/index.html
+++ b/static/js/lib/codemirror-4.5/mode/z80/index.html
@@ -9,12 +9,12 @@
 <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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://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>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/static/js/lib/codemirror-4.5/theme/base16-dark.css b/static/js/lib/codemirror-4.5/theme/base16-dark.css
index 199997a..a46abdb 100644
--- a/static/js/lib/codemirror-4.5/theme/base16-dark.css
+++ b/static/js/lib/codemirror-4.5/theme/base16-dark.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
-.cm-s-base16-dark div.CodeMirror-selected {background: #202020 !important;}
+.cm-s-base16-dark div.CodeMirror-selected {background: #303030 !important;}
 .cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
 .cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
@@ -32,5 +32,5 @@
 .cm-s-base16-dark span.cm-link {color: #aa759f;}
 .cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
 
-.cm-s-base16-dark .CodeMirror-activeline-background {background: #2F2F2F !important;}
+.cm-s-base16-dark .CodeMirror-activeline-background {background: #202020 !important;}
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/static/js/lib/codemirror-4.5/theme/mbo.css b/static/js/lib/codemirror-4.5/theme/mbo.css
index 6cb2b18..0ad6360 100644
--- a/static/js/lib/codemirror-4.5/theme/mbo.css
+++ b/static/js/lib/codemirror-4.5/theme/mbo.css
@@ -1,6 +1,10 @@
-/* Based on mbonaci's Brackets mbo theme */
+/****************************************************************/
+/*   Based on mbonaci's Brackets mbo theme                      */
+/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
+/*   Create your own: http://tmtheme-editor.herokuapp.com       */
+/****************************************************************/
 
-.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffe9;}
+.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffec;}
 .cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
 .cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
 .cm-s-mbo .CodeMirror-guttermarker { color: white; }
@@ -15,6 +19,7 @@
 .cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute {color: #9ddfe9;}
 .cm-s-mbo span.cm-keyword {color: #ffb928;}
 .cm-s-mbo span.cm-string {color: #ffcf6c;}
+.cm-s-mbo span.cm-string.cm-property {color: #ffffec;}
 
 .cm-s-mbo span.cm-variable {color: #ffffec;}
 .cm-s-mbo span.cm-variable-2 {color: #00a8c6;}
@@ -23,17 +28,8 @@
 .cm-s-mbo span.cm-tag {color: #9ddfe9;}
 .cm-s-mbo span.cm-link {color: #f54b07;}
 .cm-s-mbo span.cm-error {border-bottom: #636363; color: #ffffec;}
+.cm-s-mbo span.cm-qualifier {color: #ffffec;}
 
 .cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
-.cm-s-mbo .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: #f5e107 !important;
- }
- 
-.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
-
-.cm-s-mbo span.cm-searching {
-  background-color: none;
-  background: none;
-  box-shadow: 0 0 0 1px #ffffec;
-}
+.cm-s-mbo .CodeMirror-matchingbracket {color: #222 !important;}
+.cm-s-mbo .CodeMirror-matchingtag {background: rgba(255, 255, 255, .37);}
diff --git a/static/js/lib/codemirror-4.5/theme/mdn-like.css b/static/js/lib/codemirror-4.5/theme/mdn-like.css
index 1e20b9e..81b2177 100644
--- a/static/js/lib/codemirror-4.5/theme/mdn-like.css
+++ b/static/js/lib/codemirror-4.5/theme/mdn-like.css
@@ -1,7 +1,7 @@
 /*
   MDN-LIKE Theme - Mozilla
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
   GitHub: @peterkroon
 
   The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
diff --git a/static/js/lib/codemirror-4.5/theme/wide.css b/static/js/overwrite/codemirror-4.5/theme/wide.css
similarity index 100%
rename from static/js/lib/codemirror-4.5/theme/wide.css
rename to static/js/overwrite/codemirror-4.5/theme/wide.css
diff --git a/views/index.html b/views/index.html
index 19030ae..d709dfc 100644
--- a/views/index.html
+++ b/views/index.html
@@ -8,7 +8,7 @@
         <link rel="stylesheet" href="{{.conf.StaticServer}}/static/js/lib/codemirror-4.5/addon/lint/lint.css">
         <link rel="stylesheet" href="{{.conf.StaticServer}}/static/js/lib/codemirror-4.5/addon/fold/foldgutter.css">
         <link rel="stylesheet" href="{{.conf.StaticServer}}/static/js/lib/codemirror-4.5/addon/dialog/dialog.css">
-        <link rel="stylesheet" href="{{.conf.StaticServer}}/static/js/lib/codemirror-4.5/theme/wide.css">
+        <link rel="stylesheet" href="{{.conf.StaticServer}}/static/js/overwrite/codemirror-4.5/theme/wide.css">
 
         <link rel="stylesheet" href="{{.conf.StaticServer}}/static/js/lib/ztree/zTreeStyle.css">