diff --git a/editions/codemirrordemo/tiddlers/cm-theme-tiddlywiki.tid b/editions/codemirrordemo/tiddlers/cm-theme-tiddlywiki.tid
deleted file mode 100644
index 501b20b9a..000000000
--- a/editions/codemirrordemo/tiddlers/cm-theme-tiddlywiki.tid
+++ /dev/null
@@ -1,56 +0,0 @@
-title: $:/themes/codemirror/tiddlywiki
-tags: $:/tags/Stylesheet
-module-type: codemirror-theme
-name: tiddlywiki
-
-.cm-s-tiddlywiki {
-	font-size: 1em;
-	line-height: 1.5em;
-	letter-spacing: 0.3px;
-	word-spacing: 1px;
-	background: <<colour page-background>>;
-	color: <<colour foreground>>;
-}
-.cm-s-tiddlywiki .CodeMirror-lines {
-	padding: 8px 0;
-}
-.cm-s-tiddlywiki .CodeMirror-gutters {
-	background-color: <<colour page-background>>;
-	padding-right: 10px;
-	z-index: 3;
-	border: none;
-}
-.cm-s-tiddlywiki div.CodeMirror-cursor {
-	border-left: 3px solid <<colour very-muted-foreground>>;
-}
-.cm-s-tiddlywiki .CodeMirror-activeline-background {
-	background: <<colour tiddler-editor-fields-even>>;
-}
-.cm-s-tiddlywiki .CodeMirror-selected {
-	background: <<colour muted-foreground>>;
-}
-.cm-s-tiddlywiki .cm-comment {
-	font-style: italic;
-	color: <<colour muted-foreground>>;
-}
-.cm-s-tiddlywiki .CodeMirror-linenumber {
-	color: italic;
-}
-
-.cm-s-tiddlywiki span.cm-atom, .cm-s-tiddlywiki span.cm-number, .cm-s-tiddlywiki span.cm-keyword, .cm-s-tiddlywiki span.cm-variable, .cm-s-tiddlywiki span.cm-attribute, .cm-s-tiddlywiki span.cm-quote, .cm-s-tiddlywiki-light span.cm-hr, .cm-s-tiddlywiki-light span.cm-link { color: #063289; }
-
-.cm-s-tiddlywiki span.cm-property { color: #b29762; }
-.cm-s-tiddlywiki span.cm-punctuation, .cm-s-tiddlywiki span.cm-unit, .cm-s-tiddlywiki span.cm-negative { color: #063289; }
-.cm-s-tiddlywiki span.cm-string, .cm-s-tiddlywiki span.cm-operator { color: #1659df; }
-.cm-s-tiddlywiki span.cm-positive { color: #896724; }
-
-.cm-s-tiddlywiki span.cm-variable-2, .cm-s-tiddlywiki span.cm-variable-3, .cm-s-tiddlywiki span.cm-type, .cm-s-tiddlywiki span.cm-string-2, .cm-s-tiddlywiki span.cm-url { color: #896724; }
-.cm-s-tiddlywiki span.cm-def, .cm-s-tiddlywiki span.cm-tag, .cm-s-tiddlywiki span.cm-builtin, .cm-s-tiddlywiki span.cm-qualifier, .cm-s-tiddlywiki span.cm-header, .cm-s-tiddlywiki span.cm-em { color: #2d2006; }
-.cm-s-tiddlywiki span.cm-bracket, .cm-s-tiddlywiki span.cm-comment { color: #b6ad9a; }
-
-/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
-/* .cm-s-tiddlywiki span.cm-error { background: #896724; color: #728fcb; } */
-.cm-s-tiddlywiki span.cm-error, .cm-s-tiddlywiki span.cm-invalidchar { color: #f00; }
-
-.cm-s-tiddlywiki span.cm-header { font-weight: normal; }
-.cm-s-tiddlywiki .CodeMirror-matchingbracket { text-decoration: underline; color: #faf8f5 !important; }
diff --git a/plugins/tiddlywiki/codemirror/config/theme.tid b/plugins/tiddlywiki/codemirror/config/theme.tid
index 66eb3fce0..e0e25ba37 100644
--- a/plugins/tiddlywiki/codemirror/config/theme.tid
+++ b/plugins/tiddlywiki/codemirror/config/theme.tid
@@ -1,3 +1,3 @@
 title: $:/config/codemirror/theme
 type: string
-text: default
+text: tiddlywiki
diff --git a/plugins/tiddlywiki/codemirror/styles.tid b/plugins/tiddlywiki/codemirror/styles.tid
index 869521839..135584b2a 100755
--- a/plugins/tiddlywiki/codemirror/styles.tid
+++ b/plugins/tiddlywiki/codemirror/styles.tid
@@ -1,5 +1,7 @@
 title: $:/plugins/tiddlywiki/codemirror/styles
 tags: [[$:/tags/Stylesheet]]
+module-type: codemirror-theme
+name: tiddlywiki
 
 /* Make the editor resize to fit its content */
 
@@ -13,5 +15,81 @@ tags: [[$:/tags/Stylesheet]]
 
 .CodeMirror-scroll {
 	overflow-x: auto;
-	overflow-y: hidden;	
+	overflow-y: hidden;
+}
+
+.cm-s-tiddlywiki {
+  color-profile: sRGB;
+  rendering-intent: auto;
+}
+
+.cm-s-tiddlywiki.CodeMirror, .cm-s-tiddlywiki .CodeMirror-gutters { background-color: <<colour tiddler-editor-background>>; color: <<colour foreground>>; }
+.cm-s-tiddlywiki .CodeMirror-gutters {background: <<colour tiddler-editor-background>>; border-right: 0px;}
+.cm-s-tiddlywiki .CodeMirror-linenumber {color: <<colour primary>>;}
+.cm-s-tiddlywiki .CodeMirror-cursor { border-left: 2px solid <<colour foreground>>; }
+.cm-s-tiddlywiki div.CodeMirror-selected { background: <<colour selection-background>>; }
+.cm-s-tiddlywiki .CodeMirror-selectedtext,
+.cm-s-tiddlywiki .CodeMirror-selected,
+.cm-s-tiddlywiki .CodeMirror-line::selection,
+.cm-s-tiddlywiki .CodeMirror-line > span::selection,
+.cm-s-tiddlywiki .CodeMirror-line > span > span::selection,
+.cm-s-tiddlywiki .CodeMirror-line::-moz-selection,
+.cm-s-tiddlywiki .CodeMirror-line > span::-moz-selection,
+.cm-s-tiddlywiki .CodeMirror-line > span > span::-moz-selection { background: <<colour selection-background>>; }
+.cm-s-tiddlywiki span.cm-comment { color: <<colour muted-foreground>>; font-style:italic; font-weight:normal; }
+.cm-s-tiddlywiki .CodeMirror-activeline-background, .cm-s-tiddlywiki .CodeMirror-activeline-gutter .CodeMirror-linenumber { background: <<colour background>>; }
+.cm-s-tiddlywiki .CodeMirror-activeline .CodeMirror-linenumber.CodeMirror-gutter-elt { background: <<colour background>>; color: <<colour foreground>>; }
+.cm-s-tiddlywiki .CodeMirror-matchingbracket { background: <<colour primary>>; color:<<colour foreground>> !important; }
+.cm-s-tiddlywiki span.cm-matchhighlight { color: <<colour foreground>>; background-color: <<colour primary>>; font-weight: normal;}
+.cm-s-tiddlywiki span.cm-searching { color: <<colour foreground>>; background-color: <<colour primary>>; font-weight: normal;}
+
+
+.cm-s-tiddlywiki .CodeMirror-widget {
+  text-shadow: none;
+}
+
+.cm-s-tiddlywiki .cm-header { color: #586e75; }
+.cm-s-tiddlywiki .cm-quote { color: #93a1a1; }
+
+.cm-s-tiddlywiki .cm-keyword { color: #cb4b16; }
+.cm-s-tiddlywiki .cm-atom { color: #d33682; }
+.cm-s-tiddlywiki .cm-number { color: #d33682; }
+.cm-s-tiddlywiki .cm-def { color: #2aa198; }
+
+.cm-s-tiddlywiki .cm-variable { color: #839496; }
+.cm-s-tiddlywiki .cm-variable-2 { color: #b58900; }
+.cm-s-tiddlywiki .cm-variable-3, .cm-s-tiddlywiki .cm-type { color: #6c71c4; }
+
+.cm-s-tiddlywiki .cm-property { color: #2aa198; }
+.cm-s-tiddlywiki .cm-operator { color: #6c71c4; }
+
+.cm-s-tiddlywiki .cm-comment { color: #586e75; font-style:italic; }
+
+.cm-s-tiddlywiki .cm-string { color: #859900; }
+.cm-s-tiddlywiki .cm-string-2 { color: #b58900; }
+
+.cm-s-tiddlywiki .cm-meta { color: #859900; }
+.cm-s-tiddlywiki .cm-qualifier { color: #b58900; }
+.cm-s-tiddlywiki .cm-builtin { color: #d33682; }
+.cm-s-tiddlywiki .cm-bracket { color: #cb4b16; }
+.cm-s-tiddlywiki .CodeMirror-matchingbracket { color: #859900; }
+.cm-s-tiddlywiki .CodeMirror-nonmatchingbracket { color: #dc322f; }
+.cm-s-tiddlywiki .cm-tag { color: #93a1a1; }
+.cm-s-tiddlywiki .cm-attribute { color: #2aa198; }
+.cm-s-tiddlywiki .cm-hr {
+  color: transparent;
+  border-top: 1px solid #586e75;
+  display: block;
+}
+.cm-s-tiddlywiki .cm-link { color: #93a1a1; cursor: pointer; }
+.cm-s-tiddlywiki .cm-special { color: #6c71c4; }
+.cm-s-tiddlywiki .cm-em {
+  color: #999;
+  text-decoration: underline;
+  text-decoration-style: dotted;
+}
+.cm-s-tiddlywiki .cm-error,
+.cm-s-tiddlywiki .cm-invalidchar {
+  color: #586e75;
+  border-bottom: 1px dotted #dc322f;
 }
diff --git a/plugins/tiddlywiki/highlight/styles.tid b/plugins/tiddlywiki/highlight/styles.tid
index 1e55917ed..ac22a85b4 100644
--- a/plugins/tiddlywiki/highlight/styles.tid
+++ b/plugins/tiddlywiki/highlight/styles.tid
@@ -1,4 +1,82 @@
 title: $:/plugins/tiddlywiki/highlight/styles
 tags: [[$:/tags/Stylesheet]]
 
-.hljs{display:block;overflow-x:auto;padding:.5em;color:#333;background:#f8f8f8;-webkit-text-size-adjust:none}.hljs-comment,.diff .hljs-header,.hljs-javadoc{color:#998;font-style:italic}.hljs-keyword,.css .rule .hljs-keyword,.hljs-winutils,.nginx .hljs-title,.hljs-subst,.hljs-request,.hljs-status{color:#333;font-weight:bold}.hljs-number,.hljs-hexcolor,.ruby .hljs-constant{color:teal}.hljs-string,.hljs-tag .hljs-value,.hljs-phpdoc,.hljs-dartdoc,.tex .hljs-formula{color:#d14}.hljs-title,.hljs-id,.scss .hljs-preprocessor{color:#900;font-weight:bold}.hljs-list .hljs-keyword,.hljs-subst{font-weight:normal}.hljs-class .hljs-title,.hljs-type,.vhdl .hljs-literal,.tex .hljs-command{color:#458;font-weight:bold}.hljs-tag,.hljs-tag .hljs-title,.hljs-rule .hljs-property,.django .hljs-tag .hljs-keyword{color:navy;font-weight:normal}.hljs-attribute,.hljs-variable,.lisp .hljs-body,.hljs-name{color:teal}.hljs-regexp{color:#009926}.hljs-symbol,.ruby .hljs-symbol .hljs-string,.lisp .hljs-keyword,.clojure .hljs-keyword,.scheme .hljs-keyword,.tex .hljs-special,.hljs-prompt{color:#990073}.hljs-built_in{color:#0086b3}.hljs-preprocessor,.hljs-pragma,.hljs-pi,.hljs-doctype,.hljs-shebang,.hljs-cdata{color:#999;font-weight:bold}.hljs-deletion{background:#fdd}.hljs-addition{background:#dfd}.diff .hljs-change{background:#0086b3}.hljs-chunk{color:#aaa}
\ No newline at end of file
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: <<colour tiddler-editor-background>>;
+  color: <<colour foreground>>;
+  -webkit-text-size-adjust:none
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #93a1a1;
+}
+
+/* Solarized Green */
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-addition {
+  color: #859900;
+}
+
+/* Solarized Cyan */
+.hljs-number,
+.hljs-string,
+.hljs-meta .hljs-meta-string,
+.hljs-literal,
+.hljs-doctag,
+.hljs-regexp {
+  color: #2aa198;
+}
+
+/* Solarized Blue */
+.hljs-title,
+.hljs-section,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #268bd2;
+}
+
+/* Solarized Yellow */
+.hljs-attribute,
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-class .hljs-title,
+.hljs-type {
+  color: #b58900;
+}
+
+/* Solarized Orange */
+.hljs-symbol,
+.hljs-bullet,
+.hljs-subst,
+.hljs-meta,
+.hljs-meta .hljs-keyword,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-link {
+  color: #cb4b16;
+}
+
+/* Solarized Red */
+.hljs-built_in,
+.hljs-deletion {
+  color: #dc322f;
+}
+
+.hljs-formula {
+  background: #eee8d5;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}