From 95fda257c7a5e221942483c6f3fbb3ada85c34aa Mon Sep 17 00:00:00 2001
From: overdodactyl <pjohns33@protonmail.com>
Date: Sun, 15 Apr 2018 16:41:05 -0600
Subject: [PATCH] push changes to *chrome/content.css

---
 .../userContent_no_addons.css                 |  11 +-
 css/common-files/color_variables.css          |  13 +-
 .../webextension-tweaks/dark_mode.css         |   2 +-
 .../webextension-tweaks/generic_style.css     | 191 ++--
 .../webextension-tweaks/greasemonkey.css      |  30 +-
 .../multi_account_containers.css              |   2 +-
 .../webextension-tweaks/pocket.css            |   6 +-
 .../webextension-tweaks/request_control.css   |  38 +-
 .../webextension-tweaks/tree_style_tab.css    |   2 +-
 .../webextension-tweaks/tridactyl.css         |   2 +-
 .../webextension-tweaks/ublock_origin.css     |   6 +-
 .../webextension-tweaks/ubo_scope.css         |   2 +-
 .../webextension-tweaks/umatrix.css           |   2 +-
 .../webextension-tweaks/violentmonkey.css     |   2 +-
 userChrome.css                                |  11 +-
 userContent.css                               | 877 ++++++++----------
 16 files changed, 546 insertions(+), 651 deletions(-)

diff --git a/alternative_user_files/userContent_no_addons.css b/alternative_user_files/userContent_no_addons.css
index ac6e98b..bc6b3b7 100644
--- a/alternative_user_files/userContent_no_addons.css
+++ b/alternative_user_files/userContent_no_addons.css
@@ -60,7 +60,7 @@
   --theme-highlight-bluegrey: #5e88b0;
   --theme-highlight-lightorange: #d99b28;
   --theme-highlight-orange: #d96629;
-  --theme-highlight-pink: #FF7DE9;
+  --theme-highlight-pink: #df80ff;
   --tone-1: var(--grey-10);
   --tone-2: var(--grey-20);
   --tone-3: var(--grey-30);
@@ -113,6 +113,15 @@
   --in-content-dark-header-background: var(--tone-9)!important;
   --secure-connection-color: var(--accent-1);
   --theme-sidebar-background: #1B1B1D!important;
+  --cm-background: var(--tone-8)!important;
+  --cm-selection: #353b48!important;
+  --cm-marker: #555!important;
+  --cm-linenumber: #58575c!important;
+  --cm-cursor: #fff!important;
+  --cm-active-line-background: rgba(185,215,253,.15)!important;
+  --cm-matching-bracket: rgba(255,255,255,.25)!important;
+  --cm-search-background: rgba(24,29,32,1)!important;
+  --cm-red: #de7474!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 14fa6ec..fb099f1 100644
--- a/css/common-files/color_variables.css
+++ b/css/common-files/color_variables.css
@@ -115,15 +115,14 @@
   --theme-sidebar-background: #1B1B1D!important;
   --cm-background: var(--tone-8)!important;
   --cm-selection: #353b48!important;
-  --cm-marker: #555 !important;
-  --cm-linenumber:#58575c!important;
-  --cm-cursor:#fff!important;
+  --cm-marker: #555!important;
+  --cm-linenumber: #58575c!important;
+  --cm-cursor: #fff!important;
   --cm-active-line-background: rgba(185,215,253,.15)!important;
-  --cm-matching-bracket: rgba(255,255,255,.25) !important;
-  --cm-search-background: rgba(24,29,32,1) !important;
+  --cm-matching-bracket: rgba(255,255,255,.25)!important;
+  --cm-search-background: rgba(24,29,32,1)!important;
   --cm-red: #de7474!important;
   --start-indicator-for-updater-scripts: black;
   --end-indicator-for-updater-scripts: black;
   --dummy-variable-for-updater-scripys: black
