diff --git a/alternative_user_files/userContent_no_addons.css b/alternative_user_files/userContent_no_addons.css
index 818efe6..58ca828 100644
--- a/alternative_user_files/userContent_no_addons.css
+++ b/alternative_user_files/userContent_no_addons.css
@@ -112,6 +112,7 @@
   --selected-icon-fill-color: var(--tone-2)!important;
   --in-content-dark-header-background: var(--tone-9)!important;
   --secure-connection-color: var(--accent-1);
+  --theme-sidebar-background: #1B1B1D!important;
   --start-indicator-for-updater-scripts: black;
   --end-indicator-for-updater-scripts: black;
   --dummy-variable-for-updater-scripys: black
diff --git a/css/common-files/color_variables.css b/css/common-files/color_variables.css
index e32ba32..0f09f6f 100644
--- a/css/common-files/color_variables.css
+++ b/css/common-files/color_variables.css
@@ -112,6 +112,7 @@
   --selected-icon-fill-color: var(--tone-2)!important;
   --in-content-dark-header-background: var(--tone-9)!important;
   --secure-connection-color: var(--accent-1);
+  --theme-sidebar-background: #1B1B1D!important;
   --start-indicator-for-updater-scripts: black;
   --end-indicator-for-updater-scripts: black;
   --dummy-variable-for-updater-scripys: black
diff --git a/css/userContent-files/webextension-tweaks/ublock_origin.css b/css/userContent-files/webextension-tweaks/ublock_origin.css
index dca2d95..a957273 100644
--- a/css/userContent-files/webextension-tweaks/ublock_origin.css
+++ b/css/userContent-files/webextension-tweaks/ublock_origin.css
@@ -2,10 +2,11 @@
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://ublock_origin_UUID/") {
   .CodeMirror {
-    border: 1px solid!important;
-    border-color: var(--tone-5)!important;
-    background: #2a2a2e!important;
-    color: #b1b1b3!important
+    border: 1px solid #2a2a2c!important;
+    background: var(--tone-8)!important;
+    color: #b1b1b3!important;
+    font-size: 11px!important;
+    line-height: 14px!important
   }
   div.CodeMirror-selected {
     background: #353b48!important
@@ -27,10 +28,10 @@
     background: var(--tone-7)!important
   }
   .cm-search-widget {
-    background-color: var(--tone-9)!important;
+    background-color: var(--theme-sidebar-background)!important;
     border: 1px solid;
     border-bottom: none!important;
-    border-color: var(--tone-5)!important;
+    border-color: #2a2a2c!important;
     max-height: 15px!important;
     justify-content: right!important
   }
@@ -51,12 +52,12 @@
     font-weight: 700
   }
   .CodeMirror-merge-gap {
-    background-color: var(--tone-9)!important;
+    background-color: var(--theme-sidebar-background)!important;
     border-top: 1px solid!important;
     border-bottom: 1px solid!important;
     border-right: none!important;
     border-left: none!important;
-    border-color: var(--tone-5)!important
+    border-color: #2a2a2c!important
   }
   .CodeMirror-merge {
     border: none!important
@@ -66,7 +67,7 @@
     font-size: 100%!important
   }
   .CodeMirror-gutters {
-    background: var(--tone-9)!important;
+    background: var(--theme-sidebar-background)!important;
     border-right: 0 solid #4a4a4f!important
   }
   .CodeMirror-guttermarker,
@@ -74,11 +75,15 @@
     color: #555!important
   }
   .CodeMirror-linenumber {
-    color: #939393!important
+    padding: 0 8px 0 5px!important;
+    color: #58575c!important
   }
   .CodeMirror-cursor {
     border-left: 1px solid #fff!important
   }
+  .cm-comment {
+    color: #939393!important
+  }
   .cm-staticext {
     color: var(--theme-highlight-blue)!important
   }
