diff --git a/alternative_user_files/userChrome_windows.css b/alternative_user_files/userChrome_windows.css
index 52040c7..f9c42d0 100644
--- a/alternative_user_files/userChrome_windows.css
+++ b/alternative_user_files/userChrome_windows.css
@@ -110,7 +110,8 @@
 url-prefix(chrome://browser/content/preferences/),
 url(chrome://passwordmgr/content/passwordManager.xul),
 url(chrome://formautofill/content/manageAddresses.xhtml),
-url-prefix(chrome://pippki)  {
+url-prefix(chrome://pippki),
+url(chrome://browser/content/pageinfo/pageInfo.xul)  {
   treechildren::-moz-tree-row,
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol,odd) {
     background-color: var(--in-content-box-background)!important;
@@ -120,6 +121,11 @@ url-prefix(chrome://pippki)  {
     background-color: var(--theme-selection-background-hover)!important;
   }
 
+  treechildren::-moz-tree-cell-text(hover),
+  treechildren::-moz-tree-cell-text(selected) {
+    color: var(--in-content-text-color)!important;
+  }
+
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
     background-color: var(--theme-selection-background)!important;
   }
@@ -144,6 +150,11 @@ url-prefix(chrome://pippki)  {
     background-color: var(--in-content-category-header-background)!important;
     color: var(--in-content-page-color)!important;
   }
+
+  prefpane#mainPrefPane groupbox#applicationsGroup richlistbox#handlersView richlistitem[selected=true] {
+    background: var(--in-content-page-background)!important;
+    color: var(--in-content-page-color)!important;
+  }
 }
 @-moz-document url(chrome://browser/content/aboutDialog.xul)  {
   #clientBox {
@@ -270,12 +281,17 @@ treechildren.searchbar-treebody::-moz-tree-row(hover) {
   -moz-border-bottom-colors: var(--theme-selection-background-hover)!important;
 }
 
+#editBMPanel_folderTree treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(hover) {
+  color: var(--in-content-selected-text)!important;
+}
+
 #editBMPanel_folderTree treechildren::-moz-tree-image {
   fill: var(--in-content-page-color)!important;
 }
 
+#editBMPanel_folderTree treechildren::-moz-tree-image(hover),
 #editBMPanel_folderTree treechildren::-moz-tree-image(selected) {
-  fill: var(--in-content-item-selected)!important;
+  fill: var(--selected-icon-fill-color)!important;
 }
 
 #editBMPanel_folderTree treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected,current,focus) {
@@ -750,8 +766,7 @@ photonpanelmultiview panelview {
 }
 
 #identity-popup-permissions-content {
-  filter: invert(90%)!important;
-  color: var(--in-content-page-background)!important;
+  background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjQsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMjRweCIgaGVpZ2h0PSIyNHB4IiB2aWV3Qm94PSIwIDAgMjQgMjQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDI0IDI0IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxkZWZzPg0KCTxmaWx0ZXIgaWQ9IkFkb2JlX09wYWNpdHlNYXNrRmlsdGVyIiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjAiIHk9IjAiIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCI+DQoJCTxmZUNvbG9yTWF0cml4ICB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMSAwIDAgMCAwICAwIDEgMCAwIDAgIDAgMCAxIDAgMCAgMCAwIDAgMSAwIi8+DQoJPC9maWx0ZXI+DQo8L2RlZnM+DQo8bWFzayBtYXNrVW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4PSIwIiB5PSIwIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIGlkPSJtYXNrLXBlcm1pc3Npb25zIj4NCgk8cGF0aCBmaWxsPSIjRkZGRkZGIiBmaWx0ZXI9InVybCgjQWRvYmVfT3BhY2l0eU1hc2tGaWx0ZXIpIiBkPSJNMiwxaDIwYzEuMSwwLDIsMC45LDIsMnYxOGMwLDEuMS0wLjksMi0yLDJIMmMtMS4xLDAtMi0wLjktMi0yVjMNCgkJQzAsMS45LDAuOSwxLDIsMXoiLz4NCgk8cGF0aCBkPSJNMTIsM2g5YzAuNiwwLDEsMC40LDEsMXYxNmMwLDAuNi0wLjQsMS0xLDFoLTlWM3oiLz4NCgk8cGF0aCBkPSJNNS41LDEyLjVsMi43LTMuN0M4LjQsOC41LDguOCw4LjUsOSw4LjdsMC43LDAuNWMwLjIsMC4yLDAuMiwwLjUsMCwwLjdMNS44LDE1Yy0wLjIsMC4yLTAuNSwwLjMtMC44LDAuMUwyLjgsMTIuOQ0KCQljLTAuMi0wLjItMC4yLTAuNSwwLTAuN2wwLjgtMC44YzAuMi0wLjIsMC41LTAuMiwwLjcsMEw1LjUsMTIuNXoiLz4NCgkNCgkJPHJlY3QgeD0iMTYuMzM1IiB5PSI4LjQ4NSIgdHJhbnNmb3JtPSJtYXRyaXgoLTAuNzA3MyAwLjcwNjkgLTAuNzA2OSAtMC43MDczIDM3LjU5MiA4LjUwNTEpIiBmaWxsPSIjRkZGRkZGIiB3aWR0aD0iMS40IiBoZWlnaHQ9IjcuMTAxIi8+DQoJDQoJCTxyZWN0IHg9IjE2LjMzNSIgeT0iOC40MTUiIHRyYW5zZm9ybT0ibWF0cml4KDAuNzA2OCAwLjcwNzUgLTAuNzA3NSAwLjcwNjggMTMuNDYwMiAtOC41NDI5KSIgZmlsbD0iI0ZGRkZGRiIgd2lkdGg9IjEuNCIgaGVpZ2h0PSI3LjEiLz4NCjwvbWFzaz4NCjxyZWN0IGlkPSJwZXJtaXNzaW9ucyIgbWFzaz0idXJsKCNtYXNrLXBlcm1pc3Npb25zKSIgZmlsbD0iI0IxQjFCMyIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ii8+DQo8L3N2Zz4NCg==")!important;
 }
 
 .identity-popup-expander {
@@ -765,7 +780,8 @@ photonpanelmultiview panelview {
   color: var(--in-content-text-color);
 }
 
-#update-available-whats-new {
+#update-available-whats-new,
+.text-link {
   color: var(--in-content-link-color)!important;
 }
 
@@ -808,48 +824,100 @@ toolbar[brighttext] {
 
   #mainDeck {
     background: var(--in-content-page-background)!important;
-    color: #fff!important;
+    color: var(--in-content-page-color)!important;
   }
 
   textbox {
     color: var(--in-content-page-color)!important;
   }
 
-  tree {
+  .text-link {
+    color: var(--in-content-link-color)!important;
+  }
+
+  button {
     -moz-appearance: none!important;
-    border-color: var(--in-content-border-color)!important;
-    color: --in-content-page-color!important;
+    background-color: var(--in-content-page-background)!important;
+    border: 1px solid!important;
+    border-radius: 3px!important;
+    color: var(--in-content-page-color)!important;
+    border-color: var(--in-content-box-border-color)!important;
+  }
+
+  button:hover {
     background-color: var(--in-content-box-background)!important;
   }
 
-  treechildren::-moz-tree-row {
-    background-color: transparent!important;
-  }
-
-  treecol {
-    -moz-appearance: none!important;
-    border: 0 solid!important;
-    border-color: var(--in-content-box-background)!important;
-    color: var(--in-content-selected-text)!important;
-  }
-
-  treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected,current,focus) {
-    background: var(--theme-selection-background-hover)!important;
-  }
-
+  #feedListbox,
+  #feedListbox > richlistitem,
+  #imagecontainerbox,
+  .groupbox-body,
   .permission {
     -moz-appearance: none!important;
     background: var(--in-content-box-background)!important;
     color: var(--in-content-page-color)!important;
-    border-color: var(--in-content-border-color)!important;
+    border-color: var(--in-content-box-border-color)!important;
+  }
+
+  #feedListbox richlistitem {
+    border-color: var(--in-content-box-border-color)!important;
   }
 
   #permPluginTemplate {
     color: var(--in-content-page-color)!important;
   }
 
