2 files changed, 9 insertions, 14 deletions
diff --git a/web_src/less/_editor.less b/web_src/less/_editor.less
index bb69960646..82a7153c7b 100644
--- a/web_src/less/_editor.less
+++ b/web_src/less/_editor.less
@@ -1,6 +1,13 @@
-.CodeMirror {
+.EasyMDEContainer .CodeMirror {
+  color: var(--color-input-text);
+  background-color: var(--color-input-background);
+  border-color: var(--color-secondary);
   font: 14px var(--fonts-monospace);
 
+  .CodeMirror-cursor {
+    border-left: 1px solid var(--color-input-text);
+  }
+
   &.cm-s-default {
     border-radius: 3px;
     padding: 0 !important;
@@ -27,6 +34,7 @@
 
 .editor-toolbar {
   opacity: 1 !important;
+  border-color: var(--color-secondary);
 }
 
 .editor-toolbar button:not(:hover) {
diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less
index 49a86de99d..2d097a6553 100644
--- a/web_src/less/themes/theme-arc-green.less
+++ b/web_src/less/themes/theme-arc-green.less
@@ -1267,19 +1267,6 @@ a.blob-excerpt:hover {
 /* code mirror dark theme */
 
 .CodeMirror {
-  color: #9daccc;
-  background-color: #2e323e;
-  border-color: var(--color-secondary);
-  border-top: 0;
-
-  div.CodeMirror-cursor {
-    border-left: 1px solid var(--color-secondary-dark-6);
-  }
-
-  .CodeMirror-gutters {
-    background-color: #2e323e;
-  }
-
   &.cm-s-default,
   &.cm-s-paper {
     .cm-property {