diff --git a/css/userContent-files/webextension-tweaks/umatrix.css b/css/userContent-files/webextension-tweaks/umatrix.css
index 6226189..6bd7d85 100644
--- a/css/userContent-files/webextension-tweaks/umatrix.css
+++ b/css/userContent-files/webextension-tweaks/umatrix.css
@@ -2,10 +2,11 @@
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://umatrix_UUID/") {
   .CodeMirror {
-    border: 1px solid!important;
-    border-color: var(--tone-5)!important;
-    background: #2a2a2e!important;
-    color: #b1b1b3!important
+    border: 1px solid #2a2a2c!important;
+    background: var(--tone-8)!important;
+    color: #b1b1b3!important;
+    font-size: 11px!important;
+    line-height: 14px!important
   }
   div.CodeMirror-selected {
     background: #353b48!important
@@ -30,18 +31,18 @@
     background-color: var(--warning-background-color)!important
   }
   .CodeMirror-merge-gap {
-    background-color: var(--tone-9)!important;
+    background-color: var(--theme-sidebar-background)!important;
     border-top: 1px solid!important;
     border-bottom: 1px solid!important;
     border-right: none!important;
     border-left: none!important;
-    border-color: var(--tone-5)!important
+    border-color: #2a2a2c!important
   }
   .CodeMirror-merge {
     border: none!important
   }
   .CodeMirror-gutters {
-    background: var(--tone-9)!important;
+    background: var(--theme-sidebar-background)!important;
     border-right: 0 solid #4a4a4f!important
   }
   .CodeMirror-guttermarker,
@@ -49,7 +50,8 @@
     color: #555!important
   }
   .CodeMirror-linenumber {
-    color: #939393!important
+    padding: 0 8px 0 5px!important;
+    color: #58575c!important
   }
   .CodeMirror-cursor {
     border-left: 1px solid #fff!important
@@ -123,20 +125,17 @@
   #dashboard-nav-widgets {
     background-color: var(--tone-8)!important;
     color: var(--tone-4)!important;
-    border-bottom: 1px solid var(--tone-5);
+    border-bottom: 1px solid!important;
     border-color: var(--tone-5)!important
   }
   .tabButton {
-    background: var(--tone-6)!important;
+    background-color: var(--tone-7)!important;
     color: var(--tone-4)!important;
-    border-color: var(--tone-5)!important;
-    border-bottom: none!important
+    border-color: var(--tone-5)!important
   }
   .tabButton.selected {
-    border-bottom: none!important;
-    background-color: var(--tone-7)!important;
-    border-color: var(--tone-5)!important;
-    color: var(--accent-1)!important
+    background-color: var(--tone-8)!important;
+    border-color: var(--tone-5)!important
   }
   button.custom.important {
     background-color: #ffcc7f!important;
@@ -235,9 +234,6 @@
     background: var(--tone-6)!important;
     color: var(--tone-4)!important
   }