-  #permList {
-    border: 2px solid!important;
+  #feedListbox,
+  #imagecontainerbox,
+  #permList,
+  .groupbox-body {
+    border: 1px solid!important;
+    border-color: var(--in-content-box-border-color)!important;
+  }
+
+  groupbox.collapsable caption .caption-icon {
+    filter: invert(65%)!important;
+  }
+
+  tree {
+    -moz-appearance: none!important;
+    color: var(--in-content-page-color)!important;
+  }
+
+  treecol {
+    -moz-appearance: none!important;
+    border: 0 solid!important;
+    border-color: var(--in-content-box-background)!important;
+  }
+
+  treecolpicker {
+    -moz-appearance: none;
+    border: none!important;
+  }
+
+  #viewGroup > radio {
+    -moz-appearance: none!important;
+    background-color: var(--in-content-box-background)!important;
+    text-shadow: none!important;
+    padding: 0 8px!important;
+    color: var(--in-content-page-color);
+    border-right: 1px solid!important;
+    border-color: var(--in-content-box-border-color)!important;
+  }
+
+  #viewGroup > radio[selected=true] {
+    color: var(--in-content-selected-text)!important;
+  }
+
+  #viewGroup > radio:first-of-type {
+    border-top-left-radius: 4px!important;
+    border-bottom-left-radius: 4px!important;
+  }
+
+  #viewGroup > radio:last-of-type {
+    border: none!important;
+    border-top-right-radius: 4px!important;
+    border-bottom-right-radius: 4px!important;
   }
 
 @media screen and (-moz-windows-theme),
diff --git a/alternative_user_files/userContent_no_addons.css b/alternative_user_files/userContent_no_addons.css
index b9143df..27270af 100644
--- a/alternative_user_files/userContent_no_addons.css
+++ b/alternative_user_files/userContent_no_addons.css
@@ -105,12 +105,46 @@
   --warning-color: #FCE19F;
   --warning-background-color: #44391F;
 }
