From 4909e58907b4a99e489665e4ac6add875d684e95 Mon Sep 17 00:00:00 2001
From: overdodactyl <pjohns33@protonmail.com>
Date: Tue, 26 Dec 2017 22:07:48 -0700
Subject: [PATCH] Add support for Request Control

---
 .../webextension-tweaks/request_control.css   |  87 ++
 userContent.css                               | 947 ++++++++++--------
 userContent_imports.css                       |   1 +
 3 files changed, 614 insertions(+), 421 deletions(-)
 create mode 100644 userContent-files/webextension-tweaks/request_control.css

diff --git a/userContent-files/webextension-tweaks/request_control.css b/userContent-files/webextension-tweaks/request_control.css
new file mode 100644
index 0000000..9c904fc
--- /dev/null
+++ b/userContent-files/webextension-tweaks/request_control.css
@@ -0,0 +1,87 @@
+@-moz-document url-prefix("moz-extension://ed3f80c9-0ccb-ca41-bd62-f71a9fb72d27/") {
+
+  body {
+      background-color: var(--primary-dark-color) !important;
+      color: var(--primary-light-color) !important;
+  }
+
+  .rule:not(.editing):not(:hover) {
+      background-color: var(--grey-60) !important;
+      border: 1px solid var(--grey-50) !important;
+  }
+
+  .rule:hover:not(.editing) {
+      background-color: var(--grey-80) !important;
+      border: 1px solid var(--grey-50) !important;
+  }
+
+  .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
+      color: var(--primary-light-color) !important;
+      background-color: var(--grey-80) !important;
+      border: 1px solid var(--grey-50) !important;
+  }
+
+  .nav-tabs > li > a:hover {
+      background-color: var(--grey-80) !important;
+      border: 1px solid var(--grey-50) !important;
+  }
+
+  tabs.nav-justified > li > a {
+      border-bottom: 1px solid var(--grey-50) !important;
+  }
+
+  .btn-default {
+      color: var(--primary-light-color) !important;
+      background-color: var(--grey-80) !important;
+      border-color: var(--grey-50) !important;
+  }
+
+  .btn-default.active {
+    background-color: var(--grey-60) !important;
+  }
+
+  .btn-default:hover {
+      color: var(--primary-light-color) !important;
+      background-color: var(--grey-50) !important;
+      border-color: var(--grey-50) !important;
+  }
+
+  .list-group-item:first-child {
+      background: var(--grey-60) !important;
+      border-color: var(--grey-50) !important;
+
+  }
+
+  .table {
+      background: var(--grey-60) !important;
+  }
+
+  .table-striped > tbody > tr:nth-of-type(2n+1) {
+      background-color: var(--grey-80) !important;
+  }
+
+  .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:not(:last-child):not(.dropdown-toggle),
+  .input-group-btn:last-child > .btn-group:not(:last-child) > .btn,
+   select.input-sm,
+  .btn-group-params > .tags-input {
+      background: var(--grey-50) !important;
+      color: var(--grey-30) !important;
+      border-color: var(--grey-40) !important;
+  }
+  .list-group-item {
+      background-color: var(--grey-60) !important;
+      border: 1px solid #ddd;
+  }
+
+  .tags-input .tag {
+      background: var(--grey-80) !important;
+      border: 1px solid var(--grey-60) !important;
+      color: var(--primary-light-color) !important;
+  }
+
+}
diff --git a/userContent.css b/userContent.css
index ae06493..59256ad 100644
--- a/userContent.css
+++ b/userContent.css
@@ -119,427 +119,6 @@
     color: var(--primary-accent-color) !important;
   }
 }