-  #dashboard-nav-widgets {
-    border-bottom: 1px solid!important
-  }
   .whatisthis-expandable {
     background-color: var(--tone-8)!important;
     border: 1px dotted!important;
diff --git a/userChrome.css b/userChrome.css
index 92af8d0..f7e8134 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -112,6 +112,7 @@
   --selected-icon-fill-color: var(--tone-2)!important;
   --in-content-dark-header-background: var(--tone-9)!important;
   --secure-connection-color: var(--accent-1);
+  --theme-sidebar-background: #1B1B1D!important;
   --start-indicator-for-updater-scripts: black;
   --end-indicator-for-updater-scripts: black;
   --dummy-variable-for-updater-scripys: black;
diff --git a/userContent.css b/userContent.css
index 3125b1e..bab683f 100644
--- a/userContent.css
+++ b/userContent.css
@@ -112,6 +112,7 @@
   --selected-icon-fill-color: var(--tone-2)!important;
   --in-content-dark-header-background: var(--tone-9)!important;
   --secure-connection-color: var(--accent-1);
+  --theme-sidebar-background: #1B1B1D!important;
   --start-indicator-for-updater-scripts: black;
   --end-indicator-for-updater-scripts: black;
   --dummy-variable-for-updater-scripys: black
@@ -1632,10 +1633,11 @@ url-prefix(https://discovery.addons.mozilla.org) {
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://ublock_origin_UUID/") {
   .CodeMirror {
-    border: 1px solid!important;
-    border-color: var(--tone-5)!important;
-    background: #2a2a2e!important;
-    color: #b1b1b3!important
+    border: 1px solid #2a2a2c!important;
+    background: var(--tone-8)!important;
+    color: #b1b1b3!important;
+    font-size: 11px!important;
+    line-height: 14px!important
   }
   div.CodeMirror-selected {
     background: #353b48!important
@@ -1657,10 +1659,10 @@ url-prefix(https://discovery.addons.mozilla.org) {
     background: var(--tone-7)!important
   }
   .cm-search-widget {
-    background-color: var(--tone-9)!important;
+    background-color: var(--theme-sidebar-background)!important;
     border: 1px solid;
     border-bottom: none!important;
-    border-color: var(--tone-5)!important;
+    border-color: #2a2a2c!important;
     max-height: 15px!important;
     justify-content: right!important
   }
@@ -1681,12 +1683,12 @@ url-prefix(https://discovery.addons.mozilla.org) {
     font-weight: 700
   }
   .CodeMirror-merge-gap {
-    background-color: var(--tone-9)!important;
+    background-color: var(--theme-sidebar-background)!important;
     border-top: 1px solid!important;
     border-bottom: 1px solid!important;
     border-right: none!important;
     border-left: none!important;
-    border-color: var(--tone-5)!important
+    border-color: #2a2a2c!important
   }
   .CodeMirror-merge {
     border: none!important
@@ -1696,7 +1698,7 @@ url-prefix(https://discovery.addons.mozilla.org) {
     font-size: 100%!important
   }
   .CodeMirror-gutters {
-    background: var(--tone-9)!important;
+    background: var(--theme-sidebar-background)!important;
     border-right: 0 solid #4a4a4f!important
   }
   .CodeMirror-guttermarker,
@@ -1704,11 +1706,15 @@ url-prefix(https://discovery.addons.mozilla.org) {
     color: #555!important
   }
   .CodeMirror-linenumber {
-    color: #939393!important
+    padding: 0 8px 0 5px!important;
+    color: #58575c!important
   }
   .CodeMirror-cursor {
     border-left: 1px solid #fff!important
   }
+  .cm-comment {
+    color: #939393!important
+  }
   .cm-staticext {
     color: var(--theme-highlight-blue)!important
   }
@@ -2038,10 +2044,11 @@ url-prefix(https://discovery.addons.mozilla.org) {
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://umatrix_UUID/") {
   .CodeMirror {
-    border: 1px solid!important;
-    border-color: var(--tone-5)!important;
-    background: #2a2a2e!important;
-    color: #b1b1b3!important
+    border: 1px solid #2a2a2c!important;
+    background: var(--tone-8)!important;
+    color: #b1b1b3!important;
+    font-size: 11px!important;
+    line-height: 14px!important
   }
   div.CodeMirror-selected {
     background: #353b48!important
@@ -2066,18 +2073,18 @@ url-prefix(https://discovery.addons.mozilla.org) {
     background-color: var(--warning-background-color)!important
   }
   .CodeMirror-merge-gap {
-    background-color: var(--tone-9)!important;
+    background-color: var(--theme-sidebar-background)!important;
     border-top: 1px solid!important;
     border-bottom: 1px solid!important;
     border-right: none!important;
     border-left: none!important;
-    border-color: var(--tone-5)!important
+    border-color: #2a2a2c!important
   }
   .CodeMirror-merge {
     border: none!important
   }
   .CodeMirror-gutters {
-    background: var(--tone-9)!important;
+    background: var(--theme-sidebar-background)!important;
     border-right: 0 solid #4a4a4f!important
   }
   .CodeMirror-guttermarker,
@@ -2085,7 +2092,8 @@ url-prefix(https://discovery.addons.mozilla.org) {
     color: #555!important
   }
   .CodeMirror-linenumber {
-    color: #939393!important
+    padding: 0 8px 0 5px!important;
+    color: #58575c!important
   }
   .CodeMirror-cursor {
     border-left: 1px solid #fff!important
@@ -2159,20 +2167,17 @@ url-prefix(https://discovery.addons.mozilla.org) {
   #dashboard-nav-widgets {
     background-color: var(--tone-8)!important;
     color: var(--tone-4)!important;
-    border-bottom: 1px solid var(--tone-5);
+    border-bottom: 1px solid!important;
     border-color: var(--tone-5)!important
   }
   .tabButton {
-    background: var(--tone-6)!important;
+    background-color: var(--tone-7)!important;
     color: var(--tone-4)!important;
-    border-color: var(--tone-5)!important;
-    border-bottom: none!important
+    border-color: var(--tone-5)!important
   }
   .tabButton.selected {
-    border-bottom: none!important;
-    background-color: var(--tone-7)!important;
-    border-color: var(--tone-5)!important;
-    color: var(--accent-1)!important
+    background-color: var(--tone-8)!important;
+    border-color: var(--tone-5)!important
   }
   button.custom.important {
     background-color: #ffcc7f!important;
@@ -2271,9 +2276,6 @@ url-prefix(https://discovery.addons.mozilla.org) {
     background: var(--tone-6)!important;
     color: var(--tone-4)!important
   }
-  #dashboard-nav-widgets {
-    border-bottom: 1px solid!important
-  }
   .whatisthis-expandable {
     background-color: var(--tone-8)!important;
     border: 1px dotted!important;