+@-moz-document url-prefix(about:),
+url-prefix(chrome://)  {
+  .checkbox-check,
+  .prefs-pane [type=checkbox]:checked + label::before,
+  .prefs-pane [type=checkbox]:not(:checked) + label::before,
+  .radio-check,
+  input[type=checkbox] {
+    -moz-appearance: none!important;
+    border: 1px solid!important;
+    background-color: var(--in-content-box-background)!important;
+    background-image: none!important;
+    box-shadow: none!important;
+    border-color: var(--in-content-box-border-color)!important;
+  }
 
+  radio[disabled=true] {
+    color: var(--in-content-box-border-color)!important;
+  }
+
+  .radio-check[selected] {
+    list-style-image: url("chrome://global/skin/in-content/radio.svg");
+    fill: var(--in-content-border-highlight)!important;
+    -moz-context-properties: fill,stroke;
+    stroke: none;
+    border-radius: 50%!important;
+  }
+
+  .checkbox-check[checked] {
+    list-style-image: url("chrome://global/skin/in-content/check.svg")!important;
+    fill: var(--in-content-border-highlight)!important;
+    -moz-context-properties: fill,stroke;
+    stroke: none;
+  }
+}
 @-moz-document url-prefix(about:),
 url-prefix(chrome://browser/content/preferences/),
 url(chrome://passwordmgr/content/passwordManager.xul),
 url(chrome://formautofill/content/manageAddresses.xhtml),
-url-prefix(chrome://pippki)  {
+url-prefix(chrome://pippki),
+url(chrome://browser/content/pageinfo/pageInfo.xul)  {
   treechildren::-moz-tree-row,
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol,odd) {
     background-color: var(--in-content-box-background)!important;
@@ -120,6 +154,11 @@ url-prefix(chrome://pippki)  {
     background-color: var(--theme-selection-background-hover)!important;
   }
 
+  treechildren::-moz-tree-cell-text(selected),
+  treechildren::-moz-tree-cell-text(hover) {
+    color: var(--in-content-text-color)!important;
+  }
+
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
     background-color: var(--theme-selection-background)!important;
   }
@@ -130,7 +169,7 @@ url-prefix(chrome://pippki)  {
 
   treecol:not([hideheader=true]):not(:first-child),
   treecolpicker {
-    border-image: linear-gradient(transparent 0,transparent 20%,var(--tone-5) 20%,var(--tone-5) 80%,transparent 80%,transparent 100%) 1 1!important;
+    border-image: linear-gradient(transparent 0,transparent 20%,var(--tone-5) 20%,var(--tone-5) 80%,transparent 80%,transparent 100%) 1 1 !important;
   }
 
   menulist:not([editable=true]) > .menulist-dropmarker,
@@ -144,6 +183,11 @@ url-prefix(chrome://pippki)  {
     background-color: var(--in-content-category-header-background)!important;
     color: var(--in-content-page-color)!important;
   }
+
+  prefpane#mainPrefPane groupbox#applicationsGroup richlistbox#handlersView richlistitem[selected=true] {
+    background: var(--in-content-page-background)!important;
+    color: var(--in-content-page-color)!important;
+  }
 }
 @-moz-document regexp("^about:(?!reader).*"),
 url(https://www.mozilla.org/credits/),
@@ -236,6 +280,7 @@ url-prefix(https://discovery.addons.mozilla.org)  {
   #contents table tr.no-copy td,
   #controls.no-print div.controls div.control button:hover,
   #errorPageContainer button#errorTryAgain:hover,
+  #header-utils-btn[open=true],
   #provider table#provider-table tbody#provider-table-body tr td,
   #subprocess-reports tr td,
   .aboutPageWideContainer div#debug table#debug-table tbody tr td,
@@ -759,14 +804,14 @@ url-prefix(https://discovery.addons.mozilla.org)  {
     filter: invert(85%)!important;
   }
 }
-@-moz-document url-prefix(file:///)  {
+@-moz-document regexp("^[file:///].*[^(html)]$")  {
   :root {
-    background-color: var(--in-content-box-background)!important;
+    background-color: var(--in-content-page-background)!important;
   }
 
   body {
     border-color: var(--in-content-box-background)!important;
-    background-color: var(--in-content-page-color)!important;
+    background-color: var(--in-content-box-background)!important;
     color: var(--in-content-page-color)!important;
   }
 
@@ -775,7 +820,8 @@ url-prefix(https://discovery.addons.mozilla.org)  {
   }
 
   body > table > tbody > tr:hover {
-    outline-color: var(--in-content-box-background)!important;
+    outline-color: var(--in-content-box-background-hover)!important;
+    background-color: var(--in-content-box-background-hover)!important;
   }
 
   .dir,
diff --git a/common-files/checkboxes.css b/common-files/checkboxes.css
index dbb2b05..058be0e 100644
--- a/common-files/checkboxes.css
+++ b/common-files/checkboxes.css
@@ -12,21 +12,20 @@ url-prefix(chrome://) {
     box-shadow: none!important;
     border-color: var(--in-content-box-border-color)!important
   }
-  radio[disabled="true"] {
-    color: var(--in-content-box-border-color)!important;
+  radio[disabled=true] {
+    color: var(--in-content-box-border-color)!important
   }
   .radio-check[selected] {
     list-style-image: url(chrome://global/skin/in-content/radio.svg);
     fill: var(--in-content-border-highlight)!important;
-    -moz-context-properties: fill, stroke;
+    -moz-context-properties: fill,stroke;
     stroke: none;
-    border-radius: 50% !important;
+    border-radius: 50%!important
   }
   .checkbox-check[checked] {
-    list-style-image: url("chrome://global/skin/in-content/check.svg") !important;
+    list-style-image: url(chrome://global/skin/in-content/check.svg)!important;
     fill: var(--in-content-border-highlight)!important;
-    -moz-context-properties: fill, stroke;
-    stroke: none;
-
+    -moz-context-properties: fill,stroke;
+    stroke: none
   }
-}
+}
\ No newline at end of file
diff --git a/common-files/trees.css b/common-files/trees.css
index 308d666..bf8e10e 100644
--- a/common-files/trees.css
+++ b/common-files/trees.css
@@ -9,10 +9,10 @@ url(chrome://browser/content/pageinfo/pageInfo.xul) {
     background-color: var(--in-content-box-background)!important
   }
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
-    background-color: var(--theme-selection-background-hover)!important;
+    background-color: var(--theme-selection-background-hover)!important
   }
-  treechildren::-moz-tree-cell-text(selected),
-  treechildren::-moz-tree-cell-text(hover){
+  treechildren::-moz-tree-cell-text(hover),
+  treechildren::-moz-tree-cell-text(selected) {
     color: var(--in-content-text-color)!important
   }
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
@@ -23,7 +23,7 @@ url(chrome://browser/content/pageinfo/pageInfo.xul) {
   }
   treecol:not([hideheader=true]):not(:first-child),
   treecolpicker {
-    border-image: linear-gradient(transparent 0,transparent 20%,var(--tone-5) 20%,var(--tone-5) 80%,transparent 80%,transparent 100%) 1 1 !important;
+    border-image: linear-gradient(transparent 0,transparent 20%,var(--tone-5) 20%,var(--tone-5) 80%,transparent 80%,transparent 100%) 1 1!important
   }
   menulist:not([editable=true]) > .menulist-dropmarker,
   treecol:not([hideheader=true]) > .treecol-sortdirection[sortDirection] {
diff --git a/userChrome-files/library.css b/userChrome-files/library.css
index 2665950..5844e25 100644
--- a/userChrome-files/library.css
+++ b/userChrome-files/library.css
@@ -83,7 +83,6 @@
   tree {
     background-color: var(--in-content-box-background)!important
   }
-
   @media screen and (-moz-windows-theme),
   screen and (-moz-windows-classic),
   screen and (-moz-windows-default-theme),
diff --git a/userChrome-files/navbar_menus.css b/userChrome-files/navbar_menus.css
index 9885c6c..92d0af1 100644
--- a/userChrome-files/navbar_menus.css
+++ b/userChrome-files/navbar_menus.css
@@ -66,7 +66,7 @@ photonpanelmultiview panelview {
   fill: var(--in-content-category-text-selected)!important
 }
 #identity-popup-permissions-content {
-  background-image:  url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjQsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMjRweCIgaGVpZ2h0PSIyNHB4IiB2aWV3Qm94PSIwIDAgMjQgMjQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDI0IDI0IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxkZWZzPg0KCTxmaWx0ZXIgaWQ9IkFkb2JlX09wYWNpdHlNYXNrRmlsdGVyIiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjAiIHk9IjAiIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCI+DQoJCTxmZUNvbG9yTWF0cml4ICB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMSAwIDAgMCAwICAwIDEgMCAwIDAgIDAgMCAxIDAgMCAgMCAwIDAgMSAwIi8+DQoJPC9maWx0ZXI+DQo8L2RlZnM+DQo8bWFzayBtYXNrVW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4PSIwIiB5PSIwIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIGlkPSJtYXNrLXBlcm1pc3Npb25zIj4NCgk8cGF0aCBmaWxsPSIjRkZGRkZGIiBmaWx0ZXI9InVybCgjQWRvYmVfT3BhY2l0eU1hc2tGaWx0ZXIpIiBkPSJNMiwxaDIwYzEuMSwwLDIsMC45LDIsMnYxOGMwLDEuMS0wLjksMi0yLDJIMmMtMS4xLDAtMi0wLjktMi0yVjMNCgkJQzAsMS45LDAuOSwxLDIsMXoiLz4NCgk8cGF0aCBkPSJNMTIsM2g5YzAuNiwwLDEsMC40LDEsMXYxNmMwLDAuNi0wLjQsMS0xLDFoLTlWM3oiLz4NCgk8cGF0aCBkPSJNNS41LDEyLjVsMi43LTMuN0M4LjQsOC41LDguOCw4LjUsOSw4LjdsMC43LDAuNWMwLjIsMC4yLDAuMiwwLjUsMCwwLjdMNS44LDE1Yy0wLjIsMC4yLTAuNSwwLjMtMC44LDAuMUwyLjgsMTIuOQ0KCQljLTAuMi0wLjItMC4yLTAuNSwwLTAuN2wwLjgtMC44YzAuMi0wLjIsMC41LTAuMiwwLjcsMEw1LjUsMTIuNXoiLz4NCgkNCgkJPHJlY3QgeD0iMTYuMzM1IiB5PSI4LjQ4NSIgdHJhbnNmb3JtPSJtYXRyaXgoLTAuNzA3MyAwLjcwNjkgLTAuNzA2OSAtMC43MDczIDM3LjU5MiA4LjUwNTEpIiBmaWxsPSIjRkZGRkZGIiB3aWR0aD0iMS40IiBoZWlnaHQ9IjcuMTAxIi8+DQoJDQoJCTxyZWN0IHg9IjE2LjMzNSIgeT0iOC40MTUiIHRyYW5zZm9ybT0ibWF0cml4KDAuNzA2OCAwLjcwNzUgLTAuNzA3NSAwLjcwNjggMTMuNDYwMiAtOC41NDI5KSIgZmlsbD0iI0ZGRkZGRiIgd2lkdGg9IjEuNCIgaGVpZ2h0PSI3LjEiLz4NCjwvbWFzaz4NCjxyZWN0IGlkPSJwZXJtaXNzaW9ucyIgbWFzaz0idXJsKCNtYXNrLXBlcm1pc3Npb25zKSIgZmlsbD0iI0IxQjFCMyIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ii8+DQo8L3N2Zz4NCg==') !important;
+  background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjQsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMjRweCIgaGVpZ2h0PSIyNHB4IiB2aWV3Qm94PSIwIDAgMjQgMjQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDI0IDI0IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxkZWZzPg0KCTxmaWx0ZXIgaWQ9IkFkb2JlX09wYWNpdHlNYXNrRmlsdGVyIiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjAiIHk9IjAiIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCI+DQoJCTxmZUNvbG9yTWF0cml4ICB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMSAwIDAgMCAwICAwIDEgMCAwIDAgIDAgMCAxIDAgMCAgMCAwIDAgMSAwIi8+DQoJPC9maWx0ZXI+DQo8L2RlZnM+DQo8bWFzayBtYXNrVW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4PSIwIiB5PSIwIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIGlkPSJtYXNrLXBlcm1pc3Npb25zIj4NCgk8cGF0aCBmaWxsPSIjRkZGRkZGIiBmaWx0ZXI9InVybCgjQWRvYmVfT3BhY2l0eU1hc2tGaWx0ZXIpIiBkPSJNMiwxaDIwYzEuMSwwLDIsMC45LDIsMnYxOGMwLDEuMS0wLjksMi0yLDJIMmMtMS4xLDAtMi0wLjktMi0yVjMNCgkJQzAsMS45LDAuOSwxLDIsMXoiLz4NCgk8cGF0aCBkPSJNMTIsM2g5YzAuNiwwLDEsMC40LDEsMXYxNmMwLDAuNi0wLjQsMS0xLDFoLTlWM3oiLz4NCgk8cGF0aCBkPSJNNS41LDEyLjVsMi43LTMuN0M4LjQsOC41LDguOCw4LjUsOSw4LjdsMC43LDAuNWMwLjIsMC4yLDAuMiwwLjUsMCwwLjdMNS44LDE1Yy0wLjIsMC4yLTAuNSwwLjMtMC44LDAuMUwyLjgsMTIuOQ0KCQljLTAuMi0wLjItMC4yLTAuNSwwLTAuN2wwLjgtMC44YzAuMi0wLjIsMC41LTAuMiwwLjcsMEw1LjUsMTIuNXoiLz4NCgkNCgkJPHJlY3QgeD0iMTYuMzM1IiB5PSI4LjQ4NSIgdHJhbnNmb3JtPSJtYXRyaXgoLTAuNzA3MyAwLjcwNjkgLTAuNzA2OSAtMC43MDczIDM3LjU5MiA4LjUwNTEpIiBmaWxsPSIjRkZGRkZGIiB3aWR0aD0iMS40IiBoZWlnaHQ9IjcuMTAxIi8+DQoJDQoJCTxyZWN0IHg9IjE2LjMzNSIgeT0iOC40MTUiIHRyYW5zZm9ybT0ibWF0cml4KDAuNzA2OCAwLjcwNzUgLTAuNzA3NSAwLjcwNjggMTMuNDYwMiAtOC41NDI5KSIgZmlsbD0iI0ZGRkZGRiIgd2lkdGg9IjEuNCIgaGVpZ2h0PSI3LjEiLz4NCjwvbWFzaz4NCjxyZWN0IGlkPSJwZXJtaXNzaW9ucyIgbWFzaz0idXJsKCNtYXNrLXBlcm1pc3Npb25zKSIgZmlsbD0iI0IxQjFCMyIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ii8+DQo8L3N2Zz4NCg==)!important
 }
 .identity-popup-expander {
   border-color: var(--in-content-box-border-color)!important;
diff --git a/userChrome-files/page_info.css b/userChrome-files/page_info.css
index 2ea08ff..1774398 100644
--- a/userChrome-files/page_info.css
+++ b/userChrome-files/page_info.css
@@ -5,13 +5,13 @@
   }
   #mainDeck {
     background: var(--in-content-page-background)!important;
-    color: var(--in-content-page-color) !important
+    color: var(--in-content-page-color)!important
   }
   textbox {
     color: var(--in-content-page-color)!important
   }
   .text-link {
-    color: var(--in-content-link-color) !important;
+    color: var(--in-content-link-color)!important
   }
   button {
     -moz-appearance: none!important;
@@ -22,70 +22,68 @@
     border-color: var(--in-content-box-border-color)!important
   }
   button:hover {
-    background-color: var(--in-content-box-background)!important;
+    background-color: var(--in-content-box-background)!important
   }
-
-  .permission,
   #feedListbox,
   #feedListbox > richlistitem,
   #imagecontainerbox,
-  .groupbox-body{
+  .groupbox-body,
+  .permission {
     -moz-appearance: none!important;
     background: var(--in-content-box-background)!important;
     color: var(--in-content-page-color)!important;
     border-color: var(--in-content-box-border-color)!important
   }
   #feedListbox richlistitem {
-    border-color: var(--in-content-box-border-color) !important;
+    border-color: var(--in-content-box-border-color)!important
   }
   #permPluginTemplate {
     color: var(--in-content-page-color)!important
   }
-  #permList,
   #feedListbox,
   #imagecontainerbox,
+  #permList,
   .groupbox-body {
     border: 1px solid!important;
     border-color: var(--in-content-box-border-color)!important
   }
   groupbox.collapsable caption .caption-icon {
-    filter: invert(65%) !important;
+    filter: invert(65%)!important
   }
   tree {
     -moz-appearance: none!important;
-    color: var(--in-content-page-color) !important;
+    color: var(--in-content-page-color)!important
   }
   treecol {
     -moz-appearance: none!important;
     border: 0 solid!important;
-    border-color: var(--in-content-box-background)!important;
+    border-color: var(--in-content-box-background)!important
   }
   treecolpicker {
     -moz-appearance: none;
-    border: none !important;
+    border: none!important
   }
-  
   #viewGroup > radio {
-    -moz-appearance: none !important;
+    -moz-appearance: none!important;
     background-color: var(--in-content-box-background)!important;
-    text-shadow: none !important;
-    padding: 0 8px 0px 8px !important;
+    text-shadow: none!important;
+    padding: 0 8px!important;
     color: var(--in-content-page-color);
-    border-right: 1px solid !important;
-    border-color: var(--in-content-box-border-color) !important;
+    border-right: 1px solid!important;
+    border-color: var(--in-content-box-border-color)!important
   }
-  #viewGroup > radio[selected="true"] {
-    color: var(--in-content-selected-text) !important;
+  #viewGroup > radio[selected=true] {
+    color: var(--in-content-selected-text)!important
   }
   #viewGroup > radio:first-of-type {
-    border-top-left-radius: 4px !important;
-    border-bottom-left-radius: 4px !important;
+    border-top-left-radius: 4px!important;
+    border-bottom-left-radius: 4px!important
   }
   #viewGroup > radio:last-of-type {
-    border: none !important;
-    border-top-right-radius: 4px !important;
-    border-bottom-right-radius: 4px !important;
-  } 
+    border: none!important;
+    border-top-right-radius: 4px!important;
+    border-bottom-right-radius: 4px!important
+  }
   @media screen and (-moz-windows-theme),
   screen and (-moz-windows-classic),
   screen and (-moz-windows-default-theme),