-
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/dark_mode.css b/css/userContent-files/webextension-tweaks/dark_mode.css
index cc6f458..b6b94ee 100644
--- a/css/userContent-files/webextension-tweaks/dark_mode.css
+++ b/css/userContent-files/webextension-tweaks/dark_mode.css
@@ -10,4 +10,4 @@
   .highlight {
     background-color: var(--in-content-box-border-color)!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css
index b1b7e19..7588140 100644
--- a/css/userContent-files/webextension-tweaks/generic_style.css
+++ b/css/userContent-files/webextension-tweaks/generic_style.css
@@ -1,161 +1,162 @@
 /*! Pop Up Background Fixes */
 @-moz-document url-prefix("moz-extension://css_exfil_protection_UUID/popup.html"),
-               url-prefix("moz-extension://https_everywhere_UUID/pages/popup"),
-               url-prefix("moz-extension://decentraleyes_UUID/pages/popup"),
-               url-prefix("moz-extension://smart_https_UUID/data/data/popup.html"),
-               url-prefix("moz-extension://rename_tab_title_UUID/popup/popup.html"),
-               url-prefix("moz-extension://open_in_new_tab_UUID/popup"),
-               url-prefix("moz-extension://greasemonkey_UUID/src/browser/monkey-menu") {
+url-prefix("moz-extension://https_everywhere_UUID/pages/popup"),
+url-prefix("moz-extension://decentraleyes_UUID/pages/popup"),
+url-prefix("moz-extension://smart_https_UUID/data/data/popup.html"),
+url-prefix("moz-extension://rename_tab_title_UUID/popup/popup.html"),
+url-prefix("moz-extension://open_in_new_tab_UUID/popup"),
+url-prefix("moz-extension://greasemonkey_UUID/src/browser/monkey-menu") {
   :root {
     --in-content-page-background: var(--tone-6)!important;
     --in-content-box-background: rgba(11,11,12,0.2)!important;
     --in-content-box-border-color: rgba(249, 249, 250, 0.3)!important;
-    --in-content-box-background-hover: rgba(11,11,12,0.2)!important;
+    --in-content-box-background-hover: rgba(11,11,12,0.2)!important
   }
   button {
-    margin-top: 3px !important;
+    margin-top: 3px!important
   }
   input {
-    margin-top: 3px !important;
-    margin-bottom: 3px !important;
+    margin-top: 3px!important;
+    margin-bottom: 3px!important
   }
-  textarea,
-  input  {
-    margin-left: 0px !important;
+  input,
+  textarea {
+    margin-left: 0!important
   }
 }
-
 @-moz-document url-prefix("moz-extension://1_click_youtube_video_downloader_UUID"),
-               url-prefix("moz-extension://autocopy_UUID"),
-               url-prefix("moz-extension://custom_titlebar_text_UUID"),
-               url-prefix("moz-extension://octopatcher_UUID"),
-               url-prefix("moz-extension://text_link_UUID"),
-               url-prefix("moz-extension://multiple_tab_handler_UUID/"),
-               url-prefix("moz-extension://neat_url_UUID/"),
-               url-prefix("moz-extension://smart_referer_UUID/"),
-               url-prefix("moz-extension://tab_suspender_UUID/"),
-               url-prefix("moz-extension://css_exfil_protection_UUID/"),
-               url-prefix("moz-extension://https_everywhere_UUID/"),
-               url-prefix("moz-extension://skip_redirect_UUID/"),
-               url-prefix("moz-extension://dark_mode_UUID/"),
-               url-prefix("moz-extension://decentraleyes_UUID/"),
-               url-prefix("moz-extension://smart_https_UUID/"),
-               url-prefix("moz-extension://mind_the_time_UUID/options/options"),
-               url-prefix("moz-extension://tree_style_tab_UUID/options/options"),
-               url-prefix("moz-extension://google_translator_for_firefox_UUID"),
-               url-prefix("moz-extension://enhancer_for_youtube_UUID/options.html"),
-               url-prefix("moz-extension://flash_and_video_download_UUID/html/options.html"),
-               url-prefix("moz-extension://back_to_close_we_UUID/"),
-               url-prefix("moz-extension://containers_on_the_go_UUID/"),
-               url-prefix("moz-extension://new_tab_from_location_bar_UUID/"),
-               url-prefix("moz-extension://tab_auto_close_UUID/"),
-               url-prefix("moz-extension://open_in_new_tab_UUID/"),
-               url-prefix("moz-extension://display_anchors_UUID/"),
-               url-prefix("moz-extension://rename_tab_title_UUID/"),
-               url-prefix("moz-extension://greasemonkey_UUID/src/browser/monkey-menu"),
-
-               url-prefix("moz-extension://generic_styling_1_UUID"),
-               url-prefix("moz-extension://generic_styling_2_UUID"),
-               url-prefix("moz-extension://generic_styling_3_UUID"),
-               url-prefix("moz-extension://generic_styling_4_UUID"),
-               url-prefix("moz-extension://generic_styling_5_UUID")
-  {
+url-prefix("moz-extension://autocopy_UUID"),
+url-prefix("moz-extension://custom_titlebar_text_UUID"),
+url-prefix("moz-extension://octopatcher_UUID"),
+url-prefix("moz-extension://text_link_UUID"),
+url-prefix("moz-extension://multiple_tab_handler_UUID/"),
+url-prefix("moz-extension://neat_url_UUID/"),
+url-prefix("moz-extension://smart_referer_UUID/"),
+url-prefix("moz-extension://tab_suspender_UUID/"),
+url-prefix("moz-extension://css_exfil_protection_UUID/"),
+url-prefix("moz-extension://https_everywhere_UUID/"),
+url-prefix("moz-extension://skip_redirect_UUID/"),
+url-prefix("moz-extension://dark_mode_UUID/"),
+url-prefix("moz-extension://decentraleyes_UUID/"),
+url-prefix("moz-extension://smart_https_UUID/"),
+url-prefix("moz-extension://mind_the_time_UUID/options/options"),
+url-prefix("moz-extension://tree_style_tab_UUID/options/options"),
+url-prefix("moz-extension://google_translator_for_firefox_UUID"),
+url-prefix("moz-extension://enhancer_for_youtube_UUID/options.html"),
+url-prefix("moz-extension://flash_and_video_download_UUID/html/options.html"),
+url-prefix("moz-extension://back_to_close_we_UUID/"),
+url-prefix("moz-extension://containers_on_the_go_UUID/"),
+url-prefix("moz-extension://new_tab_from_location_bar_UUID/"),
+url-prefix("moz-extension://tab_auto_close_UUID/"),
+url-prefix("moz-extension://open_in_new_tab_UUID/"),
+url-prefix("moz-extension://display_anchors_UUID/"),
+url-prefix("moz-extension://rename_tab_title_UUID/"),
+url-prefix("moz-extension://greasemonkey_UUID/src/browser/monkey-menu"),
+url-prefix("moz-extension://generic_styling_1_UUID"),
+url-prefix("moz-extension://generic_styling_2_UUID"),
+url-prefix("moz-extension://generic_styling_3_UUID"),
+url-prefix("moz-extension://generic_styling_4_UUID"),
+url-prefix("moz-extension://generic_styling_5_UUID") {
   * {
-    color: var(--in-content-page-color) !important;
+    color: var(--in-content-page-color)!important;
     background-color: var(--in-content-page-background)!important;
     border-color: var(--in-content-box-border-color)!important;
     text-shadow: none!important
   }
   select {
-    color: black !important;
+    color: #000!important
   }
   select * {
-    background-color: var(--in-content-box-background) !important;
+    background-color: var(--in-content-box-background)!important
   }
   a {
-    color: var(--in-content-link-color) !important;
+    color: var(--in-content-link-color)!important
   }
   a:hover {
-    color: var(--in-content-link-color-hover) !important;
+    color: var(--in-content-link-color-hover)!important
   }
-  h1, h2, h3, h4, h5, h6 {
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
     color: var(--in-content-category-text-selected)!important
   }
   fieldset {
     border: 2px solid!important;
     border-color: var(--in-content-box-border-color)!important
   }
-  input:not([type=checkbox])  {
+  input:not([type=checkbox]) {
     background: var(--in-content-box-background)!important;
-    color: var(--in-content-page-color)!important;
+    color: var(--in-content-page-color)!important
   }
-  input[type="file"] {
-    background-color: var(--in-content-page-background)!important;
+  input[type=file] {
+    background-color: var(--in-content-page-background)!important
   }
-  textarea,
-  input[type="input"],
-  input[type="text"],
-  input[type="number"],
-  input[type="url"],
-  input[type="textbox"]  {
+  input[type=input],
+  input[type=number],
+  input[type=text],
+  input[type=textbox],
+  input[type=url],
+  textarea {
     -moz-appearance: none!important;
     background: var(--in-content-box-background)!important;
     color: var(--in-content-page-color)!important;
     border: 1px solid!important;
     border-color: var(--in-content-box-border-color)!important;
-    margin-left: 3px !important;
-    padding-left: 3px !important;
+    margin-left: 3px!important;
+    padding-left: 3px!important
   }
   input:checked + .slider {
-    background-color: var(--in-content-primary-button-background) !important;
+    background-color: var(--in-content-primary-button-background)!important
   }
   input:not(:checked) + .slider {
-    background-color: var(--in-content-box-background) !important;
+    background-color: var(--in-content-box-background)!important
   }
   textarea {
-    margin: 2px 0 2px 0 !important;
-    padding: 5px 5px 5px 5px !important;
+    margin: 2px 0!important;
+    padding: 5px!important
   }
-  button,
   .button,
-  input[type="submit"] {
+  button,
+  input[type=submit] {
     -moz-appearance: none!important;
     background-image: none!important;
-    background-color: var(--in-content-page-background) !important;
+    background-color: var(--in-content-page-background)!important;
     color: var(--in-content-page-color)!important;
     border: 1px solid!important;
     border-color: var(--in-content-box-border-color)!important;
     border-radius: 3px!important
   }
-  button:hover,
   .button:hover,
-  input[type="submit"]:hover {
+  button:hover,
+  input[type=submit]:hover {
     background-color: var(--in-content-box-background-hover)!important
   }
 }
-
 /*! Code Mirror */
 @-moz-document url-prefix("moz-extension://violentmonkey_UUID/"),
-               url-prefix("moz-extension://ublock_origin_UUID/"),
-               url-prefix("moz-extension://umatrix_UUID/"),
-               url-prefix("moz-extension://greasemonkey_UUID/src/content/edit-user-script") {
+url-prefix("moz-extension://ublock_origin_UUID/"),
+url-prefix("moz-extension://umatrix_UUID/"),
+url-prefix("moz-extension://greasemonkey_UUID/src/content/edit-user-script") {
   .CodeMirror {
-     border: 1px solid !important;
-     border-color: var(--cm-background)!important;
-     background: var(--cm-background)!important;
-     color: #b1b1b3!important;
-     font-size: 11px!important;
-     line-height: 14px!important
+    border: 1px solid!important;
+    border-color: var(--cm-background)!important;
+    background: var(--cm-background)!important;
+    color: #b1b1b3!important;
+    font-size: 11px!important;
+    line-height: 14px!important
   }
-  div.CodeMirror-selected,
   .CodeMirror-line > span > span::selection,
   .CodeMirror-line > span::selection,
-  .CodeMirror-line::selection {
+  .CodeMirror-line::selection,
+  div.CodeMirror-selected {
     background: var(--cm-selection)!important
   }
   .CodeMirror-gutters {
     background: var(--theme-sidebar-background)!important;
-    border-right: 0 solid var(--in-content-border-color)!important
+    border-right: 0 solid!important
   }
   .CodeMirror-guttermarker,
   .CodeMirror-guttermarker-subtle {
@@ -187,13 +188,13 @@
   span.cm-string-2 {
     color: #6b89ff!important
   }
-  span.cm-header,
-  span.cm-qualifier,
-  span.cm-variable-2,
   span.cm-bracket,
   span.cm-def,
+  span.cm-header,
   span.cm-link:visited,
-  span.cm-tag {
+  span.cm-qualifier,
+  span.cm-tag,
+  span.cm-variable-2 {
     color: var(--theme-highlight-blue)!important
   }
   span.cm-property {
@@ -202,8 +203,8 @@
   span.cm-variable {
     color: var(--theme-highlight-purple)!important
   }
-  span.cm-variable-3,
-  span.cm-special {
+  span.cm-special,
+  span.cm-variable-3 {
     color: var(--in-content-text-color)!important
   }
   span.cm-link {
@@ -270,4 +271,4 @@
   .cm-staticnetAllow {
     color: var(--theme-highlight-green)!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/greasemonkey.css b/css/userContent-files/webextension-tweaks/greasemonkey.css
index 1ab828c..88922f0 100644
--- a/css/userContent-files/webextension-tweaks/greasemonkey.css
+++ b/css/userContent-files/webextension-tweaks/greasemonkey.css
@@ -1,28 +1,28 @@
 @-moz-document url-prefix("moz-extension://greasemonkey_UUID/") {
-  html,
-  body {
-    background: var(--in-content-page-background) !important;
+  body,
+  html {
+    background: var(--in-content-page-background)!important
   }
   #tabs .tab.active,
   .command-item {
-    background: var(--tone-8) !important;
-    color: var(--in-content-page-color) !important;
+    background: var(--tone-8)!important;
+    color: var(--in-content-page-color)!important
   }
   .subview-back::before {
     content: url(/skin/back.svg);
-    filter: invert(65%);
+    filter: invert(65%)
   }
-  .subview-back:hover,
   .subview-back:focus,
-  .subview-item:hover,
-  .subview-item:focus {
-    background-color: var(--in-content-category-background-hover) !important;
+  .subview-back:hover,
+  .subview-item:focus,
+  .subview-item:hover {
+    background-color: var(--in-content-category-background-hover)!important;
     cursor: default;
     color: inherit;
-    text-decoration: none;
+    text-decoration: none
   }
-  .subview-item .text,
-  .subview-item .icon {
-    background: transparent !important;
+  .subview-item .icon,
+  .subview-item .text {
+    background: 0 0!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/multi_account_containers.css b/css/userContent-files/webextension-tweaks/multi_account_containers.css
index 715556e..0788547 100644
--- a/css/userContent-files/webextension-tweaks/multi_account_containers.css
+++ b/css/userContent-files/webextension-tweaks/multi_account_containers.css
@@ -116,4 +116,4 @@
     background-image: url(chrome://global/skin/in-content/check.svg)!important;
     background-color: var(--tone-6)!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/pocket.css b/css/userContent-files/webextension-tweaks/pocket.css
index c5c990d..1943db6 100644
--- a/css/userContent-files/webextension-tweaks/pocket.css
+++ b/css/userContent-files/webextension-tweaks/pocket.css
@@ -1,11 +1,11 @@
-.pkt_ext_containersaved h2,
 .pkt_ext_containersaved .pkt_ext_tag_input_wrapper input::placeholder,
+.pkt_ext_containersaved h2,
 .token-input-dropdown-tag ul li {
   color: var(--in-content-page-color)!important
 }
 .pkt_ext_containersaved .pkt_ext_tag_detail,
 .pkt_ext_containersaved .pkt_ext_tag_input_wrapper,
-.token-input-dropdown-tag  {
+.token-input-dropdown-tag {
   border-color: var(--in-content-box-border-color)!important;
   background: var(--in-content-box-background)!important
 }
@@ -20,4 +20,4 @@
   border-color: var(--in-content-box-border-color)!important;
   background-color: var(--in-content-table-border-dark-color)!important;
   color: var(--in-content-page-color)!important
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/request_control.css b/css/userContent-files/webextension-tweaks/request_control.css
index ccdb9ff..76d1454 100644
--- a/css/userContent-files/webextension-tweaks/request_control.css
+++ b/css/userContent-files/webextension-tweaks/request_control.css
@@ -2,35 +2,34 @@
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://request_control_UUID/") {
   * {
-    color: var(--in-content-page-color) !important;
+    color: var(--in-content-page-color)!important
   }
-  
   body {
-    background-color: var(--in-content-page-background)!important;
+    background-color: var(--in-content-page-background)!important
   }
-  hr,
-  .page-header{
+  .page-header,
+  hr {
     border-color: var(--in-content-box-border-color)!important
   }
   .nav-tabs.nav-justified > li > a {
     border-bottom-color: var(--in-content-box-border-color)!important
   }
   .badge {
-    color: var(--in-content-text-color) !important;
+    color: var(--in-content-text-color)!important
   }
   .rule:not(.editing):not(:hover) {
-    background-color: var(--in-content-box-background)!important;
+    background-color: var(--in-content-box-background)!important
   }
-  .rule:hover:not(.editing),
+  .editing .rule-header,
   .list-group-item,
-  .editing .rule-header{
+  .rule:hover:not(.editing) {
     background-color: var(--in-content-box-background-hover)!important;
     border-color: var(--in-content-box-border-color)!important
   }
+  .nav-tabs > li > a:hover,
   .nav-tabs > li.active > a,
   .nav-tabs > li.active > a:focus,
-  .nav-tabs > li.active > a:hover,
-  .nav-tabs > li > a:hover{
+  .nav-tabs > li.active > a:hover {
     background-color: var(--in-content-category-header-background)!important;
     border-color: var(--in-content-box-border-color)!important
   }
@@ -56,20 +55,19 @@
   .table-striped > tbody > tr:nth-of-type(2n+1) {
     background-color: var(--in-content-box-background)!important
   }
-  input[type="text"],
-  select,
-  .tags-input {
+  .tags-input,
+  input[type=text],
+  select {
     background: var(--in-content-page-background)!important;
     color: var(--in-content-text-color)!important;
     border-color: var(--in-content-box-border-color)!important
   }
   .tags-input .tag {
     background: var(--in-content-item-selected)!important;
-    border-color: var(--in-content-box-border-color)!important;
+    border-color: var(--in-content-box-border-color)!important
   }
-  img.arrow,
-  button img{
-    filter: invert(65%) !important;
+  button img,
+  img.arrow {
+    filter: invert(65%)!important
   }
-
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/tree_style_tab.css b/css/userContent-files/webextension-tweaks/tree_style_tab.css
index 9df5a8a..d3ac64e 100644
--- a/css/userContent-files/webextension-tweaks/tree_style_tab.css
+++ b/css/userContent-files/webextension-tweaks/tree_style_tab.css
@@ -102,4 +102,4 @@
   #tabbar {
     background: var(--in-content-page-background)!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/tridactyl.css b/css/userContent-files/webextension-tweaks/tridactyl.css
index 3961434..65d20a7 100644
--- a/css/userContent-files/webextension-tweaks/tridactyl.css
+++ b/css/userContent-files/webextension-tweaks/tridactyl.css
@@ -43,4 +43,4 @@
     background: var(--warning-background-color)!important;
     color: var(--warning-color)!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/ublock_origin.css b/css/userContent-files/webextension-tweaks/ublock_origin.css
index c2fced8..09ec5a9 100644
--- a/css/userContent-files/webextension-tweaks/ublock_origin.css
+++ b/css/userContent-files/webextension-tweaks/ublock_origin.css
@@ -80,8 +80,8 @@
     color: var(--tone-2)!important
   }
   #extraTools,
-  h2,
-  #extraTools > span > span.badge {
+  #extraTools > span > span.badge,
+  h2 {
     background-color: var(--tone-8)!important;
     color: var(--tone-4)!important
   }
@@ -336,4 +336,4 @@
     background-color: var(--theme-highlight-blue)!important;
     color: #000!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/ubo_scope.css b/css/userContent-files/webextension-tweaks/ubo_scope.css
index 6d84a3b..770775a 100644
--- a/css/userContent-files/webextension-tweaks/ubo_scope.css
+++ b/css/userContent-files/webextension-tweaks/ubo_scope.css
@@ -49,4 +49,4 @@
   * {
     border-color: var(--in-content-box-border-color)!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/umatrix.css b/css/userContent-files/webextension-tweaks/umatrix.css
index 68a9cfe..4ec812a 100644
--- a/css/userContent-files/webextension-tweaks/umatrix.css
+++ b/css/userContent-files/webextension-tweaks/umatrix.css
@@ -317,4 +317,4 @@
     border-bottom: 1px solid!important;
     border-color: var(--tone-5)!important
   }
-}
+}
\ No newline at end of file
diff --git a/css/userContent-files/webextension-tweaks/violentmonkey.css b/css/userContent-files/webextension-tweaks/violentmonkey.css
index df6fc81..395a099 100644
--- a/css/userContent-files/webextension-tweaks/violentmonkey.css
+++ b/css/userContent-files/webextension-tweaks/violentmonkey.css
@@ -114,4 +114,4 @@
   .frame-block {
     background: var(--in-content-box-background)!important
   }
-}
+}
\ No newline at end of file
diff --git a/userChrome.css b/userChrome.css
index 9a4bc8d..e44bdf7 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -60,7 +60,7 @@
   --theme-highlight-bluegrey: #5e88b0;
   --theme-highlight-lightorange: #d99b28;
   --theme-highlight-orange: #d96629;
-  --theme-highlight-pink: #FF7DE9;
+  --theme-highlight-pink: #df80ff;
   --tone-1: var(--grey-10);
   --tone-2: var(--grey-20);
   --tone-3: var(--grey-30);
@@ -113,6 +113,15 @@
   --in-content-dark-header-background: var(--tone-9)!important;
   --secure-connection-color: var(--accent-1);
   --theme-sidebar-background: #1B1B1D!important;
+  --cm-background: var(--tone-8)!important;
+  --cm-selection: #353b48!important;
+  --cm-marker: #555!important;
+  --cm-linenumber: #58575c!important;
+  --cm-cursor: #fff!important;
+  --cm-active-line-background: rgba(185,215,253,.15)!important;
+  --cm-matching-bracket: rgba(255,255,255,.25)!important;
+  --cm-search-background: rgba(24,29,32,1)!important;
+  --cm-red: #de7474!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 7207dad..db89c2b 100644
--- a/userContent.css
+++ b/userContent.css
@@ -60,7 +60,7 @@
   --theme-highlight-bluegrey: #5e88b0;
   --theme-highlight-lightorange: #d99b28;
   --theme-highlight-orange: #d96629;
-  --theme-highlight-pink: #FF7DE9;
+  --theme-highlight-pink: #df80ff;
   --tone-1: var(--grey-10);
   --tone-2: var(--grey-20);
   --tone-3: var(--grey-30);
@@ -113,6 +113,15 @@
   --in-content-dark-header-background: var(--tone-9)!important;
   --secure-connection-color: var(--accent-1);
   --theme-sidebar-background: #1B1B1D!important;
+  --cm-background: var(--tone-8)!important;
+  --cm-selection: #353b48!important;
+  --cm-marker: #555!important;
+  --cm-linenumber: #58575c!important;
+  --cm-cursor: #fff!important;
+  --cm-active-line-background: rgba(185,215,253,.15)!important;
+  --cm-matching-bracket: rgba(255,255,255,.25)!important;
+  --cm-search-background: rgba(24,29,32,1)!important;
+  --cm-red: #de7474!important;
   --start-indicator-for-updater-scripts: black;
   --end-indicator-for-updater-scripts: black;
   --dummy-variable-for-updater-scripys: black
@@ -1075,58 +1084,315 @@ url-prefix(https://discovery.addons.mozilla.org) {
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://dark_mode_UUID/") {
   .comment {
-    color: var(--accent-1)!important
-  }
-  label {
-    color: var(--tone-4)!important
+    color: var(--in-content-link-color)!important
   }
   .title {
-    color: var(--in-content-page-color)!important;
     background-color: var(--in-content-category-header-background)!important
   }
-  textarea {
-    color: var(--in-content-page-color)!important;
-    background-color: var(--in-content-box-background)!important;
-    border: none!important
-  }
   .highlight {
     background-color: var(--in-content-box-border-color)!important
   }
 }
-/*! Alters the webextension Decentraleyes
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://decentraleyes_UUID/") {
-  body {
-    background-color: var(--in-content-box-background)!important;
-    color: var(--tone-4)!important
+/*! Pop Up Background Fixes */
+@-moz-document url-prefix("moz-extension://css_exfil_protection_UUID/popup.html"),
+url-prefix("moz-extension://https_everywhere_UUID/pages/popup"),
+url-prefix("moz-extension://decentraleyes_UUID/pages/popup"),
+url-prefix("moz-extension://smart_https_UUID/data/data/popup.html"),
+url-prefix("moz-extension://rename_tab_title_UUID/popup/popup.html"),
+url-prefix("moz-extension://open_in_new_tab_UUID/popup"),
+url-prefix("moz-extension://greasemonkey_UUID/src/browser/monkey-menu") {
+  :root {
+    --in-content-page-background: var(--tone-6)!important;
+    --in-content-box-background: rgba(11,11,12,0.2)!important;
+    --in-content-box-border-color: rgba(249, 249, 250, 0.3)!important;
+    --in-content-box-background-hover: rgba(11,11,12,0.2)!important
   }
-  .panel:not(:last-child),
-  header {
-    border-color: var(--tone-5)!important
+  button {
+    margin-top: 3px!important
   }
-  .button {
-    background-color: var(--in-content-box-background)!important;
-    border-color: var(--tone-5)!important
+  input {
+    margin-top: 3px!important;
+    margin-bottom: 3px!important
   }
-  .button:hover {
-    background-color: var(--in-content-page-background)!important
+  input,
+  textarea {
+    margin-left: 0!important
   }
 }
-/*! Alters the webextension HTTPS Everywhere
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://https_everywhere_UUID/") {
-  body {
-    color: var(--tone-4)!important;
-    background: var(--tone-6)!important
+@-moz-document url-prefix("moz-extension://1_click_youtube_video_downloader_UUID"),
+url-prefix("moz-extension://autocopy_UUID"),
+url-prefix("moz-extension://custom_titlebar_text_UUID"),
+url-prefix("moz-extension://octopatcher_UUID"),
+url-prefix("moz-extension://text_link_UUID"),
+url-prefix("moz-extension://multiple_tab_handler_UUID/"),
+url-prefix("moz-extension://neat_url_UUID/"),
+url-prefix("moz-extension://smart_referer_UUID/"),
+url-prefix("moz-extension://tab_suspender_UUID/"),
+url-prefix("moz-extension://css_exfil_protection_UUID/"),
+url-prefix("moz-extension://https_everywhere_UUID/"),
+url-prefix("moz-extension://skip_redirect_UUID/"),
+url-prefix("moz-extension://dark_mode_UUID/"),
+url-prefix("moz-extension://decentraleyes_UUID/"),
+url-prefix("moz-extension://smart_https_UUID/"),
+url-prefix("moz-extension://mind_the_time_UUID/options/options"),
+url-prefix("moz-extension://tree_style_tab_UUID/options/options"),
+url-prefix("moz-extension://google_translator_for_firefox_UUID"),
+url-prefix("moz-extension://enhancer_for_youtube_UUID/options.html"),
+url-prefix("moz-extension://flash_and_video_download_UUID/html/options.html"),
+url-prefix("moz-extension://back_to_close_we_UUID/"),
+url-prefix("moz-extension://containers_on_the_go_UUID/"),
+url-prefix("moz-extension://new_tab_from_location_bar_UUID/"),
+url-prefix("moz-extension://tab_auto_close_UUID/"),
+url-prefix("moz-extension://open_in_new_tab_UUID/"),
+url-prefix("moz-extension://display_anchors_UUID/"),
+url-prefix("moz-extension://rename_tab_title_UUID/"),
+url-prefix("moz-extension://greasemonkey_UUID/src/browser/monkey-menu"),
+url-prefix("moz-extension://generic_styling_1_UUID"),
+url-prefix("moz-extension://generic_styling_2_UUID"),
+url-prefix("moz-extension://generic_styling_3_UUID"),
+url-prefix("moz-extension://generic_styling_4_UUID"),
+url-prefix("moz-extension://generic_styling_5_UUID") {
+  * {
+    color: var(--in-content-page-color)!important;
+    background-color: var(--in-content-page-background)!important;
+    border-color: var(--in-content-box-border-color)!important;
+    text-shadow: none!important
   }
-  html {
-    background-color: var(--tone-6)!important
+  select {
+    color: #000!important
+  }
+  select * {
+    background-color: var(--in-content-box-background)!important
   }
   a {
-    color: var(--accent-1)!important
+    color: var(--in-content-link-color)!important
   }
-  h3 {
-    color: var(--tone-4)!important
+  a:hover {
+    color: var(--in-content-link-color-hover)!important
+  }
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    color: var(--in-content-category-text-selected)!important
+  }
+  fieldset {
+    border: 2px solid!important;
+    border-color: var(--in-content-box-border-color)!important
+  }
+  input:not([type=checkbox]) {
+    background: var(--in-content-box-background)!important;
+    color: var(--in-content-page-color)!important
+  }
+  input[type=file] {
+    background-color: var(--in-content-page-background)!important
+  }
+  input[type=input],
+  input[type=number],
+  input[type=text],
+  input[type=textbox],
+  input[type=url],
+  textarea {
+    -moz-appearance: none!important;
+    background: var(--in-content-box-background)!important;
+    color: var(--in-content-page-color)!important;
+    border: 1px solid!important;
+    border-color: var(--in-content-box-border-color)!important;
+    margin-left: 3px!important;
+    padding-left: 3px!important
+  }
+  input:checked + .slider {
+    background-color: var(--in-content-primary-button-background)!important
+  }
+  input:not(:checked) + .slider {
+    background-color: var(--in-content-box-background)!important
+  }
+  textarea {
+    margin: 2px 0!important;
+    padding: 5px!important
+  }
+  .button,
+  button,
+  input[type=submit] {
+    -moz-appearance: none!important;
+    background-image: none!important;
+    background-color: var(--in-content-page-background)!important;
+    color: var(--in-content-page-color)!important;
+    border: 1px solid!important;
+    border-color: var(--in-content-box-border-color)!important;
+    border-radius: 3px!important
+  }
+  .button:hover,
+  button:hover,
+  input[type=submit]:hover {
+    background-color: var(--in-content-box-background-hover)!important
+  }
+}
+/*! Code Mirror */
+@-moz-document url-prefix("moz-extension://violentmonkey_UUID/"),
+url-prefix("moz-extension://ublock_origin_UUID/"),
+url-prefix("moz-extension://umatrix_UUID/"),
+url-prefix("moz-extension://greasemonkey_UUID/src/content/edit-user-script") {
+  .CodeMirror {
+    border: 1px solid!important;
+    border-color: var(--cm-background)!important;
+    background: var(--cm-background)!important;
+    color: #b1b1b3!important;
+    font-size: 11px!important;
+    line-height: 14px!important
+  }
+  .CodeMirror-line > span > span::selection,
+  .CodeMirror-line > span::selection,
+  .CodeMirror-line::selection,
+  div.CodeMirror-selected {
+    background: var(--cm-selection)!important
+  }
+  .CodeMirror-gutters {
+    background: var(--theme-sidebar-background)!important;
+    border-right: 0 solid!important
+  }
+  .CodeMirror-guttermarker,
+  .CodeMirror-guttermarker-subtle {
+    color: var(--cm-marker)!important
+  }
+  .CodeMirror-linenumber {
+    padding: 0 8px 0 5px!important;
+    color: var(--cm-linenumber)!important
+  }
+  .CodeMirror-cursor {
+    border-left: 1px solid!important;
+    border-color: var(--cm-cursor)!important
+  }
+  span.cm-comment,
+  span.cm-hr,
+  span.cm-meta {
+    color: #939393!important
+  }
+  span.cm-atom,
+  span.cm-attribute,
+  span.cm-builtin,
+  span.cm-error,
+  span.cm-keyword,
+  span.cm-quote {
+    color: var(--theme-highlight-red)!important
+  }
+  span.cm-number,
+  span.cm-string,
+  span.cm-string-2 {
+    color: #6b89ff!important
+  }
+  span.cm-bracket,
+  span.cm-def,
+  span.cm-header,
+  span.cm-link:visited,
+  span.cm-qualifier,
+  span.cm-tag,
+  span.cm-variable-2 {
+    color: var(--theme-highlight-blue)!important
+  }
+  span.cm-property {
+    color: var(--theme-highlight-green)!important
+  }
+  span.cm-variable {
+    color: var(--theme-highlight-purple)!important
+  }
+  span.cm-special,
+  span.cm-variable-3 {
+    color: var(--in-content-text-color)!important
+  }
+  span.cm-link {
+    color: var(--in-content-box-border-color)!important
+  }
+  span.cm-operator {
+    color: var(--in-content-page-color)!important
+  }
+  .CodeMirror-activeline-background {
+    background: var(--cm-active-line-background)!important
+  }
+  .CodeMirror-matchingbracket {
+    outline: var(--cm-matching-bracket) solid 1px!important;
+    color: var(--cm-cursor)!important
+  }
+  .CodeMirror-merge-l-chunk {
+    background: var(--in-content-page-background)!important
+  }
+  .cm-search-widget {
+    background-color: var(--theme-sidebar-background)!important;
+    border: 1px solid;
+    border-bottom: none!important;
+    border-color: var(--in-content-category-header-background)!important;
+    max-height: 15px!important;
+    justify-content: right!important
+  }
+  .cm-search-widget input {
+    -moz-appearance: none!important;
+    background-color: var(--cm-search-background)!important;
+    border: 1px solid!important;
+    border-color: var(--in-content-table-border-dark-color)!important;
+    color: var(--in-content-page-color)!important;
+    border-radius: 8px!important;
+    padding-left: 8px!important
+  }
+  .cm-searching {
+    background-color: var(--warning-background-color)!important
+  }
+  .cm-staticOpt {
+    background-color: var(--in-content-box-background)!important;
+    font-weight: 700
+  }
+  .CodeMirror-merge-gap {
+    background-color: var(--in-content-category-header-background)!important;
+    border-top: 1px solid!important;
+    border-bottom: 1px solid!important;
+    border-right: none!important;
+    border-left: none!important;
+    border-color: var(--cm-background)!important
+  }
+  .CodeMirror-merge {
+    border: none!important
+  }
+  .cm-search-widget span.fa {
+    color: var(--in-content-border-color)!important;
+    font-size: 100%!important
+  }
+  .cm-staticext {
+    color: var(--theme-highlight-blue)!important
+  }
+  .cm-staticnetBlock {
+    color: var(--cm-red)!important
+  }
+  .cm-staticnetAllow {
+    color: var(--theme-highlight-green)!important
+  }
+}
+@-moz-document url-prefix("moz-extension://greasemonkey_UUID/") {
+  body,
+  html {
+    background: var(--in-content-page-background)!important
+  }
+  #tabs .tab.active,
+  .command-item {
+    background: var(--tone-8)!important;
+    color: var(--in-content-page-color)!important
+  }
+  .subview-back::before {
+    content: url(/skin/back.svg);
+    filter: invert(65%)
+  }
+  .subview-back:focus,
+  .subview-back:hover,
+  .subview-item:focus,
+  .subview-item:hover {
+    background-color: var(--in-content-category-background-hover)!important;
+    cursor: default;
+    color: inherit;
+    text-decoration: none
+  }
+  .subview-item .icon,
+  .subview-item .text {
+    background: 0 0!important
   }
 }
 /*! Alters the webextension Multi-Account Containers
@@ -1135,17 +1401,17 @@ url-prefix(https://discovery.addons.mozilla.org) {
   #current-tab,
   .column-panel-content,
   html body div#container-panel.panel.container-panel {
-    background: var(--tone-6)!important;
-    color: var(--tone-4)!important
+    background: var(--in-content-box-background)!important;
+    color: var(--in-content-page-color)!important
   }
   #current-tab > h3,
   .container-info-list,
   .panel-header-text {
-    color: var(--tone-4)!important
+    color: var(--in-content-page-color)!important
   }
   #container-panel #sort-containers-link {
-    border-color: var(--tone-5)!important;
-    color: var(--tone-4)!important
+    border-color: var(--in-content-box-border-color)!important;
+    color: var(--in-content-page-color)!important
   }
   #container-panel #sort-containers-link:hover,
   .clickable:hover {
@@ -1154,7 +1420,7 @@ url-prefix(https://discovery.addons.mozilla.org) {
   .container-panel-row {
     background-color: var(--tone-6)!important;
     border-block-end: 1px solid var(--tone-5);
-    color: var(--tone-4)!important
+    color: var(--in-content-page-color)!important
   }
   .scrollable {
     border-block-start: 1px solid var(--tone-5)!important;
@@ -1195,22 +1461,22 @@ url-prefix(https://discovery.addons.mozilla.org) {
   }
   .edit-container-panel fieldset,
   .edit-containers-text a {
-    color: var(--tone-4)!important
+    color: var(--in-content-page-color)!important
   }
   .edit-container-panel input[type=text] {
     background: var(--tone-8)!important;
-    color: var(--tone-4)!important;
+    color: var(--in-content-page-color)!important;
     border-color: var(--tone-5)!important
   }
   [data-identity-color=grey] {
     --identity-icon-color: var(--tone-4)!important
   }
   .button {
-    color: var(--tone-4)!important
+    color: var(--in-content-page-color)!important
   }
   .container-notification {
     background: var(--tone-7)!important;
-    color: var(--tone-4)!important
+    color: var(--in-content-page-color)!important
   }
   .edit-containers-text {
     border-inline-end: solid 0 #d8d8d8!important
@@ -1224,13 +1490,13 @@ url-prefix(https://discovery.addons.mozilla.org) {
   }
   .title-text,
   body {
-    color: var(--tone-4)!important
+    color: var(--in-content-page-color)!important
   }
   #redirect-url {
     background: var(--tone-8)!important
   }
   .button-container > button:first-child {
-    background: var(--tone-6)!important;
+    background: var(--in-content-box-background)!important;
     border-color: var(--tone-5)!important
   }
   .button-container > button:first-child:hover {
@@ -1239,7 +1505,7 @@ url-prefix(https://discovery.addons.mozilla.org) {
   #never-ask {
     -moz-appearance: none!important;
     background-color: var(--tone-6)!important;
-    border-color: var(--tone-5)!important;
+    border-color: var(--in-content-box-border-color)!important;
     background-image: none!important;
     box-shadow: none!important
   }
@@ -1248,44 +1514,6 @@ url-prefix(https://discovery.addons.mozilla.org) {
     background-color: var(--tone-6)!important
   }
 }
-/*! Alters the webextension Multiple Tab Handler
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://multiple_tab_handler_UUID/") {
-  h1,
-  p,
-  ul,
-  ul li {
-    color: var(--tone-4)!important
-  }
-}
-/*! Alters the webextension Neat URL
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://neat_url_UUID/") {
-  body,
-  h2,
-  label {
-    color: var(--tone-4)!important
-  }
-  input,
-  textarea {
-    -moz-appearance: none!important;
-    background: var(--tone-6)!important;
-    color: var(--tone-4)!important;
-    border-color: var(--tone-5)!important;
-    padding: 5px!important
-  }
-  a:link {
-    color: var(--accent-1)!important
-  }
-  button {
-    background-color: var(--tone-8)!important;
-    color: var(--tone-4)!important;
-    border-color: var(--tone-5)!important
-  }
-  button:hover {
-    background-color: var(--tone-7)!important
-  }
-}
 /*! Alters the webextension NoScript
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://noscript_UUID/") {
@@ -1331,192 +1559,100 @@ url-prefix(https://discovery.addons.mozilla.org) {
     border: none!important
   }
 }
-.pkt_ext_containersaved h2 {
-  color: var(--tone-4)!important
+.pkt_ext_containersaved .pkt_ext_tag_input_wrapper input::placeholder,
+.pkt_ext_containersaved h2,
+.token-input-dropdown-tag ul li {
+  color: var(--in-content-page-color)!important
 }
-.pkt_ext_containersaved .pkt_ext_tag_detail {
-  border-color: var(--tone-5)!important;
-  background: var(--tone-6)!important
-}
-.pkt_ext_containersaved .pkt_ext_tag_input_wrapper {
-  background-color: var(--tone-6)!important;
-  border-color: var(--tone-5)!important
-}
-.pkt_ext_containersaved .pkt_ext_tag_input_wrapper input::placeholder {
-  color: var(--tone-4)!important
+.pkt_ext_containersaved .pkt_ext_tag_detail,
+.pkt_ext_containersaved .pkt_ext_tag_input_wrapper,
+.token-input-dropdown-tag {
+  border-color: var(--in-content-box-border-color)!important;
+  background: var(--in-content-box-background)!important
 }
 .pkt_ext_containersaved .pkt_ext_tag_input_wrapper input {
-  background-color: var(--tone-6)!important;
-  color: var(--tone-4)!important
+  background-color: var(--in-content-box-background)!important;
+  color: var(--in-content-page-color)!important
 }
 .pkt_ext_containersaved .pkt_ext_btn {
-  background: var(--tone-8)!important
+  background: var(--in-content-category-header-background)!important
 }
 .pkt_ext_containersaved .token-input-token {
-  border-color: var(--tone-5)!important;
-  background-color: var(--tone-7)!important;
-  color: var(--tone-4)!important
-}
-.token-input-dropdown-tag {
-  background: var(--tone-6)!important;
-  border-color: var(--tone-5)!important
-}
-.token-input-dropdown-tag ul li {
-  color: var(--tone-4)!important
+  border-color: var(--in-content-box-border-color)!important;
+  background-color: var(--in-content-table-border-dark-color)!important;
+  color: var(--in-content-page-color)!important
 }
 /*! Alters the webextension Request Control
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://request_control_UUID/") {
+  * {
+    color: var(--in-content-page-color)!important
+  }
   body {
-    background-color: var(--tone-7)!important;
-    color: var(--tone-4)!important
+    background-color: var(--in-content-page-background)!important
+  }
+  .page-header,
+  hr {
+    border-color: var(--in-content-box-border-color)!important
+  }
+  .nav-tabs.nav-justified > li > a {
+    border-bottom-color: var(--in-content-box-border-color)!important
+  }
+  .badge {
+    color: var(--in-content-text-color)!important
   }
   .rule:not(.editing):not(:hover) {
-    background-color: var(--tone-6)!important;
-    border-color: var(--tone-5)!important
+    background-color: var(--in-content-box-background)!important
   }
+  .editing .rule-header,
+  .list-group-item,
   .rule:hover:not(.editing) {
-    background-color: var(--tone-8)!important;
-    border-color: var(--tone-5)!important
+    background-color: var(--in-content-box-background-hover)!important;
+    border-color: var(--in-content-box-border-color)!important
   }
+  .nav-tabs > li > a:hover,
   .nav-tabs > li.active > a,
   .nav-tabs > li.active > a:focus,
   .nav-tabs > li.active > a:hover {
-    color: var(--tone-4)!important;
-    background-color: var(--tone-8)!important;
-    border-color: var(--tone-5)!important
-  }
-  .nav-tabs > li > a:hover {
-    background-color: var(--tone-8)!important;
-    border: 1px solid!important
+    background-color: var(--in-content-category-header-background)!important;
+    border-color: var(--in-content-box-border-color)!important
   }
   tabs.nav-justified > li > a {
-    border-bottom: 1px solid!important
+    border-bottom: 1px solid!important;
+    border-color: var(--in-content-box-border-color)!important
   }
   .btn-default {
-    color: var(--tone-4)!important;
-    background-color: var(--tone-8)!important;
-    border-color: var(--tone-5)!important
+    background-color: var(--in-content-page-background)!important;
+    border-color: var(--in-content-box-border-color)!important
   }
   .btn-default.active {
-    background-color: var(--tone-6)!important
+    background-color: var(--in-content-box-background-active)!important
   }
   .btn-default:hover {
-    color: var(--tone-4)!important;
-    background-color: var(--tone-5)!important;
-    border-color: var(--tone-5)!important
+    background-color: var(--in-content-box-background-hover)!important
   }
   .list-group-item:first-child {
-    background: var(--tone-6)!important;
-    border-color: var(--tone-5)!important
-  }
-  .table {
-    background: var(--tone-6)!important
+    background: var(--in-content-box-background)!important;
+    border-color: var(--in-content-box-border-color)!important
   }
+  .table,
   .table-striped > tbody > tr:nth-of-type(2n+1) {
-    background-color: var(--tone-8)!important
+    background-color: var(--in-content-box-background)!important
   }
-  .btn-group-params > .tags-input,
-  .input-group .form-control:first-child,
-  .input-group-addon:first-child,
-  .input-group-btn:first-child > .btn,
-  .input-group-btn:first-child > .btn-group > .btn,
-  .input-group-btn:first-child > .dropdown-toggle,
-  .input-group-btn:last-child > .btn-group:not(:last-child) > .btn,
-  .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
-  select.input-sm {
-    background: var(--tone-5)!important;
-    color: var(--grey-30)!important;
-    border-color: var(--tone-4)!important
-  }
-  .list-group-item {
-    background-color: var(--tone-6)!important;
-    border: 1px solid #ddd
+  .tags-input,
+  input[type=text],
+  select {
+    background: var(--in-content-page-background)!important;
+    color: var(--in-content-text-color)!important;
+    border-color: var(--in-content-box-border-color)!important
   }
   .tags-input .tag {
-    background: var(--tone-8)!important;
-    border-color: var(--tone-5)!important;
-    color: var(--tone-4)!important
+    background: var(--in-content-item-selected)!important;
+    border-color: var(--in-content-box-border-color)!important
   }
-}
-/*! Alters the webextension Skip Redirect
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://skip_redirect_UUID/") {
-  body {
-    background: var(--tone-6)!important;
-    color: var(--tone-4)!important
-  }
-  input[type=number],
-  input[type=text],
-  textarea {
-    -moz-appearance: none!important;
-    background: var(--tone-5)!important;
-    color: var(--grey-30)!important
-  }
-  label a {
-    color: var(--accent-1)!important
-  }
-}
-/*! Alters the webextension Smart HTTPS
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://smart_https_UUID/") {
-  body {
-    background-color: var(--tone-6)!important;
-    color: var(--tone-4)!important
-  }
-  .information input[type=number],
-  input[type=text] {
-    -moz-appearance: none!important;
-    background: var(--tone-6)!important;
-    color: var(--tone-4)!important;
-    border-color: var(--tone-5)!important
-  }
-  .information p {
-    color: var(--tone-4)!important
-  }
-}
-/*! Alters the webextension Smart Referer
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://smart_referer_UUID/") {
-  body,
-  body > [data-option] > .label.with-description > p,
-  body > [data-option] > label.with-description > p {
-    color: var(--in-content-page-color)!important;
-    text-shadow: none!important
-  }
-  input[type=text] {
-    -moz-appearance: none!important;
-    background-color: var(--in-content-box-background)!important;
-    border: 1px solid!important;
-    border-color: var(--in-content-box-border-color)!important;
-    color: var(--in-content-page-color)!important
-  }
-  button[type=submit] {
-    filter: invert(65%)
-  }
-}
-/*! Alters the webextension Tab Suspender (memory saver)
-  IMPORTANT: change the Internal UUID */
-@-moz-document url-prefix("moz-extension://tab_suspender_UUID/") {
-  body,
-  label {
-    color: var(--tone-4)!important
-  }
-  input[type=number],
-  textarea {
-    -moz-appearance: none!important;
-    background: var(--tone-6)!important;
-    color: var(--tone-4)!important;
-    border-color: var(--tone-5)!important
-  }
-  #recovery,
-  #save {
-    -moz-appearance: none!important;
-    height: 20px!important;
-    background: var(--tone-8)!important;
-    color: var(--tone-4)!important;
-    border-color: var(--tone-5)!important;
-    border-radius: 4px!important
+  button img,
+  img.arrow {
+    filter: invert(65%)!important
   }
 }
 /*! Alters the webextension Tree Style Tab
@@ -1548,17 +1684,6 @@ url-prefix(https://discovery.addons.mozilla.org) {
   a {
     color: var(--accent-2)!important
   }
-  #autoGroupNewTabsDelayOnNewWindow,
-  #autoGroupNewTabsTimeout,
-  #importedConfigsFromLegacy,
-  #importedTreeStructureFromLegacy,
-  #legacyConfigsNextMigrationVersion,
-  #userStyleRules {
-    -moz-appearance: none!important;
-    background: var(--tone-6)!important;
-    color: var(--tone-4)!important;
-    border-color: var(--tone-5)!important
-  }
   #contextual-identities-selector,
   #newtab-action-selector,
   #tabContextMenu,
@@ -1569,10 +1694,6 @@ url-prefix(https://discovery.addons.mozilla.org) {
   .menu-ui-59858.menu-ui.menu li.separator {
     border-color: var(--in-content-box-border-color)!important
   }
-  fieldset {
-    border: 2px solid!important;
-    border-color: var(--in-content-box-border-color)!important
-  }
   :root {
     background-color: var(--in-content-page-background)!important
   }
@@ -1656,8 +1777,9 @@ url-prefix(https://discovery.addons.mozilla.org) {
     background: var(--in-content-category-header-background)!important;
     border-color: var(--in-content-category-header-background)!important
   }
-  body {
-    color: var(--tone-4)!important
+  body,
+  table {
+    color: var(--in-content-page-color)!important
   }
   a:link {
     color: var(--in-content-link-color)!important
@@ -1667,12 +1789,8 @@ url-prefix(https://discovery.addons.mozilla.org) {
     color: var(--in-content-text-color)!important
   }
   #completions {
-    overflow: visible!important;
     background: var(--in-content-page-background)!important;
-    border-color: var(--tone-5)!important
-  }
-  table {
-    color: var(--tone-4)!important
+    border-color: var(--in-content-box-border-color)!important
   }
   .option:not(.focused) .url {
     color: var(--code-green)!important;
@@ -1691,98 +1809,6 @@ url-prefix(https://discovery.addons.mozilla.org) {
 /*! Alters the webextension uBlock Origin
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://ublock_origin_UUID/") {
-  .CodeMirror {
-    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
-  }
-  .CodeMirror-line > span > span::selection,
-  .CodeMirror-line > span::selection,
-  .CodeMirror-line::selection {
-    background: #353b48!important
-  }
-  .CodeMirror-line > span > span::-moz-selection,
-  .CodeMirror-line > span::-moz-selection,
-  .CodeMirror-line::-moz-selection {
-    background: #353b48!important
-  }
-  .CodeMirror-activeline-background {
-    background: rgba(185,215,253,.15)!important
-  }
-  .CodeMirror-merge-l-chunk {
-    background: var(--tone-7)!important
-  }
-  .cm-search-widget {
-    background-color: var(--theme-sidebar-background)!important;
-    border: 1px solid;
-    border-bottom: none!important;
-    border-color: #2a2a2c!important;
-    max-height: 15px!important;
-    justify-content: right!important
-  }
-  .cm-search-widget input {
-    -moz-appearance: none!important;
-    background-color: rgba(24,29,32,1)!important;
-    border: 1px solid!important;
-    border-color: var(--tone-7)!important;
-    color: var(--tone-4)!important;
-    border-radius: 8px!important;
-    padding-left: 8px!important
-  }
-  .cm-searching {
-    background-color: var(--warning-background-color)!important
-  }
-  .cm-staticOpt {
-    background-color: var(--tone-6)!important;
-    font-weight: 700
-  }
-  .CodeMirror-merge-gap {
-    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: #2a2a2c!important
-  }
-  .CodeMirror-merge {
-    border: none!important
-  }
-  html body div#userFilters.codeMirrorContainer div div.cm-search-widget span.fa {
-    color: var(--tone-6)!important;
-    font-size: 100%!important
-  }
-  .CodeMirror-gutters {
-    background: var(--theme-sidebar-background)!important;
-    border-right: 0 solid #4a4a4f!important
-  }
-  .CodeMirror-guttermarker,
-  .CodeMirror-guttermarker-subtle {
-    color: #555!important
-  }
-  .CodeMirror-linenumber {
-    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
-  }
-  .cm-staticnetBlock {
-    color: #de7474!important
-  }
-  .cm-staticnetAllow {
-    color: var(--theme-highlight-green)!important
-  }
   button.custom {
     background-color: var(--in-content-page-background)!important;
     background-image: none!important;
@@ -1862,6 +1888,7 @@ url-prefix(https://discovery.addons.mozilla.org) {
     color: var(--tone-2)!important
   }
   #extraTools,
+  #extraTools > span > span.badge,
   h2 {
     background-color: var(--tone-8)!important;
     color: var(--tone-4)!important
@@ -1870,9 +1897,6 @@ url-prefix(https://discovery.addons.mozilla.org) {
     background-color: var(--tone-8)!important;
     border-color: var(--tone-5)!important
   }
-  #extraTools > span > span.badge {
-    color: var(--tone-4)!important
-  }
   #firewallContainer > div {
     background-color: var(--tone-6)!important
   }
@@ -2176,61 +2200,6 @@ url-prefix(https://discovery.addons.mozilla.org) {
 /*! Alters the webextension uMatrix
   IMPORTANT: change the Internal UUID */
 @-moz-document url-prefix("moz-extension://umatrix_UUID/") {
-  .CodeMirror {
-    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
-  }
-  .CodeMirror-line > span > span::selection,
-  .CodeMirror-line > span::selection,
-  .CodeMirror-line::selection {
-    background: #353b48!important
-  }
-  .CodeMirror-line > span > span::-moz-selection,
-  .CodeMirror-line > span::-moz-selection,
-  .CodeMirror-line::-moz-selection {
-    background: #353b48!important
-  }
-  .CodeMirror-activeline-background {
-    background: rgba(185,215,253,.15)!important
-  }
-  .CodeMirror-merge-l-chunk {
-    background: var(--tone-7)!important
-  }
-  .cm-searching {
-    background-color: var(--warning-background-color)!important
-  }
-  .CodeMirror-merge-gap {
-    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: #2a2a2c!important
-  }
-  .CodeMirror-merge {
-    border: none!important
-  }
-  .CodeMirror-gutters {
-    background: var(--theme-sidebar-background)!important;
-    border-right: 0 solid #4a4a4f!important
-  }
-  .CodeMirror-guttermarker,
-  .CodeMirror-guttermarker-subtle {
-    color: #555!important
-  }
-  .CodeMirror-linenumber {
-    padding: 0 8px 0 5px!important;
-    color: #58575c!important
-  }
-  .CodeMirror-cursor {
-    border-left: 1px solid #fff!important
-  }
   .t81 {
     color: #fff;
     background-color: #db4c4c!important
@@ -2710,94 +2679,4 @@ url-prefix(https://discovery.addons.mozilla.org) {
   .frame-block {
     background: var(--in-content-box-background)!important
   }
-  .CodeMirror {
-    border: 1px solid #4a4a4f;
-    border-radius: 4px!important;
-    background: #2a2a2e!important;
-    color: #b1b1b3!important
-  }
-  div.CodeMirror-selected {
-    background: #353b48!important
-  }
-  .CodeMirror-line > span > span::selection,
-  .CodeMirror-line > span::selection,
-  .CodeMirror-line::selection {
-    background: #353b48!important
-  }
-  .CodeMirror-line > span > span::-moz-selection,
-  .CodeMirror-line > span::-moz-selection,
-  .CodeMirror-line::-moz-selection {
-    background: #353b48!important
-  }
-  .CodeMirror-gutters {
-    background: #2a2a2e!important;
-    border-right: 0 solid #4a4a4f!important
-  }
-  .CodeMirror-guttermarker,
-  .CodeMirror-guttermarker-subtle {
-    color: #555!important
-  }
-  .CodeMirror-linenumber {
-    color: #939393!important
-  }
-  .CodeMirror-cursor {
-    border-left: 1px solid!important;
-    border-color: #fff!important
-  }
-  span.cm-comment {
-    color: #939393!important
-  }
-  span.cm-atom,
-  span.cm-attribute,
-  span.cm-builtin,
-  span.cm-error,
-  span.cm-keyword,
-  span.cm-quote {
-    color: #ff7de9!important
-  }
-  span.cm-number,
-  span.cm-string,
-  span.cm-string-2 {
-    color: #6b89ff!important
-  }
-  span.cm-hr,
-  span.cm-meta {
-    color: #939393!important
-  }
-  span.cm-header,
-  span.cm-qualifier,
-  span.cm-variable-2 {
-    color: #75bfff!important
-  }
-  span.cm-property {
-    color: #86de74!important
-  }
-  span.cm-bracket,
-  span.cm-def,
-  span.cm-link:visited,
-  span.cm-tag {
-    color: #75bfff!important
-  }
-  span.cm-variable {
-    color: #b98eff!important
-  }
-  span.cm-variable-3 {
-    color: #d7d7db!important
-  }
-  span.cm-link {
-    color: #737373!important
-  }
-  span.cm-operator {
-    color: #b1b1b3!important
-  }
-  span.cm-special {
-    color: #d7d7db!important
-  }
-  .CodeMirror-activeline-background {
-    background: rgba(185,215,253,.15)!important
-  }
-  .CodeMirror-matchingbracket {
-    outline: rgba(255,255,255,.25) solid 1px!important;
-    color: #fff!important
-  }
 }
\ No newline at end of file