-/* Alters the preferences page for Dark Mode */
-
-/* IMPORTANT: change the Internal UUID */
-
-@-moz-document url-prefix("moz-extension://32b18bd1-4169-b649-b20a-ebafe1e7e549/")  {
-  /* Headers */
-
-  .comment {
-    color: var(--primary-accent-color) !important;
-  }
-
-  label {
-    color: var(--primary-light-color) !important;
-  }
-}
-@-moz-document url-prefix("moz-extension://20cadb98-5f0e-d748-9a3b-a1eaf7c640f6/")  {
-  body {
-    background-color: var(--grey-60) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  header,
-  .panel:not(:last-child) {
-    border-bottom: solid var(--grey-50) 1px !important;
-  }
-
-  .button {
-    -moz-user-select: none;
-    background-color: var(--grey-70) !important;
-  }
-}
-@-moz-document url-prefix("moz-extension://897dfa7c-fa54-be49-996c-594df8db2260/")  {
-  body {
-    color: var(--primary-light-color) !important;
-    background: var(--grey-60) !important;
-  }
-
-  a {
-    color: var(--primary-accent-color) !important;
-  }
-
-  h3 {
-    color: var(--primary-light-color) !important;
-  }
-}
-/* Alters the preferences page */
-
-@-moz-document url-prefix("moz-extension://cd5adf97-491d-f44b-9ea2-d2417d781589/")  {
-  h1,
-  p,
-  ul,
-  ul li {
-    color: var(--primary-light-color) !important;
-  }
-}
-/* Alters the preferences page */
-
-/* IMPORTANT: change the Internal UUID */
-
-@-moz-document url-prefix("moz-extension://19684a2f-ee86-d644-961c-ab8b8ad10aca/")  {
-  body {
-    background: var(--primary-dark-color) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  #notes {
-    background: var(--primary-dark-color) !important;
-    color: var(--primary-light-color) !important;
-  }
-}
-/* Alters the preferences page 
- * and context menus */
-
-@-moz-document url-prefix("moz-extension://2a3d122c-dc21-7f4c-a805-82cbd472de98/")  {
-  p,
-  ul {
-    color: var(--primary-light-color) !important;
-  }
-
-  h1,
-  legend {
-    color: var(--primary-accent-color) !important;
-  }
-
-  a {
-    color: var(--primary-accent-color-dark) !important;
-  }
-
-  #tabContextMenu {
-    background: var(--grey-60) !important;
-    border: none !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  #debug-configs {
-    color: var(--primary-light-color) !important;
-  }
-}
-@-moz-document url-prefix("moz-extension://7ce809b7-4a3b-484c-89de-42aa4db7f5de/")  {
-  body {
-    background: var(--grey-60) !important;
-  }
-
-  #topPane {
-    background-color: var(--grey-60) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  #heatmaps .togglerBar {
-    background: var(--grey-60) !important;
-  }
-
-  body.theoretical #heatmaps .heatmap.theoretical {
-    background: var(--grey-60) !important;
-  }
-
-  #heatmaps .heatmap {
-    border: none;
-    background: var(--grey-60) !important;
-  }
-
-  #heatmaps.list .hmcell {
-    background-color: var(--grey-60) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  #domain3rdDetails {
-    background-color: var(--grey-70) !important;
-    border: 1px solid var(--grey-70) !important;
-  }
-
-  #domain3rdDetails #authority {
-    background-color: var(--grey-80) !important;
-    position: relative;
-  }
-
-  #scores .scores .score.actual {
-    color: white !important;
-  }
-
-  #scores .scores .score.theoretical {
-    color: var(--grey-70) !important;
-  }
-
-  body.theoretical #scores .scores .score.actual {
-    color: var(--grey-70) !important;
-  }
-
-  body.theoretical #scores .scores .score.theoretical {
-    color: var(--primary-light-color) !important;
-  }
-}
-@-moz-document url-prefix("moz-extension://de835161-ee69-c14d-9940-203fbacf2276/")  {
-  /* header */
-
-  #appinfo {
-    background-color: var(--grey-80) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  /* Right Column */
-
-  body[dir="ltr"] #panes > div {
-    background: var(--grey-70) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  body,
-  #panes {
-    background: var(--grey-70) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  label a,
-  p a,
-  ul a {
-    color: var(--primary-accent-color) !important;
-  }
-
-  /* Subgroup in Settings */
-
-  ul#userSettings .subgroup > span {
-    color: var(--primary-accent-color) !important;
-  }
-
-  #dashboard-nav-widgets span {
-    color: var(--primary-light-color) !important;
-  }
-
-  /* info icons */
-
-  a.info {
-    color: var(--primary-light-color) !important;
-    opacity: .5;
-  }
-
-  li.listEntry span.status {
-    color: var(--primary-light-color) !important;
-  }
-
-  li.listEntry > a.remove,
-  li.listEntry > a.remove:visited {
-    color: var(--red-80) !important;
-  }
-
-  /* Power Switch */
-
-  #switch .fa {
-    color: var(--primary-accent-color) !important;
-  }
-
-  /* Power Switch - Off */
-
-  body.off #switch .fa {
-    color: var(--primary-light-color) !important;
-  }
-
-  /* Tool Buttons */
-
-  .tool {
-    color: var(--primary-light-color) !important;
-  }
-
-  .tool:hover {
-    color: var(--grey-80) !important;
-  }
-
-  /* Stripped row */
-
-  h2,
-  #extraTools {
-    background-color: var(--grey-80) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  /* Refresh Button */
-
-  #refresh {
-    background-color: var(--grey-80) !important;
-    border-color: var(--grey-50) !important;
-  }
-
-  /* Badge number */
-
-  #extraTools > span > span.badge {
-    color: var(--primary-light-color) !important;
-  }
-
-  /* Firewall Container */
-
-  #firewallContainer > div {
-    background-color: var(--grey-60) !important;
-  }
-
-  #firewallContainer > div > span {
-    color: var(--primary-light-color) !important;
-    border-color: var(--grey-50) !important;
-  }
-
-  /* Darker Red */
-
-  body.advancedUser #firewallContainer > div > span.blockRule.ownRule {
-    background-color: #ab0000 !important;
-  }
-
-  /* Lighter Red */
-
-  body.advancedUser #firewallContainer > div > span.blockRule {
-    background-color: #dda0a2 !important;
-  }
-
-  #firewallContainer > div.blocked > span:first-of-type::before,
-  #firewallContainer.minimized > div.isDomain.totalBlocked > span:first-of-type::before {
-    background-color: #af0202 !important;
-  }
-
-  /* Darker Green */
-
-  body.advancedUser #firewallContainer > div > span.allowRule.ownRule {
-    background-color: #229400 !important;
-  }
-
-  /* Lighter Green */
-
-  body.advancedUser #firewallContainer > div > span.allowRule {
-    background-color: #95ca8a !important;
-  }
-
-  #firewallContainer > div.allowed > span:first-of-type::before,
-  #firewallContainer.minimized > div.isDomain.totalAllowed > span:first-of-type::before {
-    background-color: #02af06 !important;
-  }
-
-  /* Darker Blue */
-
-  body.advancedUser #firewallContainer > div > span.noopRule.ownRule {
-    background-color: #0c46a7 !important;
-  }
-
-  /* Blue on hover */
-
-  #actionSelector > span:nth-of-type(2) {
-    background-color: #0c46a7 !important;
-  }
-
-  /* Lighter Blue */
-
-  body.advancedUser #firewallContainer > div > span.noopRule {
-    background-color: #65bdfb !important;
-  }
-
-  /* Color Blind Friendly */
-
-  /* Dark Block Color */
-
-  body.advancedUser #firewallContainer.colorBlind > div > span.blockRule.ownRule {
-    background-color: #000060 !important;
-  }
-
-  /* Light Block Color */
-
-  body.advancedUser #firewallContainer.colorBlind > div > span.blockRule {
-    background-color: #787dab !important;
-  }
-
-  /* Dark Allow */
-
-  body.advancedUser #firewallContainer.colorBlind > div > span.allowRule.ownRule {
-    background-color: #fbb900 !important;
-  }
-
-  /* Light Allow */
-
-  body.advancedUser #firewallContainer.colorBlind > div > span.allowRule {
-    background-color: #f2d98d !important;
-  }
-
-  /* Dark Noop */
-
-  body.advancedUser #firewallContainer > div > span.noopRule.ownRule {
-    background-color: #2f2e2e !important;
-  }
-
-  /* Light Noop */
-
-  body.advancedUser #firewallContainer > div > span.noopRule {
-    background-color: #a1a1a1 !important;
-  }
-
-  /* Yellow Side */
-
-  #firewallContainer.colorBlind > div.allowed > span:first-of-type::before,
-  #firewallContainer.colorBlind.minimized > div.isDomain.totalAllowed > span:first-of-type::before {
-    background-color: #ebd287 !important;
-  }
-
-  /* Blue Side */
-
-  #firewallContainer.colorBlind > div.blocked > span:first-of-type::before,
-  #firewallContainer.colorBlind.minimized > div.isDomain.totalBlocked > span:first-of-type::before {
-    background-color: #787cab !important;
-  }
-
-  #dashboard-nav-widgets {
-    border-bottom: 1px solid var(--grey-60) !important;
-    background-color: var(--grey-80) !important;
-  }
-
-  .tabButton {
-    background-color: var(--grey-70) !important;
-    color: var(--primary-light-color) !important;
-    border: 1px solid var(--grey-60) !important;
-    border-bottom: 1px solid var(--grey-60) !important;
-  }
-
-  .tabButton.selected {
-    background-color: var(--grey-80) !important;
-    border-bottom: 1px solid var(--grey-70) !important;
-  }
-
-  input[type="number"] {
-    -moz-appearance: none!important;
-    background-color: var(--grey-60) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  li.listEntry .content {
-    color: var(--primary-accent-color) !important;
-  }
-
-  #diff .pane {
-    color: var(--primary-light-color) !important;
-    background: var(--primary-dark-color) !important;
-  }
-
-  #diff li {
-    background-color: var(--grey-60) !important;
-  }
-
-  #diff li:nth-child(2n) {
-    background-color: var(--grey-70) !important;
-  }
-
-  /* Textbox */
-
-  code {
-    background-color: var(--grey-60) !important;
-  }
-
-  #whitelist textarea {
-    background: var(--grey-60) !important;
-    color: var(--primary-light-color) !important;
-  }
-
-  textarea#userFilters.userFilters,
-  textarea#externalLists {
-    -moz-appearance: none!important;
-    background: var(--grey-60) !important;
-    color: var(--primary-light-color) !important;
-  }
-}
 @-moz-document url(about:)  {
   a:link {
     color: var(--primary-accent-color) !important;
@@ -1314,6 +893,532 @@
     color: var(--primary-accent-color) !important;
   }
 }