diff --git a/userChrome.css b/userChrome.css
index ba8d80d..4eda1f0 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -103,10 +103,10 @@
   --in-content-dark-header-background: var(--tone-9)!important;
   --code-green: #86de74!important;
   --warning-color: #FCE19F;
-  --warning-background-color: #44391F
+  --warning-background-color: #44391F;
 }
 @-moz-document url-prefix(about:),
-url-prefix(chrome://) {
+url-prefix(chrome://)  {
   .checkbox-check,
   .prefs-pane [type=checkbox]:checked + label::before,
   .prefs-pane [type=checkbox]:not(:checked) + label::before,
@@ -117,83 +117,122 @@ url-prefix(chrome://) {
     background-color: var(--in-content-box-background)!important;
     background-image: none!important;
     box-shadow: none!important;
-    border-color: var(--in-content-box-border-color)!important
+    border-color: var(--in-content-box-border-color)!important;
   }
+
+  radio[disabled=true] {
+    color: var(--in-content-box-border-color)!important;
+  }
+
   .radio-check[selected] {
-    list-style-image: url(chrome://global/skin/in-content/radio.svg);
-    fill: var(--in-content-border-highlight)!important
+    list-style-image: url("chrome://global/skin/in-content/radio.svg");
+    fill: var(--in-content-border-highlight)!important;
+    -moz-context-properties: fill,stroke;
+    stroke: none;
+    border-radius: 50%!important;
+  }
+
+  .checkbox-check[checked] {
+    list-style-image: url("chrome://global/skin/in-content/check.svg")!important;
+    fill: var(--in-content-border-highlight)!important;
+    -moz-context-properties: fill,stroke;
+    stroke: none;
   }
 }
 @-moz-document url-prefix(about:),
 url-prefix(chrome://browser/content/preferences/),
 url(chrome://passwordmgr/content/passwordManager.xul),
 url(chrome://formautofill/content/manageAddresses.xhtml),
-url-prefix(chrome://pippki) {
+url-prefix(chrome://pippki),
+url(chrome://browser/content/pageinfo/pageInfo.xul)  {
   treechildren::-moz-tree-row,
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol,odd) {
-    background-color: var(--in-content-box-background)!important
+    background-color: var(--in-content-box-background)!important;
   }
+
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
-    background-color: var(--theme-selection-background-hover)!important
+    background-color: var(--theme-selection-background-hover)!important;
   }
+
+  treechildren::-moz-tree-cell-text(hover),
+  treechildren::-moz-tree-cell-text(selected) {
+    color: var(--in-content-text-color)!important;
+  }
+
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
-    background-color: var(--theme-selection-background)!important
+    background-color: var(--theme-selection-background)!important;
   }
+
   tree {
-    background-color: var(--in-content-box-background)!important
+    background-color: var(--in-content-box-background)!important;
   }
+
   treecol:not([hideheader=true]):not(:first-child),
   treecolpicker {
-    border-image: linear-gradient(transparent 0,transparent 20%,var(--tone-5) 20%,var(--tone-5) 80%,transparent 80%,transparent 100%) 1 1!important
+    border-image: linear-gradient(transparent 0,transparent 20%,var(--tone-5) 20%,var(--tone-5) 80%,transparent 80%,transparent 100%) 1 1!important;
   }
+
   menulist:not([editable=true]) > .menulist-dropmarker,
   treecol:not([hideheader=true]) > .treecol-sortdirection[sortDirection] {
-    fill: var(--in-content-category-text)!important
+    fill: var(--in-content-category-text)!important;
   }
+
   fieldset > legend,
   treecol:not([hideheader=true]),
   treecolpicker {
     background-color: var(--in-content-category-header-background)!important;
-    color: var(--in-content-page-color)!important
+    color: var(--in-content-page-color)!important;
+  }
+
+  prefpane#mainPrefPane groupbox#applicationsGroup richlistbox#handlersView richlistitem[selected=true] {
+    background: var(--in-content-page-background)!important;
+    color: var(--in-content-page-color)!important;
   }
 }
-@-moz-document url(chrome://browser/content/aboutDialog.xul) {
+@-moz-document url(chrome://browser/content/aboutDialog.xul)  {
   #clientBox {
     color: var(--in-content-page-color)!important;
-    background-color: var(--in-content-page-background)!important
+    background-color: var(--in-content-page-background)!important;
   }
+
   #bottomBox {
-    background: var(--in-content-category-header-background)!important
+    background: var(--in-content-category-header-background)!important;
   }
 }
 :root {
-  --panel-separator-color: var(--in-content-border-color)!important
+  --panel-separator-color: var(--in-content-border-color)!important;
 }
+
 #urlbar[focused=true],
 .searchbar-textbox[focused=true] {
   border: 1px solid!important;
   box-shadow: 0 1px 4px var(--in-content-border-focus)!important;
-  border-color: var(--in-content-border-focus)!important
+  border-color: var(--in-content-border-focus)!important;
 }
+
 #PopupAutoCompleteRichResult .autocomplete-richlistbox,
 .searchbar-treebody::-moz-tree-row {
-  background-color: var(--in-content-box-background)!important
+  background-color: var(--in-content-box-background)!important;
 }
+
 #PopupAutoCompleteRichResult .autocomplete-richlistitem,
 .autocomplete-tree {
-  border-bottom-color: var(--in-content-page-color)!important
+  border-bottom-color: var(--in-content-page-color)!important;
 }
+
 #PopupSearchAutoComplete,
 .autocomplete-richlistitem .ac-action,
 .autocomplete-richlistitem .ac-separator,
 .autocomplete-richlistitem .ac-title,
 .autocomplete-tree {
-  color: var(--in-content-page-color)!important
+  color: var(--in-content-page-color)!important;
 }
+
 .autocomplete-richlistitem[selected=true],
 .searchbar-treebody::-moz-tree-row(selected) {
-  background-color: var(--theme-selection-background)!important
+  background-color: var(--theme-selection-background)!important;
 }
+
 .ac-action[selected],
 .ac-separator[selected],
 .ac-title[selected],
@@ -202,30 +241,35 @@ url-prefix(chrome://pippki) {
 .autocomplete-richlistitem[selected=true] .ac-separator,
 .autocomplete-richlistitem[selected=true] .ac-title,
 .autocomplete-richlistitem[selected=true] .ac-url {
-  color: var(--in-content-selected-text)!important
+  color: var(--in-content-selected-text)!important;
 }
+
 .ac-url,
 .search-panel-input-value {
-  color: var(--in-content-link-color)!important
+  color: var(--in-content-link-color)!important;
 }
+
 .search-one-offs {
-  background: var(--in-content-box-background)!important
+  background: var(--in-content-box-background)!important;
 }
+
 .search-panel-header,
 .search-panel-one-offs {
   background: var(--in-content-category-header-background)!important;
-  border-top: none!important
+  border-top: none!important;
 }
+
 .autocomplete-history-popup,
 panel[type=autocomplete-richlistbox],
 panel[type=autocomplete] {
   color: var(--in-content-page-color)!important;
-  background: var(--in-content-page-color)!important
+  background: var(--in-content-page-color)!important;
 }
+
 .autocomplete-richlistitem:hover,
 .searchbar-treebody::-moz-tree-row(hover),
 treechildren.searchbar-treebody::-moz-tree-row(hover) {
-  background-color: var(--in-content-page-background)!important
+  background-color: var(--in-content-page-background)!important;
 }
 #editBMPanel_folderMenuList,
 #editBMPanel_foldersExpander,
@@ -239,23 +283,27 @@ treechildren.searchbar-treebody::-moz-tree-row(hover) {
   color: var(--in-content-page-color)!important;
   border: 1px solid!important;
   border-color: var(--in-content-box-border-color)!important;
-  box-shadow: none!important
+  box-shadow: none!important;
 }
+
 #editBookmarkPanel .expander-down > .button-box > .button-icon {
-  filter: invert(65%)!important
+  filter: invert(65%)!important;
 }
+
 #editBMPanel_folderTree,
 #editBMPanel_tagsSelector {
   -moz-appearance: none!important;
   background: var(--in-content-page-background)!important;
   color: var(--in-content-page-color)!important;
-  opacity: 1!important
+  opacity: 1!important;
 }
+
 #editBMPanel_folderTree treechildren:not(.autocomplete-treebody)::-moz-tree-row,
 #editBMPanel_tagsSelector treechildren:not(.autocomplete-treebody)::-moz-tree-row {
   background: var(--in-content-box-background)!important;
-  color: var(--in-content-page-background)!important
+  color: var(--in-content-page-background)!important;
 }
