diff --git a/test/lint/parse-js.js b/test/lint/parse-js.js
diff --git a/test/mode_test.js b/test/mode_test.js
@@ -59,14 +59,21 @@
     return {tokens: tokens, plain: plain};
   }
 
+  test.indentation = function(name, mode, tokens, modeName) {
+    var data = parseTokens(tokens);
+    return test((modeName || mode.name) + "_indent_" + name, function() {
+      return compare(data.plain, data.tokens, mode, true);
+    });
+  };
+
   test.mode = function(name, mode, tokens, modeName) {
     var data = parseTokens(tokens);
     return test((modeName || mode.name) + "_" + name, function() {
       return compare(data.plain, data.tokens, mode);
     });
   };
 
-  function compare(text, expected, mode) {
+  function compare(text, expected, mode, compareIndentation) {
 
     var expectedOutput = [];
     for (var i = 0; i < expected.length; i += 2) {
@@ -75,7 +82,7 @@
       expectedOutput.push(sty, expected[i + 1]);
     }
 
-    var observedOutput = highlight(text, mode);
+    var observedOutput = highlight(text, mode, compareIndentation);
 
     var pass, passStyle = "";
     pass = highlightOutputsEqual(expectedOutput, observedOutput);
@@ -114,7 +121,7 @@
    *
    * @return array of [style, token] pairs
    */
-  function highlight(string, mode) {
+  function highlight(string, mode, compareIndentation) {
     var state = mode.startState()
 
     var lines = string.replace(/\r\n/g,'\n').split('\n');
@@ -125,14 +132,15 @@
       if (line == "" && mode.blankLine) mode.blankLine(state);
       /* Start copied code from CodeMirror.highlight */
       while (!stream.eol()) {
-        var style = mode.token(stream, state), substr = stream.current();
-        if (style && style.indexOf(" ") > -1) style = style.split(' ').sort().join(' ');
+				var compare = mode.token(stream, state), substr = stream.current();
+				if(compareIndentation) compare = mode.indent(state) || null;
+        else if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
 
-        stream.start = stream.pos;
-        if (pos && st[pos-2] == style && !newLine) {
+				stream.start = stream.pos;
+        if (pos && st[pos-2] == compare && !newLine) {
           st[pos-1] += substr;
         } else if (substr) {
-          st[pos++] = style; st[pos++] = substr;
+          st[pos++] = compare; st[pos++] = substr;
         }
         // Give up when line is ridiculously long
         if (stream.pos > 5000) {

diff --git a/test/vim_test.js b/test/vim_test.js
@@ -1175,6 +1175,13 @@ testVim('p_line', function(cm, vim, helpers) {
   eq('___\n  a\nd\n  a\nd', cm.getValue());
   helpers.assertCursorAt(1, 2);
 }, { value: '___' });
+testVim('p_lastline', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().pushText('"', 'yank', '  a\nd', true);
+  helpers.doKeys('2', 'p');
+  eq('___\n  a\nd\n  a\nd', cm.getValue());
+  helpers.assertCursorAt(1, 2);
+}, { value: '___' });
 testVim('P', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);
@@ -1479,6 +1486,34 @@ testVim('visual_blank', function(cm, vim, helpers) {
   helpers.doKeys('v', 'k');
   eq(vim.visualMode, true);
 }, { value: '\n' });
+testVim('s_normal', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('s');
+  helpers.doInsertModeKeys('Esc');
+  helpers.assertCursorAt(0, 0);
+  eq('ac', cm.getValue());
+}, { value: 'abc'});
+testVim('s_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v', 's');
+  helpers.doInsertModeKeys('Esc');
+  helpers.assertCursorAt(0, 0);
+  eq('ac', cm.getValue());
+}, { value: 'abc'});
+testVim('S_normal', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('j', 'S');
+  helpers.doInsertModeKeys('Esc');
+  helpers.assertCursorAt(1, 0);
+  eq('aa\n\ncc', cm.getValue());
+}, { value: 'aa\nbb\ncc'});
+testVim('S_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v', 'j', 'S');
+  helpers.doInsertModeKeys('Esc');
+  helpers.assertCursorAt(0, 0);
+  eq('\ncc', cm.getValue());
+}, { value: 'aa\nbb\ncc'});
 testVim('/ and n/N', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('match');
   helpers.doKeys('/');

diff --git a/theme/3024-day.css b/theme/3024-day.css
@@ -25,10 +25,10 @@
 .cm-s-3024-day span.cm-variable {color: #01a252;}
 .cm-s-3024-day span.cm-variable-2 {color: #01a0e4;}
 .cm-s-3024-day span.cm-def {color: #e8bbd0;}
-.cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
 .cm-s-3024-day span.cm-bracket {color: #3a3432;}
 .cm-s-3024-day span.cm-tag {color: #db2d20;}
 .cm-s-3024-day span.cm-link {color: #a16a94;}
+.cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
 
 .cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/3024-night.css b/theme/3024-night.css
@@ -25,10 +25,10 @@
 .cm-s-3024-night span.cm-variable {color: #01a252;}
 .cm-s-3024-night span.cm-variable-2 {color: #01a0e4;}
 .cm-s-3024-night span.cm-def {color: #e8bbd0;}
-.cm-s-3024-night span.cm-error {background: #db2d20; color: #807d7c;}
 .cm-s-3024-night span.cm-bracket {color: #d6d5d4;}
 .cm-s-3024-night span.cm-tag {color: #db2d20;}
 .cm-s-3024-night span.cm-link {color: #a16a94;}
+.cm-s-3024-night span.cm-error {background: #db2d20; color: #807d7c;}
 
 .cm-s-3024-night .CodeMirror-activeline-background {background: #2F2F2F !important;}
 .cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/ambiance.css b/theme/ambiance.css
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
@@ -25,10 +25,10 @@
 .cm-s-base16-dark span.cm-variable {color: #90a959;}
 .cm-s-base16-dark span.cm-variable-2 {color: #6a9fb5;}
 .cm-s-base16-dark span.cm-def {color: #d28445;}
-.cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
 .cm-s-base16-dark span.cm-bracket {color: #e0e0e0;}
 .cm-s-base16-dark span.cm-tag {color: #ac4142;}
 .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-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/base16-light.css b/theme/base16-light.css
@@ -25,10 +25,10 @@
 .cm-s-base16-light span.cm-variable {color: #90a959;}
 .cm-s-base16-light span.cm-variable-2 {color: #6a9fb5;}
 .cm-s-base16-light span.cm-def {color: #d28445;}
-.cm-s-base16-light span.cm-error {background: #ac4142; color: #505050;}
 .cm-s-base16-light span.cm-bracket {color: #202020;}
 .cm-s-base16-light span.cm-tag {color: #ac4142;}
 .cm-s-base16-light span.cm-link {color: #aa759f;}
+.cm-s-base16-light span.cm-error {background: #ac4142; color: #505050;}
 
 .cm-s-base16-light .CodeMirror-activeline-background {background: #DDDCDC !important;}
 .cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/blackboard.css b/theme/blackboard.css
@@ -16,13 +16,13 @@
 .cm-s-blackboard .cm-string { color: #61CE3C; }
 .cm-s-blackboard .cm-string-2 { color: #61CE3C; }
 .cm-s-blackboard .cm-meta { color: #D8FA3C; }
-.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 .cm-s-blackboard .cm-builtin { color: #8DA6CE; }
 .cm-s-blackboard .cm-tag { color: #8DA6CE; }
 .cm-s-blackboard .cm-attribute { color: #8DA6CE; }
 .cm-s-blackboard .cm-header { color: #FF6400; }
 .cm-s-blackboard .cm-hr { color: #AEAEAE; }
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
+.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 
 .cm-s-blackboard .CodeMirror-activeline-background {background: #3C3636 !important;}
 .cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
diff --git a/theme/cobalt.css b/theme/cobalt.css
@@ -12,10 +12,10 @@
 .cm-s-cobalt span.cm-meta { color: #ff9d00; }
 .cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
 .cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
-.cm-s-cobalt span.cm-error { color: #9d1e15; }
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
 .cm-s-cobalt span.cm-link { color: #845dc4; }
+.cm-s-cobalt span.cm-error { color: #9d1e15; }
 
 .cm-s-cobalt .CodeMirror-activeline-background {background: #002D57 !important;}
 .cm-s-cobalt .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
diff --git a/theme/eclipse.css b/theme/eclipse.css
@@ -11,13 +11,13 @@
 .cm-s-eclipse span.cm-comment {color: #3F7F5F;}
 .cm-s-eclipse span.cm-string {color: #2A00FF;}
 .cm-s-eclipse span.cm-string-2 {color: #f50;}
-.cm-s-eclipse span.cm-error {color: #f00;}
 .cm-s-eclipse span.cm-qualifier {color: #555;}
 .cm-s-eclipse span.cm-builtin {color: #30a;}
 .cm-s-eclipse span.cm-bracket {color: #cc7;}
 .cm-s-eclipse span.cm-tag {color: #170;}
 .cm-s-eclipse span.cm-attribute {color: #00c;}
 .cm-s-eclipse span.cm-link {color: #219;}
+.cm-s-eclipse span.cm-error {color: #f00;}
 
 .cm-s-eclipse .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-eclipse .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/theme/elegant.css b/theme/elegant.css
@@ -6,8 +6,8 @@
 .cm-s-elegant span.cm-qualifier {color: #555;}
 .cm-s-elegant span.cm-keyword {color: #730;}
 .cm-s-elegant span.cm-builtin {color: #30a;}
-.cm-s-elegant span.cm-error {background-color: #fdd;}
 .cm-s-elegant span.cm-link {color: #762;}
+.cm-s-elegant span.cm-error {background-color: #fdd;}
 
 .cm-s-elegant .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-elegant .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
@@ -10,7 +10,6 @@
 .cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
 .cm-s-erlang-dark span.cm-comment    { color: #77f; }
 .cm-s-erlang-dark span.cm-def        { color: #e7a; }
-.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 .cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
 .cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
 .cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
@@ -25,6 +24,7 @@
 .cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
 .cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
 .cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
+.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
 .cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
 .cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
@@ -32,7 +32,6 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-string { color: #BCD279; }
 .cm-s-lesser-dark span.cm-string-2 {color: #f50;}
 .cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 .cm-s-lesser-dark span.cm-qualifier {color: #555;}
 .cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
 .cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
@@ -42,6 +41,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-quote {color: #090;}
 .cm-s-lesser-dark span.cm-hr {color: #999;}
 .cm-s-lesser-dark span.cm-link {color: #00c;}
+.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 
 .cm-s-lesser-dark .CodeMirror-activeline-background {background: #3C3A3A !important;}
 .cm-s-lesser-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/mbo.css b/theme/mbo.css
@@ -0,0 +1,35 @@
+/* Based on mbonaci's Brackets mbo theme */
+
+.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffe9;}
+.cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
+.cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
+.cm-s-mbo .CodeMirror-linenumber {color: #dadada;}
+.cm-s-mbo .CodeMirror-cursor {border-left: 1px solid #ffffec !important;}
+
+.cm-s-mbo span.cm-comment {color: #95958a;}
+.cm-s-mbo span.cm-atom {color: #00a8c6;}
+.cm-s-mbo span.cm-number {color: #00a8c6;}
+
+.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-variable {color: #ffffec;}
+.cm-s-mbo span.cm-variable-2 {color: #00a8c6;}
+.cm-s-mbo span.cm-def {color: #ffffec;}
+.cm-s-mbo span.cm-bracket {color: #fffffc; font-weight: bold;}
+.cm-s-mbo span.cm-tag {color: #9ddfe9;}
+.cm-s-mbo span.cm-link {color: #f54b07;}
+.cm-s-mbo span.cm-error {background: #636363; color: #ffffec;}
+
+.cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
+.cm-s-mbo .CodeMirror-matchingbracket {
+   text-decoration: underline;
+  color: #f5e107 !important;
+ }
+
+div.CodeMirror span.CodeMirror-searching {
+  background-color: none;
+  background: none;
+  box-shadow: 0 0 0 1px #ffffec;
+}
diff --git a/theme/midnight.css b/theme/midnight.css
@@ -32,10 +32,10 @@
 .cm-s-midnight span.cm-variable {color: #FFAA3E;}
 .cm-s-midnight span.cm-variable-2 {color: #FFAA3E;}
 .cm-s-midnight span.cm-def {color: #4DD;}
-.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
 .cm-s-midnight span.cm-bracket {color: #D1EDFF;}
 .cm-s-midnight span.cm-tag {color: #449;}
 .cm-s-midnight span.cm-link {color: #AE81FF;}
+.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
 
 .cm-s-midnight .CodeMirror-matchingbracket {
   text-decoration: underline;

diff --git a/theme/monokai.css b/theme/monokai.css
@@ -17,10 +17,10 @@
 .cm-s-monokai span.cm-variable {color: #a6e22e;}
 .cm-s-monokai span.cm-variable-2 {color: #9effff;}
 .cm-s-monokai span.cm-def {color: #fd971f;}
-.cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
 .cm-s-monokai span.cm-bracket {color: #f8f8f2;}
 .cm-s-monokai span.cm-tag {color: #f92672;}
 .cm-s-monokai span.cm-link {color: #ae81ff;}
+.cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
 
 .cm-s-monokai .CodeMirror-activeline-background {background: #373831 !important;}
 .cm-s-monokai .CodeMirror-matchingbracket {

diff --git a/theme/night.css b/theme/night.css
@@ -14,11 +14,11 @@
 .cm-s-night span.cm-meta { color: #7678e2; }
 .cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
 .cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
-.cm-s-night span.cm-error { color: #9d1e15; }
 .cm-s-night span.cm-bracket { color: #8da6ce; }
 .cm-s-night span.cm-comment { color: #6900a1; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
 .cm-s-night span.cm-link { color: #845dc4; }
+.cm-s-night span.cm-error { color: #9d1e15; }
 
 .cm-s-night .CodeMirror-activeline-background {background: #1C005A !important;}
 .cm-s-night .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
@@ -25,10 +25,10 @@
 .cm-s-paraiso-dark span.cm-variable {color: #48b685;}
 .cm-s-paraiso-dark span.cm-variable-2 {color: #06b6ef;}
 .cm-s-paraiso-dark span.cm-def {color: #f99b15;}
-.cm-s-paraiso-dark span.cm-error {background: #ef6155; color: #8d8687;}
 .cm-s-paraiso-dark span.cm-bracket {color: #b9b6b0;}
 .cm-s-paraiso-dark span.cm-tag {color: #ef6155;}
 .cm-s-paraiso-dark span.cm-link {color: #815ba4;}
+.cm-s-paraiso-dark span.cm-error {background: #ef6155; color: #8d8687;}
 
 .cm-s-paraiso-dark .CodeMirror-activeline-background {background: #4D344A !important;}
 .cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
@@ -25,10 +25,10 @@
 .cm-s-paraiso-light span.cm-variable {color: #48b685;}
 .cm-s-paraiso-light span.cm-variable-2 {color: #06b6ef;}
 .cm-s-paraiso-light span.cm-def {color: #f99b15;}
-.cm-s-paraiso-light span.cm-error {background: #ef6155; color: #776e71;}
 .cm-s-paraiso-light span.cm-bracket {color: #41323f;}
 .cm-s-paraiso-light span.cm-tag {color: #ef6155;}
 .cm-s-paraiso-light span.cm-link {color: #815ba4;}
+.cm-s-paraiso-light span.cm-error {background: #ef6155; color: #776e71;}
 
 .cm-s-paraiso-light .CodeMirror-activeline-background {background: #CFD1C4 !important;}
 .cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
@@ -14,10 +14,10 @@
 .cm-s-rubyblue span.cm-meta { color: #F0F; }
 .cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
 .cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
-.cm-s-rubyblue span.cm-error { color: #AF2018; }
 .cm-s-rubyblue span.cm-bracket { color: #F0F; }
 .cm-s-rubyblue span.cm-link { color: #F4C20B; }
 .cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
+.cm-s-rubyblue span.cm-error { color: #AF2018; }
 
 .cm-s-rubyblue .CodeMirror-activeline-background {background: #173047 !important;}
diff --git a/theme/solarized.css b/theme/solarized.css
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
@@ -16,11 +16,11 @@
 .cm-s-the-matrix span.cm-comment {color: #CCCCCC;}
 .cm-s-the-matrix span.cm-string {color: #39C;}
 .cm-s-the-matrix span.cm-meta {color: #C9F;}
-.cm-s-the-matrix span.cm-error {color: #FF0000;}
 .cm-s-the-matrix span.cm-qualifier {color: #FFF700;}
 .cm-s-the-matrix span.cm-builtin {color: #30a;}
 .cm-s-the-matrix span.cm-bracket {color: #cc7;}
 .cm-s-the-matrix span.cm-tag {color: #FFBD40;}
 .cm-s-the-matrix span.cm-attribute {color: #FFF700;}
+.cm-s-the-matrix span.cm-error {color: #FF0000;}
 
 .cm-s-the-matrix .CodeMirror-activeline-background {background: #040;}
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
@@ -25,10 +25,10 @@
 .cm-s-tomorrow-night-eighties span.cm-variable {color: #99cc99;}
 .cm-s-tomorrow-night-eighties span.cm-variable-2 {color: #6699cc;}
 .cm-s-tomorrow-night-eighties span.cm-def {color: #f99157;}
-.cm-s-tomorrow-night-eighties span.cm-error {background: #f2777a; color: #6A6A6A;}
 .cm-s-tomorrow-night-eighties span.cm-bracket {color: #CCCCCC;}
 .cm-s-tomorrow-night-eighties span.cm-tag {color: #f2777a;}
 .cm-s-tomorrow-night-eighties span.cm-link {color: #a16a94;}
+.cm-s-tomorrow-night-eighties span.cm-error {background: #f2777a; color: #6A6A6A;}
 
 .cm-s-tomorrow-night-eighties .CodeMirror-activeline-background {background: #343600 !important;}
 .cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/twilight.css b/theme/twilight.css
@@ -16,13 +16,13 @@
 .cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
 .cm-s-twilight .cm-string-2 { color:#bd6b18 } /*?*/
 .cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
-.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 .cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
 .cm-s-twilight .cm-tag { color: #997643; } /**/
 .cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
 .cm-s-twilight .cm-header { color: #FF6400; }
 .cm-s-twilight .cm-hr { color: #AEAEAE; }
 .cm-s-twilight .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
+.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 
 .cm-s-twilight .CodeMirror-activeline-background {background: #27282E !important;}
 .cm-s-twilight .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
@@ -18,13 +18,13 @@
 .cm-s-vibrant-ink .cm-string { color:  #A5C25C }
 .cm-s-vibrant-ink .cm-string-2 { color: red }
 .cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
-.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 .cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-header { color: #FF6400; }
 .cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
 .cm-s-vibrant-ink .cm-link { color: blue; }
+.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 
 .cm-s-vibrant-ink .CodeMirror-activeline-background {background: #27282E !important;}
 .cm-s-vibrant-ink .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
@@ -38,12 +38,12 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-comment {color: gray;}
 .cm-s-xq-dark span.cm-string {color: #9FEE00;}
 .cm-s-xq-dark span.cm-meta {color: yellow;}
-.cm-s-xq-dark span.cm-error {color: #f00;}
 .cm-s-xq-dark span.cm-qualifier {color: #FFF700;}
 .cm-s-xq-dark span.cm-builtin {color: #30a;}
 .cm-s-xq-dark span.cm-bracket {color: #cc7;}
 .cm-s-xq-dark span.cm-tag {color: #FFBD40;}
 .cm-s-xq-dark span.cm-attribute {color: #FFF700;}
+.cm-s-xq-dark span.cm-error {color: #f00;}
 
 .cm-s-xq-dark .CodeMirror-activeline-background {background: #27282E !important;}
 .cm-s-xq-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/xq-light.css b/theme/xq-light.css
@@ -32,12 +32,12 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-comment {color: #0080FF; font-style: italic;}
 .cm-s-xq-light span.cm-string {color: red;}
 .cm-s-xq-light span.cm-meta {color: yellow;}
-.cm-s-xq-light span.cm-error {color: #f00;}
 .cm-s-xq-light span.cm-qualifier {color: grey}
 .cm-s-xq-light span.cm-builtin {color: #7EA656;}
 .cm-s-xq-light span.cm-bracket {color: #cc7;}
 .cm-s-xq-light span.cm-tag {color: #3F7F7F;}
 .cm-s-xq-light span.cm-attribute {color: #7F007F;}
+.cm-s-xq-light span.cm-error {color: #f00;}
 
 .cm-s-xq-light .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-xq-light .CodeMirror-matchingbracket {outline:1px solid grey;color:black !important;background:yellow;}