X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fglobal%2Fin-content%2Fcommon.css;h=2b6ef8a3118142bfafadbc09544e50af53c1e3fb;hp=3faf41f17ab849f33cf36a8669f3b63c1ff77a82;hb=a9f6369d5cebd3c329b993d57e73bcf30fffd2cd;hpb=21c0144b2194f018832e93a3b6e112d3bd4852cb

diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css
index 3faf41f1..2b6ef8a3 100644
--- a/LCARStrek/global/in-content/common.css
+++ b/LCARStrek/global/in-content/common.css
@@ -7,12 +7,73 @@
 @namespace html "http://www.w3.org/1999/xhtml";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-html|body,
-xul|page {
+*|*:root {
+  --in-content-page-color: #FF9F00;
+  --in-content-page-background: #000000;
+  --in-content-text-color: #FF9F00;
+  --in-content-selected-text: #000000;
+  --in-content-header-border-color: #A09090;
+  --in-content-button-background: #C09070;
+  --in-content-box-background: #000000;
+  ---in-content-box-background-odd: #f3f6fa;
+  --in-content-box-background-hover: #FFCF00;
+  --in-content-box-background-active: #FF9F00;
+  --in-content-box-background-disabled: #402858;
+  --in-content-box-border-color: #FF9F00;
+  ---in-content-item-hover: rgba(0,149,221,0.25);
+  ---in-content-item-selected: #0095dd;
+  ---in-content-border-highlight: #33FF33;
+  --in-content-border-focus: #FFCF00;
+  --in-content-border-color: #9C9CFF;
+  --in-content-border-disabled: #8050B0;
+  --in-content-category-text: #FFCF00;
+  --in-content-category-border-focus: 1px dotted #000000;
+  --in-content-category-text-selected: #000000;
+  --in-content-categorylist-background: #A09090;
+  --in-content-category-background: #000000;
+  --in-content-category-background-hover: #FFCF00;
+  --in-content-category-background-active: #008484;
+  ---in-content-tab-color: #424f5a;
+  --in-content-link-color: #3333FF;
+  --in-content-link-color-hover: #FFCF00;
+  --in-content-link-color-active: #FF9F00;
+  --in-content-link-color-visited: #6000CF;
+  --in-content-primary-button-background: #A06060;
+  --in-content-primary-button-background-hover: #FFCF00;
+  --in-content-primary-button-background-active: #FF9F00;
+  --in-content-table-border-dark-color: #9C9CFF;
+  --in-content-table-header-background: #A09090;
+  --in-content-disabled-text: #8050B0;
+}
+
+@-moz-document url("about:privatebrowsing") {
+  #bar {
+    background-color: #6000CF !important;
+    color: #FFCF00 !important;
+  }
+
+  #tpEnabled {
+    background-color: #008484 !important;
+    color: #000000 !important;
+  }
+
+  #tpDisabled {
+    background-color: #FF0000 !important;
+    color: #000000 !important;
+  }
+
+  #trackingProtectionSection {
+    border-color: #A09090 !important;
+  }
+}
+
+html|html,
+xul|page,
+xul|window {
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
   -moz-appearance: none;
-  background-color: #000000;
-  color: #FF9F00;
+  background-color: var(--in-content-page-background);
+  color: var(--in-content-page-color);
 }
 
 html|body {
@@ -25,27 +86,35 @@ html|h1 {
   font-size: 2.5em;
   font-weight: lighter;
   line-height: 1.2;
+  color: var(--in-content-text-color);
   margin: 0;
   margin-bottom: .5em;
 }
 
+html|hr {
+  border-style: solid none none none;
+  border-color: var(--in-content-border-color);
+}
+
 xul|caption {
 }
 
+html|h2,
+xul|caption > xul|checkbox,
 xul|caption > xul|label {
-  margin-top: 0;
-  margin-bottom: 0;
 }
 
-xul|description {
-  -moz-margin-start: 0;
+xul|caption > xul|checkbox,
+xul|caption > xul|label {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 *|*.main-content {
   padding-top: 40px;
-  -moz-padding-end: 48px; /* orig is 44px to compensate the 4px margin of child elements */
+  padding-inline-end: 48px; /* orig is 44px to compensate the 4px margin of child elements */
   padding-bottom: 48px;
-  -moz-padding-start: 48px;
+  padding-inline-start: 48px;
   overflow: auto;
 }
 
@@ -58,18 +127,17 @@ xul|prefpane > xul|*.content-box {
 xul|groupbox {
   -moz-appearance: none;
   border: none;
-  margin-top: 15px;
-  margin-bottom: 15px;
-  -moz-margin-end: 0;
-  -moz-padding-start: 0;
-  -moz-padding-end: 0;
+  margin: 15px 0 0;
+  padding-inline-start: 0;
+  padding-inline-end: 0;
   font-size: 1.25rem;
 }
 
-xul|groupbox xul|label {
+xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.indent):not(.learnMore),
+xul|groupbox xul|description {
   / !important needed to override toolkit !important rule /
-  -moz-margin-start: 0 !important;
-  -moz-margin-end: 0 !important;
+  margin-inline-start: 0 !important;
+  margin-inline-end: 0 !important;
 }
 */
 /* tabpanels and tabs */
@@ -86,9 +154,9 @@ xul|tabpanels {
 
 xul|tabs {
   margin-bottom: 15px;
-  border-top: 1px solid #c1c1c1;
-  border-bottom: 1px solid #c1c1c1;
-  background-color: #fbfbfb;
+  border-top: 1px solid var(--in-content-box-border-color);
+  border-bottom: 1px solid var(--in-content-box-border-color);
+  background-color: var(--in-content-page-background);
 }
 
 xul|*.tabs-left,
@@ -101,20 +169,22 @@ xul|tab {
   margin-top: 0;
   padding: 4px 20px;
   min-height: 44px;
-  color: #424f5a;
-  background-color: #fbfbfb;
+  color: var(--in-content-tab-color);
+  background-color: var(--in-content-page-background);
   border-width: 0;
+  / !important overrides tabbox.css RTL and visuallyselected rules /
+  border-radius: 0 !important;
   transition: background-color 50ms ease 0s;
 }
 
 xul|tab:hover {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
 }
 
 xul|tab[selected] {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
   padding-bottom: 0; / compensate the 4px border /
-  border-bottom: 4px solid #ff9500;
+  border-bottom: 4px solid var(--in-content-border-highlight);
 }
 
 xul|*.tab-text {
@@ -127,8 +197,8 @@ xul|*.tab-text {
 html|button {
   border-radius: 300px;
   border: none;
-  background-color: #C09070;
-  color: #000000;
+  background-color: var(--in-content-button-background);
+  color: var(--in-content-selected-text);
   /* override forms.css */
   font: inherit;
 }
@@ -136,58 +206,60 @@ html|button {
 /* xul buttons and menulists */
 /*
 *|button,
+html|select,
 xul|colorpicker[type="button"],
 xul|menulist {
   -moz-appearance: none;
-  height: 30px;
-  color: #333;
-  line-height: 20px;
-  border: 1px solid #c1c1c1;
+  min-height: 30px;
+  color: var(--in-content-text-color);
+  border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-left-colors: none !important;
   border-radius: 2px;
-  background-color: #fbfbfb;
+  background-color: var(--in-content-page-background);
 }
 */
 html|button:enabled:hover,
+html|select:enabled:hover,
 xul|button:not([disabled="true"]):hover,
 xul|colorpicker[type="button"]:not([disabled="true"]):hover,
 xul|menulist:not([disabled="true"]):hover {
-  background-color: #FFCF00;
-  color: #000000;
+  background-color: var(--in-content-box-background-hover);
+  color: var(--in-content-selected-text);
 }
 
 html|button:enabled:hover:active,
+html|select:enabled:hover:active,
 xul|button:not([disabled="true"]):hover:active,
 xul|colorpicker[type="button"]:not([disabled="true"]):hover:active,
 xul|menulist[open="true"]:not([disabled="true"]) {
-  background-color: #FF9F00;
-  color: #000000;
+  background-color: var(--in-content-box-background-active);
+  color: var(--in-content-selected-text);
 }
 
 html|button:disabled,
+html|select:disabled,
 xul|button[disabled="true"],
 xul|colorpicker[type="button"][disabled="true"],
 xul|menulist[disabled="true"] {
-  cursor: not-allowed;
-  background-color: #402858;
-  color: #000000;
+  background-color: var(--in-content-box-background-disabled);
+  color: var(--in-content-selected-text);
 }
 
 *|button.primary {
-  background-color: #A06060;
+  background-color: var(--in-content-primary-button-background);
 }
 
 html|button.primary:enabled:hover,
 xul|button.primary:not([disabled="true"]):hover {
-  background-color: #FFCF00;
+  background-color: var(--in-content-primary-button-background-hover);
 }
 
 html|button.primary:enabled:hover:active,
 xul|button.primary:not([disabled="true"]):hover:active {
-  background-color: #FF9F00;
+  background-color: var(--in-content-primary-button-background-active);
 }
 /*
 xul|colorpicker[type="button"] {
@@ -201,14 +273,14 @@ xul|menulist > xul|*.menulist-label-box {
   padding-left: 10px !important;
 }
 
-xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon {
-  -moz-margin-end: 5px;
+xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon[src] {
+  margin-inline-end: 5px;
 }
 
 xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
   -moz-appearance: none;
   margin: 1px 0;
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
   padding: 0;
   width: 10px;
   height: 16px;
@@ -220,10 +292,9 @@ xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
 */
 xul|*.help-button {
 /*
-  min-width: 30px;
-  border-radius: 2px;
+  min-width: 16px;
+  margin-inline-end: 0;
   border-width: 0;
-  background-color: #ffcb00;
   background-image: none;
   box-shadow: none;
 */
@@ -231,13 +302,16 @@ xul|*.help-button {
 }
 /*
 xul|*.help-button:not([disabled="true"]):hover {
-  background-color: #f4c200;
   background-image: none;
+  / Override default button background /
+  background-color: transparent;
+  list-style-image: url("chrome://global/skin/in-content/help-glyph.svg#help-hover");
 }
-
 xul|*.help-button:not([disabled="true"]):hover:active {
-  background-color: #eaba00;
   background-image: none;
+  / Override default button background /
+  background-color: transparent;
+  list-style-image: url("chrome://global/skin/in-content/help-glyph.svg#help-pressed");
 }
 
 xul|*.close-icon > xul|*.button-box,
@@ -249,17 +323,38 @@ xul|*.help-button > xul|*.button-box {
 }
 */
 xul|*.help-button > xul|*.button-box > xul|*.button-icon {
-  width: 18px;
-  height: 18px;
+  width: 16px;
+  height: 16px;
 }
 
 xul|*.help-button > xul|*.button-box > xul|*.button-text {
   display: none;
 }
+
+html|*.help-button {
+  width: 16px;
+  height: 16px;
+  border: 0;
+  padding: 0;
+  display: inline-block;
+  background-image: url("chrome://global/skin/in-content/help-glyph.svg#help");
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-size: contain;
+}
+
+html|*.help-button:hover {
+  background-image: url("chrome://global/skin/in-content/help-glyph.svg#help-hover");
+}
+
+html|*.help-button:hover:active {
+  background-image: url("chrome://global/skin/in-content/help-glyph.svg#help-pressed");
+}
 /*
 xul|*.spinbuttons-button {
-  -moz-margin-start: 10px !important;
-  -moz-margin-end: 2px !important;
+  min-height: initial;
+  margin-inline-start: 10px !important;
+  margin-inline-end: 2px !important;
 }
 
 xul|*.spinbuttons-up {
@@ -294,7 +389,7 @@ xul|*.spinbuttons-down[disabled="true"] > xul|*.button-box > xul|*.button-icon {
 
 xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
   -moz-appearance: none;
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   padding: 0;
   border: none;
   background-color: transparent;
@@ -313,9 +408,9 @@ xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker
 xul|menulist > xul|menupopup,
 xul|button[type="menu"] > xul|menupopup {
   -moz-appearance: none;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   border-radius: 2px;
-  background-color: #fff;
+  background-color: var(--in-content-box-background);
 }
 
 xul|menulist > xul|menupopup xul|menu,
@@ -324,27 +419,37 @@ xul|button[type="menu"] > xul|menupopup xul|menu,
 xul|button[type="menu"] > xul|menupopup xul|menuitem {
   -moz-appearance: none;
   font-size: 1rem;
-  color: #333;
+  color: var(--in-content-text-color);
   padding-top: 0.2em;
   padding-bottom: 0.2em;
-  -moz-padding-start: 10px;
-  -moz-padding-end: 30px;
+  padding-inline-start: 10px;
+  padding-inline-end: 30px;
 }
 
-xul|menulist > xul|menupopup > xul|menu[_moz-menuactive="true"],
-xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] {
-  color: #333;
-  background-color: rgba(0,149,221,0.25);
+xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
+xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
+  color: var(--in-content-text-color);
+  background-color: var(--in-content-item-hover);
 }
 
-xul|menulist > xul|menupopup > xul|menu[selected="true"],
-xul|menulist > xul|menupopup > xul|menuitem[selected="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] {
-  color: #fff;
-  background-color: #0095DD;
+xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
+xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
+  color: var(--in-content-selected-text);
+  background-color: var(--in-content-item-selected);
+}
+
+xul|menulist > xul|menupopup > xul|menu[disabled="true"],
+xul|menulist > xul|menupopup > xul|menuitem[disabled="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu[disabled="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem[disabled="true"] {
+  color: #999;
+  / override the [_moz-menuactive="true"] background color from
+     global/menu.css /
+  background-color: transparent;
 }
 
 xul|menulist > xul|menupopup xul|menuseparator,
@@ -352,35 +457,55 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
   -moz-appearance: none;
   margin: 0;
   padding: 0;
-  border-top: 1px solid #c1c1c1;
+  border-top: 1px solid var(--in-content-box-border-color);
   border-bottom: none;
 }
 */
 /* textboxes */
 /*
-*|textbox {
+html|input[type="text"],
+html|textarea,
+xul|textbox {
   -moz-appearance: none;
-  height: 30px;
-  color: #333;
-  line-height: 20px;
-  text-shadow: 0 1px 1px #fefffe;
-  padding-right: 10px;
-  padding-left: 10px;
-  border: 1px solid #c1c1c1;
+  color: var(--in-content-text-color);
+  border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-left-colors: none !important;
   border-radius: 2px;
-  background-color: #fff;
+  background-color: var(--in-content-box-background);
+}
+
+xul|textbox {
+  min-height: 30px;
+  padding-right: 10px;
+  padding-left: 10px;
+}
+
+/ Create a separate rule to unset these styles on .tree-input instead of
+   using :not(.tree-input) so the selector specifity doesn't change. /
+xul|textbox.tree-input {
+  min-height: unset;
+  padding-right: unset;
+  padding-left: unset;
+}
+
+html|input[type="text"],
+html|textarea {
+  font-family: inherit;
+  font-size: inherit;
+  padding: 5px 10px;
 }
 
-html|textbox:focus,
+html|input[type="text"]:focus,
+html|textarea:focus,
 xul|textbox[focused] {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
-html|textbox:disabled,
+html|input[type="text"]:disabled,
+html|textarea:disabled,
 xul|textbox[disabled="true"] {
   opacity: 0.5;
 }
@@ -388,85 +513,128 @@ xul|textbox[disabled="true"] {
 /* Links */
 
 html|a,
-xul|*.text-link,
-xul|*.inline-link {
-/*  line-height: 22px;*/
-  color: #3333FF;
+.text-link {
+  color: var(--in-content-link-color);
   text-decoration: none;
 }
 
 html|a:hover,
-xul|*.text-link:hover,
-xul|*.inline-link:hover {
-  color: #FFCF00;
+.text-link:hover {
+  color: var(--in-content-link-color-hover);
   text-decoration: underline;
 }
 
+html|a:visited {
+  color: var(--in-content-link-color-visited);
+}
+
 html|a:hover:active,
-xul|*.text-link:hover:active,
-xul|*.inline-link:hover:active {
-  color: #FF9F00;
+.text-link:hover:active {
+  color: var(--in-content-link-color-active);
   text-decoration: underline;
 }
 
 /* Checkboxes and radio buttons */
+/* Hide the actual checkbox */
+html|input[type="checkbox"] {
+  opacity: 0;
+  width: 0;
+  pointer-events: none;
+  position: absolute;
+}
+
+/* Create a box to style as the checkbox */
+html|input[type="checkbox"] + html|label::before {
+  display: inline-block;
+  content: "";
+  vertical-align: middle;
+}
+
+html|input[type="checkbox"] + html|label {
+  line-height: 0px;
+}
 /*
 xul|checkbox {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
-
-xul|*.checkbox-check {
+*/
+/* xul|*.checkbox-check, */
+html|input[type="checkbox"] + html|label::before {
   -moz-appearance: none;
   width: 23px;
   height: 23px;
-  border-radius: 2px;
-  border: 1px solid #c1c1c1;
-  -moz-margin-end: 10px;
-  background-color: #f1f1f1;
-  / !important needed to override toolkit checked !important rule /
-  background-image: linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
+  border-radius: 0;
+  border: 1px solid var(--in-content-box-border-color);
+  margin-inline-end: 10px;
+  background-color: var(--in-content-box-background);
   background-position: center center;
   background-repeat: no-repeat;
-  box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03);
 }
 
-xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check {
-  border-color: #0095dd;
+/* xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check, */
+html|input[type="checkbox"]:not(:disabled) + html|label:hover::before {
+  border-color: var(--in-content-border-focus);
 }
-
+html|input[type="checkbox"]:not(:disabled) + html|label:hover {
+  color: var(--in-content-link-color-hover);
+}
+/*
 xul|*.checkbox-check[checked] {
   background-image: url("chrome://global/skin/in-content/check.png"),
                     / * !important needed to override toolkit !important rule * /
                     linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
 }
-
-xul|checkbox[disabled="true"] > xul|*.checkbox-check {
-  opacity: 0.5;
+*/
+html|input[type="checkbox"]:checked + html|label::before {
+  background-image: url("chrome://global/skin/in-content/check.svg#check");
 }
 
+/*xul|checkbox[checked][disabled="true"] > xul|*.checkbox-check,*/
+html|input[type="checkbox"]:checked:disabled + html|label::before {
+  background-image: url("chrome://global/skin/in-content/check.svg#check-disabled");
+}
+html|input[type="checkbox"]:checked:not(:disabled) + html|label:hover::before {
+  background-image: url("chrome://global/skin/in-content/check.svg#check-hover");
+}
+html|input[type="checkbox"]:disabled + html|label::before {
+  border-color: var(--in-content-border-disabled);
+}
+html|input[type="checkbox"]:disabled + html|label {
+  color: var(--in-content-disabled-text);
+}
+/*
 xul|*.checkbox-label-box {
-  -moz-margin-start: -1px; / * negative margin for the transparent border * /
-  -moz-padding-start: 0;
+  margin-inline-start: -1px; / * negative margin for the transparent border * /
+  padding-inline-start: 0;
 }
 
 xul|richlistitem > xul|*.checkbox-check {
   margin: 3px 6px;
 }
+*/
+html|*.toggle-container-with-text {
+  display: flex;
+  align-items: center;
+}
+/*
+xul|radio {
+  margin-inline-start: 0;
+}
 
 xul|*.radio-check {
   -moz-appearance: none;
   width: 23px;
   height: 23px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   border-radius: 50%;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
   background-color: #f1f1f1;
   background-image: linear-gradient(#fff, rgba(255,255,255,0.80));
   box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03);
 }
 
 xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 xul|*.radio-check[selected] {
@@ -478,67 +646,69 @@ xul|radio[disabled="true"] > xul|*.radio-check {
 }
 
 xul|*.radio-label-box {
-  -moz-margin-start: -1px; / * negative margin for the transparent border *  /
-  -moz-margin-end: 10px;
-  -moz-padding-start: 0;
+  margin-inline-start: -1px; / * negative margin for the transparent border *  /
+  margin-inline-end: 10px;
+  padding-inline-start: 0;
 }
 */
 /* Category List */
-/*
-xul|*#categories {
-  -moz-appearance: none;
-  background-color: #424f5a;
-  padding-top: 39px;
+
+*|*#categories {
+  background-color: var(--in-content-categorylist-background);
+  padding-top: 4em;
   margin: 0;
-  border-width: 0;
+  border-radius: 1em 0 0 0;
+  border: none;
 }
 
-xul|*.category {
-  -moz-appearance: none;
-  color: #c1c1c1;
-  -moz-border-end-width: 0;
-  -moz-padding-start: 15px;
-  -moz-padding-end: 21px;
+*|*.category {
+  background-color: var(--in-content-category-background);
+  color: var(--in-content-category-text);
+  border-inline-end-width: 0;
+  padding-inline-start: 15px;
+  padding-inline-end: 21px;
   min-height: 40px;
   transition: background-color 150ms;
 }
 
-xul|*.category:hover {
-  background-color: #5e6972;
+*|*.category:hover {
+  background-color: var(--in-content-category-background-hover);
+  color: var(--in-content-category-text-selected);
 }
 
-xul|*.category[selected] {
-  background-color: #343f48;
-  color: #f2f2f2;
-  -moz-padding-start: 11px; / compensate the 4px border /
-  -moz-border-start: solid 4px #ff9500;
+*|*.category[selected],
+*|*.category.selected {
+  background-color: var(--in-content-category-background-active);
+  color: var(--in-content-category-text-selected);
 }
 
-xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {
-  border-top: 1px #ffffff dotted;
-  border-bottom: 1px #ffffff dotted;
+*|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {
+  border-top: var(--in-content-category-border-focus);
+  border-bottom: var(--in-content-category-border-focus);
 }
 
 *|*.category-name {
   line-height: 22px;
   font-size: 1.25rem;
   padding-bottom: 2px;
-  -moz-padding-start: 9px;
+  padding-inline-start: 9px;
   margin: 0;
+  -moz-user-select: none;
 }
 
 *|*.category-icon {
   width: 24px;
   height: 24px;
 }
-*/
+
 /* header */
 
 *|*.header {
-/*  -moz-margin-end: 4px; / add the 4px end-margin of other elements /
-  border-bottom: 1px solid #A09090;
+/*  margin-inline-end: 4px; / add the 4px end-margin of other elements /
+  border-bottom: 1px solid var(--in-content-header-border-color);
   margin-bottom: 15px;
   padding-bottom: 15px; */
+  -moz-box-align: baseline;
 }
 
 *|*.header-name {
@@ -546,6 +716,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur
   font-weight: normal;
   line-height: 40px;
   margin: 0;
+  -moz-user-select: none;
 }
 
 /* File fields */
@@ -562,13 +733,13 @@ xul|*.fileFieldContentBox {
 }
 
 xul|*.fileFieldIcon {
-  -moz-margin-start: 10px;
-  -moz-margin-end: 0;
+  margin-inline-start: 10px;
+  margin-inline-end: 0;
 }
 
 xul|*.fileFieldLabel {
-  -moz-margin-start: -26px;
-  -moz-padding-start: 36px;
+  margin-inline-start: -26px;
+  padding-inline-start: 36px;
 }
 
 xul|textbox:-moz-locale-dir(rtl),
@@ -589,7 +760,7 @@ xul|filefield + xul|button:-moz-locale-dir(rtl) {
 
 xul|textbox + xul|button,
 xul|filefield + xul|button {
-  -moz-border-start: none;
+  border-inline-start: none;
 }
 */
 /* List boxes */
@@ -597,10 +768,10 @@ xul|filefield + xul|button {
 xul|richlistbox,
 xul|listbox {
   -moz-appearance: none;
-  -moz-margin-start: 0;
-  background-color: #fff;
-  border: 1px solid #c1c1c1;
-  color: #333;
+  margin-inline-start: 0;
+  background-color: var(--in-content-box-background);
+  border: 1px solid var(--in-content-box-border-color);
+  color: var(--in-content-text-color);
 }
 
 xul|treechildren::-moz-tree-row,
@@ -614,13 +785,13 @@ xul|listbox xul|listitem {
 
 xul|treechildren::-moz-tree-row(hover),
 xul|listbox xul|listitem:hover {
-  background-color: rgba(0,149,221,0.25);
+  background-color: var(--in-content-item-hover);
 }
 
 xul|treechildren::-moz-tree-row(selected),
 xul|listbox xul|listitem[selected="true"] {
-  background-color: #0095dd;
-  color: #fff;
+  background-color: var(--in-content-item-selected);
+  color: var(--in-content-selected-text);
 }
 
 / This is the only way to increase the height of a tree row unfortunately /
@@ -642,53 +813,72 @@ xul|treechildren::-moz-tree-cell-text(selected) {
 xul|tree {
   -moz-appearance: none;
   font-size: 1em;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
+  background-color: var(--in-content-box-background);
+  margin: 0;
+}
+
+xul|tree:-moz-focusring,
+xul|richlistbox:-moz-focusring {
+  border: 1px dotted var(--in-content-border-focus);
 }
 
 xul|listheader,
 xul|treecols {
   -moz-appearance: none;
   border: none;
-  border-bottom: 1px solid #c1c1c1;
+  border-bottom: 1px solid var(--in-content-border-color);
   padding: 0;
 }
 
+.autocomplete-tree > xul|treecols {
+  border-bottom: none !important;
+}
+
 xul|treecol:not([hideheader="true"]),
 xul|treecolpicker {
   -moz-appearance: none;
   border: none;
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
   color: #808080;
   padding: 5px 10px;
 }
 
-xul|treecol:not([hideheader="true"]):hover,
+xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover,
 xul|treecolpicker:hover {
-  background-color: #dadada;
-  color: #333;
+  background-color: var(--in-content-box-background-active);
+  color: var(--in-content-text-color);
 }
 
 xul|treecol:not([hideheader="true"]):not(:first-child),
 xul|treecolpicker {
-  -moz-border-start-width: 1px;
-  -moz-border-start-style: solid;
+  border-inline-start-width: 1px;
+  border-inline-start-style: solid;
   border-image: linear-gradient(transparent 0%, transparent 20%, #c1c1c1 20%, #c1c1c1 80%, transparent 80%, transparent 100%) 1 1;
 }
 
 xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] {
-  list-style-image: url("chrome://global/skin/in-content/sorter.png");
-  width: 12px;
-  height: 8px;
+  list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown");
+  width: 18px;
+  height: 18px;
 }
 
-xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="descending"] {
+xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="ascending"] {
   transform: scaleY(-1);
 }
 
-@media (min-resolution: 2dppx) {
-  xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] {
-    list-style-image: url("chrome://global/skin/in-content/sorter@2x.png");
-  }
+/ This is the only way to increase the height of a tree row unfortunately /
+xul|treechildren::-moz-tree-row {
+  min-height: 2em;
+}
+
+/ Color needs to be set on tree cell in order to be applied /
+xul|treechildren::-moz-tree-cell-text {
+  color: var(--in-content-text-color);
+}
+
+xul|treechildren::-moz-tree-cell-text(selected) {
+  color: var(--in-content-selected-text);
 }
 */
 /* === END common.inc.css === */
@@ -698,6 +888,7 @@ xul|caption {
 }
 
 xul|button,
+html|button,
 xul|colorpicker[type="button"],
 xul|menulist {
   margin: 2px 4px;
@@ -709,23 +900,20 @@ xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
 }
 
 xul|checkbox {
-  -moz-padding-start: 0;
+  padding-inline-start: 0;
 }
 
 xul|radio {
   -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
-  -moz-margin-start: 0;
-  -moz-padding-start: 0;
+  padding-inline-start: 0;
 }
 
 xul|*.radio-icon,
 xul|*.checkbox-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 */
-html|a:-moz-focusring,
-xul|*.text-link:-moz-focusring,
-xul|*.inline-link:-moz-focusring {
+.text-link:-moz-focusring {
   /* Don't specify the outline-color, we should always use initial value. */
   outline: 1px dotted;
 }