+
 #editBMPanel_folderTree treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover),
 #editBMPanel_tagsSelector treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
   background: var(--theme-selection-background-hover)!important;
@@ -263,38 +311,50 @@ treechildren.searchbar-treebody::-moz-tree-row(hover) {
   -moz-border-top-colors: var(--theme-selection-background-hover)!important;
   -moz-border-right-colors: var(--theme-selection-background-hover)!important;
   -moz-border-left-colors: var(--theme-selection-background-hover)!important;
-  -moz-border-bottom-colors: var(--theme-selection-background-hover)!important
+  -moz-border-bottom-colors: var(--theme-selection-background-hover)!important;
 }
+
+#editBMPanel_folderTree treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(hover) {
+  color: var(--in-content-selected-text)!important;
+}
+
 #editBMPanel_folderTree treechildren::-moz-tree-image {
-  fill: var(--in-content-page-color)!important
+  fill: var(--in-content-page-color)!important;
 }
+
+#editBMPanel_folderTree treechildren::-moz-tree-image(hover),
 #editBMPanel_folderTree treechildren::-moz-tree-image(selected) {
-  fill: var(--in-content-item-selected)!important
+  fill: var(--selected-icon-fill-color)!important;
 }
+
 #editBMPanel_folderTree treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected,current,focus) {
-  background: var(--theme-selection-background)!important
+  background: var(--theme-selection-background)!important;
 }
+
 listitem[selected=true] {
   background-color: var(--theme-selection-background)!important;
-  color: var(--in-content-selected-text)!important
+  color: var(--in-content-selected-text)!important;
 }
+
 #editBMPanel_folderTree treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected,current) {
-  background: var(--theme-selection-background)!important
+  background: var(--theme-selection-background)!important;
 }
+
 #editBMPanel_folderTree {
   border-color: var(--in-content-box-border-color)!important;
-  border-bottom: none!important
+  border-bottom: none!important;
 }
+
 #editBMPanel_newFolderBox {
   background: var(--in-content-page-background)!important;
   border-color: var(--in-content-box-border-color)!important;
-  box-shadow: none!important
+  box-shadow: none!important;
 }
-@-moz-document url("chrome://global/content/commonDialog.xul") {
+@-moz-document url("chrome://global/content/commonDialog.xul")  {
   #commonDialog {
     -moz-appearance: none!important;
     background: var(--in-content-page-background)!important;
-    color: var(--in-content-page-color)!important
+    color: var(--in-content-page-color)!important;
   }
 }
 menupopup,
@@ -305,62 +365,75 @@ popup > menu > menupopup {
   -moz-appearance: none!important;
   background: var(--in-content-box-background)!important;
   border: none!important;
-  padding: 0!important
+  padding: 0!important;
 }
+
 .menu-right {
-  filter: invert(95%)!important
+  filter: invert(95%)!important;
 }
+
 #context-navigation menuitem {
   color: var(--in-content-selected-text)!important;
-  background: var(--in-content-page-background)!important
+  background: var(--in-content-page-background)!important;
 }
+
 #context-navigation menuitem:hover {
-  background: var(--in-content-category-header-background)!important
+  background: var(--in-content-category-header-background)!important;
 }
+
 menuitem,
 menupopup menu {
   -moz-appearance: none!important;
-  color: var(--in-content-selected-text)!important
+  color: var(--in-content-selected-text)!important;
 }
+
 menupopup menuseparator {
   padding: 0!important;
   border-top: none!important;
-  margin: 2px 6px!important
+  margin: 2px 6px!important;
 }
+
 #context-navigation menuitem[disabled=true],
 menu[disabled=true],
 menuitem[disabled=true] {
-  color: var(--in-content-box-border-color)!important
+  color: var(--in-content-box-border-color)!important;
 }
+
 menu[disabled=true]:hover,
 menuitem:hover[disabled=true] {
   color: var(--in-content-box-border-color)!important;
-  background-color: var(--in-content-page-background)!important
+  background-color: var(--in-content-page-background)!important;
 }
+
 #context-navigation menuitem:hover[disabled=true] {
   color: var(--in-content-box-border-color)!important;
-  background-color: var(--in-content-category-header-background)!important
+  background-color: var(--in-content-category-header-background)!important;
 }
+
 menu[_moz-menuactive=true],
 menuitem:hover,
 menuitem[_moz-menuactive=true],
 menupopup menu:hover {
   color: var(--in-content-selected-text)!important;
-  background-color: var(--in-content-category-header-background)!important
+  background-color: var(--in-content-category-header-background)!important;
 }
+
 .panel-arrowcontent {
   color: var(--in-content-selected-text)!important;
-  background: var(--in-content-box-background)!important
+  background: var(--in-content-box-background)!important;
 }
+
 vbox#sidebar-box.chromeclass-extrachrome {
   border-color: var(--in-content-category-header-background)!important;
   border-right: 1px!important;
-  border-style: solid!important
+  border-style: solid!important;
 }
+
 #_testpilot-containers_7 .menu-iconic-left,
 #treestyletab_piro_sakura_ne_jp_8 .menu-iconic-left {
-  filter: invert(55%)!important
+  filter: invert(55%)!important;
 }
+
 @media screen and (-moz-windows-theme),
 screen and (-moz-windows-classic),
 screen and (-moz-windows-default-theme),
@@ -370,15 +443,18 @@ screen and (-moz-os-version:windows-win10) {
   menupopup menuseparator {
     -moz-appearance: none!important;
     background: rgba(0,0,0,0)!important;
-    border: 0!important
+    border: 0!important;
   }
+
   #context-navigation,
   #context-sep-navigation {
-    padding: 0!important
+    padding: 0!important;
   }
+
   #BMB_bookmarksPopup menupopup {
-    padding: 4px 0 0!important
+    padding: 4px 0 0!important;
   }
+
   #BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
   #personal-bookmarks menupopup,
   .box-inherit scrollbox-innerbox,
@@ -398,24 +474,28 @@ screen and (-moz-os-version:windows-win10) {
   toolbaritem#menubar-items menupopup {
     border-color: var(--in-content-page-color)!important;
     border-width: 1px!important;
-    border-style: solid!important
+    border-style: solid!important;
   }
+
   #bookmarksMenuPopup,
   #personal-bookmarks menupopup .bookmark-item,
   menupopup#goPopup {
     padding-left: 4px!important;
-    padding-right: 4px!important
+    padding-right: 4px!important;
   }
+
   menupopup#contentAreaContextMenu menupopup,
   menupopup#tabContextMenu > menu > menupopup > .popup-internal-box,
   menupopup#toolbar-context-menu {
     padding-left: 2px!important;
-    padding-right: 2px!important
+    padding-right: 2px!important;
   }
