diff --git a/ghost/admin/assets/sass/layouts/editor.scss b/ghost/admin/assets/sass/layouts/editor.scss
index 8f0cf0edc0..e3b1f1978c 100644
--- a/ghost/admin/assets/sass/layouts/editor.scss
+++ b/ghost/admin/assets/sass/layouts/editor.scss
@@ -256,7 +256,7 @@
     }
 
     .cm-header {
-        color: #000;
+        color: #3c4043;
         font-size: 1.4em;
         line-height: 1.4em;
         font-weight: bold;
@@ -268,18 +268,22 @@
         color: lighten($darkgrey, 10%);
     }
 
-    .cm-string,
+
     .cm-strong,
-    .cm-link,
     .cm-comment,
     .cm-quote,
     .cm-number,
     .cm-atom,
     .cm-tag {
-        color: #000;
+        color: #3c4043;
         font-weight: bold;
     }
 
+    .cm-string,
+    .cm-link {
+        color: #3c4043;
+    }
+
     .entry-preview {
         // Align the tab of entry-preview on the right
         .floatingheader {
@@ -370,6 +374,10 @@
         text-decoration: underline;
     }
 
+    sup a {
+        text-decoration: none;
+    }
+
     .btn {
         text-decoration: none;
         color: $grey;
diff --git a/ghost/admin/assets/sass/vendor/codemirror.scss b/ghost/admin/assets/sass/vendor/codemirror.scss
index 5720405aeb..c72b327720 100644
--- a/ghost/admin/assets/sass/vendor/codemirror.scss
+++ b/ghost/admin/assets/sass/vendor/codemirror.scss
@@ -55,16 +55,16 @@
 .cm-s-default .cm-atom {color: #219;}
 .cm-s-default .cm-number {color: #164;}
 .cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable {color: black;}
+.cm-s-default .cm-variable {color: #3c4043;}
 .cm-s-default .cm-variable-2 {color: #05a;}
 .cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-property {color: black;}
-.cm-s-default .cm-operator {color: black;}
+.cm-s-default .cm-property {color: #3c4043;}
+.cm-s-default .cm-operator {color: #3c4043;}
 .cm-s-default .cm-comment {color: #a50;}
 .cm-s-default .cm-string {color: #a11;}
 .cm-s-default .cm-string-2 {color: #f50;}
 .cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-error {color: #f00;}
+.cm-s-default .cm-error {color: #3c4043;}
 .cm-s-default .cm-qualifier {color: #555;}
 .cm-s-default .cm-builtin {color: #30a;}
 .cm-s-default .cm-bracket {color: #997;}