Index: admin/js/codemirror/theme/abcdef.css
===================================================================
--- admin/js/codemirror/theme/abcdef.css	(revision 3251)
+++ admin/js/codemirror/theme/abcdef.css	(revision 3617)
@@ -15,5 +15,5 @@
 .cm-s-abcdef span.cm-variable { color: #abcdef; }
 .cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
-.cm-s-abcdef span.cm-variable-3 { color: #def; }
+.cm-s-abcdef span.cm-variable-3, .cm-s-abcdef span.cm-type { color: #def; }
 .cm-s-abcdef span.cm-property { color: #fedcba; }
 .cm-s-abcdef span.cm-operator { color: #ff0; }
Index: admin/js/codemirror/theme/ambiance.css
===================================================================
--- admin/js/codemirror/theme/ambiance.css	(revision 3251)
+++ admin/js/codemirror/theme/ambiance.css	(revision 3617)
@@ -12,5 +12,5 @@
 .cm-s-ambiance .cm-variable { color: #ffb795; }
 .cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
-.cm-s-ambiance .cm-variable-3 { color: #faded3; }
+.cm-s-ambiance .cm-variable-3, .cm-s-ambiance .cm-type { color: #faded3; }
 .cm-s-ambiance .cm-property { color: #eed1b3; }
 .cm-s-ambiance .cm-operator { color: #fa8d6a; }
Index: admin/js/codemirror/theme/cobalt.css
===================================================================
--- admin/js/codemirror/theme/cobalt.css	(revision 3251)
+++ admin/js/codemirror/theme/cobalt.css	(revision 3617)
@@ -16,5 +16,5 @@
 .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-variable-3, .cm-s-cobalt span.cm-def, .cm-s-cobalt .cm-type { color: white; }
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
Index: admin/js/codemirror/theme/colorforth.css
===================================================================
--- admin/js/codemirror/theme/colorforth.css	(revision 3251)
+++ admin/js/codemirror/theme/colorforth.css	(revision 3617)
@@ -16,5 +16,5 @@
 
 .cm-s-colorforth span.cm-variable-2  { color: #EEE; }
-.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
+.cm-s-colorforth span.cm-variable-3, .cm-s-colorforth span.cm-type { color: #DDD; }
 .cm-s-colorforth span.cm-property    {}
 .cm-s-colorforth span.cm-operator    {}
Index: admin/js/codemirror/theme/dracula.css
===================================================================
--- admin/js/codemirror/theme/dracula.css	(revision 3532)
+++ admin/js/codemirror/theme/dracula.css	(revision 3617)
@@ -35,5 +35,5 @@
 .cm-s-dracula span.cm-property { color: #66d9ef; }
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3 { color: #ffb86c; }
+.cm-s-dracula span.cm-variable-3, .cm-s-dracula span.cm-type { color: #ffb86c; }
 
 .cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
Index: admin/js/codemirror/theme/duotone-dark.css
===================================================================
--- admin/js/codemirror/theme/duotone-dark.css	(revision 3532)
+++ admin/js/codemirror/theme/duotone-dark.css	(revision 3617)
@@ -25,5 +25,5 @@
 .cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
 
-.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
+.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
 .cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
 .cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
Index: admin/js/codemirror/theme/duotone-light.css
===================================================================
--- admin/js/codemirror/theme/duotone-light.css	(revision 3532)
+++ admin/js/codemirror/theme/duotone-light.css	(revision 3617)
@@ -24,5 +24,5 @@
 .cm-s-duotone-light span.cm-positive { color: #896724; }
 
-.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
+.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
 .cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
 .cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
Index: admin/js/codemirror/theme/eclipse.css
===================================================================
--- admin/js/codemirror/theme/eclipse.css	(revision 3251)
+++ admin/js/codemirror/theme/eclipse.css	(revision 3617)
@@ -6,5 +6,5 @@
 .cm-s-eclipse span.cm-variable { color: black; }
 .cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
-.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3, .cm-s-eclipse span.cm-type { color: #0000C0; }
 .cm-s-eclipse span.cm-property { color: black; }
 .cm-s-eclipse span.cm-operator { color: black; }
Index: admin/js/codemirror/theme/erlang-dark.css
===================================================================
--- admin/js/codemirror/theme/erlang-dark.css	(revision 3251)
+++ admin/js/codemirror/theme/erlang-dark.css	(revision 3617)
@@ -28,5 +28,5 @@
 .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-variable-3, .cm-s-erlang-dark span.cm-type { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
Index: admin/js/codemirror/theme/icecoder.css
===================================================================
--- admin/js/codemirror/theme/icecoder.css	(revision 3251)
+++ admin/js/codemirror/theme/icecoder.css	(revision 3617)
@@ -12,5 +12,5 @@
 .cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
 .cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
-.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
+.cm-s-icecoder span.cm-variable-3, .cm-s-icecoder span.cm-type { color: #f9602c; } /* orange */
 
 .cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
Index: admin/js/codemirror/theme/lesser-dark.css
===================================================================
--- admin/js/codemirror/theme/lesser-dark.css	(revision 3251)
+++ admin/js/codemirror/theme/lesser-dark.css	(revision 3617)
@@ -28,5 +28,5 @@
 .cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
 .cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
+.cm-s-lesser-dark span.cm-variable-3, .cm-s-lesser-dark span.cm-type { color: white; }
 .cm-s-lesser-dark span.cm-property { color: #92A75C; }
 .cm-s-lesser-dark span.cm-operator { color: #92A75C; }
Index: admin/js/codemirror/theme/liquibyte.css
===================================================================
--- admin/js/codemirror/theme/liquibyte.css	(revision 3251)
+++ admin/js/codemirror/theme/liquibyte.css	(revision 3617)
@@ -37,5 +37,5 @@
 
 .cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable-3  { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable-3, .cm-s-liquibyte span.cm-type { color: #c080ff; font-weight: bold; }
 .cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
 .cm-s-liquibyte span.cm-operator    { color: #fff; }
@@ -60,8 +60,8 @@
 /* Scrollbars */
 /* Simple */
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div:hover {
 	background-color: rgba(80, 80, 80, .7);
 }
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
 	background-color: rgba(80, 80, 80, .3);
 	border: 1px solid #404040;
Index: admin/js/codemirror/theme/material.css
===================================================================
--- admin/js/codemirror/theme/material.css	(revision 3532)
+++ admin/js/codemirror/theme/material.css	(revision 3617)
@@ -28,5 +28,5 @@
 .cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
 .cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3 { color: #82B1FF; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #82B1FF; }
 .cm-s-material .cm-builtin { color: #DECB6B; }
 .cm-s-material .cm-atom { color: #F77669; }
@@ -42,5 +42,5 @@
 .cm-s-material .cm-property { color: #80CBAE; }
 .cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3 { color: #DECB6B; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #DECB6B; }
 .cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
 .cm-s-material .cm-error {
Index: admin/js/codemirror/theme/mdn-like.css
===================================================================
--- admin/js/codemirror/theme/mdn-like.css	(revision 3251)
+++ admin/js/codemirror/theme/mdn-like.css	(revision 3617)
@@ -22,5 +22,5 @@
 .cm-s-mdn-like .cm-def { color: #8DA6CE; }
 .cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
-.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; }
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def, .cm-s-mdn-like span.cm-type { color: #07a; }
 
 .cm-s-mdn-like .cm-variable { color: #07a; }
Index: admin/js/codemirror/theme/midnight.css
===================================================================
--- admin/js/codemirror/theme/midnight.css	(revision 3251)
+++ admin/js/codemirror/theme/midnight.css	(revision 3617)
@@ -12,6 +12,4 @@
     color: #D1EDFF;
 }
-
-.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
 
 .cm-s-midnight div.CodeMirror-selected { background: #314D67; }
Index: admin/js/codemirror/theme/monokai.css
===================================================================
--- admin/js/codemirror/theme/monokai.css	(revision 3251)
+++ admin/js/codemirror/theme/monokai.css	(revision 3617)
@@ -22,5 +22,5 @@
 .cm-s-monokai span.cm-variable { color: #f8f8f2; }
 .cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
+.cm-s-monokai span.cm-variable-3, .cm-s-monokai span.cm-type { color: #66d9ef; }
 .cm-s-monokai span.cm-def { color: #fd971f; }
 .cm-s-monokai span.cm-bracket { color: #f8f8f2; }
Index: admin/js/codemirror/theme/night.css
===================================================================
--- admin/js/codemirror/theme/night.css	(revision 3251)
+++ admin/js/codemirror/theme/night.css	(revision 3617)
@@ -18,5 +18,5 @@
 .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-variable-3, .cm-s-night span.cm-def, .cm-s-night span.cm-type { color: white; }
 .cm-s-night span.cm-bracket { color: #8da6ce; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
Index: admin/js/codemirror/theme/panda-syntax.css
===================================================================
--- admin/js/codemirror/theme/panda-syntax.css	(revision 3532)
+++ admin/js/codemirror/theme/panda-syntax.css	(revision 3617)
@@ -53,5 +53,5 @@
 	color: #ff9ac1;
 }
-.cm-s-panda-syntax .cm-variable-3 {
+.cm-s-panda-syntax .cm-variable-3, .cm-s-panda-syntax .cm-type {
 	color: #ff9ac1;
 }
Index: admin/js/codemirror/theme/pastel-on-dark.css
===================================================================
--- admin/js/codemirror/theme/pastel-on-dark.css	(revision 3532)
+++ admin/js/codemirror/theme/pastel-on-dark.css	(revision 3617)
@@ -35,5 +35,5 @@
 .cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
 .cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
-.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-variable-3, .cm-s-pastel-on-dark span.cm-type { color: #DE8E30; }
 .cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
 .cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
Index: admin/js/codemirror/theme/rubyblue.css
===================================================================
--- admin/js/codemirror/theme/rubyblue.css	(revision 3251)
+++ admin/js/codemirror/theme/rubyblue.css	(revision 3617)
@@ -16,5 +16,5 @@
 .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-variable-3, .cm-s-rubyblue span.cm-def, .cm-s-rubyblue span.cm-type { color: white; }
 .cm-s-rubyblue span.cm-bracket { color: #F0F; }
 .cm-s-rubyblue span.cm-link { color: #F4C20B; }
Index: admin/js/codemirror/theme/seti.css
===================================================================
--- admin/js/codemirror/theme/seti.css	(revision 3251)
+++ admin/js/codemirror/theme/seti.css	(revision 3617)
@@ -39,5 +39,5 @@
 .cm-s-seti span.cm-qualifier { color: #9fca56; }
 .cm-s-seti span.cm-property { color: #a074c4; }
-.cm-s-seti span.cm-variable-3 { color: #9fca56; }
+.cm-s-seti span.cm-variable-3, .cm-s-seti span.cm-type { color: #9fca56; }
 .cm-s-seti span.cm-builtin { color: #9fca56; }
 .cm-s-seti .CodeMirror-activeline-background { background: #101213; }
Index: admin/js/codemirror/theme/solarized.css
===================================================================
--- admin/js/codemirror/theme/solarized.css	(revision 3532)
+++ admin/js/codemirror/theme/solarized.css	(revision 3617)
@@ -58,5 +58,5 @@
 .cm-s-solarized .cm-variable { color: #839496; }
 .cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
+.cm-s-solarized .cm-variable-3, .cm-s-solarized .cm-type { color: #6c71c4; }
 
 .cm-s-solarized .cm-property { color: #2aa198; }
@@ -88,5 +88,4 @@
   text-decoration-style: dotted;
 }
-.cm-s-solarized .cm-strong { color: #eee; }
 .cm-s-solarized .cm-error,
 .cm-s-solarized .cm-invalidchar {
Index: admin/js/codemirror/theme/the-matrix.css
===================================================================
--- admin/js/codemirror/theme/the-matrix.css	(revision 3251)
+++ admin/js/codemirror/theme/the-matrix.css	(revision 3617)
@@ -15,5 +15,5 @@
 .cm-s-the-matrix span.cm-variable { color: #F6C; }
 .cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
-.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
+.cm-s-the-matrix span.cm-variable-3, .cm-s-the-matrix span.cm-type { color: #96F; }
 .cm-s-the-matrix span.cm-property { color: #62FFA0; }
 .cm-s-the-matrix span.cm-operator { color: #999; }
Index: admin/js/codemirror/theme/ttcn.css
===================================================================
--- admin/js/codemirror/theme/ttcn.css	(revision 3251)
+++ admin/js/codemirror/theme/ttcn.css	(revision 3617)
@@ -30,5 +30,5 @@
 .cm-s-ttcn .cm-variable { color: #8B2252; }
 .cm-s-ttcn .cm-variable-2 { color: #05a; }
-.cm-s-ttcn .cm-variable-3 { color: #085; }
+.cm-s-ttcn .cm-variable-3, .cm-s-ttcn .cm-type { color: #085; }
 
 .cm-s-ttcn .cm-invalidchar { color: #f00; }
Index: admin/js/codemirror/theme/twilight.css
===================================================================
--- admin/js/codemirror/theme/twilight.css	(revision 3251)
+++ admin/js/codemirror/theme/twilight.css	(revision 3617)
@@ -15,5 +15,5 @@
 .cm-s-twilight .cm-def { color: #8DA6CE; }
 .cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def, .cm-s-twilight span.cm-type { color: #607392; } /**/
 .cm-s-twilight .cm-operator { color: #cda869; } /**/
 .cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
Index: admin/js/codemirror/theme/vibrant-ink.css
===================================================================
--- admin/js/codemirror/theme/vibrant-ink.css	(revision 3251)
+++ admin/js/codemirror/theme/vibrant-ink.css	(revision 3617)
@@ -17,5 +17,5 @@
 .cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
 .cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def, .cm-s-vibrant span.cm-type { color: #FFC66D; }
 .cm-s-vibrant-ink .cm-operator { color: #888; }
 .cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
Index: admin/js/codemirror/theme/xq-dark.css
===================================================================
--- admin/js/codemirror/theme/xq-dark.css	(revision 3251)
+++ admin/js/codemirror/theme/xq-dark.css	(revision 3617)
@@ -37,5 +37,5 @@
 .cm-s-xq-dark span.cm-variable { color: #FFF; }
 .cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
-.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
+.cm-s-xq-dark span.cm-variable-3, .cm-s-xq-dark span.cm-type { color: #DDD; }
 .cm-s-xq-dark span.cm-property {}
 .cm-s-xq-dark span.cm-operator {}
Index: admin/js/codemirror/theme/xq-light.css
===================================================================
--- admin/js/codemirror/theme/xq-light.css	(revision 3251)
+++ admin/js/codemirror/theme/xq-light.css	(revision 3617)
@@ -27,5 +27,5 @@
 .cm-s-xq-light span.cm-variable { color: black; }
 .cm-s-xq-light span.cm-variable-2 { color:black; }
-.cm-s-xq-light span.cm-variable-3 { color: black; }
+.cm-s-xq-light span.cm-variable-3, .cm-s-xq-light span.cm-type { color: black; }
 .cm-s-xq-light span.cm-property {}
 .cm-s-xq-light span.cm-operator {}
Index: admin/js/codemirror/theme/yeti.css
===================================================================
--- admin/js/codemirror/theme/yeti.css	(revision 3251)
+++ admin/js/codemirror/theme/yeti.css	(revision 3617)
@@ -40,5 +40,5 @@
 .cm-s-yeti span.cm-property { color: #a074c4; }
 .cm-s-yeti span.cm-builtin { color: #a074c4; }
-.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
+.cm-s-yeti span.cm-variable-3, .cm-s-yeti span.cm-type { color: #96c0d8; }
 .cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
 .cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