+
   menupopup,
   menupopup > menu > menupopup {
-    padding: 4px 0!important
+    padding: 4px 0!important;
   }
+
   #PlacesToolbar menupopup > menu,
   #PlacesToolbar menupopup > menuitem,
   menupopup#contentAreaContextMenu > menu,
@@ -428,8 +508,9 @@ screen and (-moz-os-version:windows-win10) {
   menupopup#toolbar-context-menu > menuitem {
     font-size: 1.167em!important;
     padding-top: 1px!important;
-    padding-bottom: 1px!important
+    padding-bottom: 1px!important;
   }
+
   #PlacesToolbar menupopup menupopup > menu,
   #PlacesToolbar menupopup menupopup > menuitem,
   menupopup#contentAreaContextMenu menupopup > menu,
@@ -437,67 +518,78 @@ screen and (-moz-os-version:windows-win10) {
   menupopup#tabContextMenu menupopup > menu,
   menupopup#tabContextMenu menupopup > menuitem,
   menupopup.textbox-contextmenu > menuitem {
-    font-size: 1em!important
+    font-size: 1em!important;
   }
+
   toolbaritem#menubar-items menupopup > menu,
   toolbaritem#menubar-items menupopup > menuitem {
-    font-size: 1.167em!important
+    font-size: 1.167em!important;
   }
+
   toolbaritem#menubar-items menupopup menupopup > menu,
   toolbaritem#menubar-items menupopup menupopup > menuitem {
-    font-size: 1em!important
+    font-size: 1em!important;
   }
+
   #customization-toolbar-menu,
   toolbaritem#menubar-items menupopup,
   toolbaritem#menubar-items menupopup > menu > menupopup {
     padding-left: 2px!important;
-    padding-right: 2px!important
+    padding-right: 2px!important;
   }
+
   #personal-bookmarks menupopup menuitem,
   menupopup#contentAreaContextMenu menu,
   menupopup#contentAreaContextMenu menuitem {
     padding-top: 1px!important;
-    padding-bottom: 1px!important
+    padding-bottom: 1px!important;
   }
+
   menupopup#contentAreaContextMenu > .menuitem-iconic {
     padding-top: 0!important;
-    padding-bottom: 0!important
+    padding-bottom: 0!important;
   }
+
   menupopup .menu-right {
-    margin-right: 0!important
+    margin-right: 0!important;
   }
 }
 #customization-done-button {
   color: var(--in-content-text-color);
   border-color: var(--in-content-primary-button-background)!important;
-  background-color: var(---in-content-primary-button-background)!important
+  background-color: var(---in-content-primary-button-background)!important;
 }
+
 #customization-done-button:-moz-any(:focus,:active,:hover):not([disabled]) {
-  background-color: var(--in-content-primary-button-background-hover)!important
+  background-color: var(--in-content-primary-button-background-hover)!important;
 }
 .browserContainer > findbar {
-  border-top: 1px solid!important
+  border-top: 1px solid!important;
 }
+
 .findbar-find-next,
 .findbar-find-previous {
   border: none!important;
   background: 0 0!important;
   border-radius: 2px!important;
-  fill: var(--in-content-page-color)!important
+  fill: var(--in-content-page-color)!important;
 }
+
 .findbar-find-previous {
-  margin-left: 6px!important
+  margin-left: 6px!important;
 }
+
 .findbar-find-next:hover,
 .findbar-find-previous:hover {
-  background: var(--toolbarbutton-hover-background)!important
+  background: var(--toolbarbutton-hover-background)!important;
 }
-@-moz-document url(chrome://browser/content/places/places.xul) {
+@-moz-document url(chrome://browser/content/places/places.xul)  {
   toolbar {
     -moz-appearance: none!important;
     background-color: var(--in-content-category-header-background)!important;
-    border: none!important
+    border: none!important;
   }
+
   listbox,
   textbox {
     -moz-appearance: none!important;
@@ -507,77 +599,93 @@ screen and (-moz-os-version:windows-win10) {
     padding: 0 0 0 4px!important;
     border: 1px solid!important;
     border-color: var(--in-content-box-border-color)!important;
-    border-radius: 3px!important
+    border-radius: 3px!important;
   }
+
   #placesToolbar > toolbarbutton {
     margin: 6px 4px 5px!important;
     -moz-appearance: none!important;
     background-color: var(--tone-4)!important;
     border-radius: 5px!important;
-    filter: invert(100%)!important
+    filter: invert(100%)!important;
   }
+
   #placesList {
     -moz-appearance: none!important;
     color: var(--in-content-page-color)!important;
-    background-color: var(--in-content-page-background)!important
+    background-color: var(--in-content-page-background)!important;
   }
+
   #placesView > splitter {
-    border-color: var(--in-content-border-color)!important
+    border-color: var(--in-content-border-color)!important;
   }
+
   #places #downloadsRichListBox {
     -moz-appearance: none!important;
     color: var(--in-content-page-color)!important;
-    background-color: var(--in-content-box-background)!important
+    background-color: var(--in-content-box-background)!important;
   }
+
   #detailsDeck {
     border: none!important;
     background-color: var(--in-content-page-background)!important;
-    color: var(--in-content-page-color)!important
+    color: var(--in-content-page-color)!important;
   }
+
   .expander-down,
   .expander-up {
-    filter: invert(60%)!important
+    filter: invert(60%)!important;
   }
+
   #placeContent treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text() {
-    color: var(--in-content-text-color)!important
+    color: var(--in-content-text-color)!important;
   }
+
   #places treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected),
   #placesList > treechildren::-moz-tree-row(selected) {
     -moz-appearance: none!important;
     -moz-font-smoothing-background-color: none!important;
     border-top: none!important;
     background: var(--theme-selection-background)!important;
-    color: var(--in-content-text-color)!important
+    color: var(--in-content-text-color)!important;
   }
+
   #placeContent treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected),
   #placesList > treechildren::-moz-tree-cell-text(selected) {
-    color: var(--in-content-text-color)!important
+    color: var(--in-content-text-color)!important;
   }
+
   #places treechildren::-moz-tree-row {
-    background-color: transparent!important
+    background-color: transparent!important;
   }
+
   #places treechildren::-moz-tree-image {
-    fill: var(--in-content-page-color)!important
+    fill: var(--in-content-page-color)!important;
   }
+
   #places treechildren::-moz-tree-image(selected) {
-    fill: var(--selected-icon-fill-color)!important
+    fill: var(--selected-icon-fill-color)!important;
   }
+
   #placeContent > treechildren::-moz-tree-cell,
   #placeContent > treechildren::-moz-tree-column {
-    border-color: var(--in-content-box-border-color)!important
+    border-color: var(--in-content-box-border-color)!important;
   }
+
   #contentView treecol {
     -moz-appearance: none!important;
     border: none!important;
     background: var(--in-content-category-header-background)!important;
     color: var(--in-content-text-color)!important;
     border-right: 1px solid!important;
-    border-color: var(--in-content-box-border-color)!important
+    border-color: var(--in-content-box-border-color)!important;
   }
+
   tree {
-    background-color: var(--in-content-box-background)!important
+    background-color: var(--in-content-box-background)!important;
   }
-  @media screen and (-moz-windows-theme),
+
+@media screen and (-moz-windows-theme),
   screen and (-moz-windows-classic),
   screen and (-moz-windows-default-theme),
   screen and (-moz-os-version:windows-win7),
@@ -593,167 +701,259 @@ screen and (-moz-os-version:windows-win10) {
       -moz-appearance: none!important;
       background-color: var(--in-content-page-background)!important;
       border: none!important;
-      color: var(--in-content-selected-text)!important
+      color: var(--in-content-selected-text)!important;
     }
+
     #security-identity-groupbox,
     #security-privacy-groupbox,
     #security-technical-groupbox {
       -moz-appearance: none!important;
-      background-color: var(--in-content-category-header-background)!important
+      background-color: var(--in-content-category-header-background)!important;
     }
-  }
+}
 }
 :root {
-  --tab-loading-fill: var(--in-content-category-text-selected)!important
+  --tab-loading-fill: var(--in-content-category-text-selected)!important;
 }
+
 .tab-throbber::before {
   fill: var(--in-content-category-text-selected)!important;
-  opacity: 1!important
+  opacity: 1!important;
 }
+
 .panel-arrow {
-  filter: invert(70%)!important
+  filter: invert(70%)!important;
 }
+
 #appMenu-zoomReset-button,
 .panel-subview-body {
   color: var(--in-content-selected-text)!important;
-  background: var(--in-content-box-background)!important
+  background: var(--in-content-box-background)!important;
 }
+
 .panel-subview-footer,
 [class^=PanelUI-] {
   color: var(--in-content-selected-text)!important;
-  background: var(--in-content-page-background)!important
+  background: var(--in-content-page-background)!important;
 }
