diff --git a/src/css/codemirror.css b/src/css/codemirror.css
index 7e95eb5ce..9c5f184c2 100644
--- a/src/css/codemirror.css
+++ b/src/css/codemirror.css
@@ -5,7 +5,9 @@
     position: relative;
     }
 .CodeMirror {
+    background-color: var(--default-surface);
     box-sizing: border-box;
+    color: var(--default-ink);
     flex-grow: 1;
     height: 100%;
     width: 100%;
@@ -23,6 +25,7 @@
     }
 
 /* CodeMirror theme overrides */
+.cm-s-default .cm-variable { color: var(--sf-variable-ink); }
 .cm-s-default .cm-value { color: #930; }
 .cm-s-default .cm-comment { color: var(--sf-comment-ink); }
 .cm-s-default .cm-keyword { color: #90b; }
diff --git a/src/css/popup-fenix.css b/src/css/popup-fenix.css
index cd0762f59..20452d82a 100644
--- a/src/css/popup-fenix.css
+++ b/src/css/popup-fenix.css
@@ -24,7 +24,8 @@
     opacity: 0;
     }
 a {
-    color: inherit;
+    color: var(--default-ink);
+    fill: var(--default-ink);
     text-decoration: none;
     }
 :focus {
diff --git a/src/css/themes/default.css b/src/css/themes/default.css
index 0424488b5..ba01adb7a 100644
--- a/src/css/themes/default.css
+++ b/src/css/themes/default.css
@@ -161,8 +161,11 @@
     --popup-icon-x-ink: var(--red-60);
 
     /* syntax highlight: static filtering */
+    --sf-variable-ink: var(--default-ink);
     --sf-comment-ink: var(--light-gray-90);
     --sf-warning-ink: var(--yellow-50);
+
+    /* syntax highlight: dynamic filtering */
 }
 
 /**
@@ -259,7 +262,6 @@
     --bg-tooltip: var(--dark-gray-50);
     --fg-tooltip: var(--light-gray-30);
     --bg-popup-cell-1: var(--dark-gray-50);
-    --popup-power-ink: var(--violet-70);
     --popup-power-disabled-ink: var(--light-gray-60);
     --popup-power-ink-hover: var(--dark-gray-30);
     --bg-popup-cell-2: var(--dark-gray-50);