4 files changed, 16 insertions, 4 deletions
diff --git a/devtools/client/themes/dark-theme.css b/devtools/client/themes/dark-theme.css
index 8433bc75c4..cd1b58e36e 100644
--- a/devtools/client/themes/dark-theme.css
+++ b/devtools/client/themes/dark-theme.css
@@ -261,12 +261,16 @@ div.CodeMirror span.marked-text {
 }
 
 
-.cm-s-mozilla .empty-line .CodeMirror-linenumber {
+.cm-s-mozilla .empty-line .CodeMirror-linenumber,
+/* Codemirror 6 */
+.cm-editor .cm-gutterElement.empty-line {
   color: var(--grey-50);
 }
 
 /* Blackboxing lines */
-.CodeMirror-lines .blackboxed-line :is(span, .cm-comment, .CodeMirror-gutter-elt) {
+.CodeMirror-lines .blackboxed-line :is(span, .cm-comment, .CodeMirror-gutter-elt),
+/* Codemirror 6 */
+.cm-gutterElement.blackboxed-line, .cm-line.blackboxed-line span[class^="tok-"] {
   color: #806414cc;
 }
 
diff --git a/toolkit/themes/shared/icons/whatsnew.svg b/devtools/client/themes/images/whatsnew.svg
index b77d0165a6..b77d0165a6 100644
--- a/toolkit/themes/shared/icons/whatsnew.svg
+++ b/devtools/client/themes/images/whatsnew.svg
diff --git a/devtools/client/themes/light-theme.css b/devtools/client/themes/light-theme.css
index d54bfffef3..979999bd31 100644
--- a/devtools/client/themes/light-theme.css
+++ b/devtools/client/themes/light-theme.css
@@ -248,12 +248,16 @@ div.CodeMirror span.marked-text {
   margin-inline-end: -1px;
 }
 
-.cm-s-mozilla .empty-line .CodeMirror-linenumber {
+.cm-s-mozilla .empty-line .CodeMirror-linenumber,
+/* Codemirror 6 */
+.cm-editor .cm-gutterElement.empty-line {
   color: var(--grey-40);
 }
 
 /* Blackboxing lines */
-.CodeMirror-lines .blackboxed-line :is(span, .cm-comment, .CodeMirror-gutter-elt) {
+.CodeMirror-lines .blackboxed-line :is(span, .cm-comment, .CodeMirror-gutter-elt),
+/* Codemirror 6 */
+.cm-gutterElement.blackboxed-line, .cm-line.blackboxed-line span[class^="tok-"] {
   color: #806414cc;
 }
 
diff --git a/devtools/client/themes/rules.css b/devtools/client/themes/rules.css
index 72ca35fff7..c3079e3d62 100644
--- a/devtools/client/themes/rules.css
+++ b/devtools/client/themes/rules.css
@@ -825,6 +825,10 @@
   cursor: text;
 }
 
+.ruleview-variable {
+  color: var(--theme-highlight-blue);
+}
+
 .ruleview-selector-separator,
 .ruleview-selector.unmatched,
 .ruleview-unmatched-variable,