+
 /*! webextension popup fix */
+
 .webextension-popup-browser {
-  background: #fff!important
+  background: #fff!important;
 }
+
 photonpanelmultiview panelview {
   background: 0 0!important;
-  color: var(--in-content-page-color)!important
+  color: var(--in-content-page-color)!important;
 }
+
 #emptyDownloads {
   background: var(--in-content-box-background)!important;
-  color: var(--in-content-page-color)!important
+  color: var(--in-content-page-color)!important;
 }
+
 #downloadsFooterButtons {
   background: var(--in-content-page-color)!important;
-  color: var(--in-content-page-color)!important
+  color: var(--in-content-page-color)!important;
 }
+
 #downloadsFooter[showingsummary] > stack:not(:hover) {
-  background-color: var(--in-content-category-header-background)!important
+  background-color: var(--in-content-category-header-background)!important;
 }
+
 #downloadsListBox {
-  background: var(--in-content-page-background)!important
+  background: var(--in-content-page-background)!important;
 }
+
 #appMenu-mainView toolbarbutton:hover,
 #customizationui-widget-multiview toolbarbutton:hover,
 #widget-overflow-list toolbarbutton:hover {
-  background: var(--in-content-category-header-background)!important
+  background: var(--in-content-category-header-background)!important;
 }
+
 #BMB_bookmarksPopup {
-  background: 0 0!important
+  background: 0 0!important;
 }
+
 #identity-popup-securityView {
-  background: var(--in-content-box-background)!important
+  background: var(--in-content-box-background)!important;
 }
+
 #identity-popup-multiView > .panel-viewcontainer > .panel-viewstack > .panel-subviews {
-  background: var(--in-content-box-border-color)!important
+  background: var(--in-content-box-border-color)!important;
 }
+
 .identity-popup-expander[panel-multiview-anchor] {
   background-color: var(--in-content-primary-button-background)!important;
-  fill: var(--in-content-text-color)!important
+  fill: var(--in-content-text-color)!important;
 }
+
 #identity-popup-mainView {
   background: var(--in-content-box-background)!important;
-  color: var(--in-content-page-color)!important
+  color: var(--in-content-page-color)!important;
 }
+
 #identity-popup[connection^=secure] .identity-popup-security-content {
-  fill: var(--in-content-category-text-selected)!important
+  fill: var(--in-content-category-text-selected)!important;
 }
+
 #identity-popup-permissions-content {
-  filter: invert(90%)!important;
-  color: var(--in-content-page-background)!important
+  background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjQsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMjRweCIgaGVpZ2h0PSIyNHB4IiB2aWV3Qm94PSIwIDAgMjQgMjQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDI0IDI0IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxkZWZzPg0KCTxmaWx0ZXIgaWQ9IkFkb2JlX09wYWNpdHlNYXNrRmlsdGVyIiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjAiIHk9IjAiIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCI+DQoJCTxmZUNvbG9yTWF0cml4ICB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMSAwIDAgMCAwICAwIDEgMCAwIDAgIDAgMCAxIDAgMCAgMCAwIDAgMSAwIi8+DQoJPC9maWx0ZXI+DQo8L2RlZnM+DQo8bWFzayBtYXNrVW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4PSIwIiB5PSIwIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIGlkPSJtYXNrLXBlcm1pc3Npb25zIj4NCgk8cGF0aCBmaWxsPSIjRkZGRkZGIiBmaWx0ZXI9InVybCgjQWRvYmVfT3BhY2l0eU1hc2tGaWx0ZXIpIiBkPSJNMiwxaDIwYzEuMSwwLDIsMC45LDIsMnYxOGMwLDEuMS0wLjksMi0yLDJIMmMtMS4xLDAtMi0wLjktMi0yVjMNCgkJQzAsMS45LDAuOSwxLDIsMXoiLz4NCgk8cGF0aCBkPSJNMTIsM2g5YzAuNiwwLDEsMC40LDEsMXYxNmMwLDAuNi0wLjQsMS0xLDFoLTlWM3oiLz4NCgk8cGF0aCBkPSJNNS41LDEyLjVsMi43LTMuN0M4LjQsOC41LDguOCw4LjUsOSw4LjdsMC43LDAuNWMwLjIsMC4yLDAuMiwwLjUsMCwwLjdMNS44LDE1Yy0wLjIsMC4yLTAuNSwwLjMtMC44LDAuMUwyLjgsMTIuOQ0KCQljLTAuMi0wLjItMC4yLTAuNSwwLTAuN2wwLjgtMC44YzAuMi0wLjIsMC41LTAuMiwwLjcsMEw1LjUsMTIuNXoiLz4NCgkNCgkJPHJlY3QgeD0iMTYuMzM1IiB5PSI4LjQ4NSIgdHJhbnNmb3JtPSJtYXRyaXgoLTAuNzA3MyAwLjcwNjkgLTAuNzA2OSAtMC43MDczIDM3LjU5MiA4LjUwNTEpIiBmaWxsPSIjRkZGRkZGIiB3aWR0aD0iMS40IiBoZWlnaHQ9IjcuMTAxIi8+DQoJDQoJCTxyZWN0IHg9IjE2LjMzNSIgeT0iOC40MTUiIHRyYW5zZm9ybT0ibWF0cml4KDAuNzA2OCAwLjcwNzUgLTAuNzA3NSAwLjcwNjggMTMuNDYwMiAtOC41NDI5KSIgZmlsbD0iI0ZGRkZGRiIgd2lkdGg9IjEuNCIgaGVpZ2h0PSI3LjEiLz4NCjwvbWFzaz4NCjxyZWN0IGlkPSJwZXJtaXNzaW9ucyIgbWFzaz0idXJsKCNtYXNrLXBlcm1pc3Npb25zKSIgZmlsbD0iI0IxQjFCMyIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ii8+DQo8L3N2Zz4NCg==")!important;
 }
+
 .identity-popup-expander {
   border-color: var(--in-content-box-border-color)!important;
   background-color: var(--in-content-box-background)!important;
-  fill: var(--in-content-box-border-color)!important
+  fill: var(--in-content-box-border-color)!important;
 }
+
 .popup-notification-button[default][highlight=true]:not([disabled]) {
   background-color: var(--in-content-primary-button-background)!important;
-  color: var(--in-content-text-color)
+  color: var(--in-content-text-color);
 }
-#update-available-whats-new {
-  color: var(--in-content-link-color)!important
+
+#update-available-whats-new,
+.text-link {
+  color: var(--in-content-link-color)!important;
 }
+
 .popup-notification-icon[popupid=update-available],
 .popup-notification-icon[popupid=update-manual],
 .popup-notification-icon[popupid=update-restart] {
   background-color: var(--in-content-item-selected)!important;
-  border-radius: 50%
+  border-radius: 50%;
 }
+
 toolbarbutton {
-  text-shadow: none!important
+  text-shadow: none!important;
 }
+
 .panel-banner-item > .toolbarbutton-multiline-text {
-  color: var(--in-content-page-color)!important
+  color: var(--in-content-page-color)!important;
 }
+
 .panel-banner-item {
-  background-color: hsla(96,65%,37%,.9)!important
+  background-color: hsla(96,65%,37%,.9)!important;
 }
+
 #update-manual-whats-new {
-  color: var(--in-content-link-color)!important
+  color: var(--in-content-link-color)!important;
 }
+
 toolbar[brighttext] {
-  --toolbarbutton-icon-fill-attention: var(--in-content-primary-button-background)!important
+  --toolbarbutton-icon-fill-attention: var(--in-content-primary-button-background)!important;
 }
+
 ::-moz-selection {
   background: var(--in-content-link-color);
-  color: var(--in-content-selected-text)!important
+  color: var(--in-content-selected-text)!important;
 }
-@-moz-document url(chrome://browser/content/pageinfo/pageInfo.xul) {
+@-moz-document url(chrome://browser/content/pageinfo/pageInfo.xul)  {
   #topBar {
     -moz-appearance: none!important;
-    background: var(--in-content-category-header-background)!important
+    background: var(--in-content-category-header-background)!important;
   }
+
   #mainDeck {
     background: var(--in-content-page-background)!important;
-    color: #fff!important
+    color: var(--in-content-page-color)!important;
   }
+
   textbox {
-    color: var(--in-content-page-color)!important
+    color: var(--in-content-page-color)!important;
   }
