From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 19 Oct 2015 11:05:58 +0000 (+0200)
Subject: sync EarlyBlue theme with toolkit windows theme changes in Mozilla 41 cycle
X-Git-Tag: LCARStrek-2.38~9
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=ed351b9114c8a9d94d604e671f92cc19a2900b68;p=themes.git

sync EarlyBlue theme with toolkit windows theme changes in Mozilla 41 cycle
---

diff --git a/EarlyBlue/global/aboutSupport.css b/EarlyBlue/global/aboutSupport.css
index 990091a8..6e805322 100644
--- a/EarlyBlue/global/aboutSupport.css
+++ b/EarlyBlue/global/aboutSupport.css
@@ -3,15 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 html {
-  background-color: #CCD0DD;
-  color: #000000;
-  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  --aboutSupport-table-background: #CCD0DD;
+  background-color: var(--in-content-page-background);
 }
 
 body {
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
+  margin: 40px 48px;
 }
 
 .page-subtitle {
@@ -26,22 +23,27 @@ body {
   font-weight: bold;
 }
 
+button {
+  -moz-margin-start: 0;
+  -moz-margin-end: 8px;
+}
+
 table {
-  background-color: #CCD0DD;
-  color: #000000;
+  background-color: var(--aboutSupport-table-background);
+  color: var(--in-content-text-color);
   text-align: start;
   width: 100%;
-  border: 1px solid #9999CC;
+  border: 1px solid var(--in-content-border-color);
   border-spacing: 0px;
 }
 
 th, td {
-  padding: 3px;
+  padding: 4px;
 }
 
-th + th,
-td + td {
-  border-left: 1px dotted #9999CC;
+th:not(:first-child),
+td:not(:first-child) {
+  border-left: 1px dotted var(--in-content-border-color);
 }
 
 thead th {
@@ -50,8 +52,8 @@ thead th {
 
 th {
   text-align: start;
-  background-color: #666699;
-  color: #CCD0DD;
+  background-color: var(--in-content-table-header-background);
+  color: var(--in-content-selected-text);
 }
 
 th.column {
@@ -61,7 +63,12 @@ th.column {
 
 td {
   text-align: start;
-  border-top: 1px dotted #9999CC;
+}
+
+tr:not(:first-child) > td,
+tr:not(:first-child) > th {
+  text-align: start;
+  border-top: 1px dotted var(--in-content-table-border-dark-color);
 }
 
 .prefs-table {
@@ -82,9 +89,9 @@ td {
 }
 
 #action-box {
-  background-color: #CCD0DD;
-  border: 1px solid #666699;
-  color: #000000;
+  background-color: var(--aboutSupport-table-background);
+  border: 1px solid var(--in-content-border-color);
+  color: var(--in-content-text-color);
   float: right;
   margin-top: 2em;
   margin-bottom: 20px;
diff --git a/EarlyBlue/global/arrow/panelarrow-horizontal.svg b/EarlyBlue/global/arrow/panelarrow-horizontal.svg
index ddc31bfe..09b33865 100644
--- a/EarlyBlue/global/arrow/panelarrow-horizontal.svg
+++ b/EarlyBlue/global/arrow/panelarrow-horizontal.svg
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="10"
-     height="20">
-  <path d="M 10,0 L 0,10 10,20 z"
-        fill="#808080"/>
-  <path d="M 10,1 L 1,10 10,19 z"
-        fill="#CCD0DD"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20">
+  <path d="M 10,0 L 0,10 10,20 z" fill="#808080"/>
+  <path d="M 10,1 L 1,10 10,19 z" fill="#CCD0DD"/>
 </svg>
diff --git a/EarlyBlue/global/arrow/panelarrow-vertical.svg b/EarlyBlue/global/arrow/panelarrow-vertical.svg
index 6bb7a12a..b8ac274d 100644
--- a/EarlyBlue/global/arrow/panelarrow-vertical.svg
+++ b/EarlyBlue/global/arrow/panelarrow-vertical.svg
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="20"
-     height="10">
-  <path d="M 0,10 L 10,0 20,10 z"
-        fill="#808080"/>
-  <path d="M 1,10 L 10,1 19,10 z"
-        fill="#CCD0DD"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path d="M 0,10 L 10,0 20,10 z" fill="#808080"/>
+  <path d="M 1,10 L 10,1 19,10 z" fill="#CCD0DD"/>
 </svg>
diff --git a/EarlyBlue/global/icons/autocomplete-search.svg b/EarlyBlue/global/icons/autocomplete-search.svg
index 90322fc5..ed5c6716 100644
--- a/EarlyBlue/global/icons/autocomplete-search.svg
+++ b/EarlyBlue/global/icons/autocomplete-search.svg
@@ -2,32 +2,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0px" y="0px"
-     viewBox="0 0 16 16"
-     enable-background="new 0 0 16 16"
-     xml:space="preserve">
-<style>
-  use:not(:target) {
-    display: none;
-  }
-
-  use {
-    fill: #666699;
-  }
-
-  use[id$="-inverted"] {
-    fill: #FFFFFF;
-  }
-</style>
-<defs style="display:none">
-  <path id="search" fill-rule="evenodd" clip-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947
-    l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283
-    c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001
-    c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352
-    C12.7,8.501,11.203,10.001,9.356,10.001z"/>
-</defs>
-<use id="search-icon"             xlink:href="#search"/>
-<use id="search-icon-inverted"    xlink:href="#search"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #666699;
+    }
+    use[id$="-inverted"] {
+      fill: #FFFFFF;
+    }
+  </style>
+  <defs>
+    <path id="search" fill-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947 l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283 c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001 c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352 C12.7,8.501,11.203,10.001,9.356,10.001z"/>
+  </defs>
+  <use id="search-icon" xlink:href="#search"/>
+  <use id="search-icon-inverted" xlink:href="#search"/>
 </svg>
diff --git a/EarlyBlue/global/in-content/common.css b/EarlyBlue/global/in-content/common.css
index 0b211eb5..4c3a2e27 100644
--- a/EarlyBlue/global/in-content/common.css
+++ b/EarlyBlue/global/in-content/common.css
@@ -7,13 +7,51 @@
 @namespace html "http://www.w3.org/1999/xhtml";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+*|*:root {
+  --in-content-page-color: #000000;
+  --in-content-page-background: #CCD0DD;
+  --in-content-text-color: #000000;
+  --in-content-selected-text: #000000;
+  ---in-content-header-border-color: #c8c8c8;
+  --in-content-box-background: #CCD0DD;
+  ---in-content-box-background-odd: #f3f6fa;
+  ---in-content-box-background-hover: #ebebeb;
+  ---in-content-box-background-active: #dadada;
+  --in-content-box-border-color: #CCD0DD;
+  ---in-content-item-hover: rgba(0,149,221,0.25);
+  ---in-content-item-selected: #0095dd;
+  --in-content-border-highlight: #33FF33;
+  ---in-content-border-focus: #0095dd;
+  --in-content-border-color: #9999CC;
+  --in-content-category-text: #000000;
+  --in-content-category-border-focus: 1px dotted #FFFFFF;
+  --in-content-category-text-selected: #FFFFFF;
+  --in-content-category-background: #666699;
+  --in-content-category-background-hover: #CCD0DD;
+  --in-content-category-background-active: #336699;
+  ---in-content-tab-color: #424f5a;
+  ---in-content-link-color: #0095dd;
+  ---in-content-link-color-hover: #178ce5;
+  ---in-content-link-color-active: #ff9500;
+  ---in-content-link-color-visited: #551a8b;
+  ---in-content-primary-button-background: #0095dd;
+  ---in-content-primary-button-background-hover: #008acb;
+  ---in-content-primary-button-background-active: #006b9d;
+  --in-content-table-border-dark-color: #9999CC;
+  --in-content-table-header-background: #666699;
+  ---in-content-help-button-background: #ffcb00;
+  ---in-content-help-button-background-hover: #f4c200;
+  ---in-content-help-button-background-active: #eaba00;
+  --in-content-disabled-text: #999999;
+}
+
 html|body,
 xul|page,
 xul|window {
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
   -moz-appearance: none;
-  background-color: #CCD0DD;
-  color: #000000;
+  background-color: var(--in-content-page-background);
+  color: var(--in-content-page-color);
 }
 
 html|body {
@@ -26,14 +64,14 @@ html|h1 {
   font-size: 2.5em;
   font-weight: lighter;
   line-height: 1.2;
-  color: #000000;
+  color: var(--in-content-text-color);
   margin: 0;
   margin-bottom: .5em;
 }
 
 html|hr {
   border-style: solid none none none;
-  border-color: #666699;
+  border-color: var(--in-content-border-color);
 }
 
 xul|caption {
@@ -89,9 +127,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,
@@ -104,20 +142,20 @@ 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;
   transition: background-color 50ms ease 0s;
 }
 
 xul|tab:hover {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
 }
 
-xul|tab[visuallyselected] {
-  background-color: #ebebeb;
+xul|tab[selected] {
+  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 {
@@ -129,10 +167,10 @@ xul|*.tab-text {
 
 html|button {
   border-radius: 0px;
-  border: 1px outset #CCD0DD;
-  background-color: #CCD0DD;
-  color: #000000;
-  / * override forms.css * /
+  border: 1px outset var(--in-content-box-border-color);
+  background-color: var(--in-content-box-background);
+  color: var(--in-content-text-color);
+  /* override forms.css */
   font: inherit;
 }
 
@@ -143,15 +181,14 @@ xul|colorpicker[type="button"],
 xul|menulist {
   -moz-appearance: none;
   height: 30px;
-  color: #333;
-  line-height: 20px;
-  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: #fbfbfb;
+  background-color: var(--in-content-page-background);
 }
 */
 html|button:enabled:hover,
@@ -164,7 +201,7 @@ html|button: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"]) {
-  border: 1px inset #CCD0DD;
+  border: 1px inset var(--in-content-box-border-color);
 }
 
 html|button:disabled,
@@ -172,24 +209,24 @@ xul|button[disabled="true"],
 xul|colorpicker[type="button"][disabled="true"],
 xul|menulist[disabled="true"] {
   cursor: not-allowed;
-  border: 1px outset #CCD0DD;
-  color: #999999;
+  border: 1px outset var(--in-content-box-border-color);
+  color: var(--in-content-disabled-text);
 }
 /*
 *|button.primary {
-  background-color: #0095dd;
+  background-color: var(--in-content-primary-button-background);
   border-color: transparent;
-  color: #fff;
+  color: var(--in-content-selected-text);
 }
 
 html|button.primary:enabled:hover,
 xul|button.primary:not([disabled="true"]):hover {
-  background-color: #008acb;
+  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: #006b9d;
+  background-color: var(--in-content-primary-button-background-active);
 }
 
 xul|colorpicker[type="button"] {
@@ -223,19 +260,19 @@ xul|*.help-button {
   min-width: 30px;
   border-radius: 2px;
   border-width: 0;
-  background-color: #ffcb00;
+  background-color: var(--in-content-help-button-background);
   background-image: none;
   box-shadow: none;
   list-style-image: url("chrome://global/skin/in-content/help-glyph.svg");
 }
 
 xul|*.help-button:not([disabled="true"]):hover {
-  background-color: #f4c200;
+  background-color: var(--in-content-help-button-background-hover);
   background-image: none;
 }
 
 xul|*.help-button:not([disabled="true"]):hover:active {
-  background-color: #eaba00;
+  background-color: var(--in-content-help-button-background-active);
   background-image: none;
 }
 
@@ -312,9 +349,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,
@@ -323,7 +360,7 @@ 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;
@@ -334,23 +371,23 @@ xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="
 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: #333;
-  background-color: rgba(0,149,221,0.25);
+  color: var(--in-content-text-color);
+  background-color: var(--in-content-item-hover);
 }
 
 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: #fff;
-  background-color: #0095dd;
+  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;
+  color: var(--in-content-box-border-color);
   / override the [_moz-menuactive="true"] background color from
      global/menu.css /
   background-color: transparent;
@@ -361,7 +398,7 @@ 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;
 }
 */
@@ -370,22 +407,22 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
 *|textbox {
   -moz-appearance: none;
   height: 30px;
-  color: #333;
+  color: var(--in-content-text-color);
   line-height: 20px;
   padding-right: 10px;
   padding-left: 10px;
-  border: 1px solid #c1c1c1;
+  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);
 }
 
 html|textbox:focus,
 xul|textbox[focused] {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 html|textbox:disabled,
@@ -398,25 +435,25 @@ xul|textbox[disabled="true"] {
 html|a,
 .text-link,
 .inline-link {
-  color: #0095dd;
+  color: var(--in-content-link-color);
   text-decoration: none;
 }
 
-html|a:visited {
-  color: #551a8b;
-}
-
 html|a:hover,
 .text-link:hover,
 .inline-link:hover {
-  color: #4cb1ff;
+  color:  var(--in-content-link-color-hover);
   text-decoration: none;
 }
 
+html|a:visited {
+  color: var(--in-content-link-color-visited);
+}
+
 html|a:hover:active,
 .text-link:hover:active,
 .inline-link:hover:active {
-  color: #ff9500;
+  color: var(--in-content-link-color-active);
   text-decoration: none;
 }
 */
@@ -449,7 +486,7 @@ html|input[type="checkbox"] + html|label:before {
   width: 23px;
   height: 23px;
   border-radius: 2px;
-  border: 1px solid #c1c1c1;
+  border: 1px solid var(--in-content-box-border-color);
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
   / !important needed to override toolkit checked !important rule /
@@ -461,7 +498,7 @@ html|input[type="checkbox"] + html|label:before {
 
 xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check,
 html|input[type="checkbox"]:not(:disabled) + html|label:hover:before {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 xul|*.checkbox-check[checked] {
@@ -496,7 +533,7 @@ 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;
   background-color: #f1f1f1;
@@ -505,7 +542,7 @@ xul|*.radio-check {
 }
 
 xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 xul|*.radio-check[selected] {
@@ -526,7 +563,7 @@ xul|*.radio-label-box {
 
 xul|*#categories {
   -moz-appearance: none;
-  background-color: #666699;
+  background-color: var(--in-content-category-background);
   padding-top: 39px;
   margin: 0;
   border-width: 0;
@@ -534,7 +571,7 @@ xul|*#categories {
 
 xul|*.category {
   -moz-appearance: none;
-  color: #000000;
+  color: var(--in-content-category-text);
   -moz-border-end-width: 0;
   -moz-padding-start: 15px;
   -moz-padding-end: 21px;
@@ -543,19 +580,19 @@ xul|*.category {
 }
 
 xul|*.category:hover {
-  background-color: #CCD0DD;
+  background-color: var(--in-content-category-background-hover);
 }
 
 xul|*.category[selected] {
-  background-color: #336699;
-  color: #FFFFFF;
+  background-color: var(--in-content-category-background-active);
+  color: var(--in-content-category-text-selected);
   -moz-padding-start: 11px; /* compensate the 4px border */
-  -moz-border-start: solid 4px #33FF33;
+  -moz-border-start: solid 4px var(--in-content-border-highlight);
 }
 
 xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {
-  border-top: 1px #ffffff dotted;
-  border-bottom: 1px #ffffff dotted;
+  border-top: var(--in-content-category-border-focus);
+  border-bottom: var(--in-content-category-border-focus);
 }
 
 *|*.category-name {
@@ -576,7 +613,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur
 /*
 *|*.header {
   -moz-margin-end: 4px; / add the 4px end-margin of other elements /
-  border-bottom: 1px solid #c8c8c8;
+  border-bottom: 1px solid var(--in-content-header-border-color);
   margin-bottom: 15px;
   padding-bottom: 15px;
 }
@@ -639,9 +676,9 @@ xul|richlistbox,
 xul|listbox {
   -moz-appearance: none;
   -moz-margin-start: 0;
-  background-color: #fff;
-  border: 1px solid #c1c1c1;
-  color: #333;
+  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,
@@ -655,13 +692,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);
 }
 */
 /* Trees */
@@ -669,19 +706,21 @@ xul|listbox xul|listitem[selected="true"] {
 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 #0095dd;
+  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-box-border-color);
   padding: 0;
 }
 
@@ -689,15 +728,15 @@ 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"]):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),
@@ -724,11 +763,11 @@ xul|treechildren::-moz-tree-row {
 
 / Color needs to be set on tree cell in order to be applied /
 xul|treechildren::-moz-tree-cell-text {
-  color: #333;
+  color: var(--in-content-text-color);
 }
 
 xul|treechildren::-moz-tree-cell-text(selected) {
-  color: #fff;
+  color: var(--in-content-selected-text);
 }
 */
 /* === END common.inc.css === */
diff --git a/EarlyBlue/global/in-content/help-glyph.svg b/EarlyBlue/global/in-content/help-glyph.svg
index 738f1d73..1645bd9a 100644
--- a/EarlyBlue/global/in-content/help-glyph.svg
+++ b/EarlyBlue/global/in-content/help-glyph.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-	<path d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89
-		c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182
-		C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457
-		c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z" fill="#000000"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <path fill="#000000" d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89 c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182 C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457 c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z"/>
 </svg>
diff --git a/EarlyBlue/global/in-content/info-pages.css b/EarlyBlue/global/in-content/info-pages.css
index 45f6a0b3..69ed5a59 100644
--- a/EarlyBlue/global/in-content/info-pages.css
+++ b/EarlyBlue/global/in-content/info-pages.css
@@ -1,89 +1,109 @@
-@import url("chrome://global/skin/in-content/common.css");
-/* Body and container */
-body {
-  display: flex;
-  box-sizing: padding-box;
-  min-height: 100vh;
-  padding-top: 0;
-  padding-bottom: 0;
-  -moz-padding-start: calc(48px + 4.6em);
-  -moz-padding-end: 48px;
-  align-items: center;
-  justify-content: center;
-}
-
-.container {
-  min-width: 13em;
-  max-width: 52em;
-}
-
-/* Typography */
-.title {
-  background-image: url("chrome://browser/skin/aboutNetError_info.svg");
-  background-position: left 0;
-  background-repeat: no-repeat;
-  background-size: 1.6em;
-  -moz-margin-start: -2.3em;
-  -moz-padding-start: 2.3em;
-  font-size: 2.5em;
-}
-
-.title:-moz-dir(rtl) {
-  background-position: right 0;
-}
-
-.title-text {
-  border-bottom: 1px solid #666699;
-  font-size: inherit;
-  padding-bottom: 0.4em;
-}
-
-@media (max-width: 675px) {
-  body {
-    padding: 0 48px;
-  }
-
-  .title {
-    background-image: none !important;
-    -moz-padding-start: 0;
-    -moz-margin-start: 0;
-  }
-
-  .title-text {
-    padding-top: 0;
-  }
-}
-
-ul, ol {
-  margin: 0;
-  padding: 0;
-  -moz-margin-start: 1em;
-}
-
-ul > li, ol > li {
-  margin-bottom: .5em;
-}
-
-ul {
-  list-style: disc;
-}
-
-/* Buttons */
-.button-container {
-  margin-top: 1.2em;
-}
-
-.button-container > button {
-  min-width: 150px;
-}
-
-.button-container > button:first-child {
-  -moz-margin-start: 0;
-}
-
-/* Trees */
-tree {
-  min-height: 12em;
-  margin-top: 1.2em;
-  width: 100%;
-}
\ No newline at end of file
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://global/skin/in-content/common.css");
+/* Body and container */
+body {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  min-height: 100vh;
+  padding-top: 0;
+  padding-bottom: 0;
+  -moz-padding-start: calc(48px + 4.6em);
+  -moz-padding-end: 48px;
+  align-items: center;
+  justify-content: center;
+}
+
+.container {
+  min-width: 13em;
+  max-width: 52em;
+}
+
+.container.restore-chosen {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  margin: 10vh 0;
+}
+
+/* Typography */
+.title {
+  background-image: url("chrome://browser/skin/aboutNetError_info.svg");
+  background-position: left 0;
+  background-repeat: no-repeat;
+  background-size: 1.6em;
+  -moz-margin-start: -2.3em;
+  -moz-padding-start: 2.3em;
+  font-size: 2.5em;
+}
+
+.title:-moz-dir(rtl) {
+  background-position: right 0;
+}
+
+.title-text {
+  border-bottom: 1px solid #666699;
+  font-size: inherit;
+  padding-bottom: 0.4em;
+}
+
+@media (max-width: 675px) {
+  body {
+    padding: 0 48px;
+  }
+
+  .title {
+    background-image: none !important;
+    -moz-padding-start: 0;
+    -moz-margin-start: 0;
+  }
+
+  .title-text {
+    padding-top: 0;
+  }
+}
+
+ul, ol {
+  margin: 0;
+  padding: 0;
+  -moz-margin-start: 1em;
+}
+
+ul > li, ol > li {
+  margin-bottom: .5em;
+}
+
+ul {
+  list-style: disc;
+}
+
+/* Buttons */
+.button-container {
+  margin-top: 1.2em;
+}
+
+.button-container > button {
+  min-width: 150px;
+}
+
+.button-container > button:first-child {
+  -moz-margin-start: 0;
+}
+
+/* Trees */
+.tree-container {
+  margin-top: 1.2em;
+  flex-grow: 1;
+  min-height: 12em;
+}
+
+.tree-container > tree {
+  height: 100%;
+}
+
+tree {
+  width: 100%;
+}
diff --git a/EarlyBlue/global/inContentUI.css b/EarlyBlue/global/inContentUI.css
deleted file mode 100644
index fa29ca25..00000000
--- a/EarlyBlue/global/inContentUI.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * The default namespace for this file is XUL. Be sure to prefix rules that
- * are applicable to both XUL and HTML with '*|'.
- */
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* Page background */
-*|*:root {
-  background-color: #CCD0DD;
-  color: #000000;
-  margin: 20px;
-}
-
-html|html {
-  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
-}
-
-/* Use the new in-content colors for #contentAreaDownloadsView. After landing
-   of bug 989469 the colors can be moved to *|*:root */
-*|*#contentAreaDownloadsView {
-  background: #CCD0DD;
-  color: #000000;
-}
-
-/* Content */
-*|*.main-content {
-  /* Needed to allow the radius to clip the inner content, see bug 595656 */
-  overflow: hidden;
-  background-color: #FFFFFF;
-  border: 1px solid #666699;
-}
-
-colorpicker[type="button"] {
-  margin: 1px 5px 2px 5px;
-  padding: 3px;
-  height: 25px;
-}
diff --git a/EarlyBlue/global/media/videoClickToPlayButton.svg b/EarlyBlue/global/media/videoClickToPlayButton.svg
index f118afb0..68c63a79 100644
--- a/EarlyBlue/global/media/videoClickToPlayButton.svg
+++ b/EarlyBlue/global/media/videoClickToPlayButton.svg
@@ -1,6 +1,35 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="whiteGradientStops">
+      <stop style="stop-color:#fff;stop-opacity:.95" offset="0"/>
+      <stop style="stop-color:#fff;stop-opacity:.75" offset=".45"/>
+      <stop style="stop-color:#fff;stop-opacity:.72" offset=".55"/>
+      <stop style="stop-color:#fff;stop-opacity:.65" offset="1"/>
+    </linearGradient>
+    <linearGradient x1="32" y1="0" x2="32" y2="62" id="whiteGradient" xlink:href="#whiteGradientStops" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="arrowGradientStops">
+      <stop style="stop-color:#333;stop-opacity:.5" offset="0"/>
+      <stop style="stop-color:#666;stop-opacity:.5" offset="1"/>
+    </linearGradient>
+    <linearGradient x1="32" y1="16" x2="32" y2="48" id="arrowGradient" xlink:href="#arrowGradientStops" gradientUnits="userSpaceOnUse"/>
+    <filter x="-0.15" y="-0.15" width="1.25" height="1.25" color-interpolation-filters="sRGB" id="dropShadow">
+      <feDropShadow dx="0" dy="1" flood-opacity="0.5"/>
+    </filter>
+    <mask id="dropShadowMask">
+      <path style="fill:#fff;" d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"/>
+    </mask>
+  </defs>
+  <path mask="url(#dropShadowMask)" id="playButtonShadow" style="filter:url(#dropShadow);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonArrow" style="fill:url(#arrowGradient);" d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"/>
+  <path id="playButton" style="fill:url(#whiteGradient);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonEdgeHighlights" style="fill:white;fill-opacity:.3;" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonTopEdgeHighlights" style="fill:white;fill-opacity:.8;" d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css
index ea038910..3026d2cd 100644
--- a/EarlyBlue/global/menu.css
+++ b/EarlyBlue/global/menu.css
@@ -12,6 +12,7 @@
 
 menu,
 menuitem,
+menucaption,
 .splitmenu-menuitem {
   -moz-box-align: center;
   max-width: 42em;
@@ -77,13 +78,15 @@ menuitem.spell-suggestion {
 menupopup > menu,
 popup > menu,
 menupopup > menuitem,
-popup > menuitem {
+popup > menuitem,
+menupopup > menucaption {
   padding: 2px;
 }
 
 /* ::::: menu/menuitems in menulist popups ::::: */
 
 menulist > menupopup > menuitem,
+menulist > menupopup > menucaption,
 menulist > menupopup > menu {
   padding: 1px 5px;
   max-width: none;
@@ -110,6 +113,12 @@ menulist > menupopup > menu {
   font-weight: inherit;
 }
 
+menucaption > .menu-text,
+menucaption > .menu-iconic-text {
+  font-weight: bold;
+  -moz-padding-start: 0 !important;
+}
+
 .menu-description {
   font-style: italic;
   color: #808080;
@@ -181,6 +190,7 @@ menulist > menupopup > menu {
 }
 
 menulist > menupopup > menuitem > .menu-iconic-left,
+menulist > menupopup > menucaption > .menu-iconic-left,
 menulist > menupopup > menu > .menu-iconic-left {
   display: none;
 }
diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css
index 0e4b896b..ec2fd0a1 100644
--- a/EarlyBlue/global/popup.css
+++ b/EarlyBlue/global/popup.css
@@ -10,6 +10,7 @@
 
 /* ::::: Variables ::::: */
 .panel-arrowcontent {
+  --panel-arrowcontent-padding: 6px;
   --panel-arrowcontent-background: #CCD0DD;
   --panel-arrowcontent-color: #000000;
   --panel-arrowcontent-border: 1px outset #CCD0DD;
@@ -51,7 +52,7 @@ panel[type="arrow"][side="right"] {
 }
 
 .panel-arrowcontent {
-  padding: 6px;
+  padding: var(--panel-arrowcontent-padding);
   color: var(--panel-arrowcontent-color);
   background: var(--panel-arrowcontent-background);
   background-clip: padding-box;
diff --git a/EarlyBlue/global/reader/RM-Add-24x24.svg b/EarlyBlue/global/reader/RM-Add-24x24.svg
index 66551ef1..20713815 100644
--- a/EarlyBlue/global/reader/RM-Add-24x24.svg
+++ b/EarlyBlue/global/reader/RM-Add-24x24.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10
-    C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>
 </svg>
diff --git a/EarlyBlue/global/reader/RM-Close-24x24.svg b/EarlyBlue/global/reader/RM-Close-24x24.svg
index b0674b2d..e57a475b 100644
--- a/EarlyBlue/global/reader/RM-Close-24x24.svg
+++ b/EarlyBlue/global/reader/RM-Close-24x24.svg
@@ -2,30 +2,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg viewBox="0 0 24 24"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
-    <style type="text/css">
+    <style>
       use:not(:target) {
         display: none;
       }
-
       #close {
         fill: #808080;
       }
       #close-hover {
-        fill: #FFFFFF;
+        fill: #fff;
       }
     </style>
-
     <g id="close-shape">
       <polygon points="20.477,6.551 20.477,17.449 11.992,17.449 11.992,20 23,20 23,4 11.992,4 11.992,6.551"/>
       <polygon points="1,11.981 9.698,19.95 9.698,15.13 18.184,15.13 18.184,8.87 9.698,8.87 9.698,4.011"/>
     </g>
   </defs>
-
-  <use id="close"       xlink:href="#close-shape"/>
+  <use id="close" xlink:href="#close-shape"/>
   <use id="close-hover" xlink:href="#close-shape"/>
-
-</svg>
\ No newline at end of file
+</svg>
diff --git a/EarlyBlue/global/reader/RM-Delete-24x24.svg b/EarlyBlue/global/reader/RM-Delete-24x24.svg
index 6010fbe7..0ed39830 100644
--- a/EarlyBlue/global/reader/RM-Delete-24x24.svg
+++ b/EarlyBlue/global/reader/RM-Delete-24x24.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10
-    C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>
 </svg>
diff --git a/EarlyBlue/global/reader/RM-Minus-24x24.svg b/EarlyBlue/global/reader/RM-Minus-24x24.svg
index 9da7e03b..e85a3976 100644
--- a/EarlyBlue/global/reader/RM-Minus-24x24.svg
+++ b/EarlyBlue/global/reader/RM-Minus-24x24.svg
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-269.917" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>
 </svg>
diff --git a/EarlyBlue/global/reader/RM-Plus-24x24.svg b/EarlyBlue/global/reader/RM-Plus-24x24.svg
index 249912a1..f3a98ddb 100644
--- a/EarlyBlue/global/reader/RM-Plus-24x24.svg
+++ b/EarlyBlue/global/reader/RM-Plus-24x24.svg
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-233.667" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>
 </svg>
diff --git a/EarlyBlue/global/reader/RM-Reading-List-24x24.svg b/EarlyBlue/global/reader/RM-Reading-List-24x24.svg
index 1f21efd5..b43a8b89 100644
--- a/EarlyBlue/global/reader/RM-Reading-List-24x24.svg
+++ b/EarlyBlue/global/reader/RM-Reading-List-24x24.svg
@@ -1,46 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-    <rect x="8" y="10" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <rect x="8" y="16" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <rect x="8" y="4" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="6" r="2"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="12" r="2"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="18" r="2"/>
-</g>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-197" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <rect x="8" y="10" fill="#808080" width="14" height="4"/>
+  <rect x="8" y="16" fill="#808080" width="14" height="4"/>
+  <rect x="8" y="4" fill="#808080" width="14" height="4"/>
+  <circle fill="#808080" cx="4" cy="6" r="2"/>
+  <circle fill="#808080" cx="4" cy="12" r="2"/>
+  <circle fill="#808080" cx="4" cy="18" r="2"/>
 </svg>
diff --git a/EarlyBlue/global/reader/RM-Type-Controls-24x24.svg b/EarlyBlue/global/reader/RM-Type-Controls-24x24.svg
index a25429ad..8a5a2125 100644
--- a/EarlyBlue/global/reader/RM-Type-Controls-24x24.svg
+++ b/EarlyBlue/global/reader/RM-Type-Controls-24x24.svg
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07
-        H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166
-        L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z
-         M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>
-    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425
-        c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815
-        S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581
-        s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273
-        c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181
-        c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061
-        c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459
-        c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474
-        c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03
-        s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592
-        c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786
-        c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117
-        c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07 H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166 L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>
+    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425 c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815 S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581 s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273 c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181 c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061 c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459 c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474 c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03 s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592 c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786 c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117 c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>
 </svg>
diff --git a/EarlyBlue/global/reader/RM-Type-Controls-Arrow.svg b/EarlyBlue/global/reader/RM-Type-Controls-Arrow.svg
index 9094d8a3..837392ff 100644
--- a/EarlyBlue/global/reader/RM-Type-Controls-Arrow.svg
+++ b/EarlyBlue/global/reader/RM-Type-Controls-Arrow.svg
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<polygon opacity="0.15" fill-rule="evenodd" clip-rule="evenodd" points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985
-    "/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-125" y="-1086.667" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
-<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FBFBFB" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008
-    16.591,22.994 "/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <polygon opacity="0.15"  points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985"/>
+  <polygon fill="#fbfbfb" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008 16.591,22.994 "/>
 </svg>
diff --git a/EarlyBlue/global/reader/pocket.svg b/EarlyBlue/global/reader/pocket.svg
index 63b22fa6..d93fd6a1 100644
--- a/EarlyBlue/global/reader/pocket.svg
+++ b/EarlyBlue/global/reader/pocket.svg
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 24 24">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
   <style>
     use:not(:target) {
       display: none;
@@ -10,18 +11,11 @@
       fill: #808080;
     }
     use[id$="-added"] {
-      fill: #EE4056;
+      fill: #ee4056;
     }
   </style>
-  <defs style="display: none;">
-    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179
-      C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018
-      c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171
-      c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018
-      c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z
-      M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547
-      c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63
-      c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>
+  <defs>
+    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179 C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018 c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018 c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547 c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63 c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>
   </defs>
   <use id="pocket-mark" xlink:href="#pocket-mark-shape"/>
   <use id="pocket-mark-added" xlink:href="#pocket-mark-shape"/>
diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css
index 87f8306d..bf975b93 100644
--- a/EarlyBlue/mozapps/extensions/extensions.css
+++ b/EarlyBlue/mozapps/extensions/extensions.css
@@ -368,7 +368,7 @@
 
 .list {
   margin: 0;
-  border: none;
+  border-width: 0 !important;
   background-color: transparent;
 }
 
diff --git a/EarlyBlue/mozapps/extensions/utilities.svg b/EarlyBlue/mozapps/extensions/utilities.svg
index 29c5be1b..9cac8680 100644
--- a/EarlyBlue/mozapps/extensions/utilities.svg
+++ b/EarlyBlue/mozapps/extensions/utilities.svg
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="16"
-     height="16"
-     viewBox="0 0 16 16">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
   <style>
     use:not(:target) {
       display: none;
@@ -17,7 +14,7 @@
       fill: GrayText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <path id="utilities-shape" d="m11.5,13.9l-.6-1.5c.3-.2 .5-.4 .8-.6 .2-.2 .4-.5 .6-.7l1.5,.6c.3,.1 .6,0 .7-.3l.4-1c.1-.3 0-.6-.3-.7l-1.5-.6c.1-.6 .1-1.3 0-2l1.5-.6c.3-.1 .4-.4 .3-.7l-.4-1c-.1-.3-.4-.4-.7-.3l-1.5,.6c-.2-.3-.4-.5-.6-.8-.2-.1-.5-.3-.7-.5l.6-1.5c.1-.3 0-.6-.3-.7l-.9-.4c-.3-.1-.6,0-.7,.3l-.6,1.5c-.6-.1-1.3-.1-2,0l-.6-1.5c-.1-.3-.4-.4-.7-.3l-1,.4c-.2,.1-.3,.4-.2,.6l.6,1.5c-.3,.3-.5,.5-.8,.7-.2,.3-.4,.5-.6,.8l-1.5-.7c-.3-.1-.6,0-.7,.3l-.4,.9c-.1,.3 0,.6 .3,.7l1.5,.7c-.1,.6-.1,1.3 0,1.9l-1.5,.6c-.3,.1-.4,.4-.3,.7l.4,1c.1,.3 .4,.4 .7,.3l1.5-.6c.2,.3 .4,.5 .6,.8 .2,.2 .5,.4 .7,.6l-.6,1.5c-.1,.3 0,.6 .3,.7l1,.4c.3,.1 .6,0 .7-.3l.6-1.5c.6,.1 1.3,.1 2,0l.6,1.5c.1,.3 .4,.4 .7,.3l1-.4c.1-.1 .3-.4 .1-.7zm-5.1-4.2c-.9-.9-.9-2.4 0-3.3 .9-.9 2.4-.9 3.3,0 .9,.9 .9,2.4 0,3.3-.9,.9-2.4,.9-3.3,0z"/>
   </defs>
   <use id="utilities" xlink:href="#utilities-shape"/>
diff --git a/EarlyBlue/mozapps/places/defaultFavicon@2x.png b/EarlyBlue/mozapps/places/defaultFavicon@2x.png
new file mode 100644
index 00000000..113d12f8
Binary files /dev/null and b/EarlyBlue/mozapps/places/defaultFavicon@2x.png differ
diff --git a/LCARStrek/global/aboutSupport.css b/LCARStrek/global/aboutSupport.css
index d99ed071..1e3c240f 100644
--- a/LCARStrek/global/aboutSupport.css
+++ b/LCARStrek/global/aboutSupport.css
@@ -3,29 +3,32 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 html {
-  background-color: #000000;
-  color: #FF9F00;
-  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  --aboutSupport-table-background: #000000;
+  background-color: var(--in-content-page-background);
 }
 
 body {
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
+  margin: 40px 48px;
 }
 
-a:link, a:visited, a:active {
+a:link, a:visited {
   border-radius: 3px;
-  color: #FFCF00;
-  background-color: #000000;
+  color: var(--in-content-link-color);
+  background-color: var(--in-content-page-background);
   text-decoration: none;
   -moz-padding-start: 1px;
   -moz-padding-end: 1px;
 }
 
+/* on hover and active, behave like buttons */
 a:hover {
-  color: #000000;
-  background-color: #FFCF00;
+  color: var(--in-content-selected-text);
+  background-color: var(--in-content-box-background-hover);
+}
+
+a:active {
+  color: var(--in-content-selected-text);
+  background-color: var(--in-content-box-background-active);
 }
 
 .page-subtitle {
@@ -40,13 +43,18 @@ a:hover {
   font-weight: bold;
 }
 
+button {
+  -moz-margin-start: 0;
+  -moz-margin-end: 8px;
+}
+
 table {
-  background-color: #000000;
-  color: #E7ADE7;
+  background-color: var(--aboutSupport-table-background);
+  color: var(--in-content-text-color);
   text-align: start;
   width: 100%;
   border-radius: 10px;
-  border: 1px solid #9C9FFF;
+  border: 1px solid var(--in-content-border-color);
   border-spacing: 0px;
 }
 
@@ -60,7 +68,17 @@ th, td {
 
 th:not(:first-child),
 td:not(:first-child) {
-  border-left: 1px dotted #9C9FFF;
+  border-left: 1px dotted var(--in-content-border-color);
+}
+
+thead th {
+  text-align: center;
+}
+
+th {
+  text-align: start;
+  background-color: var(--in-content-table-header-background);
+  color: var(--in-content-selected-text);
 }
 
 /* adjustments for not painting outside of table border */
@@ -94,16 +112,6 @@ tbody:last-child > tr:last-child > td:last-child {
   border-bottom-right-radius: 9px;
 }
 
-thead th {
-  text-align: center;
-}
-
-th {
-  text-align: start;
-  background-color: #008484;
-  color: #FFCF00;
-}
-
 th.column {
   white-space: nowrap;
   width: 0px;
@@ -113,7 +121,7 @@ tr:not(:first-child) > td,
 tr:not(:first-child) > th,
 tbody:not(:first-child) > tr > td,
 tbody:not(:first-child) > tr > th {
-  border-top: 1px dotted #9C9FFF;
+  border-top: 1px dotted var(--in-content-table-border-dark-color);
 }
 
 td {
@@ -138,9 +146,9 @@ td {
 }
 
 #action-box {
-  background-color: #000000;
-  border: 1px solid #9C9CFF;
-  color: #FF9F00;
+  background-color: var(--aboutSupport-table-background);
+  border: 1px solid var(--in-content-border-color);
+  color: var(--in-content-text-color);
   float: right;
   margin-top: 2em;
   margin-bottom: 20px;
diff --git a/LCARStrek/global/arrow/panelarrow-horizontal.svg b/LCARStrek/global/arrow/panelarrow-horizontal.svg
index d53a9a06..abbf94fb 100644
--- a/LCARStrek/global/arrow/panelarrow-horizontal.svg
+++ b/LCARStrek/global/arrow/panelarrow-horizontal.svg
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="10"
-     height="20">
-  <path d="M 10,0 L 0,10 10,20 z"
-        fill="#FF9F00"/>
-  <path d="M 10,1 L 1,10 10,19 z"
-        fill="#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="20">
+  <path d="M 10,0 L 0,10 10,20 z" fill="#FF9F00"/>
+  <path d="M 10,1 L 1,10 10,19 z" fill="#000000"/>
 </svg>
diff --git a/LCARStrek/global/arrow/panelarrow-vertical.svg b/LCARStrek/global/arrow/panelarrow-vertical.svg
index 082bd207..c116521d 100644
--- a/LCARStrek/global/arrow/panelarrow-vertical.svg
+++ b/LCARStrek/global/arrow/panelarrow-vertical.svg
@@ -2,12 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="20"
-     height="10">
-  <path d="M 0,10 L 10,0 20,10 z"
-        fill="#FF9F00"/>
-  <path d="M 1,10 L 10,1 19,10 z"
-        fill="#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+  <path d="M 0,10 L 10,0 20,10 z" fill="#FF9F00"/>
+  <path d="M 1,10 L 10,1 19,10 z" fill="#000000"/>
 </svg>
diff --git a/LCARStrek/global/icons/autocomplete-search.svg b/LCARStrek/global/icons/autocomplete-search.svg
index fdd54a3b..096c1959 100644
--- a/LCARStrek/global/icons/autocomplete-search.svg
+++ b/LCARStrek/global/icons/autocomplete-search.svg
@@ -2,32 +2,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0px" y="0px"
-     viewBox="0 0 16 16"
-     enable-background="new 0 0 16 16"
-     xml:space="preserve">
-<style>
-  use:not(:target) {
-    display: none;
-  }
-
-  use {
-    fill: #FFCF00;
-  }
-
-  use[id$="-inverted"] {
-    fill: #000000;
-  }
-</style>
-<defs style="display:none">
-  <path id="search" fill-rule="evenodd" clip-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947
-    l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283
-    c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001
-    c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352
-    C12.7,8.501,11.203,10.001,9.356,10.001z"/>
-</defs>
-<use id="search-icon"             xlink:href="#search"/>
-<use id="search-icon-inverted"    xlink:href="#search"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #FFCF00;
+    }
+    use[id$="-inverted"] {
+      fill: #000000;
+    }
+  </style>
+  <defs>
+    <path id="search" fill-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947 l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283 c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001 c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352 C12.7,8.501,11.203,10.001,9.356,10.001z"/>
+  </defs>
+  <use id="search-icon" xlink:href="#search"/>
+  <use id="search-icon-inverted" xlink:href="#search"/>
 </svg>
diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css
index d16a367b..9a2975f6 100644
--- a/LCARStrek/global/in-content/common.css
+++ b/LCARStrek/global/in-content/common.css
@@ -7,13 +7,54 @@
 @namespace html "http://www.w3.org/1999/xhtml";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+*|*: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: #c8c8c8;
+  --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-help-button-background: #ffcb00;
+  ---in-content-help-button-background-hover: #f4c200;
+  ---in-content-help-button-background-active: #eaba00;
+  --in-content-disabled-text: #8050B0;
+}
 html|body,
 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 {
@@ -26,14 +67,14 @@ html|h1 {
   font-size: 2.5em;
   font-weight: lighter;
   line-height: 1.2;
-  color: #9C9CFF;
+  color: var(--in-content-text-color);
   margin: 0;
   margin-bottom: .5em;
 }
 
 html|hr {
   border-style: solid none none none;
-  border-color: #9C9CFF;
+  border-color: var(--in-content-border-color);
 }
 
 xul|caption {
@@ -89,9 +130,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,
@@ -104,20 +145,20 @@ 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;
   transition: background-color 50ms ease 0s;
 }
 
 xul|tab:hover {
-  background-color: #ebebeb;
+  background-color: var(--in-content-box-background-hover);
 }
 
-xul|tab[visuallyselected] {
-  background-color: #ebebeb;
+xul|tab[selected] {
+  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 {
@@ -130,8 +171,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;
 }
@@ -143,31 +184,30 @@ xul|colorpicker[type="button"],
 xul|menulist {
   -moz-appearance: none;
   height: 30px;
-  color: #333;
-  line-height: 20px;
-  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: #fbfbfb;
+  background-color: var(--in-content-page-background);
 }
 */
 html|button: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,
 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,
@@ -175,22 +215,22 @@ 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"] {
@@ -316,9 +356,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,
@@ -327,7 +367,7 @@ 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;
@@ -338,16 +378,16 @@ xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="
 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: #333;
-  background-color: rgba(0,149,221,0.25);
+  color: var(--in-content-text-color);
+  background-color: var(--in-content-item-hover);
 }
 
 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: #fff;
-  background-color: #0095dd;
+  color: var(--in-content-selected-text);
+  background-color: var(--in-content-item-selected);
 }
 
 xul|menulist > xul|menupopup > xul|menu[disabled="true"],
@@ -365,7 +405,7 @@ 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;
 }
 */
@@ -374,22 +414,22 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
 *|textbox {
   -moz-appearance: none;
   height: 30px;
-  color: #333;
+  color: var(--in-content-text-color);
   line-height: 20px;
   padding-right: 10px;
   padding-left: 10px;
-  border: 1px solid #c1c1c1;
+  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);
 }
 
 html|textbox:focus,
 xul|textbox[focused] {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 html|textbox:disabled,
@@ -402,25 +442,25 @@ xul|textbox[disabled="true"] {
 html|a,
 .text-link,
 .inline-link {
-  color: #3333FF;
+  color: var(--in-content-link-color);
   text-decoration: none;
 }
 
-html|a:visited {
-  color: #6000CF;
-}
-
 html|a:hover,
 .text-link:hover,
 .inline-link:hover {
-  color: #FFCF00;
+  color: var(--in-content-link-color-hover);
   text-decoration: underline;
 }
 
+html|a:visited {
+  color: var(--in-content-link-color-visited);
+}
+
 html|a:hover:active,
 .text-link:hover:active,
 .inline-link:hover:active {
-  color: #FF9F00;
+  color: var(--in-content-link-color-active);
   text-decoration: underline;
 }
 
@@ -452,19 +492,19 @@ html|input[type="checkbox"] + html|label:before {
   width: 23px;
   height: 23px;
   border-radius: 0;
-  border: 1px solid #FF9F00;
+  border: 1px solid var(--in-content-box-border-color);
   -moz-margin-end: 10px;
-  background-color: #000000;
+  background-color: var(--in-content-box-background);
   background-position: center center;
   background-repeat: no-repeat;
 }
 
 /* xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check, */
 html|input[type="checkbox"]:not(:disabled) + html|label:hover:before {
-  border-color: #FFCF00;
+  border-color: var(--in-content-border-focus);
 }
 html|input[type="checkbox"]:not(:disabled) + html|label:hover {
-  color: #FFCF00;
+  color: var(--in-content-link-color-hover);
 }
 /*
 xul|*.checkbox-check[checked] {
@@ -485,10 +525,10 @@ html|input[type="checkbox"]: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: #8050B0;
+  border-color: var(--in-content-border-disabled);
 }
 html|input[type="checkbox"]:disabled + html|label {
-  color: #8050B0;
+  color: var(--in-content-disabled-text);
 }
 /*
 xul|*.checkbox-label-box {
@@ -508,7 +548,7 @@ 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;
   background-color: #f1f1f1;
@@ -517,7 +557,7 @@ xul|*.radio-check {
 }
 
 xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
-  border-color: #0095dd;
+  border-color: var(--in-content-border-focus);
 }
 
 xul|*.radio-check[selected] {
@@ -537,7 +577,7 @@ xul|*.radio-label-box {
 /* Category List */
 
 xul|*#categories {
-  background-color: #A09090;
+  background-color: var(--in-content-categorylist-background);
   padding-top: 4em;
   margin: 0;
   border-radius: 1em 0 0 0;
@@ -545,8 +585,8 @@ xul|*#categories {
 }
 
 xul|*.category {
-  background-color: #000000;
-  color: #FFCF00;
+  background-color: var(--in-content-category-background);
+  color: var(--in-content-category-text);
   -moz-border-end-width: 0;
   -moz-padding-start: 15px;
   -moz-padding-end: 21px;
@@ -555,18 +595,18 @@ xul|*.category {
 }
 
 xul|*.category:hover {
-  background-color: #FFCF00;
-  color: #000000;
+  background-color: var(--in-content-category-background-hover);
+  color: var(--in-content-category-text-selected);
 }
 
 xul|*.category[selected] {
-  background-color: #008484;
-  color: #000000;
+  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 dotted #000000;
-  border-bottom: 1px dotted #000000;
+  border-top: var(--in-content-category-border-focus);
+  border-bottom: var(--in-content-category-border-focus);
 }
 
 *|*.category-name {
@@ -587,7 +627,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur
 
 *|*.header {
 /*  -moz-margin-end: 4px; / add the 4px end-margin of other elements /
-  border-bottom: 1px solid #A09090;
+  border-bottom: 1px solid var(--in-content-header-border-color);
   margin-bottom: 15px;
   padding-bottom: 15px; */
 }
@@ -650,9 +690,9 @@ xul|richlistbox,
 xul|listbox {
   -moz-appearance: none;
   -moz-margin-start: 0;
-  background-color: #fff;
-  border: 1px solid #c1c1c1;
-  color: #333;
+  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,
@@ -666,13 +706,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 /
@@ -694,20 +734,21 @@ 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 #0095dd;
+  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;
 }
 
@@ -715,15 +756,15 @@ 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"]):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),
@@ -742,6 +783,20 @@ xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection
 xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="ascending"] {
   transform: scaleY(-1);
 }
+
+/ 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 === */
 /*
diff --git a/LCARStrek/global/in-content/help-glyph.svg b/LCARStrek/global/in-content/help-glyph.svg
index 738f1d73..1645bd9a 100644
--- a/LCARStrek/global/in-content/help-glyph.svg
+++ b/LCARStrek/global/in-content/help-glyph.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-	<path d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89
-		c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182
-		C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457
-		c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z" fill="#000000"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <path fill="#000000" d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89 c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182 C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457 c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z"/>
 </svg>
diff --git a/LCARStrek/global/in-content/info-pages.css b/LCARStrek/global/in-content/info-pages.css
index 9bcb30ab..902b1f87 100644
--- a/LCARStrek/global/in-content/info-pages.css
+++ b/LCARStrek/global/in-content/info-pages.css
@@ -1,106 +1,109 @@
-@import url("chrome://global/skin/in-content/common.css");
-/* Body and container */
-body {
-  display: flex;
-  flex-direction: column;
-  box-sizing: padding-box;
-  min-height: 100vh;
-  padding-top: 0;
-  padding-bottom: 0;
-  -moz-padding-start: calc(48px + 4.6em);
-  -moz-padding-end: 48px;
-  align-items: center;
-  justify-content: center;
-}
-
-.container {
-  min-width: 13em;
-  max-width: 52em;
-}
-
-.container.flex,
-.container.restore-chosen {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-  margin: 10vh 0;
-}
-
-/* Typography */
-.title {
-  background-image: url("chrome://browser/skin/aboutNetError_info.svg");
-  background-position: left 0;
-  background-repeat: no-repeat;
-  background-size: 1.6em;
-  -moz-margin-start: -2.3em;
-  -moz-padding-start: 2.3em;
-  font-size: 2.5em;
-}
-
-.title:-moz-dir(rtl) {
-  background-position: right 0;
-}
-
-.title-text {
-  border-bottom: 1px solid #A09090;
-  font-size: inherit;
-  padding-bottom: 0.4em;
-}
-
-@media (max-width: 675px) {
-  body {
-    padding: 0 48px;
-  }
-
-  .title {
-    background-image: none !important;
-    -moz-padding-start: 0;
-    -moz-margin-start: 0;
-  }
-
-  .title-text {
-    padding-top: 0;
-  }
-}
-
-ul, ol {
-  margin: 0;
-  padding: 0;
-  -moz-margin-start: 1em;
-}
-
-ul > li, ol > li {
-  margin-bottom: .5em;
-}
-
-ul {
-  list-style: disc;
-}
-
-/* Buttons */
-.button-container {
-  margin-top: 1.2em;
-}
-
-.button-container > button {
-  min-width: 150px;
-}
-
-.button-container > button:first-child {
-  -moz-margin-start: 0;
-}
-
-/* Trees */
-.tree-container {
-  margin-top: 1.2em;
-  flex-grow: 1;
-  min-height: 12em;
-}
-
-.tree-container > tree {
-  height: 100%;
-}
-
-tree {
-  width: 100%;
-}
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://global/skin/in-content/common.css");
+/* Body and container */
+body {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  min-height: 100vh;
+  padding-top: 0;
+  padding-bottom: 0;
+  -moz-padding-start: calc(48px + 4.6em);
+  -moz-padding-end: 48px;
+  align-items: center;
+  justify-content: center;
+}
+
+.container {
+  min-width: 13em;
+  max-width: 52em;
+}
+
+.container.restore-chosen {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  margin: 10vh 0;
+}
+
+/* Typography */
+.title {
+  background-image: url("chrome://browser/skin/aboutNetError_info.svg");
+  background-position: left 0;
+  background-repeat: no-repeat;
+  background-size: 1.6em;
+  -moz-margin-start: -2.3em;
+  -moz-padding-start: 2.3em;
+  font-size: 2.5em;
+}
+
+.title:-moz-dir(rtl) {
+  background-position: right 0;
+}
+
+.title-text {
+  border-bottom: 1px solid #A09090;
+  font-size: inherit;
+  padding-bottom: 0.4em;
+}
+
+@media (max-width: 675px) {
+  body {
+    padding: 0 48px;
+  }
+
+  .title {
+    background-image: none !important;
+    -moz-padding-start: 0;
+    -moz-margin-start: 0;
+  }
+
+  .title-text {
+    padding-top: 0;
+  }
+}
+
+ul, ol {
+  margin: 0;
+  padding: 0;
+  -moz-margin-start: 1em;
+}
+
+ul > li, ol > li {
+  margin-bottom: .5em;
+}
+
+ul {
+  list-style: disc;
+}
+
+/* Buttons */
+.button-container {
+  margin-top: 1.2em;
+}
+
+.button-container > button {
+  min-width: 150px;
+}
+
+.button-container > button:first-child {
+  -moz-margin-start: 0;
+}
+
+/* Trees */
+.tree-container {
+  margin-top: 1.2em;
+  flex-grow: 1;
+  min-height: 12em;
+}
+
+.tree-container > tree {
+  height: 100%;
+}
+
+tree {
+  width: 100%;
+}
diff --git a/LCARStrek/global/inContentUI.css b/LCARStrek/global/inContentUI.css
index 78940c0b..0e5971d0 100644
--- a/LCARStrek/global/inContentUI.css
+++ b/LCARStrek/global/inContentUI.css
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/* THIS FILE HAS BEEN DELETED IN THE ORIGINAL THEME.
+ * We keep it only as long as some LCARStrek stuff still refers to it. */
+
 /*
  * The default namespace for this file is XUL. Be sure to prefix rules that
  * are applicable to both XUL and HTML with '*|'.
diff --git a/LCARStrek/global/media/videoClickToPlayButton.svg b/LCARStrek/global/media/videoClickToPlayButton.svg
index 62ee0448..13727998 100644
--- a/LCARStrek/global/media/videoClickToPlayButton.svg
+++ b/LCARStrek/global/media/videoClickToPlayButton.svg
@@ -1,79 +1,30 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   id="videoPlayButtonOverlay"
-   preserveAspectRatio="xMinYMin meet"
-   viewBox="0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet" viewBox="0 0 64 64">
   <defs>
     <linearGradient id="whiteGradientStops">
-      <stop id="whiteGradientStop01" style="stop-color:#000000;stop-opacity:.95" offset="0" />
-      <stop id="whiteGradientStop02" style="stop-color:#000000;stop-opacity:.75" offset=".45" />
-      <stop id="whiteGradientStop03" style="stop-color:#000000;stop-opacity:.72" offset=".55" />
-      <stop id="whiteGradientStop04" style="stop-color:#000000;stop-opacity:.65" offset="1" />
+      <stop style="stop-color:#000000;stop-opacity:.95" offset="0"/>
+      <stop style="stop-color:#000000;stop-opacity:.75" offset=".45"/>
+      <stop style="stop-color:#000000;stop-opacity:.72" offset=".55"/>
+      <stop style="stop-color:#000000;stop-opacity:.65" offset="1"/>
     </linearGradient>
-    <linearGradient
-       x1="32"
-       y1="0"
-       x2="32"
-       y2="62"
-       id="whiteGradient"
-       xlink:href="#whiteGradientStops"
-       gradientUnits="userSpaceOnUse" />
+    <linearGradient x1="32" y1="0" x2="32" y2="62" id="whiteGradient" xlink:href="#whiteGradientStops" gradientUnits="userSpaceOnUse"/>
     <linearGradient id="arrowGradientStops">
-      <stop id="arrowGradientStop01" style="stop-color:#FFCF00;stop-opacity:.8" offset="0" />
-      <stop id="arrowGradientStop02" style="stop-color:#FF9F00;stop-opacity:.8" offset="1" />
+      <stop style="stop-color:#FFCF00;stop-opacity:.5" offset="0"/>
+      <stop style="stop-color:#FF9F00;stop-opacity:.5" offset="1"/>
     </linearGradient>
-    <linearGradient
-       x1="32"
-       y1="16"
-       x2="32"
-       y2="48"
-       id="arrowGradient"
-       xlink:href="#arrowGradientStops"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       x="-0.15"
-       y="-0.15"
-       width="1.25"
-       height="1.25"
-       color-interpolation-filters="sRGB"
-       id="dropShadow">
+    <linearGradient x1="32" y1="16" x2="32" y2="48" id="arrowGradient" xlink:href="#arrowGradientStops" gradientUnits="userSpaceOnUse"/>
+    <filter x="-0.15" y="-0.15" width="1.25" height="1.25" color-interpolation-filters="sRGB" id="dropShadow">
       <feDropShadow dx="0" dy="1" flood-opacity="0.5"/>
     </filter>
     <mask id="dropShadowMask">
-      <path
-         d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"
-         id="dropShadowMaskPath"
-         style="fill:#000000;" />
-    </mask>       
+      <path style="fill:#000000;" d="M47.285,30.991L23.75,17.24c-0.357-0.208-0.692-0.278-0.969-0.221 C22.32,17.115,22,17.555,22,18.252v27.499c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748C48.238,32.458,48.238,31.547,47.285,30.991 z M0,0v64h64V0H0z M32,60C16.536,60,4,47.464,4,32S16.536,4,32,4s28,12.536,28,28S47.464,60,32,60z"/>
+    </mask>
   </defs>
-  <path 
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"
-     mask="url(#dropShadowMask)"
-     id="playButtonShadow"
-     style="filter:url(#dropShadow);" />
-  <path
-     d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"
-     id="playButtonArrow"
-     style="fill:url(#arrowGradient);" />
-  <path 
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"
-     id="playButton"
-     style="fill:url(#whiteGradient);" />
-  <path
-     d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"
-     id="playButtonEdgeHighlights"
-     style="fill:#000000;fill-opacity:.3;" />
-  <path
-     d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"
-     id="playButtonTopEdgeHighlights"
-     style="fill:#402800;fill-opacity:.8;" />
+  <path mask="url(#dropShadowMask)" id="playButtonShadow" style="filter:url(#dropShadow);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonArrow" style="fill:url(#arrowGradient);" d="M22.781,17.019C22.32,17.114,22,17.555,22,18.251v27.5c0,1.112,0.797,1.568,1.75,1.011 l23.535-13.748c0.953-0.556,0.953-1.467,0-2.023L23.75,17.24C23.393,17.031,23.058,16.961,22.781,17.019z"/>
+  <path id="playButton" style="fill:url(#whiteGradient);" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M47.285,33.014 L23.75,46.762C22.797,47.319,22,46.863,22,45.751v-27.5c0-0.697,0.32-1.137,0.781-1.232c0.277-0.058,0.612,0.012,0.969,0.221 l23.535,13.751C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonEdgeHighlights" style="fill:#000000;fill-opacity:.3;" d="M32,4C16.536,4,4,16.536,4,32s12.536,28,28,28s28-12.536,28-28S47.464,4,32,4z M32,59C17.112,59,5,46.888,5,32S17.112,5,32,5s27,12.112,27,27S46.888,59,32,59z M47.789,30.127l-23.534-13.75 C23.826,16.126,23.396,16,22.976,16c-0.135,0-0.27,0.014-0.398,0.041C21.62,16.238,21,17.106,21,18.251v27.5 C21,47.075,21.812,48,22.977,48c0.423,0,0.854-0.126,1.279-0.375L47.79,33.877c0.769-0.449,1.21-1.132,1.21-1.875 S48.559,30.576,47.789,30.127z M47.285,33.014L23.75,46.762C23.474,46.924,23.211,47,22.977,47C22.402,47,22,46.541,22,45.751v-27.5 c0-0.697,0.32-1.137,0.781-1.232L22.976,17c0.233,0,0.498,0.079,0.775,0.24l23.535,13.751 C48.238,31.546,48.238,32.458,47.285,33.014z"/>
+  <path id="playButtonTopEdgeHighlights" style="fill:#402800;fill-opacity:.8;" d="M32,4C16.536,4,4,16.536,4,32c0,0.167,0.01,0.333,0.013,0.5 C4.28,17.268,16.704,5,32,5c15.296,0,27.72,12.268,27.987,27.5C59.99,32.333,60,32.167,60,32C60,16.536,47.464,4,32,4z M47.285,33.014L23.75,46.762C22.797,47.319,22,46.863,22,45.751v1c0,1.112,0.797,1.568,1.75,1.011l23.535-13.748 c0.697-0.406,0.879-1.003,0.556-1.512C47.723,32.688,47.541,32.864,47.285,33.014z"/>
 </svg>
diff --git a/LCARStrek/global/menu.css b/LCARStrek/global/menu.css
index dafa9ea2..269d8d60 100644
--- a/LCARStrek/global/menu.css
+++ b/LCARStrek/global/menu.css
@@ -12,6 +12,7 @@
 
 menu,
 menuitem,
+menucaption,
 .splitmenu-menuitem {
   -moz-box-align: center;
   max-width: 42em;
@@ -77,13 +78,15 @@ menuitem.spell-suggestion {
 menupopup > menu,
 popup > menu,
 menupopup > menuitem,
-popup > menuitem {
+popup > menuitem,
+menupopup > menucaption {
   padding: 2px;
 }
 
 /* ::::: menu/menuitems in menulist popups ::::: */
 
 menulist > menupopup > menuitem,
+menulist > menupopup > menucaption,
 menulist > menupopup > menu {
   padding: 1px 5px;
   max-width: none;
@@ -110,6 +113,12 @@ menulist > menupopup > menu {
   font-weight: inherit;
 }
 
+menucaption > .menu-text,
+menucaption > .menu-iconic-text {
+  font-weight: bold;
+  -moz-padding-start: 0 !important;
+}
+
 .menu-description {
   font-style: italic;
   color: #9C9CFF;
@@ -181,6 +190,7 @@ menulist > menupopup > menu {
 }
 
 menulist > menupopup > menuitem > .menu-iconic-left,
+menulist > menupopup > menucaption > .menu-iconic-left,
 menulist > menupopup > menu > .menu-iconic-left {
   display: none;
 }
diff --git a/LCARStrek/global/popup.css b/LCARStrek/global/popup.css
index 00661adf..1e5968e7 100644
--- a/LCARStrek/global/popup.css
+++ b/LCARStrek/global/popup.css
@@ -10,6 +10,7 @@
 
 /* ::::: Variables ::::: */
 .panel-arrowcontent {
+  --panel-arrowcontent-padding: 6px;
   --panel-arrowcontent-background: #000000;
   --panel-arrowcontent-color: #FF9F00;
   --panel-arrowcontent-border: 1px solid #FF9F00;
@@ -52,7 +53,7 @@ panel[type="arrow"][side="right"] {
 
 .panel-arrowcontent {
   border-radius: 6px;
-  padding: 6px;
+  padding: var(--panel-arrowcontent-padding);
   color: var(--panel-arrowcontent-color);
   background: var(--panel-arrowcontent-background);
   background-clip: padding-box;
diff --git a/LCARStrek/global/reader/RM-Add-24x24.svg b/LCARStrek/global/reader/RM-Add-24x24.svg
index 66551ef1..20713815 100644
--- a/LCARStrek/global/reader/RM-Add-24x24.svg
+++ b/LCARStrek/global/reader/RM-Add-24x24.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10
-    C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>
 </svg>
diff --git a/LCARStrek/global/reader/RM-Close-24x24.svg b/LCARStrek/global/reader/RM-Close-24x24.svg
index b0674b2d..e57a475b 100644
--- a/LCARStrek/global/reader/RM-Close-24x24.svg
+++ b/LCARStrek/global/reader/RM-Close-24x24.svg
@@ -2,30 +2,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg viewBox="0 0 24 24"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
-    <style type="text/css">
+    <style>
       use:not(:target) {
         display: none;
       }
-
       #close {
         fill: #808080;
       }
       #close-hover {
-        fill: #FFFFFF;
+        fill: #fff;
       }
     </style>
-
     <g id="close-shape">
       <polygon points="20.477,6.551 20.477,17.449 11.992,17.449 11.992,20 23,20 23,4 11.992,4 11.992,6.551"/>
       <polygon points="1,11.981 9.698,19.95 9.698,15.13 18.184,15.13 18.184,8.87 9.698,8.87 9.698,4.011"/>
     </g>
   </defs>
-
-  <use id="close"       xlink:href="#close-shape"/>
+  <use id="close" xlink:href="#close-shape"/>
   <use id="close-hover" xlink:href="#close-shape"/>
-
-</svg>
\ No newline at end of file
+</svg>
diff --git a/LCARStrek/global/reader/RM-Delete-24x24.svg b/LCARStrek/global/reader/RM-Delete-24x24.svg
index 6010fbe7..0ed39830 100644
--- a/LCARStrek/global/reader/RM-Delete-24x24.svg
+++ b/LCARStrek/global/reader/RM-Delete-24x24.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10
-    C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>
 </svg>
diff --git a/LCARStrek/global/reader/RM-Minus-24x24.svg b/LCARStrek/global/reader/RM-Minus-24x24.svg
index 9da7e03b..e85a3976 100644
--- a/LCARStrek/global/reader/RM-Minus-24x24.svg
+++ b/LCARStrek/global/reader/RM-Minus-24x24.svg
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-269.917" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-365.917" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>
 </svg>
diff --git a/LCARStrek/global/reader/RM-Plus-24x24.svg b/LCARStrek/global/reader/RM-Plus-24x24.svg
index 249912a1..f3a98ddb 100644
--- a/LCARStrek/global/reader/RM-Plus-24x24.svg
+++ b/LCARStrek/global/reader/RM-Plus-24x24.svg
@@ -1,39 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-233.667" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-329.667" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>
 </svg>
diff --git a/LCARStrek/global/reader/RM-Reading-List-24x24.svg b/LCARStrek/global/reader/RM-Reading-List-24x24.svg
index 1f21efd5..b43a8b89 100644
--- a/LCARStrek/global/reader/RM-Reading-List-24x24.svg
+++ b/LCARStrek/global/reader/RM-Reading-List-24x24.svg
@@ -1,46 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-    <rect x="8" y="10" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <rect x="8" y="16" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <rect x="8" y="4" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="6" r="2"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="12" r="2"/>
-    <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="18" r="2"/>
-</g>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-197" y="-1054" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-293" y="-1459" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <rect x="8" y="10" fill="#808080" width="14" height="4"/>
+  <rect x="8" y="16" fill="#808080" width="14" height="4"/>
+  <rect x="8" y="4" fill="#808080" width="14" height="4"/>
+  <circle fill="#808080" cx="4" cy="6" r="2"/>
+  <circle fill="#808080" cx="4" cy="12" r="2"/>
+  <circle fill="#808080" cx="4" cy="18" r="2"/>
 </svg>
diff --git a/LCARStrek/global/reader/RM-Type-Controls-24x24.svg b/LCARStrek/global/reader/RM-Type-Controls-24x24.svg
index a25429ad..8a5a2125 100644
--- a/LCARStrek/global/reader/RM-Type-Controls-24x24.svg
+++ b/LCARStrek/global/reader/RM-Type-Controls-24x24.svg
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07
-        H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166
-        L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z
-         M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>
-    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425
-        c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815
-        S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581
-        s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273
-        c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181
-        c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061
-        c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459
-        c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474
-        c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03
-        s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592
-        c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786
-        c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117
-        c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>
-</g>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07 H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166 L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/>
+    <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425 c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815 S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581 s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273 c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181 c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061 c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459 c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474 c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03 s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592 c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786 c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117 c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/>
 </svg>
diff --git a/LCARStrek/global/reader/RM-Type-Controls-Arrow.svg b/LCARStrek/global/reader/RM-Type-Controls-Arrow.svg
index 9094d8a3..837392ff 100644
--- a/LCARStrek/global/reader/RM-Type-Controls-Arrow.svg
+++ b/LCARStrek/global/reader/RM-Type-Controls-Arrow.svg
@@ -1,42 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<polygon opacity="0.15" fill-rule="evenodd" clip-rule="evenodd" points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985
-    "/>
-<g enable-background="new    ">
-    <g>
-        <defs>
-            <rect id="SVGID_2_" x="-125" y="-1086.667" width="22" height="34"/>
-        </defs>
-        <clipPath id="SVGID_1_">
-            <use xlink:href="#SVGID_2_"  overflow="visible"/>
-        </clipPath>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_6_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_3_">
-                <use xlink:href="#SVGID_6_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_10_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_5_">
-                <use xlink:href="#SVGID_10_"  overflow="visible"/>
-            </clipPath>
-        </g>
-        <g clip-path="url(#SVGID_1_)">
-            <defs>
-                <rect id="SVGID_16_" x="-221" y="-1491.667" width="1080" height="2896"/>
-            </defs>
-            <clipPath id="SVGID_7_">
-                <use xlink:href="#SVGID_16_"  overflow="visible"/>
-            </clipPath>
-        </g>
-    </g>
-</g>
-<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FBFBFB" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008
-    16.591,22.994 "/>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <polygon opacity="0.15"  points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985"/>
+  <polygon fill="#fbfbfb" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008 16.591,22.994 "/>
 </svg>
diff --git a/LCARStrek/global/reader/pocket.svg b/LCARStrek/global/reader/pocket.svg
index 63b22fa6..d93fd6a1 100644
--- a/LCARStrek/global/reader/pocket.svg
+++ b/LCARStrek/global/reader/pocket.svg
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 24 24">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
   <style>
     use:not(:target) {
       display: none;
@@ -10,18 +11,11 @@
       fill: #808080;
     }
     use[id$="-added"] {
-      fill: #EE4056;
+      fill: #ee4056;
     }
   </style>
-  <defs style="display: none;">
-    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179
-      C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018
-      c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171
-      c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018
-      c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z
-      M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547
-      c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63
-      c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>
+  <defs>
+    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179 C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018 c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018 c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547 c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63 c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>
   </defs>
   <use id="pocket-mark" xlink:href="#pocket-mark-shape"/>
   <use id="pocket-mark-added" xlink:href="#pocket-mark-shape"/>
diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css
index 0599cb83..1253434a 100644
--- a/LCARStrek/mozapps/extensions/extensions.css
+++ b/LCARStrek/mozapps/extensions/extensions.css
@@ -409,10 +409,18 @@
 
 .list {
   margin: 0;
-  border-color: transparent;
+  border-width: 0 !important;
   background-color: transparent;
 }
 
+.list > scrollbox > .scrollbox-innerbox {
+  border: 1px dotted transparent;
+}
+
+.list:-moz-focusring > scrollbox > .scrollbox-innerbox {
+  border-color: #008484;
+}
+
 .addon {
   border-bottom: 1px solid #9C9CFF;
   padding: 5px;
diff --git a/LCARStrek/mozapps/extensions/utilities.svg b/LCARStrek/mozapps/extensions/utilities.svg
index 250f4c3c..cc55099a 100644
--- a/LCARStrek/mozapps/extensions/utilities.svg
+++ b/LCARStrek/mozapps/extensions/utilities.svg
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     x="0"
-     y="0"
-     width="16"
-     height="16"
-     viewBox="0 0 16 16">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
   <style>
     use:not(:target) {
       display: none;
@@ -20,7 +17,7 @@
       fill: GrayText;
     }
   </style>
-  <defs style="display: none;">
+  <defs>
     <path id="utilities-shape" d="m11.5,13.9l-.6-1.5c.3-.2 .5-.4 .8-.6 .2-.2 .4-.5 .6-.7l1.5,.6c.3,.1 .6,0 .7-.3l.4-1c.1-.3 0-.6-.3-.7l-1.5-.6c.1-.6 .1-1.3 0-2l1.5-.6c.3-.1 .4-.4 .3-.7l-.4-1c-.1-.3-.4-.4-.7-.3l-1.5,.6c-.2-.3-.4-.5-.6-.8-.2-.1-.5-.3-.7-.5l.6-1.5c.1-.3 0-.6-.3-.7l-.9-.4c-.3-.1-.6,0-.7,.3l-.6,1.5c-.6-.1-1.3-.1-2,0l-.6-1.5c-.1-.3-.4-.4-.7-.3l-1,.4c-.2,.1-.3,.4-.2,.6l.6,1.5c-.3,.3-.5,.5-.8,.7-.2,.3-.4,.5-.6,.8l-1.5-.7c-.3-.1-.6,0-.7,.3l-.4,.9c-.1,.3 0,.6 .3,.7l1.5,.7c-.1,.6-.1,1.3 0,1.9l-1.5,.6c-.3,.1-.4,.4-.3,.7l.4,1c.1,.3 .4,.4 .7,.3l1.5-.6c.2,.3 .4,.5 .6,.8 .2,.2 .5,.4 .7,.6l-.6,1.5c-.1,.3 0,.6 .3,.7l1,.4c.3,.1 .6,0 .7-.3l.6-1.5c.6,.1 1.3,.1 2,0l.6,1.5c.1,.3 .4,.4 .7,.3l1-.4c.1-.1 .3-.4 .1-.7zm-5.1-4.2c-.9-.9-.9-2.4 0-3.3 .9-.9 2.4-.9 3.3,0 .9,.9 .9,2.4 0,3.3-.9,.9-2.4,.9-3.3,0z"/>
   </defs>
   <use id="utilities" xlink:href="#utilities-shape"/>
diff --git a/LCARStrek/mozapps/places/defaultFavicon.png b/LCARStrek/mozapps/places/defaultFavicon.png
index 9daec6a0..c3b62f6b 100644
Binary files a/LCARStrek/mozapps/places/defaultFavicon.png and b/LCARStrek/mozapps/places/defaultFavicon.png differ
diff --git a/LCARStrek/mozapps/places/defaultFavicon@2x.png b/LCARStrek/mozapps/places/defaultFavicon@2x.png
new file mode 100644
index 00000000..dba16a0b
Binary files /dev/null and b/LCARStrek/mozapps/places/defaultFavicon@2x.png differ