+/* Alters the preferences page for Dark Mode */
+
+/* IMPORTANT: change the Internal UUID */
+
+@-moz-document url-prefix("moz-extension://32b18bd1-4169-b649-b20a-ebafe1e7e549/")  {
+  /* Headers */
+
+  .comment {
+    color: var(--primary-accent-color) !important;
+  }
+
+  label {
+    color: var(--primary-light-color) !important;
+  }
+}
+@-moz-document url-prefix("moz-extension://20cadb98-5f0e-d748-9a3b-a1eaf7c640f6/")  {
+  body {
+    background-color: var(--grey-60) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  header,
+  .panel:not(:last-child) {
+    border-bottom: solid var(--grey-50) 1px !important;
+  }
+
+  .button {
+    -moz-user-select: none;
+    background-color: var(--grey-70) !important;
+  }
+}
+@-moz-document url-prefix("moz-extension://897dfa7c-fa54-be49-996c-594df8db2260/")  {
+  body {
+    color: var(--primary-light-color) !important;
+    background: var(--grey-60) !important;
+  }
+
+  a {
+    color: var(--primary-accent-color) !important;
+  }
+
+  h3 {
+    color: var(--primary-light-color) !important;
+  }
+}
+/* Alters the preferences page */
+
+@-moz-document url-prefix("moz-extension://cd5adf97-491d-f44b-9ea2-d2417d781589/")  {
+  h1,
+  p,
+  ul,
+  ul li {
+    color: var(--primary-light-color) !important;
+  }
+}
+@-moz-document url-prefix("moz-extension://ed3f80c9-0ccb-ca41-bd62-f71a9fb72d27/")  {
+  body {
+    background-color: var(--primary-dark-color) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  .rule:not(.editing):not(:hover) {
+    background-color: var(--grey-60) !important;
+    border: 1px solid var(--grey-50) !important;
+  }
+
+  .rule:hover:not(.editing) {
+    background-color: var(--grey-80) !important;
+    border: 1px solid var(--grey-50) !important;
+  }
+
+  .nav-tabs > li.active > a,
+  .nav-tabs > li.active > a:hover,
+  .nav-tabs > li.active > a:focus {
+    color: var(--primary-light-color) !important;
+    background-color: var(--grey-80) !important;
+    border: 1px solid var(--grey-50) !important;
+  }
+
+  .nav-tabs > li > a:hover {
+    background-color: var(--grey-80) !important;
+    border: 1px solid var(--grey-50) !important;
+  }
+
+  tabs.nav-justified > li > a {
+    border-bottom: 1px solid var(--grey-50) !important;
+  }
+
+  .btn-default {
+    color: var(--primary-light-color) !important;
+    background-color: var(--grey-80) !important;
+    border-color: var(--grey-50) !important;
+  }
+
+  .btn-default.active {
+    background-color: var(--grey-60) !important;
+  }
+
+  .btn-default:hover {
+    color: var(--primary-light-color) !important;
+    background-color: var(--grey-50) !important;
+    border-color: var(--grey-50) !important;
+  }
+
+  .list-group-item:first-child {
+    background: var(--grey-60) !important;
+    border-color: var(--grey-50) !important;
+  }
+
+  .table {
+    background: var(--grey-60) !important;
+  }
+
+  .table-striped > tbody > tr:nth-of-type(2n+1) {
+    background-color: var(--grey-80) !important;
+  }
+
+  .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:not(:last-child):not(.dropdown-toggle),
+  .input-group-btn:last-child > .btn-group:not(:last-child) > .btn,
+  select.input-sm,
+  .btn-group-params > .tags-input {
+    background: var(--grey-50) !important;
+    color: var(--grey-30) !important;
+    border-color: var(--grey-40) !important;
+  }
+
+  .list-group-item {
+    background-color: var(--grey-60) !important;
+    border: 1px solid #ddd;
+  }
+
+  .tags-input .tag {
+    background: var(--grey-80) !important;
+    border: 1px solid var(--grey-60) !important;
+    color: var(--primary-light-color) !important;
+  }
+}
+@-moz-document url-prefix("moz-extension://b4b0ef21-3b88-e547-841a-b671a44bdfa7/")  {
+  body {
+    background: var(--grey-60) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  textarea,
+  input[type="text"],
+  input[type="number"] {
+    -moz-appearance: none !important;
+    background: var(--grey-50) !important;
+    color: var(--grey-30) !important;
+  }
+
+  label a {
+    color: var(--primary-accent-color) !important;
+  }
+}
+/* Alters the preferences page */
+
+/* IMPORTANT: change the Internal UUID */
+
+@-moz-document url-prefix("moz-extension://19684a2f-ee86-d644-961c-ab8b8ad10aca/")  {
+  body {
+    background: var(--primary-dark-color) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  #notes {
+    background: var(--primary-dark-color) !important;
+    color: var(--primary-light-color) !important;
+  }
+}
+/* Alters the preferences page 
+ * and context menus */
+
+@-moz-document url-prefix("moz-extension://2a3d122c-dc21-7f4c-a805-82cbd472de98/")  {
+  p,
+  ul {
+    color: var(--primary-light-color) !important;
+  }
+
+  h1,
+  legend {
+    color: var(--primary-accent-color) !important;
+  }
+
+  a {
+    color: var(--primary-accent-color-dark) !important;
+  }
+
+  #tabContextMenu {
+    background: var(--grey-60) !important;
+    border: none !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  #debug-configs {
+    color: var(--primary-light-color) !important;
+  }
+}
+@-moz-document url-prefix("moz-extension://7ce809b7-4a3b-484c-89de-42aa4db7f5de/")  {
+  body {
+    background: var(--grey-60) !important;
+  }
+
+  #topPane {
+    background-color: var(--grey-60) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  #heatmaps .togglerBar {
+    background: var(--grey-60) !important;
+  }
+
+  body.theoretical #heatmaps .heatmap.theoretical {
+    background: var(--grey-60) !important;
+  }
+
+  #heatmaps .heatmap {
+    border: none;
+    background: var(--grey-60) !important;
+  }
+
+  #heatmaps.list .hmcell {
+    background-color: var(--grey-60) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  #domain3rdDetails {
+    background-color: var(--grey-70) !important;
+    border: 1px solid var(--grey-70) !important;
+  }
+
+  #domain3rdDetails #authority {
+    background-color: var(--grey-80) !important;
+    position: relative;
+  }
+
+  #scores .scores .score.actual {
+    color: white !important;
+  }
+
+  #scores .scores .score.theoretical {
+    color: var(--grey-70) !important;
+  }
+
+  body.theoretical #scores .scores .score.actual {
+    color: var(--grey-70) !important;
+  }
+
+  body.theoretical #scores .scores .score.theoretical {
+    color: var(--primary-light-color) !important;
+  }
+}
+@-moz-document url-prefix("moz-extension://de835161-ee69-c14d-9940-203fbacf2276/")  {
+  /* header */
+
+  #appinfo {
+    background-color: var(--grey-80) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  /* Right Column */
+
+  body[dir="ltr"] #panes > div {
+    background: var(--grey-70) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  body,
+  #panes {
+    background: var(--grey-70) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  label a,
+  p a,
+  ul a {
+    color: var(--primary-accent-color) !important;
+  }
+
+  /* Subgroup in Settings */
+
+  ul#userSettings .subgroup > span {
+    color: var(--primary-accent-color) !important;
+  }
+
+  #dashboard-nav-widgets span {
+    color: var(--primary-light-color) !important;
+  }
+
+  /* info icons */
+
+  a.info {
+    color: var(--primary-light-color) !important;
+    opacity: .5;
+  }
+
+  li.listEntry span.status {
+    color: var(--primary-light-color) !important;
+  }
+
+  li.listEntry > a.remove,
+  li.listEntry > a.remove:visited {
+    color: var(--red-80) !important;
+  }
+
+  /* Power Switch */
+
+  #switch .fa {
+    color: var(--primary-accent-color) !important;
+  }
+
+  /* Power Switch - Off */
+
+  body.off #switch .fa {
+    color: var(--primary-light-color) !important;
+  }
+
+  /* Tool Buttons */
+
+  .tool {
+    color: var(--primary-light-color) !important;
+  }
+
+  .tool:hover {
+    color: var(--grey-80) !important;
+  }
+
+  /* Stripped row */
+
+  h2,
+  #extraTools {
+    background-color: var(--grey-80) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  /* Refresh Button */
+
+  #refresh {
+    background-color: var(--grey-80) !important;
+    border-color: var(--grey-50) !important;
+  }
+
+  /* Badge number */
+
+  #extraTools > span > span.badge {
+    color: var(--primary-light-color) !important;
+  }
+
+  /* Firewall Container */
+
+  #firewallContainer > div {
+    background-color: var(--grey-60) !important;
+  }
+
+  #firewallContainer > div > span {
+    color: var(--primary-light-color) !important;
+    border-color: var(--grey-50) !important;
+  }
+
+  /* Darker Red */
+
+  body.advancedUser #firewallContainer > div > span.blockRule.ownRule {
+    background-color: #ab0000 !important;
+  }
+
+  /* Lighter Red */
+
+  body.advancedUser #firewallContainer > div > span.blockRule {
+    background-color: #dda0a2 !important;
+  }
+
+  #firewallContainer > div.blocked > span:first-of-type::before,
+  #firewallContainer.minimized > div.isDomain.totalBlocked > span:first-of-type::before {
+    background-color: #af0202 !important;
+  }
+
+  /* Darker Green */
+
+  body.advancedUser #firewallContainer > div > span.allowRule.ownRule {
+    background-color: #229400 !important;
+  }
+
+  /* Lighter Green */
+
+  body.advancedUser #firewallContainer > div > span.allowRule {
+    background-color: #95ca8a !important;
+  }
+
+  #firewallContainer > div.allowed > span:first-of-type::before,
+  #firewallContainer.minimized > div.isDomain.totalAllowed > span:first-of-type::before {
+    background-color: #02af06 !important;
+  }
+
+  /* Darker Blue */
+
+  body.advancedUser #firewallContainer > div > span.noopRule.ownRule {
+    background-color: #0c46a7 !important;
+  }
+
+  /* Blue on hover */
+
+  #actionSelector > span:nth-of-type(2) {
+    background-color: #0c46a7 !important;
+  }
+
+  /* Lighter Blue */
+
+  body.advancedUser #firewallContainer > div > span.noopRule {
+    background-color: #65bdfb !important;
+  }
+
+  /* Color Blind Friendly */
+
+  /* Dark Block Color */
+
+  body.advancedUser #firewallContainer.colorBlind > div > span.blockRule.ownRule {
+    background-color: #000060 !important;
+  }
+
+  /* Light Block Color */
+
+  body.advancedUser #firewallContainer.colorBlind > div > span.blockRule {
+    background-color: #787dab !important;
+  }
+
+  /* Dark Allow */
+
+  body.advancedUser #firewallContainer.colorBlind > div > span.allowRule.ownRule {
+    background-color: #fbb900 !important;
+  }
+
+  /* Light Allow */
+
+  body.advancedUser #firewallContainer.colorBlind > div > span.allowRule {
+    background-color: #f2d98d !important;
+  }
+
+  /* Dark Noop */
+
+  body.advancedUser #firewallContainer > div > span.noopRule.ownRule {
+    background-color: #2f2e2e !important;
+  }
+
+  /* Light Noop */
+
+  body.advancedUser #firewallContainer > div > span.noopRule {
+    background-color: #a1a1a1 !important;
+  }
+
+  /* Yellow Side */
+
+  #firewallContainer.colorBlind > div.allowed > span:first-of-type::before,
+  #firewallContainer.colorBlind.minimized > div.isDomain.totalAllowed > span:first-of-type::before {
+    background-color: #ebd287 !important;
+  }
+
+  /* Blue Side */
+
+  #firewallContainer.colorBlind > div.blocked > span:first-of-type::before,
+  #firewallContainer.colorBlind.minimized > div.isDomain.totalBlocked > span:first-of-type::before {
+    background-color: #787cab !important;
+  }
+
+  #dashboard-nav-widgets {
+    border-bottom: 1px solid var(--grey-60) !important;
+    background-color: var(--grey-80) !important;
+  }
+
+  .tabButton {
+    background-color: var(--grey-70) !important;
+    color: var(--primary-light-color) !important;
+    border: 1px solid var(--grey-60) !important;
+    border-bottom: 1px solid var(--grey-60) !important;
+  }
+
+  .tabButton.selected {
+    background-color: var(--grey-80) !important;
+    border-bottom: 1px solid var(--grey-70) !important;
+  }
+
+  input[type="number"] {
+    -moz-appearance: none!important;
+    background-color: var(--grey-60) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  li.listEntry .content {
+    color: var(--primary-accent-color) !important;
+  }
+
+  #diff .pane {
+    color: var(--primary-light-color) !important;
+    background: var(--primary-dark-color) !important;
+  }
+
+  #diff li {
+    background-color: var(--grey-60) !important;
+  }
+
+  #diff li:nth-child(2n) {
+    background-color: var(--grey-70) !important;
+  }
+
+  /* Textbox */
+
+  code {
+    background-color: var(--grey-60) !important;
+  }
+
+  #whitelist textarea {
+    background: var(--grey-60) !important;
+    color: var(--primary-light-color) !important;
+  }
+
+  textarea#userFilters.userFilters,
+  textarea#externalLists {
+    -moz-appearance: none!important;
+    background: var(--grey-60) !important;
+    color: var(--primary-light-color) !important;
+  }
+}
 @-moz-document url-prefix("https://addons.mozilla.org")  {
   /* Header & Footer */
 
diff --git a/userContent_imports.css b/userContent_imports.css
index edcb00e..43d7e9c 100644
--- a/userContent_imports.css
+++ b/userContent_imports.css
@@ -38,6 +38,7 @@
 @import "userContent-files/webextension-tweaks/httpsEverywhere.css";
 @import "userContent-files/webextension-tweaks/decentraleyes.css";
 @import "userContent-files/webextension-tweaks/skipredirect.css";
+@import "userContent-files/webextension-tweaks/request_control.css";
 
 
 /* Import relevent website dark themes */