-  tree {
+
+  .text-link {
+    color: var(--in-content-link-color)!important;
+  }
+
+  button {
     -moz-appearance: none!important;
-    border-color: var(--in-content-border-color)!important;
-    color: --in-content-page-color!important;
-    background-color: var(--in-content-box-background)!important
+    background-color: var(--in-content-page-background)!important;
+    border: 1px solid!important;
+    border-radius: 3px!important;
+    color: var(--in-content-page-color)!important;
+    border-color: var(--in-content-box-border-color)!important;
   }
-  treechildren::-moz-tree-row {
-    background-color: transparent!important
-  }
-  treecol {
-    -moz-appearance: none!important;
-    border: 0 solid!important;
-    border-color: var(--in-content-box-background)!important;
-    color: var(--in-content-selected-text)!important
-  }
-  treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected,current,focus) {
-    background: var(--theme-selection-background-hover)!important
+
+  button:hover {
+    background-color: var(--in-content-box-background)!important;
   }
+
+  #feedListbox,
+  #feedListbox > richlistitem,
+  #imagecontainerbox,
+  .groupbox-body,
   .permission {
     -moz-appearance: none!important;
     background: var(--in-content-box-background)!important;
     color: var(--in-content-page-color)!important;
-    border-color: var(--in-content-border-color)!important
+    border-color: var(--in-content-box-border-color)!important;
   }
+
+  #feedListbox richlistitem {
+    border-color: var(--in-content-box-border-color)!important;
+  }
+
   #permPluginTemplate {
-    color: var(--in-content-page-color)!important
+    color: var(--in-content-page-color)!important;
   }
-  #permList {
-    border: 2px solid!important
+
+  #feedListbox,
+  #imagecontainerbox,
+  #permList,
+  .groupbox-body {
+    border: 1px solid!important;
+    border-color: var(--in-content-box-border-color)!important;
   }
-  @media screen and (-moz-windows-theme),
+
+  groupbox.collapsable caption .caption-icon {
+    filter: invert(65%)!important;
+  }
+
+  tree {
+    -moz-appearance: none!important;
+    color: var(--in-content-page-color)!important;
+  }
+
+  treecol {
+    -moz-appearance: none!important;
+    border: 0 solid!important;
+    border-color: var(--in-content-box-background)!important;
+  }
+
+  treecolpicker {
+    -moz-appearance: none;
+    border: none!important;
+  }
+
+  #viewGroup > radio {
+    -moz-appearance: none!important;
+    background-color: var(--in-content-box-background)!important;
+    text-shadow: none!important;
+    padding: 0 8px!important;
+    color: var(--in-content-page-color);
+    border-right: 1px solid!important;
+    border-color: var(--in-content-box-border-color)!important;
+  }
+
+  #viewGroup > radio[selected=true] {
+    color: var(--in-content-selected-text)!important;
+  }
+
+  #viewGroup > radio:first-of-type {
+    border-top-left-radius: 4px!important;
+    border-bottom-left-radius: 4px!important;
+  }
+
+  #viewGroup > radio:last-of-type {
+    border: none!important;
+    border-top-right-radius: 4px!important;
+    border-bottom-right-radius: 4px!important;
+  }
+
+@media screen and (-moz-windows-theme),
   screen and (-moz-windows-classic),
   screen and (-moz-windows-default-theme),
   screen and (-moz-os-version:windows-win7),
@@ -765,8 +965,9 @@ toolbar[brighttext] {
       border: none!important;
       padding-top: 5px!important;
       padding-bottom: 5px!important;
-      color: var(--selected-icon-fill-color)!important
+      color: var(--selected-icon-fill-color)!important;
     }
+
     #metaTagsCaption,
     #security-identity,
     #security-identity-groupbox,
@@ -777,43 +978,47 @@ toolbar[brighttext] {
       -moz-appearance: none!important;
       background-color: var(--in-content-page-color)!important;
       border: none!important;
-      color: var(--in-content-selected-text)!important
+      color: var(--in-content-selected-text)!important;
     }
+
     #security-identity-groupbox,
     #security-privacy-groupbox,
     #security-technical-groupbox {
       -moz-appearance: none!important;
-      background-color: var(--in-content-category-header-background)!important
+      background-color: var(--in-content-category-header-background)!important;
     }
-  }
+}
 }
 #navigator-toolbox::after {
-  border-bottom: 0!important
+  border-bottom: 0!important;
 }
 #content,
 browser[type=content-primary],
 browser[type=content] > html {
-  background: var(--in-content-page-background)!important
+  background: var(--in-content-page-background)!important;
 }
 #identity-box.verifiedIdentity {
-  --urlbar-separator-color: var(--in-content-border-focus)!important
+  --urlbar-separator-color: var(--in-content-border-focus)!important;
 }
+
 #identity-box.verifiedIdentity #identity-icon-labels,
 .identity-popup-connection-secure {
-  color: var(--in-content-link-color)!important
+  color: var(--in-content-link-color)!important;
 }
+
 #connection-icon,
 #identity-popup[connection^=secure] #identity-popup-security-content,
 #identity-popup[connection^=secure] #identity-popup-securityView {
-  fill: var(--in-content-link-color)!important
+  fill: var(--in-content-link-color)!important;
 }
 #sidebar-header,
 #sidebar-search-container,
 #sidebar-search-container #viewButton,
 .sidebar-header {
   background: var(--in-content-category-header-background)!important;
-  color: var(--in-content-page-color)!important
+  color: var(--in-content-page-color)!important;
 }
+
 hbox#sidebar-search-container textbox#search-box {
   -moz-appearance: none!important;
   background-color: var(--in-content-box-background)!important;
@@ -822,39 +1027,45 @@ hbox#sidebar-search-container textbox#search-box {
   padding: 0 0 0 4px!important;
   border: 1px solid!important;
   border-color: var(--in-content-box-border-color)!important;
-  border-radius: 3px!important
+  border-radius: 3px!important;
 }
+
 #sidebar,
 #sidebar-box,
 #webext-panels-browser,
 #webextpanels-window {
-  background: var(--in-content-page-background)!important
+  background: var(--in-content-page-background)!important;
 }
+
 .sidebar-placesTree {
   -moz-appearance: none!important;
   color: var(--in-content-page-color)!important;
   background-color: var(--in-content-page-background)!important;
-  opacity: 1!important
+  opacity: 1!important;
 }
+
 #sidebar-box[sidebarcommand=treestyletab_piro_sakura_ne_jp-sidebar-action] #sidebar-icon {
-  filter: invert(60%)
+  filter: invert(60%);
 }
+
 #button_treestyletab_piro_sakura_ne_jp-sidebar-action .toolbarbutton-icon {
-  filter: invert(87%)
+  filter: invert(87%);
 }
+
 .button-menu-dropmarker,
 .button-menubutton-dropmarker {
-  filter: invert(65%)
+  filter: invert(65%);
 }
+
 .sidebar-placesTree::-moz-tree-image,
 .sidebar-placesTreechildren::-moz-tree-image {
-  fill: var(--in-content-page-color)!important
+  fill: var(--in-content-page-color)!important;
 }
 statuspanel .statuspanel-label {
   background-color: var(--in-content-category-header-background)!important;
   color: var(--in-content-page-color)!important;
-  border: none!important
+  border: none!important;
 }
 .tab-line[selected=true] {
-  background-color: var(--in-content-border-focus)!important
+  background-color: var(--in-content-border-focus)!important;
 }
\ No newline at end of file
diff --git a/userContent.css b/userContent.css
index 1ff59d8..83f92cf 100644
--- a/userContent.css
+++ b/userContent.css
@@ -120,16 +120,31 @@ url-prefix(chrome://)  {
     border-color: var(--in-content-box-border-color)!important;
   }
 
+  radio[disabled=true] {
+    color: var(--in-content-box-border-color)!important;
+  }
+
   .radio-check[selected] {
     list-style-image: url("chrome://global/skin/in-content/radio.svg");
     fill: var(--in-content-border-highlight)!important;
+    -moz-context-properties: fill,stroke;
+    stroke: none;
+    border-radius: 50%!important;
+  }
+
+  .checkbox-check[checked] {
+    list-style-image: url("chrome://global/skin/in-content/check.svg")!important;
+    fill: var(--in-content-border-highlight)!important;
+    -moz-context-properties: fill,stroke;
+    stroke: none;
   }
 }
 @-moz-document url-prefix(about:),
 url-prefix(chrome://browser/content/preferences/),
 url(chrome://passwordmgr/content/passwordManager.xul),
 url(chrome://formautofill/content/manageAddresses.xhtml),
-url-prefix(chrome://pippki)  {
+url-prefix(chrome://pippki),
+url(chrome://browser/content/pageinfo/pageInfo.xul)  {
   treechildren::-moz-tree-row,
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol,odd) {
     background-color: var(--in-content-box-background)!important;
@@ -139,6 +154,11 @@ url-prefix(chrome://pippki)  {
     background-color: var(--theme-selection-background-hover)!important;
   }
 
+  treechildren::-moz-tree-cell-text(hover),
+  treechildren::-moz-tree-cell-text(selected) {
+    color: var(--in-content-text-color)!important;
+  }
+
   treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
     background-color: var(--theme-selection-background)!important;
   }