diff --git a/src/main/scss/form/_codemirror.scss b/src/main/scss/form/_codemirror.scss
index fb14e6bb9fe6..24081f3d4df1 100644
--- a/src/main/scss/form/_codemirror.scss
+++ b/src/main/scss/form/_codemirror.scss
@@ -14,7 +14,6 @@
   // Override the defaults of codemirror.css
   pre {
     font-family: var(--font-family-mono) !important;
-    font-weight: 500 !important;
     line-height: 1.66 !important;
   }
 
@@ -35,10 +34,6 @@
     outline: none;
   }
 
-  .cm-variable {
-    color: var(--text-color) !important;
-  }
-
   .CodeMirror-selected {
     background-color: var(--selection-color) !important;
   }
@@ -51,6 +46,127 @@
     padding: 0.5rem calc(0.625rem * 0.5) 0.625rem 0.5rem;
     color: var(--text-color-secondary);
   }
+
+  .CodeMirror-gutter {
+    background: transparent;
+    border-right: none;
+  }
+
+  .CodeMirror-cursor {
+    border-left-color: var(--text-color) !important;
+  }
+
+  .cm-property {
+    color: var(--text-color) !important;
+  }
+
+  .CodeMirror-matchingbracket {
+    color: var(--green) !important;
+  }
+
+  .cm-keyword {
+    color: var(--purple) !important;
+  }
+
+  .cm-atom {
+    color: var(--blue) !important;
+  }
+
+  .cm-number {
+    color: var(--green) !important;
+  }
+
+  .cm-def {
+    color: var(--blue) !important;
+  }
+
+  .cm-variable {
+    color: var(--text-color) !important;
+  }
+
+  .cm-variable-2 {
+    color: var(--blue) !important;
+  }
+
+  .cm-variable-3 {
+    color: var(--green) !important;
+  }
+
+  .cm-operator {
+    color: var(--text-color) !important;
+  }
+
+  .cm-comment {
+    color: var(--text-color-secondary) !important;
+  }
+
+  .cm-string {
+    color: var(--green) !important;
+  }
+
+  .cm-string-2 {
+    color: var(--orange) !important;
+  }
+
+  .cm-meta {
+    color: var(--text-color-secondary) !important;
+  }
+
+  .cm-error {
+    color: var(--error-color) !important;
+  }
+
+  .cm-qualifier {
+    color: var(--text-color-secondary) !important;
+  }
+
+  .cm-builtin {
+    color: var(--blue) !important;
+  }
+
+  .cm-bracket {
+    color: var(--text-color-secondary) !important;
+  }
+
+  .cm-tag {
+    color: var(--green) !important;
+  }
+
+  .cm-attribute {
+    color: var(--blue) !important;
+  }
+
+  .cm-header {
+    color: var(--blue) !important;
+  }
+
+  .cm-quote {
+    color: var(--green) !important;
+  }
+
+  .cm-hr {
+    color: var(--text-color-secondary) !important;
+  }
+
+  .cm-link {
+    color: var(--link-color) !important;
+  }
+
+  .cm-negative {
+    color: var(--red) !important;
+  }
+
+  .cm-positive {
+    color: var(--green) !important;
+  }
+
+  .cm-invalidchar {
+    color: var(--red) !important;
+  }
+
+  .CodeMirror-nonmatchingbracket {
+    color: var(--red) !important;
+  }
 }
 
 .jenkins-codemirror-resizer {