diff --git a/lib/codemirror.css b/lib/codemirror.css
index ceacd130479081406dadee603d2c9fa859ed6471..b313b61c68d47a23b6c6b4e3e9c9db1af4a6bc6c 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -92,6 +92,15 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
 /* DEFAULT THEME */
 
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
 .cm-s-default .cm-keyword {color: #708;}
 .cm-s-default .cm-atom {color: #219;}
 .cm-s-default .cm-number {color: #164;}
@@ -111,18 +120,9 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-s-default .cm-bracket {color: #997;}
 .cm-s-default .cm-tag {color: #170;}
 .cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
 .cm-s-default .cm-hr {color: #999;}
 .cm-s-default .cm-link {color: #00c;}
 
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
 
diff --git a/theme/ambiance.css b/theme/ambiance.css
index afcf15a37af5bb3752a4f788d0886855a4ae850a..3ab9b254830272cdc9b3c68057b5baa154d2dc1b 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -2,6 +2,9 @@
 
 /* Color scheme */
 
+.cm-s-ambiance .cm-header {color: blue;}
+.cm-s-ambiance .cm-quote { color: #24C2C7; }
+
 .cm-s-ambiance .cm-keyword { color: #cda869; }
 .cm-s-ambiance .cm-atom { color: #CF7EA9; }
 .cm-s-ambiance .cm-number { color: #78CF8A; }
@@ -20,8 +23,6 @@
 .cm-s-ambiance .cm-bracket { color: #24C2C7; }
 .cm-s-ambiance .cm-tag { color: #fee4ff }
 .cm-s-ambiance .cm-attribute {  color: #9B859D; }
-.cm-s-ambiance .cm-header {color: blue;}
-.cm-s-ambiance .cm-quote { color: #24C2C7; }
 .cm-s-ambiance .cm-hr { color: pink; }
 .cm-s-ambiance .cm-link { color: #F4C20B; }
 .cm-s-ambiance .cm-special { color: #FF9D00; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index 25c7e0a2aad79e3edfc2028c45fcdbd754191a77..e20bf1259be394b5921b4b0a28fcf6a03cc6d7d1 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -8,6 +8,7 @@
 .cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 
+.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
 .cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
 .cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
 .cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
@@ -20,7 +21,6 @@
 .cm-s-erlang-dark span.cm-operator   { color: #d55; }
 .cm-s-erlang-dark span.cm-property   { color: #ccc; }
 .cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
-.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
 .cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
 .cm-s-erlang-dark span.cm-string     { color: #3ad900; }
 .cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 5af8b7f6271676d74cbecfd05f608e849d457106..88dff921916fd13854afab9e2f43efa43d0166eb 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -19,6 +19,8 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
 .cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
 
+.cm-s-lesser-dark span.cm-header {color: #a0a;}
+.cm-s-lesser-dark span.cm-quote {color: #090;}
 .cm-s-lesser-dark span.cm-keyword { color: #599eff; }
 .cm-s-lesser-dark span.cm-atom { color: #C2B470; }
 .cm-s-lesser-dark span.cm-number { color: #B35E4D; }
@@ -37,8 +39,6 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
 .cm-s-lesser-dark span.cm-tag { color: #669199; }
 .cm-s-lesser-dark span.cm-attribute {color: #00c;}
-.cm-s-lesser-dark span.cm-header {color: #a0a;}
-.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; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 9db395157990e6d49a8e1d961fc35517bfc1a73d..1f1dedac1010b5d2529136308883f66eaaef6a31 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -47,6 +47,8 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   text-shadow: none;
 }
 
+.cm-s-solarized .cm-header { color: #586e75; }
+.cm-s-solarized .cm-quote { color: #93a1a1; }
 
 .cm-s-solarized .cm-keyword { color: #cb4b16 }
 .cm-s-solarized .cm-atom { color: #d33682; }
@@ -73,8 +75,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
 .cm-s-solarized .cm-tag { color: #93a1a1 }
 .cm-s-solarized .cm-attribute {  color: #2aa198; }
-.cm-s-solarized .cm-header { color: #586e75; }
-.cm-s-solarized .cm-quote { color: #93a1a1; }
 .cm-s-solarized .cm-hr {
   color: transparent;
   border-top: 1px solid #586e75;
diff --git a/theme/ttcn.css b/theme/ttcn.css
index 959c0479683936d5a2419c6d839d773c0025547f..9c2e9a61d7e7b9ff3a53a7e9de98ea259b2b90cf 100644
--- a/theme/ttcn.css
+++ b/theme/ttcn.css
@@ -1,4 +1,12 @@
-/* DEFAULT THEME */
+.cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+.cm-header {color: #00f; font-weight: bold;}
+
 .cm-atom {color: #219;}
 .cm-attribute {color: #00c;}
 .cm-bracket {color: #997;}
@@ -6,7 +14,6 @@
 .cm-def {color: #00f;}
 .cm-em {font-style: italic;}
 .cm-error {color: #f00;}
-.cm-header {color: #00f; font-weight: bold;}
 .cm-hr {color: #999;}
 .cm-invalidchar {color: #f00;}
 .cm-keyword {font-weight:bold}
@@ -15,7 +22,6 @@
 .cm-negative {color: #d44;}
 .cm-positive {color: #292;}
 .cm-qualifier {color: #555;}
-.cm-quote {color: #090;}
 .cm-strikethrough {text-decoration: line-through;}
 .cm-string {color: #006400;}
 .cm-string-2 {color: #f50;}
@@ -25,13 +31,6 @@
 .cm-variable-2 {color: #05a;}
 .cm-variable-3 {color: #085;}
 
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}