252 files changed, 1465 insertions, 13690 deletions

diff --git a/arc-firefox-theme/chrome/browser/Push-16.png b/arc-firefox-theme/chrome/browser/Push-16.png
deleted file mode 100644
index 082b177..0000000
--- a/arc-firefox-theme/chrome/browser/Push-16.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/Push-64.png b/arc-firefox-theme/chrome/browser/Push-64.png
deleted file mode 100644
index 6e09ab9..0000000
--- a/arc-firefox-theme/chrome/browser/Push-64.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/aboutCertError.css b/arc-firefox-theme/chrome/browser/aboutCertError.css
index c7caf53..e406eec 100644
--- a/arc-firefox-theme/chrome/browser/aboutCertError.css
+++ b/arc-firefox-theme/chrome/browser/aboutCertError.css
@@ -2,71 +2,97 @@
  * 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");
 
-html {
-  background: -moz-Dialog;
+body {
+  display: flex;
+  box-sizing: border-box;
+  min-height: 100vh;
+  padding: 0 48px;
+  align-items: center;
+  justify-content: center;
 }
 
-body {
-  margin: 0;
-  padding: 0 1em;
-  color: -moz-FieldText;
-  font: message-box;
+#errorPageContainer {
+  position: relative;
+  min-width: 320px;
+  max-width: 512px;
 }
 
-h1 {
-  margin: 0 0 .6em 0;
-  border-bottom: 1px solid ThreeDLightShadow;
-  font-size: 160%;
+#errorTitle {
+  background: url("chrome://browser/skin/cert-error.svg") left 0 no-repeat;
+  background-size: 3em;
+  margin-inline-start: -5em;
+  padding-inline-start: 5em;
 }
 
-h2 {
-  font-size: 130%;
+#errorTitle:-moz-dir(rtl) {
+  background-position: right 0;
 }
 
-#errorPageContainer {
-  position: relative;
-  min-width: 13em;
-  max-width: 52em;
-  margin: 4em auto;
-  border: 1px solid #FFBD09; /* pale yellow extracted from yellow passport icon */
-  border-radius: 10px;
-  padding: 3em;
-  -moz-padding-start: 30px;
-  background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
-  background-origin: content-box;
+#errorTitleText {
+  border-bottom: 1px solid #C1C1C1;
+  padding-bottom: 0.4em;
 }
 
-#errorPageContainer:-moz-dir(rtl) {
-  background-position: right 0;
+@media (max-width: 675px) {
+  #errorTitle {
+    padding-top: 0;
+    background-image: none;
+    margin-inline-start: 0;
+    padding-inline-start: 0;
+  }
 }
 
-#errorTitle {
-  -moz-margin-start: 80px;
+#buttonContainer {
+  display: flex;
+  flex-flow: row wrap;
 }
 
-#errorLongContent {
-  -moz-margin-start: 80px;
+#buttonSpacer {
+  flex: 1;
 }
 
-.expander > button {
-  -moz-padding-start: 20px;
-  -moz-margin-start: -20px;
-  background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat;
-  border: none;
-  font: inherit;
-  color: inherit;
+/* Pressing the retry button will cause the cursor to flicker from a pointer to
+ * not-allowed. Override the disabled cursor behaviour since we will never show
+ * the button disabled as the initial state. Remove this in Bug 1219861. */
+button:disabled {
   cursor: pointer;
 }
 
-.expander > button:-moz-dir(rtl) {
-  background-position: right center;
+#returnButton {
+  background-color: var(--in-content-primary-button-background);
+  border: none;
+  color: var(--in-content-selected-text);
+  min-width: 250px;
+  margin-inline-start: 0;
+}
+
+#returnButton:hover {
+  background-color: var(--in-content-primary-button-background-hover) !important;
+}
+
+#returnButton:hover:active {
+  background-color: var(--in-content-primary-button-background-active) !important;
+}
+
+#advancedButton {
+  min-width: 150px;
 }
 
-.expander[collapsed] > button {
-  background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png");
+/* Advanced section is hidden via inline styles until the link is clicked */
+#advancedPanel {
+  background-color: white;
+  color: var(--in-content-text-color);
+  border: 1px lightgray solid;
+  /* Don't use top padding because the default p style has top padding, and it
+   * makes the overall div look uneven */
+  padding: 0 12px 10px;
+  margin-top: 10px;
+  box-shadow: 0 0 4px #ddd;
+  font-size: 0.9em;
 }
 
-.expander[collapsed] > button:-moz-dir(rtl) {
-  background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png");
+.hostname {
+  font-weight: bold;
 }
diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css
index ff80788..7a4eca3 100644
--- a/arc-firefox-theme/chrome/browser/aboutNetError.css
+++ b/arc-firefox-theme/chrome/browser/aboutNetError.css
@@ -49,7 +49,8 @@ ul {
   background-position: right 0;
 }
 
-#errorTitle[sslv3=true] {
+#errorTitle[sslv3=true],
+#errorTitle[weakCrypto=true] {
   background-image: url("aboutNetError_alert.svg");
 }
 
@@ -78,7 +79,8 @@ button:disabled {
   cursor: pointer;
 }
 
-div#certificateErrorReporting {
+div#certificateErrorReporting,
+div#weakCryptoAdvanced {
   display: none;
   float: right;
   /* Align with the "Try Again" button */
@@ -86,11 +88,13 @@ div#certificateErrorReporting {
   -moz-margin-end: 24px;
 }
 
-div#certificateErrorReporting a {
+div#certificateErrorReporting a,
+div#weakCryptoAdvanced a {
   text-decoration: none;
 }
 
-div#certificateErrorReporting a:hover {
+div#certificateErrorReporting a:hover,
+div#weakCryptoAdvanced a:hover {
   text-decoration: underline;
 }
 
@@ -102,7 +106,8 @@ span.downArrow {
   transform: scaleY(0.7);
 }
 
-div#certificateErrorReportingPanel {
+div#certificateErrorReportingPanel,
+div#weakCryptoAdvancedPanel {
   /* Hidden until the link is clicked */
   display: none;
   background-color: white;
@@ -117,15 +122,18 @@ div#certificateErrorReportingPanel {
   margin-top: 10px;
 }
 
-div#certificateErrorReportingPanel:-moz-dir(ltr) {
+div#certificateErrorReportingPanel:-moz-dir(ltr),
+div#weakCryptoAdvancedPanel:-moz-dir(ltr) {
   left: 34%;
 }
 
-div#certificateErrorReportingPanel:-moz-dir(rtl) {
+div#certificateErrorReportingPanel:-moz-dir(rtl),
+div#weakCryptoAdvancedPanel:-moz-dir(rtl) {
   right: 0;
 }
 
-#errorStatePanel {
+#errorStatePanel,
+#overrideWeakCryptoPanel {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
diff --git a/arc-firefox-theme/chrome/browser/aboutTabCrashed.css b/arc-firefox-theme/chrome/browser/aboutTabCrashed.css
index 2ef767e..e42922a 100644
--- a/arc-firefox-theme/chrome/browser/aboutTabCrashed.css
+++ b/arc-firefox-theme/chrome/browser/aboutTabCrashed.css
@@ -9,3 +9,34 @@
 #reportSent {
   font-weight: bold;
 }
+
+#crash-reporter-container {
+  width: 80%;
+  background-color: var(--in-content-box-background-hover);
+  margin: 24px 0;
+  padding: 14px;
+  border: 1px solid var(--in-content-box-border-color);
+  border-radius: 2px;
+}
+
+#crash-reporter-title {
+  font-weight: bold;
+  margin: 0 0 14px 0;
+}
+
+input[type="text"],
+textarea {
+  width: 100%;
+  box-sizing: border-box;
+  resize: none;
+}
+
+#options {
+  list-style: none;
+  margin-inline-start: 0;
+}
+
+input[type="text"],
+#options > li {
+  margin: 14px 0 0 0;
+}
diff --git a/arc-firefox-theme/chrome/browser/badge-add-engine@2x.png b/arc-firefox-theme/chrome/browser/badge-add-engine@2x.png
new file mode 100644
index 0000000..abf084a
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/badge-add-engine@2x.png
diff --git a/arc-firefox-theme/chrome/browser/browser-lightweightTheme.css b/arc-firefox-theme/chrome/browser/browser-lightweightTheme.css
index 8bc1b45..53f07ec 100644
--- a/arc-firefox-theme/chrome/browser/browser-lightweightTheme.css
+++ b/arc-firefox-theme/chrome/browser/browser-lightweightTheme.css
@@ -18,7 +18,7 @@
 #tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-end[visuallyselected=true]:-moz-lwtheme::before {
   background-attachment: scroll, fixed;
   background-color: transparent;
-  background-image: linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, rgba(255,255,255,.3));/*, lwtHeader;*/
+  background-image: linear-gradient(transparent 2px, rgba(255,255,255,.4) 2px, rgba(255,255,255,.4));/*, lwtHeader;*/
   background-position: 0 0, right top;
   background-repeat: repeat-x, no-repeat;
 }
@@ -27,7 +27,7 @@
   background-attachment: scroll, scroll, fixed;
   background-color: transparent;
   background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png),
-                    linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, rgba(255,255,255,.3));/*,
+                    linear-gradient(transparent 2px, rgba(255,255,255,.4) 2px, rgba(255,255,255,.4));/*,
                     lwtHeader;*/
   background-position: 0 0, 0 0, right top;
   background-repeat: repeat-x, repeat-x, no-repeat;
diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css
index 3752502..7229492 100644
--- a/arc-firefox-theme/chrome/browser/browser.css
+++ b/arc-firefox-theme/chrome/browser/browser.css
@@ -482,6 +482,15 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("chrome://global/skin/console/console.png"); }
 
 /* Primary toolbar buttons */
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px; }
+
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  max-width: 18px; }
+
 .findbar-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 {
@@ -508,14 +517,11 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px; }
 
-/* Help SDK icons fit: */
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-  width: 16px; }
-
-:-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
-  width: 32px; }
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  /* horizontal padding + border + actual icon width */
+  max-width: 32px !important; }
 
 #nav-bar #PanelUI-menu-button {
   -moz-padding-start: 5px;
@@ -580,18 +586,30 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:hover:active {
   padding: 3px; }
 
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons {
+  margin-left: 2px;
+  margin-right: 2px; }
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons > .toolbarbutton-1 {
+  padding-left: 0;
+  padding-right: 0; }
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons:not(:hover) > separator,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
   content: "";
   display: -moz-box;
   width: 1px;
   height: 18px;
   -moz-margin-end: -1px;
-  background-image: var(--toolbarbutton-combined-backgroundimage);
-  background-clip: padding-box;
+  background-image: linear-gradient(currentColor 0, currentColor 100%);
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px;
-  box-shadow: var(--toolbarbutton-combined-boxshadow); }
+  opacity: .2; }
+
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbaritem-combined-buttons > separator,
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
+  opacity: .3; }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-margin-start: -4px; }
@@ -1284,7 +1302,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   #minimize-button:active {
     list-style-image: url("chrome://browser/skin/custom_images/light/window-controls/minimize_pressed.svg"); }
 
-/* Location bar */
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
@@ -1304,6 +1321,15 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
 .searchbar-textbox {
   border-radius: 20px; }
 
+#urlbar:-moz-lwtheme,
+.searchbar-textbox:-moz-lwtheme {
+  background-color: rgba(255, 255, 255, 0.8);
+  color: black; }
+
+#urlbar:-moz-lwtheme[focused=true],
+.searchbar-textbox:-moz-lwtheme[focused=true] {
+  background-color: white; }
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center; }
@@ -1315,7 +1341,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   -moz-appearance: toolbarbutton-dropdown;
   transition: opacity 0.15s ease; }
 
-#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#navigator-toolbox:not(:hover) .urlbar-history-dropmarker {
   opacity: 0; }
 
 #urlbar-container {
@@ -1489,6 +1515,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-secure.svg); }
 
+.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
 .mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); }
 
@@ -1518,9 +1545,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon[popupid="geolocation"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png); }
 
-.popup-notification-icon[popupid="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png); }
-
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
 .popup-notification-icon[popupid="addon-install-origin-blocked"] {
@@ -1548,7 +1572,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); }
 
 .popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png); }
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg); }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
 .popup-notification-icon[popupid*="offline-app-requested"],
@@ -1613,9 +1637,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 #geo-notification-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png); }
 
-#push-notification-icon {
-  list-style-image: url(chrome://browser/skin/Push-16.png); }
-
 #addons-notification-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); }
 
@@ -1699,7 +1720,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-16.png); }
+  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
+  -moz-image-region: rect(0, 16px, 16px, 0); }
+
+.web-notifications-notification-icon:hover,
+#web-notifications-notification-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px); }
+
+.web-notifications-notification-icon:hover:active,
+#web-notifications-notification-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px); }
 
 .pointerLock-notification-icon,
 #pointerLock-notification-icon {
@@ -2571,6 +2601,29 @@ lwtHeader;*/
   background-repeat: no-repeat;
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; }
 
+/* User Context UI - change tab decoration depending on userContextId.
+   Defaults to gray for unknown usercontextids. */
+.tabbrowser-tab[usercontextid] {
+  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
+  background-size: auto 2px;
+  background-repeat: no-repeat; }
+
+/* Personal User Context */
+.tabbrowser-tab[usercontextid="1"] {
+  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%); }
+
+/* Work User Context */
+.tabbrowser-tab[usercontextid="2"] {
+  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%); }
+
+/* Banking User Context */
+.tabbrowser-tab[usercontextid="3"] {
+  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%); }
+
+/* Shopping User Context */
+.tabbrowser-tab[usercontextid="4"] {
+  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%); }
+
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none; }
@@ -2589,12 +2642,20 @@ lwtHeader;*/
   height: 100%;
   position: absolute; }
 
-.tabbrowser-tab[pinned][titlechanged]:not([visuallyselected="true"]) > .tab-stack > .tab-content {
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
+.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
   background-image: radial-gradient(farthest-corner at center bottom, white 3%, rgba(186, 221, 251, 0.75) 20%, rgba(127, 179, 255, 0.25) 40%, transparent 70%);
   background-position: center bottom var(--tab-toolbar-navbar-overlap);
   background-repeat: no-repeat;
   background-size: 85% 100%; }
 
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([visuallyselected="true"]) {
+  background-position: left bottom var(--tab-toolbar-navbar-overlap);
+  background-size: 34px 100%; }
+
+.tab-label[attention]:not([visuallyselected="true"]) {
+  font-weight: bold; }
+
 /* Tab separators */
 /* Also show separators beside the selected tab when dragging it. */
 /* New tab button */
@@ -2729,6 +2790,12 @@ lwtHeader;*/
 .alltabs-endimage[soundplaying] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); }
 
+menuitem:hover > hbox > .alltabs-endimage[muted] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-muted-hover); }
+
+menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-hover); }
+
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
@@ -2798,7 +2865,7 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin-bottom: 5px; }
 
 #sync-start-panel-subtitle {
-  margin: 0; }
+  margin-bottom: 0; }
 
 /* Status panel */
 .statuspanel-label {
@@ -2951,7 +3018,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px; }
@@ -2973,7 +3040,7 @@ html|*#fullscreen-exit-button {
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px; }
 
@@ -2982,19 +3049,19 @@ html|*#fullscreen-exit-button {
   margin-left: 0; }
 
 .devtools-responsiveui-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png"); }
+  list-style-image: url("chrome://devtools/skin/images/close.png"); }
 
 .devtools-responsiveui-rotate {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate.png"); }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-close {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); }
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png"); }
 
   .devtools-responsiveui-rotate {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate@2x.png"); } }
 .devtools-responsiveui-touch {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
 .devtools-responsiveui-touch[checked] {
@@ -3002,24 +3069,24 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-touch {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px); }
 
   .devtools-responsiveui-touch[checked] {
     -moz-image-region: rect(0px, 64px, 32px, 32px); } }
 .devtools-responsiveui-screenshot {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot.png"); }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-screenshot {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot@2x.png"); } }
 .devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
   cursor: ew-resize;
   transform: translate(12px, -12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer.png"); }
 
 .devtools-responsiveui-resizebarH {
   width: 24px;
@@ -3027,7 +3094,7 @@ html|*#fullscreen-exit-button {
   cursor: ns-resize;
   transform: translate(-12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer.png"); }
 
 .devtools-responsiveui-resizehandle {
   width: 16px;
@@ -3035,7 +3102,7 @@ html|*#fullscreen-exit-button {
   cursor: se-resize;
   transform: translate(12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer.png"); }
 
 /* FxOS custom mode with additional buttons and phone look'n feel */
 /* Hide devtools manual resizer */
@@ -3071,7 +3138,7 @@ html|*#fullscreen-exit-button {
   -moz-user-focus: ignore;
   width: 40px;
   height: 30px;
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-home.png"); }
 
 .devtools-responsiveui-sleep-button {
   -moz-user-focus: ignore;
@@ -3117,13 +3184,13 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-resizebarV {
-    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer@2x.png"); }
 
   .devtools-responsiveui-resizebarH {
-    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png"); }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer@2x.png"); }
 
   .devtools-responsiveui-resizehandle {
-    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png"); } }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer@2x.png"); } }
 /* Developer toolbar */
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
@@ -3180,7 +3247,7 @@ html|*#fullscreen-exit-button {
 
 :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image,
 :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
-  filter: url("chrome://browser/skin/devtools/filters.svg#invert"); }
+  filter: url("chrome://devtools/skin/images/filters.svg#invert"); }
 
 .developer-toolbar-button > .toolbarbutton-icon,
 #developer-toolbar-closebutton > .toolbarbutton-icon {
@@ -3188,7 +3255,7 @@ html|*#fullscreen-exit-button {
   height: 16px; }
 
 #developer-toolbar-toolbox-button {
-  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
 #developer-toolbar-toolbox-button > label {
@@ -3205,7 +3272,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-toolbox-button {
-    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px); }
 
   #developer-toolbar-toolbox-button:hover {
@@ -3217,7 +3284,7 @@ html|*#fullscreen-exit-button {
   #developer-toolbar-toolbox-button[checked=true] {
     -moz-image-region: rect(0px, 128px, 32px, 96px); } }
 #developer-toolbar-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  list-style-image: url("chrome://devtools/skin/images/close.png");
   -moz-appearance: none;
   border: none;
   margin: 0 4px;
@@ -3227,7 +3294,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-closebutton {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png"); } }
 #developer-toolbar-closebutton > .toolbarbutton-icon {
   /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
      use evil CSS to give the impression of smaller content */
@@ -3289,7 +3356,7 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
   background-position: 0 center;
   background-size: 32px 16px; }
 
@@ -3298,7 +3365,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 1.1dppx) {
   .gclitoolbar-input-node::before {
-    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } }
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png"); } }
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
@@ -3734,6 +3801,12 @@ toolbar[brighttext] #downloads-indicator-counter {
 chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   transform: none; }
 
+chatbox[src^="about:loopconversation#"] .chat-minimize-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); }
+
+chatbox[src^="about:loopconversation#"] .chat-swap-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); }
+
 .chat-loop-hangup {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white");
   background-color: #d13f1a;
@@ -3755,6 +3828,9 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   text-shadow: none;
   cursor: inherit; }
 
+chatbox[src^="about:loopconversation#"] .chat-title {
+  color: white; }
+
 .chat-titlebar {
   height: 26px;
   min-height: 26px;
@@ -3771,6 +3847,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
 .chat-titlebar[selected] {
   background-color: #f0f0f0; }
 
+chatbox[src^="about:loopconversation#"] > .chat-titlebar {
+  background-color: #00a9dc;
+  border-color: #00a9dc; }
+
 .chat-titlebar > .notification-anchor-icon {
   margin-left: 2px;
   margin-right: 2px; }
@@ -4627,5 +4707,62 @@ notification.heartbeat {
   -moz-padding-end: 0 !important;
   -moz-margin-end: 0 !important; }
 
-.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0; }
+.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  overflow: hidden; }
+
+/* User Context UI browser styles */
+#menu_newUserContextTabPersonal {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
+
+#menu_newUserContextTabWork {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
+
+#menu_newUserContextTabBanking {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+
+#menu_newUserContextTabShopping {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
+
+/* URL Bar Decoration */
+#userContext-indicator {
+  height: 16px;
+  width: 16px; }
+
+#userContext-label {
+  margin-inline-end: 3px;
+  color: #909090; }
+
+#userContext-icons:not([usercontextid]) {
+  display: none; }
+
+#userContext-icons {
+  -moz-box-align: center; }
+
+/* Personal User Context */
+#userContext-icons[usercontextid="1"] > #userContext-label {
+  color: #00a7e0; }
+
+#userContext-icons[usercontextid="1"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
+
+/* Work User Context */
+#userContext-icons[usercontextid="2"] > #userContext-label {
+  color: #f89c24; }
+
+#userContext-icons[usercontextid="2"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
+
+/* Banking User Context */
+#userContext-icons[usercontextid="3"] > #userContext-label {
+  color: #7dc14c; }
+
+#userContext-icons[usercontextid="3"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+
+/* Shopping User Context */
+#userContext-icons[usercontextid="4"] > #userContext-label {
+  color: #ee5195; }
+
+#userContext-icons[usercontextid="4"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
diff --git a/arc-firefox-theme/chrome/browser/cert-error.svg b/arc-firefox-theme/chrome/browser/cert-error.svg
new file mode 100644
index 0000000..4bf5077
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/cert-error.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="45"
+     height="45"
+     viewBox="0 0 45 45">
+
+  <style>
+    .icon-default {
+      fill: #999;
+    }
+  </style>
+
+  <defs>
+    <rect id="shape-lock-clasp-outer" x="8" y="2" width="28" height="40" rx="14" ry="14" />
+    <rect id="shape-lock-clasp-inner" x="14" y="8" width="16" height="28" rx="8" ry="8" />
+    <rect id="shape-lock-base" x="4" y="18" width="36" height="24" rx="3" ry="3" />
+
+    <mask id="mask-clasp-cutout">
+      <rect width="48" height="48" fill="#000" />
+      <use xlink:href="#shape-lock-clasp-outer" fill="#fff" />
+      <use xlink:href="#shape-lock-clasp-inner" fill="#000" />
+      <line x1="4" y1="38" x2="41" y2="3" stroke="#000" stroke-width="5.5" />
+      <line x1="4" y1="46" x2="41" y2="11" stroke="#000" stroke-width="5.5" />
+      <rect x="4" y="18" width="36" height="26" rx="6" ry="6" />
+    </mask>
+
+    <mask id="mask-base-cutout">
+      <rect width="45" height="45" fill="#000" />
+      <use xlink:href="#shape-lock-base" fill="#fff" />
+      <line x1="2.5" y1="41.5" x2="41" y2="5" stroke="#000" stroke-width="8.5" />
+    </mask>
+  </defs>
+
+  <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" fill="#999" />
+  <use xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)" fill="#999" />
+
+  <line x1="2.5" y1="41.5" x2="41" y2="5" stroke="#d92d21" stroke-width="5.5" />
+
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/controlcenter/panel.css b/arc-firefox-theme/chrome/browser/controlcenter/panel.css
index e3a4d14..824c652 100644
--- a/arc-firefox-theme/chrome/browser/controlcenter/panel.css
+++ b/arc-firefox-theme/chrome/browser/controlcenter/panel.css
@@ -4,7 +4,7 @@
 
 
 /* Hide all conditional elements by default. */
-:-moz-any([when-connection],[when-mixedcontent],[when-ciphers]) {
+:-moz-any([when-connection],[when-mixedcontent],[when-ciphers],[when-loginforms]) {
   display: none;
 }
 
@@ -14,6 +14,8 @@
 #identity-popup[connection=secure] [when-connection~=secure],
 #identity-popup[connection=chrome] [when-connection~=chrome],
 #identity-popup[connection=file] [when-connection~=file],
+/* Show insecure login forms messages when needed. */
+#identity-popup[loginforms=insecure] [when-loginforms=insecure],
 /* Show weak cipher messages when needed. */
 #identity-popup[ciphers=weak] [when-ciphers~=weak],
 /* Show mixed content warnings when needed */
@@ -27,6 +29,14 @@
   display: inherit;
 }
 
+/* Hide redundant messages based on insecure login forms presence. */
+#identity-popup[loginforms=secure] [and-when-loginforms=insecure] {
+  display: none;
+}
+#identity-popup[loginforms=insecure] [and-when-loginforms=secure] {
+  display: none;
+}
+
 /* Hide 'not secure' message in subview when weak cipher or mixed content messages are shown. */
 #identity-popup-securityView-body:-moz-any([mixedcontent],[ciphers]) > description[when-connection=not-secure],
 /* Hide 'passive-loaded (only)' message when there is mixed passive content loaded and active blocked. */
@@ -223,6 +233,8 @@
   background-image: url(chrome://browser/skin/controlcenter/conn-degraded.svg);
 }
 
+#identity-popup[loginforms=insecure] #identity-popup-securityView,
+#identity-popup[loginforms=insecure] #identity-popup-security-content,
 #identity-popup[mixedcontent~=active-loaded][isbroken] #identity-popup-securityView,
 #identity-popup[mixedcontent~=active-loaded][isbroken] #identity-popup-security-content {
   background-image: url(chrome://browser/skin/controlcenter/mcb-disabled.svg);
diff --git a/arc-firefox-theme/chrome/browser/customizableui/customize-illustration-rtl@2x.png b/arc-firefox-theme/chrome/browser/customizableui/customize-illustration-rtl@2x.png
new file mode 100644
index 0000000..c1af129
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/customizableui/customize-illustration-rtl@2x.png
diff --git a/arc-firefox-theme/chrome/browser/customizableui/customize-illustration@2x.png b/arc-firefox-theme/chrome/browser/customizableui/customize-illustration@2x.png
new file mode 100644
index 0000000..50c0d19
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/customizableui/customize-illustration@2x.png
diff --git a/arc-firefox-theme/chrome/browser/customizableui/info-icon-customizeTip@2x.png b/arc-firefox-theme/chrome/browser/customizableui/info-icon-customizeTip@2x.png
new file mode 100644
index 0000000..7a87fac
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/customizableui/info-icon-customizeTip@2x.png
diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css
index 367bf27..4095e76 100644
--- a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css
+++ b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css
@@ -22,7 +22,8 @@
 
 #PanelUI-popup #PanelUI-contents:empty::before {
   content: "";
-  background-image: url(chrome://browser/skin/customizableui/whimsy-bw.png);
+  background-image: url(chrome://browser/skin/customizableui/whimsy.png);
+  background-size: 64px 64px;
   display: block;
   width: 64px;
   height: 64px;
@@ -32,6 +33,10 @@
              whimsyMoveY 3.4s linear 0s infinite alternate;
 }
 
+#PanelUI-popup #PanelUI-contents:not(:hover):empty::before {
+  filter: grayscale(100%);
+}
+
 #PanelUI-popup #PanelUI-contents:active:empty::before {
   animation: whimsyMoveX 3.05s linear 0s infinite alternate,
              whimsyMoveY 3.4s linear 0s infinite alternate,
@@ -49,16 +54,8 @@
              whimsyRotate 1s linear 0s infinite normal;
 }
 
-#PanelUI-popup #PanelUI-contents:empty:hover::before {
-  background-image: url(chrome://browser/skin/customizableui/whimsy.png);
-}
-
 @media (min-resolution: 2dppx) {
   #PanelUI-popup #PanelUI-contents:empty::before {
-    background-image: url(chrome://browser/skin/customizableui/whimsy-bw@2x.png);
-    background-size: 64px 64px;
-  }
-  #PanelUI-popup #PanelUI-contents:empty:hover::before {
     background-image: url(chrome://browser/skin/customizableui/whimsy@2x.png);
   }
 }
diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelarrow-customizeTip@2x.png b/arc-firefox-theme/chrome/browser/customizableui/panelarrow-customizeTip@2x.png
new file mode 100644
index 0000000..cfd7ba9
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/customizableui/panelarrow-customizeTip@2x.png
diff --git a/arc-firefox-theme/chrome/browser/customizableui/subView-arrow-back-inverted-rtl@2x.png b/arc-firefox-theme/chrome/browser/customizableui/subView-arrow-back-inverted-rtl@2x.png
new file mode 100644
index 0000000..bb25040
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/customizableui/subView-arrow-back-inverted-rtl@2x.png
diff --git a/arc-firefox-theme/chrome/browser/customizableui/subView-arrow-back-inverted@2x.png b/arc-firefox-theme/chrome/browser/customizableui/subView-arrow-back-inverted@2x.png
new file mode 100644
index 0000000..1c8e86d
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/customizableui/subView-arrow-back-inverted@2x.png
diff --git a/arc-firefox-theme/chrome/browser/customizableui/whimsy-bw.png b/arc-firefox-theme/chrome/browser/customizableui/whimsy-bw.png
deleted file mode 100644
index 481d3fc..0000000
--- a/arc-firefox-theme/chrome/browser/customizableui/whimsy-bw.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/customizableui/whimsy-bw@2x.png b/arc-firefox-theme/chrome/browser/customizableui/whimsy-bw@2x.png
deleted file mode 100644
index 09516ab..0000000
--- a/arc-firefox-theme/chrome/browser/customizableui/whimsy-bw@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/devedition.css
index eb2234b..860c12a 100644
--- a/arc-firefox-theme/chrome/browser/devedition.css
+++ b/arc-firefox-theme/chrome/browser/devedition.css
@@ -162,13 +162,10 @@
 .browserContainer > findbar,
 #browser-bottombox {
   background-color: var(--chrome-secondary-background-color) !important;
+  background-image: none !important;
   color: var(--chrome-color);
 }
 
-.browserContainer > findbar {
-  background-image: none;
-}
-
 .browserContainer > .findbar-textbox {
   background-color: var(--url-and-searchbar-background-color) !important;
   color: var(--url-and-searchbar-color);
@@ -243,7 +240,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
   border-bottom: none !important;
   border-radius: 0 !important;
   box-shadow: 0 -1px var(--chrome-nav-bar-separator-color) !important;
-  background-image: none !important;
 }
 
 /* No extra vertical padding for nav bar */
@@ -281,12 +277,18 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
   pointer-events: auto;
 }
 
-.tabbrowser-tab[pinned][titlechanged]:not([visuallyselected="true"]) > .tab-stack > .tab-content {
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
+.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
   background-image: var(--pinned-tab-glow);
   background-position: center;
   background-size: 100%;
 }
 
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([visuallyselected="true"]) {
+  background-position: left bottom var(--tab-toolbar-navbar-overlap);
+  background-size: 34px 100%;
+}
+
 .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover,
 .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
 .tabbrowser-tab:hover {
diff --git a/arc-firefox-theme/chrome/browser/devtools/add.svg b/arc-firefox-theme/chrome/browser/devtools/add.svg
deleted file mode 100644
index b8b93de..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/add.svg
+++ /dev/null
@@ -1,9 +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/. -->
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <g fill="#babec3">
-    <rect x="3" y="7" width="10" height="2" />
-    <rect x="7" y="3" width="2" height="10" />
-  </g>
-</svg>
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/browser/devtools/alerticon-warning.png b/arc-firefox-theme/chrome/browser/devtools/alerticon-warning.png
deleted file mode 100644
index 5c5d0ae..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/alerticon-warning.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/alerticon-warning@2x.png b/arc-firefox-theme/chrome/browser/devtools/alerticon-warning@2x.png
deleted file mode 100644
index dc3a3b1..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/alerticon-warning@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/animation-fast-track.svg b/arc-firefox-theme/chrome/browser/devtools/animation-fast-track.svg
deleted file mode 100644
index ee84427..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/animation-fast-track.svg
+++ /dev/null
@@ -1,9 +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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" width="9" height="12">
-  <g transform="matrix(1.0251088,0,0,0.85613344,-3.1546734,-888.94343)">
-    <path d="m 5.1284819,1038.3667 6.4950901,0 -2.7147491,4.6651 2.9438561,0 -8.1148915,9.3081 1.6126718,-6.8973 -2.2701022,0 z" style="fill:#4cb0e1;"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/animationinspector.css b/arc-firefox-theme/chrome/browser/devtools/animationinspector.css
deleted file mode 100644
index dfd1b3d..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/animationinspector.css
+++ /dev/null
@@ -1,508 +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/. */
-
-/* Animation-inspector specific theme variables */
-
-.theme-dark {
-  --even-animation-timeline-background-color: rgba(255,255,255,0.03);
-}
-
-.theme-light {
-  --even-animation-timeline-background-color: rgba(128,128,128,0.03);
-}
-
-:root {
-  /* How high should toolbars be */
-  --toolbar-height: 20px;
-  /* How wide should the sidebar be */
-  --timeline-sidebar-width: 150px;
-  /* How high should animations displayed in the timeline be */
-  --timeline-animation-height: 20px;
-}
-
-html {
-  height: 100%;
-}
-
-body {
-  margin: 0;
-  padding: 0;
-  display : flex;
-  flex-direction: column;
-  height: 100%;
-  overflow: hidden;
-  color: var(--theme-content-color3);
-}
-
-/* The top toolbar, containing the toggle-all button. And the timeline toolbar,
-   containing playback control buttons, shown only when there are animations
-   displayed in the timeline */
-
-#global-toolbar,
-#timeline-toolbar {
-  border-bottom: 1px solid var(--theme-splitter-color);
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: flex-end;
-  height: var(--toolbar-height);
-}
-
-#timeline-toolbar {
-  display: none;
-}
-
-[timeline] #global-toolbar {
-  display: none;
-}
-
-[timeline] #timeline-toolbar {
-  display: flex;
-}
-
-#global-toolbar .label {
-  padding: 1px 4px;
-}
-
-/* The main animations container */
-
-#players {
-  height: calc(100% - var(--toolbar-height));
-  overflow: auto;
-}
-
-[empty] #players {
-  display: none;
-}
-
-/* The error message, shown when an invalid/unanimated element is selected */
-
-#error-message {
-  padding-top: 10%;
-  text-align: center;
-  flex: 1;
-  overflow: auto;
-
-  /* The error message is hidden by default */
-  display: none;
-}
-
-[empty] #error-message {
-  display: block;
-}
-
-/* Element picker, toggle-all buttons, timeline pause button, ... */
-
-#global-toolbar .devtools-button,
-#timeline-toolbar .devtools-button {
-  border-width: 0 0 0 1px;
-  min-height: var(--toolbar-height);
-}
-
-.devtools-button {
-  position: relative;
-}
-
-.devtools-button::before {
-  content: "";
-  display: block;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin: -8px 0 0 -8px;
-}
-
-#element-picker::before {
-  background-image: url("chrome://browser/skin/devtools/command-pick.png");
-}
-
-.pause-button::before {
-  background-image: url("debugger-pause.png");
-}
-
-#element-picker[checked]::before {
-  background-position: -48px 0;
-  filter: none; /* Icon is blue when checked, don't invert for light theme */
-}
-
-.pause-button.paused::before {
-  background-image: url("debugger-play.png");
-}
-
-@media (min-resolution: 1.1dppx) {
-  #element-picker::before {
-    background-image: url("chrome://browser/skin/devtools/command-pick@2x.png");
-    background-size: 64px;
-  }
-
-  .pause-button::before {
-    background-image: url("debugger-pause@2x.png");
-  }
-
-  .pause-button.paused::before {
-    background-image: url("debugger-play@2x.png");
-  }
-}
-
-/* Animation timeline component */
-
-.animation-timeline {
-  height: 100%;
-  overflow: hidden;
-  position: relative;
-  /* The timeline gets its background-image from a canvas element created in
-     /browser/devtools/animationinspector/utils.js drawGraphElementBackground
-     thanks to document.mozSetImageElement("time-graduations", canvas)
-     This is done so that the background can be built dynamically from script */
-  background-image: -moz-element(#time-graduations);
-  background-repeat: repeat-y;
-  /* The animations are drawn 150px from the left edge so that animated nodes
-     can be displayed in a sidebar */
-  background-position: var(--timeline-sidebar-width) 0;
-  display: flex;
-  flex-direction: column;
-}
-
-.animation-timeline .scrubber {
-  position: absolute;
-  height: 100%;
-  width: var(--timeline-sidebar-width);
-  border-right: 1px solid red;
-  box-sizing: border-box;
-  z-index: 1;
-  pointer-events: none;
-}
-
-.animation-timeline .scrubber::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  width: 1px;
-  right: -6px;
-  border-top: 5px solid red;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-}
-
-.animation-timeline .time-header {
-  margin-left: var(--timeline-sidebar-width);
-  min-height: var(--toolbar-height);
-  overflow: hidden;
-  position: relative;
-  /* This is the same color as the time graduations in
-     browser/devtools/animationinspector/utils.js */
-  border-bottom: 1px solid rgba(128, 136, 144, .5);
-  cursor: col-resize;
-  -moz-user-select: none;
-}
-
-.animation-timeline .time-header .time-tick {
-  position: absolute;
-  top: 3px;
-}
-
-.animation-timeline .animations {
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-/* Animation block widgets */
-
-.animation-timeline .animation {
-  margin: 4px 0;
-  height: var(--timeline-animation-height);
-  position: relative;
-}
-
-.animation-timeline .animation:nth-child(2n) {
-  background-color: var(--even-animation-timeline-background-color);
-}
-
-.animation-timeline .animation .target {
-  width: var(--timeline-sidebar-width);
-  overflow: hidden;
-  height: 100%;
-}
-
-.animation-timeline .animation-target {
-  background-color: transparent;
-}
-
-.animation-timeline .animation .time-block {
-  position: absolute;
-  top: 0;
-  left: var(--timeline-sidebar-width);
-  right: 0;
-  height: 100%;
-}
-
-/* Animation iterations */
-
-.animation-timeline .animation .iterations {
-  position: relative;
-  height: 100%;
-  box-sizing: border-box;
-
-  --timelime-border-color: var(--theme-body-color);
-  --timeline-background-color: var(--theme-splitter-color);
-
-  /* Iterations of the animation are displayed with a repeating linear-gradient
-     which size is dynamically changed from JS. The gradient only draws 1px
-     borders between each iteration. These borders must have the same color as
-     the border of this element */
-  background-image:
-    linear-gradient(to right,
-                    var(--timelime-border-color) 0,
-                    var(--timelime-border-color) 1px,
-                    transparent 1px,
-                    transparent 2px);
-  background-repeat: repeat-x;
-  background-position: -1px 0;
-  border: 1px solid var(--timelime-border-color);
-
-  /* The background color is set independently */
-  background-color: var(--timeline-background-color);
-}
-
-.animation-timeline .animation .cssanimation {
-  --timelime-border-color: var(--theme-highlight-lightorange);
-  --timeline-background-color: var(--theme-contrast-background);
-}
-
-.animation-timeline .animation .csstransition {
-  --timelime-border-color: var(--theme-highlight-bluegrey);
-  --timeline-background-color: var(--theme-highlight-blue);
-}
-
-.animation-timeline .animation .iterations.infinite {
-  border-right-width: 0;
-}
-
-.animation-timeline .animation .iterations.infinite::before,
-.animation-timeline .animation .iterations.infinite::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 0;
-  height: 0;
-  border-right: 4px solid var(--theme-body-background);
-  border-top: 4px solid transparent;
-  border-bottom: 4px solid transparent;
-}
-
-.animation-timeline .animation .iterations.infinite::after {
-  bottom: 0;
-  top: unset;
-}
-
-.animation-timeline .animation .name {
-  color: var(--theme-selection-color);
-  height: 100%;
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  line-height: 150%;
-  padding: 0 2px;
-}
-
-.animation-timeline .animation .delay {
-  position: absolute;
-  top: 0;
-  /* Make sure the delay covers up the animation border */
-  transform: translate(-1px, -1px);
-  box-sizing: border-box;
-  height: calc(100% + 2px);
-
-  border: 1px solid var(--timelime-border-color);
-  border-width: 1px 0 1px 1px;
-  background-image: repeating-linear-gradient(45deg,
-                                              transparent,
-                                              transparent 1px,
-                                              var(--theme-selection-color) 1px,
-                                              var(--theme-selection-color) 4px);
-  background-color: var(--timelime-border-color);
-}
-
-.animation-timeline .animation .delay.negative {
-  /* Negative delays are displayed on top of the animation, so they need a
-     right border. Whereas normal delays are displayed just before the
-     animation, so there's already the animation's left border that serves as
-     a separation. */
-  border-width: 1px;
-}
-
-/* Animation target node gutter, contains a preview of the dom node */
-
-.animation-target {
-  background-color: var(--theme-toolbar-background);
-  padding: 1px 4px;
-  box-sizing: border-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.animation-target .attribute-name {
-  padding-left: 4px;
-}
-
-.animation-target .node-selector {
-  background: url("chrome://browser/skin/devtools/vview-open-inspector.png") no-repeat 0 0;
-  padding-left: 16px;
-  margin-right: 5px;
-  cursor: pointer;
-}
-
-.animation-target .node-selector:hover {
-  background-position: -32px 0;
-}
-
-.animation-target .node-selector:active {
-  background-position: -16px 0;
-}
-
-/* Animation title gutter, contains the name, duration, iteration */
-
-.animation-title {
-  background-color: var(--theme-toolbar-background);
-  border-bottom: 1px solid var(--theme-splitter-color);
-  padding: 1px 4px;
-  word-wrap: break-word;
-  overflow: auto;
-}
-
-.animation-title .meta-data {
-  float: right;
-}
-
-.animation-title strong {
-  margin: 0 .5em;
-}
-
-.animation-title .meta-data .compositor-icon {
-    display: none;
-    background-image: url("animation-fast-track.svg");
-    background-repeat: no-repeat;
-    padding-left: 12px;
-    /* Make sure the icon is positioned above the timeline range input so that
-       its tooltip appears on hover */
-    z-index: 1;
-    position: relative;
-}
-
-/* Timeline wiget */
-
-.timeline {
-  height: var(--timeline-animation-height);
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  border-bottom: 1px solid var(--theme-splitter-color);
-}
-
-.timeline .playback-controls {
-  display: flex;
-  flex-direction: row;
-}
-
-/* Playback control buttons */
-
-.timeline .playback-controls button {
-  flex-grow: 1;
-  border-width: 0 1px 0 0;
-}
-
-.timeline .toggle::before {
-  background-image: url(debugger-pause.png);
-}
-
-.paused .timeline .toggle::before,
-.finished .timeline .toggle::before {
-  background-image: url(debugger-play.png);
-}
-
-.timeline .ff::before {
-  background-image: url(fast-forward.png);
-}
-
-.timeline .rw::before {
-  background-image: url(rewind.png);
-}
-
-@media (min-resolution: 1.1dppx) {
-  .timeline .toggle::before {
-    background-image: url(debugger-pause@2x.png);
-  }
-
-  .paused .timeline .toggle::before,
-  .finished .timeline .toggle::before {
-    background-image: url(debugger-play@2x.png);
-  }
-
-  .timeline .ff::before {
-    background-image: url(fast-forward@2x.png);
-  }
-
-  .timeline .rw::before {
-    background-image: url(rewind@2x.png);
-  }
-}
-
-.timeline .rate {
-  -moz-appearance: none;
-  text-align: center;
-  color: var(--theme-body-color);
-  border-right: 1px solid var(--theme-splitter-color);
-}
-
-/* Slider (input type range) container */
-
-.timeline .sliders-container {
-  flex-grow: 1;
-  height: 100%;
-  position: relative;
-  border-width: 1px 0;
-}
-
-.timeline .sliders-container .current-time {
-  position: absolute;
-  padding: 0;
-  margin: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-
-.timeline .sliders-container .current-time::-moz-range-thumb {
-  height: 100%;
-  width: 4px;
-  border-radius: 0;
-  border: none;
-  background: var(--theme-highlight-blue);
-}
-
-.timeline .sliders-container .current-time::-moz-range-track {
-  width: 100%;
-  height: 50px;
-  background: transparent;
-}
-
-/* Current time label */
-
-.timeline .time-display {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 50px;
-  border-left: 1px solid var(--theme-splitter-color);
-  background: var(--theme-toolbar-background);
-}
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/add.svg b/arc-firefox-theme/chrome/browser/devtools/app-manager/add.svg
deleted file mode 100644
index 4a8e12a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/add.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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="64px" height="64px" viewBox="0 0 64 64">
-  <path fill="#00b2f7" d="M32.336,3.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5 S48.076,3.894,32.336,3.894z M44.86,36.966h-7.823v7.62c0,2.582-2.12,4.702-4.702,4.702c-2.584,0-4.704-2.12-4.704-4.702v-7.62 h-7.817c-2.52,0-4.572-2.056-4.572-4.572s2.053-4.572,4.572-4.572h7.817v-7.62c0-2.582,2.12-4.702,4.704-4.702 c2.582,0,4.702,2.12,4.702,4.702v7.62h7.823c2.514,0,4.57,2.056,4.57,4.572S47.374,36.966,44.86,36.966z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/connection-footer.css b/arc-firefox-theme/chrome/browser/devtools/app-manager/connection-footer.css
deleted file mode 100644
index dc51832..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/connection-footer.css
+++ /dev/null
@@ -1,224 +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/. */
-
-/************** LAYOUT **************/
-
-#connection-footer {
-  display: flex;
-  flex-direction: column;
-  height: 50px;
-}
-
-#banners-and-logs {
-  display: flex;
-  flex-grow: 1;
-  max-height: 100%;
-}
-
-#logs {
-  display: flex;
-  width: 40%;
-  padding: 0;
-  width: 100%;
-}
-
-.banner {
-  display: none;
-  width: 60%;
-}
-
-#connection-footer[status="connected"]     #banner-connected,
-#connection-footer[status="connecting"]    #banner-connecting,
-#connection-footer[status="disconnected"]  #banner-disconnected,
-#connection-footer[status="disconnecting"] #banner-disconnecting {
-  display: flex;
-}
-
-body.show-simulators .banner,
-body.edit-connection .banner {
-  display: none !important;
-}
-
-body.show-simulators #banner-simulators,
-body.edit-connection #banner-editing {
-  display: flex !important;
-}
-
-#banner-logs {
-  width: 40%;
-  display: flex;
-}
-
-#logs > pre {
-  overflow: auto;
-  white-space: pre-line;
-}
-
-#status.banner-box {
-  width: 100% !important;
-}
-
-.banner-box {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  width: 100%;
-}
-
-#banner-connected > .banner-box {
-  align-items: flex-start;
-}
-
-#start-simulator-box {
-  display: inline;
-}
-
-/************** PIXELS **************/
-
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-  font-size: 0.9rem;
-}
-
-body {
-  color: #333;
-  background-color: white;
-  font-family: Lucida Grande, Helvetica, Helvetica Neue, sans-serif;
-}
-
-button {
-  background: linear-gradient(to bottom, #49535C, #394148);
-  box-shadow: 0px 1px 1px #3C444D, inset 0 1px 0px rgba(255,255,255,0.1);
-  color: #9FA6AD;
-  text-shadow: 0px 1px 1px rgba(0,0,0,0.6);
-  border: 1px solid #111;
-  cursor: pointer;
-  border-radius: 3px;
-  padding: 3px 10px;
-}
-
-button.left {
-  margin-right: 0px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-button.right {
-  margin-left: -6px;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-button.action-primary {
-  background: linear-gradient(to bottom, #276DA3, #1E5580);
-  color: #EEE;
-}
-
-button.action-cancel {
-  background: linear-gradient(to bottom, #B32B02, #942300);
-  color: #EEE;
-}
-
-#banners-and-logs {
-  border-top: #111 solid;
-  border-width: 1px 0;
-  background: linear-gradient(to bottom, #323A42, #29313A);
-  color: #A8BABF;
-  box-shadow: inset 0 0 1px #424A51;
-}
-
-#status {
-  background: linear-gradient(to bottom, #454F59, #404952);
-  box-shadow: inset 0 0 1px #606D78, inset 0 1px 0 #5E6973;
-}
-
-#logs > pre {
-  border: 1px solid #111;
-  box-shadow: 0px 1px 1px #49525A, inset 0 0 5px rgba(0,0,0,0.3);
-  font-size: 10px;
-  background: #22272D;
-  padding: 5px;
-  height: 100%;
-  padding-left: 20px;
-  position: relative;
-}
-
-#logs > pre span{
-  text-shadow: 0 1px 2px #000;
-  color: #3195FB;
-  position: fixed;
-  right: calc(30% - 15px);
-  bottom: -1px;
-}
-
-#logs > pre b {
-  font-size: 10px;
-  color: #70C4FF;
-}
-
-.banner-box {
-  box-shadow: inset 0 0 1px #667480, inset 0 1px 0 #5E6973;
-  border-right: 1px solid #111;
-  background-position: center right;
-  background-size: 1px 100%;
-  background-repeat: no-repeat;
-  padding: 10px 20px;
-  position: relative;
-}
-
-.connected-status {
-  color: #B3BFC9;
-  text-shadow: 0px 1px 2px rgba(0,0,0,0.9);
-  padding-bottom: 10px;
-}
-
-.connected-status {
-  font-size: 150%;
-  top: 10%;
-  padding-right: 3px;
-  position: relative;
-}
-
-.connected-indicator {
-  box-shadow: inset 0 1px 0 rgba(255,255,255,0.3), inset 0 0px 1px rgba(255,255,255,0.3);
-  height: 100%;
-  flex: 0 0 10px;
-}
-
-#banner-connected .connected-indicator,
-#banner-connecting .connected-indicator {
-  background: linear-gradient(to bottom, #69B8FF, #339FFF );
-}
-
-#banner-simulators .connected-indicator,
-#banner-disconnected .connected-indicator,
-#banner-editing .connected-indicator,
-#banner-disconnecting .connected-indicator {
-  background: linear-gradient(to bottom, #375A87, #1C4375 );
-}
-
-#banner-simulators .banner-content > * {
-  display: inline-block;
-}
-
-#banner-simulators[simulator-count="0"] .found-simulator,
-#banner-simulators:not([simulator-count="0"]) .no-simulator {
-  display: none;
-}
-
-#connection-no-device,
-[device-count="0"] > #connection-found-device,
-#connection-manual,
-#connection-assisted {
-  display: none;
-}
-
-#connection-found-device,
-[device-count="0"] > #connection-no-device,
-[adb-available="true"] > #connection-assisted,
-[adb-available="false"] > #connection-manual {
-  display: inline;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/default-app-icon.png b/arc-firefox-theme/chrome/browser/devtools/app-manager/default-app-icon.png
deleted file mode 100644
index f186d9c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/default-app-icon.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/device.css b/arc-firefox-theme/chrome/browser/devtools/app-manager/device.css
deleted file mode 100644
index fc6efd9..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/device.css
+++ /dev/null
@@ -1,410 +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/. */
-
-/*****************      GENERAL      *****************/
-
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-
-html, body {
-  height: 100%;
-}
-
-body {
-  font-size: 0.9rem;
-  color: #333;
-  background-color:  rgb(225, 225, 225);
-  font-family: Lucida Grande, Helvetica, Helvetica Neue, sans-serif;
-  display: flex;
-  flex-direction: column;
-}
-
-template {
-  display: none;
-}
-
-h1 {
-  font-size: 20px;
-}
-
-#content {
-  display: flex;
-  flex-direction: row;
-  height: 100%;
-  overflow: hidden;
-}
-
-#detail {
-  background-image: url('noise.png');
-  display: flex;
-  flex-grow: 1;
-  z-index: 1;
-  overflow: hidden;
-}
-
-#meta {
-  background-size: 100%;
-  padding-top: 50px;
-}
-
-#connection-footer {
-  border-width: 0;
-  height: 50px;
-  min-height: 50px;
-}
-
-
-#root-actor-debug {
-  background: white;
-}
-
-/*****************     APP BUTTONS      *****************/
-
-
-
-.app-buttons {
-  display: block;
-  margin-left: 20px;
-  color: #BBB;
-}
-
-button {
-  margin: 0;
-  font-size: 11px;
-  border: 1px solid #CCC;
-  padding: 5px 15px;
-  cursor: pointer;
-  background: rgba(255,255,255,0.4);
-  text-transform: uppercase;
-  border-radius: 3px;
-  border-width: 1px;
-}
-
-.app-buttons > button {
-  display: none;
-}
-
-.app-buttons > button[disabled] {
-  background-color: transparent;
-  opacity: 0.4;
-  pointer-events: none;
-}
-
-.app[running="false"] > .app-buttons > .button-start,
-.app[running="true"] > .app-buttons > .button-stop,
-.app[running="true"] > .app-buttons > .button-debug {
-  display: inline-block;
-}
-
-.button-debug {
-  color: #3498DB;
-}
-
-.button-debug:hover {
-  background-color: #3498DB;
-  color: #FFF;
-}
-
-.button-debug[disabled] {
-  color: #3498DB;
-}
-
-.button-start {
-  color: #18BC9C
-}
-
-.button-start:hover {
-  background-color: #18BC9C;
-  color: #FFF;
-}
-
-.button-start[disabled] {
-  color: #18BC9C
-}
-
-.button-stop {
-  color: #E74C3C;
-}
-
-.button-stop:hover {
-  background-color: #E74C3C;
-  color: #FFF;
-}
-
-.button-stop[disabled] {
-  color: #E74C3C;
-}
-
-
-
-/*****************     PERMISSIONS     *****************/
-
-
-
-
-.permission-table {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-.permission-table-body {
-  overflow: auto;
-  display: flex;
-  flex-grow: 1;
-  flex-direction: column;
-}
-
-.permission-table-header,
-.permission-table-footer {
-  display: flex;
-  background: #FFF;
-  border-top: 1px solid #CCC;
-  z-index: 2;
-  flex-shrink: 0;
-}
-
-.permission-table-header > div,
-.permission-table-footer > div {
-  z-index: 2;
-  flex-grow: 1;
-  background: linear-gradient(to bottom, #49535C, #394148);
-  box-shadow: 0px 1px 3px rgba(12, 20, 30, 0.5), inset 0 1px 0px rgba(255,255,255,0.1);
-  color: #9FA6AD;
-  text-shadow: 0px 1px 1px rgba(0,0,0,0.6);
-  border: 0;
-  margin: auto 0;
-  padding: 5px;
-  text-align: center;
-  background: transparent;
-  box-shadow: none;
-  text-shadow: none;
-}
-
-.permission-table-header > div {
-  flex-basis: 20%;
-}
-
-.permission-table-header > div:first-child {
-  text-align: start;
-  padding-left: 10px;
-  flex-basis: 30%;
-}
-
-.permission-table-header {
-  border: 0;
-  border-bottom: 1px solid #CCC;
-  box-shadow: 0 1px 4px rgba(0,0,0,0.3);
-}
-
-.permission-table-footer {
-  box-shadow: 0 -1px 4px rgba(0,0,0,0.3);
-}
-
-.permission {
-  display: flex;
-  flex-grow: 1;
-}
-
-.permission:nth-child(odd) {
-  background: #E4E4E4;
-}
-
-.permission:hover {
-  background: #EEE;
-}
-
-.permission > div {
-  flex-grow: 1;
-  flex-basis: 20%;
-  text-align: center;
-  padding: 3px;
-  border-right: 1px solid #CCC;
-  border-bottom: 1px solid #CCC;
-}
-
-.permission > div:first-child {
-  text-align: start;
-  padding: 3px 10px;
-  flex-basis: 30%;
-  font-weight: bold;
-}
-
-.permission > div[permission="1"]:before, .allow-label:after {
-  color: #98CF39;
-  content: '   \2713';
-}
-
-.permission > div[permission="2"]:before, .deny-label:after {
-  color: #CC4908;
-  content: '   \2715';
-}
-
-.permission > div[permission="3"]:before, .prompt-label:after {
-  color: #009EED;
-  content: '   !';
-}
-
-
-
-
-/*****************     SIDEBAR      *****************/
-
-
-
-
-#sidebar {
-  background: #EEE;
-  position: relative;
-  box-shadow: 0 1px 6px rgba(0,0,0,0.3);
-  display: flex;
-  flex-direction: column;
-  flex: 0 0 350px;
-  overflow: hidden;
-  z-index: 100;
-}
-
-.sidebar-item {
-  background-color: #F6F6F6;
-  box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
-  color: #666;
-  line-height: 120%;
-  cursor: pointer;
-  display: flex;
-  padding: 15px 10px;
-  display: block;
-  text-align: start;
-  flex-grow: 1;
-}
-
-.sidebar-item > * {
-  flex-shrink: 0;
-}
-
-.sidebar-item:hover {
-  background-color: #EEE;
-}
-
-.sidebar-item.selected {
-  background-color: #46AFE3;
-  color: #FFF;
-}
-
-.help {
-  float: right;
-  padding: 0 5px;
-}
-
-/*****************     HEADER      *****************/
-
-header {
-  padding-top: 140px;
-  background-image: linear-gradient(to bottom, transparent, rgba(0,0,0,0.7));
-  color: #FFF;
-  text-shadow: 0 1px 2px rgba(0,0,0,0.8);
-  padding: 10px;
-}
-
-
-
-/*****************      APPS & BROWSER TABS      *****************/
-
-
-
-
-.apps, .browser-tabs {
-  display: flex;
-  flex-direction: column;
-  overflow: auto;
-}
-
-.browser-tabs.hidden {
-  display: none;
-}
-
-.app, .browser-tab {
-  display: flex;
-  align-items: center;
-  order: 1;
-}
-
-.app-name, .browser-tab-details {
-  flex-grow: 1;
-  font-weight: bold;
-}
-
-.app, .browser-tab {
-  padding: 10px 20px;
-  border-bottom: 1px solid #CCC;
-}
-
-.app:hover, .browser-tab:hover {
-  background-color: #EFEFEF;
-}
-
-.app-icon {
-  width: 32px;
-  height: 32px;
-  margin-right: 10px;
-}
-
-.browser-tab-url-subheading {
-  font-size: 10px;
-}
-
-
-
-/*****************      NOT CONNECTED      *****************/
-
-
-
-body:not(.notconnected) > #notConnectedMessage,
-body.notconnected > #content {
-  display: none;
-}
-
-#notConnectedMessage {
-  flex-grow: 1;
-  flex-direction: column;
-  margin: 50px auto;
-}
-
-#notConnectedMessage > span {
-  padding: 20px;
-  border: 1px solid #CCC;
-  border-radius: 5px;
-}
-
-#notConnectedMessage > span:before {
-  content: '';
-  background: url('error.svg') no-repeat;
-  background-size: 18px;
-  height: 24px;
-  width: 24px;
-  position: relative;
-  top: 10px;
-  display: inline-block;
-}
-
-
-
-/*****************      TABS       *****************/
-
-#tabs {
-  flex-grow: 1;
-  overflow: auto;
-}
-
-.tabpanel:not(.selected) {
-  display: none;
-}
-
-#tabs-headers {
-  flex-shrink: 0;
-  display: flex;
-  flex-direction: column;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/error.svg b/arc-firefox-theme/chrome/browser/devtools/app-manager/error.svg
deleted file mode 100644
index 7876e46..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/error.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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="64px" height="64px" viewBox="0 0 64 64">
-  <path fill="#e25026" d="M32,4.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5S47.74,4.894,32,4.894 z M46.903,48.674c-1.817,1.817-4.691,1.76-6.449,0.002l-8.327-8.327l-8.151,8.151c-1.877,1.877-4.87,1.814-6.685,0 c-1.877-1.877-1.879-4.811-0.002-6.687l8.151-8.151l-8.327-8.327c-1.76-1.76-1.817-4.634,0-6.451c1.76-1.76,4.691-1.76,6.451,0 l8.327,8.327l8.151-8.151c1.877-1.877,4.811-1.874,6.687,0.002c1.814,1.814,1.877,4.808,0,6.685l-8.151,8.151l8.327,8.327 C48.662,43.982,48.662,46.914,46.903,48.674z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/help.css b/arc-firefox-theme/chrome/browser/devtools/app-manager/help.css
deleted file mode 100644
index 087819e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/help.css
+++ /dev/null
@@ -1,40 +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/. */
-
-html, body {
-  margin: 0;
-  height: 100%;
-}
-
-body {
-  color: #555;
-  font-family: Lucida Grande, Helvetica, Helvetica Neue, sans-serif;
-  overflow: hidden;
-  max-width: 600px;
-  margin: auto;
-  padding: 20px 0;
-  background-color: #FFF;
-}
-
-button {
-  border: 1px solid #CCC;
-  padding: 5px 15px;
-  cursor: pointer;
-  background: rgba(255,255,255,0.4);
-  text-transform: uppercase;
-  color: #3498DB;
-}
-
-button:hover {
-  background-color: #3498DB;
-  color: #FFF;
-}
-
-a, a:visited {
-  color: rgb(39,109,163);
-}
-
-#close-button {
-  float: right;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/index-icons.svg b/arc-firefox-theme/chrome/browser/devtools/app-manager/index-icons.svg
deleted file mode 100644
index 3fea1e4..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/index-icons.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- 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="160px" height="240px" viewBox="0 0 160 240">

-  <path fill="#414042" d="M40,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L28,39.181v12l3.204,0l4.467-4.466 c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.466,4.466l3.204,0v-12l-4.597-4.596 C46.042,27.895,42.044,21.149,40,21.149z M40.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244 c-0.987,0-1.933,0.099-2.815,0.271C38.03,30.199,39.289,28.185,40.005,28.185z"/>

-  <path fill="#414042" d="M41.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553 c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627 s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C41.337,49.929,41.436,50.434,41.436,50.98z"/>

-  <path fill="#b2b5b9" d="M40,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L28,39.181v12l3.204,0l4.467-4.466 c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.466,4.466l3.204,0v-12l-4.597-4.596 C46.042,27.895,42.044,21.149,40,21.149z M40.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244 c-0.987,0-1.933,0.099-2.815,0.271C38.03,30.199,39.289,28.185,40.005,28.185z"/>

-  <path fill="#b2b5b9" d="M41.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553 c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627 s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C41.337,49.929,41.436,50.434,41.436,50.98z"/>

-  <path fill="#dce8f3" d="M120,21.149c-2.044,0.001-6.042,6.745-7.404,13.436L108,39.181v12l3.204,0l4.467-4.466 c0.457,0.478,0.96,0.88,1.5,1.199h5.652c0.543-0.318,1.05-0.719,1.507-1.199l4.467,4.466l3.204,0v-12l-4.597-4.596 C126.042,27.895,122.044,21.149,120,21.149z M120.005,28.185c0.712,0,1.965,2,2.746,4.392c-0.846-0.157-1.747-0.244-2.686-0.244 c-0.987,0-1.933,0.099-2.815,0.271C118.03,30.199,119.289,28.185,120.005,28.185z"/>

-  <path fill="#dce8f3" d="M121.436,50.98c0,1.41-1.094,2.553-1.459,2.553c-0.364,0-1.459-1.144-1.459-2.553 c0-0.546,0.099-1.051,0.266-1.466h-1.69c-0.198,0.731-0.31,1.549-0.31,2.412c0,3.108,2.411,5.627,3.215,5.627 s3.216-2.519,3.215-5.626c0-0.864-0.112-1.681-0.31-2.413l-1.734,0C121.337,49.929,121.436,50.434,121.436,50.98z"/>

-  <path fill="#b2b5b9" d="M52.5,136.017c0,2.279-1.888,4.167-4.167,4.167H31.667c-2.279,0-4.167-1.888-4.167-4.167v-33.333 c0-2.279,1.888-4.167,4.167-4.167h16.667c2.279,0,4.167,1.888,4.167,4.167V136.017z M49.375,107.892 c0-0.554-0.488-1.042-1.042-1.042H31.667c-0.553,0-1.042,0.488-1.042,1.042v22.917c0,0.554,0.488,1.042,1.042,1.042h16.667 c0.553,0,1.042-0.488,1.042-1.042V107.892z M42.604,102.684h-5.208c-0.293,0-0.521,0.228-0.521,0.521 c0,0.293,0.228,0.521,0.521,0.521h5.208c0.293,0,0.521-0.228,0.521-0.521C43.125,102.912,42.897,102.684,42.604,102.684z M40,133.413c-1.432,0-2.604,1.171-2.604,2.604c0,1.433,1.172,2.604,2.604,2.604s2.604-1.171,2.604-2.604 C42.604,134.585,41.432,133.413,40,133.413z"/>

-  <path fill="#dce8f3" d="M132.5,136.017c0,2.279-1.888,4.167-4.167,4.167h-16.667c-2.279,0-4.167-1.888-4.167-4.167v-33.333 c0-2.279,1.888-4.167,4.167-4.167h16.667c2.279,0,4.167,1.888,4.167,4.167V136.017z M129.375,107.892 c0-0.554-0.488-1.042-1.042-1.042h-16.667c-0.553,0-1.042,0.488-1.042,1.042v22.917c0,0.554,0.488,1.042,1.042,1.042h16.667 c0.553,0,1.042-0.488,1.042-1.042V107.892z M122.604,102.684h-5.208c-0.293,0-0.521,0.228-0.521,0.521 c0,0.293,0.228,0.521,0.521,0.521h5.208c0.293,0,0.521-0.228,0.521-0.521C123.125,102.912,122.897,102.684,122.604,102.684z M120,133.413c-1.432,0-2.604,1.171-2.604,2.604c0,1.433,1.172,2.604,2.604,2.604s2.604-1.171,2.604-2.604 C122.604,134.585,121.432,133.413,120,133.413z"/>

-  <path fill="#b2b5b9" d="M40,185.388c8.121,0,14.729,6.607,14.729,14.729S48.121,214.845,40,214.845s-14.729-6.607-14.729-14.729 S31.879,185.388,40,185.388 M40,182.75c-9.591,0-17.367,7.775-17.367,17.367c0,9.591,7.775,17.367,17.367,17.367 s17.367-7.775,17.367-17.367C57.367,190.525,49.591,182.75,40,182.75L40,182.75z"/>

-  <path fill="#b2b5b9" d="M39.565,204.504c-0.688,0-1.196-0.508-1.286-1.195l-0.299-2.57c-0.12-0.808,0.359-1.405,1.166-1.495 c2.81-0.269,4.364-1.345,4.364-3.229v-0.06c0-1.674-1.285-2.84-3.438-2.84c-1.584,0-2.87,0.568-4.065,1.645 c-0.299,0.239-0.688,0.418-1.106,0.418c-0.926,0-1.674-0.747-1.674-1.644c0-0.448,0.18-0.927,0.598-1.285 c1.584-1.495,3.587-2.481,6.337-2.481c4.185,0,7.024,2.331,7.024,6.068v0.06c0,3.767-2.72,5.47-6.038,6.038l-0.12,1.375 c-0.12,0.657-0.598,1.195-1.285,1.195H39.565z M39.565,206.687c1.226,0,2.122,0.896,2.122,2.062v0.299 c0,1.166-0.896,2.062-2.122,2.062s-2.123-0.896-2.123-2.062v-0.299C37.442,207.583,38.339,206.687,39.565,206.687z"/>

-  <path fill="#dce8f3" d="M120,185.388c8.121,0,14.729,6.607,14.729,14.729s-6.607,14.729-14.729,14.729s-14.729-6.607-14.729-14.729 S111.879,185.388,120,185.388 M120,182.75c-9.591,0-17.367,7.775-17.367,17.367c0,9.591,7.775,17.367,17.367,17.367 s17.367-7.775,17.367-17.367C137.367,190.525,129.591,182.75,120,182.75L120,182.75z"/>

-  <path fill="#dce8f3" d="M119.564,204.504c-0.688,0-1.195-0.508-1.285-1.195l-0.299-2.57c-0.12-0.808,0.358-1.405,1.166-1.495 c2.81-0.269,4.363-1.345,4.363-3.229v-0.06c0-1.674-1.285-2.84-3.438-2.84c-1.584,0-2.869,0.568-4.064,1.645 c-0.3,0.239-0.688,0.418-1.106,0.418c-0.927,0-1.674-0.747-1.674-1.644c0-0.448,0.18-0.927,0.598-1.285 c1.584-1.495,3.587-2.481,6.337-2.481c4.186,0,7.024,2.331,7.024,6.068v0.06c0,3.767-2.72,5.47-6.038,6.038l-0.119,1.375 c-0.12,0.657-0.598,1.195-1.285,1.195H119.564z M119.564,206.687c1.226,0,2.122,0.896,2.122,2.062v0.299 c0,1.166-0.896,2.062-2.122,2.062s-2.122-0.896-2.122-2.062v-0.299C117.442,207.583,118.339,206.687,119.564,206.687z"/>

-</svg>

diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/index.css b/arc-firefox-theme/chrome/browser/devtools/app-manager/index.css
deleted file mode 100644
index cb3f876..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/index.css
+++ /dev/null
@@ -1,103 +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/. */
-
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-  font-family: Lucida Grande, Helvetica, Helvetica Neue, sans-serif;
-}
-
-#tabs {
-  box-shadow: inset -4px 0 0 rgba(0,0,0,0.3);
-  background: #252C33;
-}
-
-#toolbox-tabs {
-  overflow-y: auto;
-}
-
-.button {
-  width: 80px;
-  height: 85px;
-  padding-bottom: 5px;
-  -moz-appearance: none;
-  border: none;
-  border-bottom: 1px solid #121214;
-  background-color: transparent;
-  color: #B5B8BB;
-  cursor: pointer;
-  text-align: center;
-  -moz-box-align: end;
-  font-size: 10px;
-  text-shadow: 0 1px 0 #333;
-  color: #9FA6AD;
-}
-
-.button:first-child {
-  border-top: none;
-}
-
-.button[selected] {
-  box-shadow: inset -4px 0 0 rgba(0,0,0,0.3), inset 2px 0 0 #DEFFFF, inset 3px 0 0 #8DC7E8, inset 4px 0 1px #1D6496;
-  color: #DCE8F3;
-  background-color: #1A4766;
-  border-color: #191B1E;
-}
-
-.button::-moz-focus-inner {
-  border-width: 0;
-}
-
-.panel {
-  border-width: 0;
-}
-
-.panel:not([selected="true"]) {
-  display: none;
-}
-
-.button.toolbox {
-  background-repeat: no-repeat;
-  background-position: center 15px;
-  background-size: 40px 40px;
-}
-
-.projects-button {
-  background: url('chrome://browser/skin/devtools/app-manager/index-icons.svg') no-repeat;
-  background-position: left -5px;
-}
-
-.projects-button[selected] {
-  background-position: right -5px;
-}
-
-.device-button {
-  background-image: url('chrome://browser/skin/devtools/app-manager/index-icons.svg');
-  background-position: left -85px, top left;
-  background-repeat: no-repeat, no-repeat;
-  background-size: 160px 240px, 2px 80px;
-}
-
-.device-button[selected] {
-  background-position: right -85px, top left;
-}
-
-.help-button {
-  border-bottom: 0;
-  background-image: url('chrome://browser/skin/devtools/app-manager/index-icons.svg');
-  background-position: left -165px, top left;
-  background-repeat: no-repeat, no-repeat;
-  background-size: 160px 240px, 2px 80px;
-}
-
-.help-button[selected] {
-  background-position: right -165px, top left;
-}
-
-#connection-footer {
-  border-width: 0;
-  height: 50px;
-  min-height: 50px;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/noise.png b/arc-firefox-theme/chrome/browser/devtools/app-manager/noise.png
deleted file mode 100644
index b3c42ac..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/noise.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/plus.svg b/arc-firefox-theme/chrome/browser/devtools/app-manager/plus.svg
deleted file mode 100644
index d21764e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/plus.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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="64px" height="64px" viewBox="0 0 64 64">
-  <path fill="#ababab" d="M32.336,3.894c-15.74,0-28.5,12.76-28.5,28.5s12.76,28.5,28.5,28.5s28.5-12.76,28.5-28.5 S48.076,3.894,32.336,3.894z M44.86,36.966h-7.823v7.62c0,2.582-2.12,4.702-4.702,4.702c-2.584,0-4.704-2.12-4.704-4.702v-7.62 h-7.817c-2.52,0-4.572-2.056-4.572-4.572s2.053-4.572,4.572-4.572h7.817v-7.62c0-2.582,2.12-4.702,4.704-4.702 c2.582,0,4.702,2.12,4.702,4.702v7.62h7.823c2.514,0,4.57,2.056,4.57,4.572S47.374,36.966,44.86,36.966z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/projects.css b/arc-firefox-theme/chrome/browser/devtools/app-manager/projects.css
deleted file mode 100644
index 98b2289..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/projects.css
+++ /dev/null
@@ -1,556 +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/. */
-
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-  font-size: 0.9rem;
-}
-
-html, body {
-  height: 100%;
-}
-
-template {
-  display: none;
-}
-
-body {
-  display: flex;
-  color: #333;
-  background-color: white;
-  font-family: Lucida Grande, Helvetica, Helvetica Neue, sans-serif;
-  overflow: hidden;
-}
-
-body:not(.connected) button.device-action {
-  display: none;
-}
-
-strong {
-  color: #111;
-}
-
-
-/********* SIDEBAR ***********/
-
-
-
-#sidebar {
-  display: flex;
-  flex-direction: column;
-  flex: 0 0 350px;
-  overflow: hidden;
-  z-index: 100;
-  background-color: #E9EAEB;
-  position: relative;
-  box-shadow: 3px 0 1.5px rgba(0,0,0,0.08);
-}
-
-#project-list {
-  height: 100%;
-  overflow: auto;
-}
-
-#project-list:not([projects-count="0"]) > #no-project {
-  display: none;
-}
-
-#no-project {
-  padding: 100px 20px 0;
-  font-weight: bold;
-  color: #BBB;
-  font-size: 22px;
-}
-
-
-/********* PROJECT MENU ***********/
-
-
-.project-item {
-  padding: 10px 0;
-  background-color: #F0F1F2;
-  box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
-  color: #666;
-  line-height: 120%;
-  cursor: pointer;
-  display: flex;
-  position: relative;
-}
-
-.project-item:hover {
-  background-color: #EEE;
-}
-
-.project-item > * {
-  flex-shrink: 0;
-}
-
-.project-item.selected {
-  background-color: #46AFE3;
-}
-
-.project-item.selected strong {
-  color: #FFF;
-}
-
-.project-item.selected p,
-.project-item.selected span {
-  color: #C1DCF0;
-}
-
-.button-remove {
-  background-image: url('remove.svg');
-  background-size: 20px;
-  width: 20px;
-  height: 20px;
-  position: absolute;
-  right: 5px;
-  bottom: 5px;
-  visibility: hidden;
-  opacity: 0.5;
-}
-
-.project-item:hover .button-remove {
-  visibility: visible;
-}
-
-.project-item-status {
-  width: 6px;
-  margin: -10px 0;
-  border-right: 1px solid rgba(0,0,0,0.1);
-  box-shadow: inset 0 0 1px 1px rgba(255,255,255,0.2), inset 0 -1px 0 0 rgba(0,0,0,0.2);
-}
-
-.project-item-status[status="valid"] {
-  background-color: #70BF53;
-}
-
-.project-item-status[status~="warning"] {
-  background-color: #F2B33F;
-}
-
-.project-item-status[status~="error"] {
-  background-color: #ED4C62;
-}
-
-.project-item-icon {
-  width: 32px;
-  height: 32px;
-  margin: 0 10px;
-}
-
-.project-item-meta {
-  flex-grow: 1;
-  flex-shrink: 1 !important;
-}
-
-.project-item-type {
-  font-size: 10px;
-  line-height: 20px;
-  float: right;
-  padding-right: 10px;
-  color: #7597B9;
-  text-transform: uppercase;
-}
-
-.project-item-description {
-  color: #888;
-  font-size: 90%;
-}
-
-/********* ADD PROJECT ***********/
-
-#new-packaged-project {
-  box-shadow: 0 -1px 5px rgba(0,0,0,0.1);
-  background-position: calc(100% - 10px) 10px;
-}
-
-#new-packaged-project,
-#new-hosted-project {
-  background-color: #EEE;
-  border: none;
-  border-top: 1px solid #DDD;
-  padding: 10px;
-  font-weight: bold;
-}
-
-#new-packaged-project:hover,
-#new-hosted-project:hover {
-  background-color: #DDD;
-}
-
-#new-hosted-project-wrapper {
-  display: flex;
-  align-items: center;
-}
-
-#new-packaged-project,
-#new-hosted-project-click {
-  background-image: url('plus.svg');
-  background-size: 20px;
-  background-repeat: no-repeat;
-  cursor: pointer;
-}
-
-#new-hosted-project-click {
-  background-position: top right;
-  width: 20px;
-  height: 20px;
-  margin-left: 5px;
-}
-
-#url-input {
-  flex-grow: 1;
-  width: 90%;
-  box-shadow: none;
-  border-radius: 3px;
-  border: 1px solid #DDD;
-  padding: 4px;
-  margin-top: 4px;
-}
-
-
-/********* LENSE ***********/
-
-
-#lense {
-  height: 100%;
-  flex-grow: 1;
-  display: flex;
-  z-index: 1;
-  overflow: hidden;
-  background-color: rgb(225, 225, 225);
-  background-image: url('rocket.svg'), url('noise.png');
-  background-repeat: no-repeat, repeat;
-  background-size: 35%, auto;
-  background-position: center center, top left;
-}
-
-#lense > div {
-  display: flex;
-  flex-grow: 1;
-  flex-direction: column;
-}
-
-
-/********* PROJECT ***********/
-
-
-.project-details {
-  background-color: rgb(225, 225, 225);
-  padding: 10px;
-  line-height: 160%;
-  display: flex;
-  flex-direction: column;
-}
-
-.project-metadata {
-  flex-grow: 1;
-}
-
-.project-status {
-  display: flex;
-}
-
-.project-title {
-  flex-direction: row;
-  display: flex;
-  align-items: flex-start;
-  padding-bottom: 10px;
-  border-bottom: 1px solid #CCC;
-  margin-bottom: 10px;
-}
-
-.project-title > h1 {
-  flex-grow: 1;
-  font-size: 24px;
-}
-
-.project-location {
-  color: gray;
-  font-size: 10px;
-  cursor: pointer;
-  font-family: monospace;
-}
-
-.project-location:hover {
-  text-decoration: underline;
-}
-
-.project-header {
-  display: flex;
-  border-bottom: 1px solid #CCC;
-  margin: 10px 20px 10px 20px;
-  padding-bottom: 10px;
-}
-
-.project-icon {
-  flex-shrink: 0;
-  width: 64px;
-  height: 64px;
-  margin-right: 10px;
-}
-
-.project-location {
-  font-size: 11px;
-  color: #999;
-}
-
-.project-description {
-  font-style: italic;
-  color: #333;
-}
-
-.project-status > p {
-  text-transform: uppercase;
-  font-size: 10px;
-  padding: 2px 10px;
-  border-radius: 2px;
-  margin-top: 6px;
-  line-height: 10px;
-}
-
-.project-validation {
-  color: #FFF;
-  display: none;
-  margin-left: 10px;
-}
-
-.project-validation.valid {
-  background-color: #70BF53;
-}
-
-.project-validation.warning {
-  background-color: #F2B33F;
-}
-
-.project-validation.error {
-  background-color: #ED4C62;
-}
-
-[status="valid"] > .project-validation.valid,
-[status~="warning"] > .project-validation.warning,
-[status~="error"] > .project-validation.error {
-  display: inline;
-}
-
-.project-type {
-  display: none;
-  margin-left: 10px;
-}
-[type="hosted"] > .project-type.hosted,
-[type="packaged"] > .project-type.packaged {
-  display: inline;
-}
-
-/********* PROJECT BUTTONS ***********/
-
-
-
-.project-buttons {
-  display: flex;
-  margin-left: 20px;
-  color: #BBB;
-}
-
-.project-buttons > button {
-  margin: 0;
-  font-size: 11px;
-  border: 1px solid #CCC;
-  border-left-width: 0;
-  padding: 5px 15px;
-  cursor: pointer;
-  background: rgba(255,255,255,0.4);
-  text-transform: uppercase;
-}
-
-.project-buttons > button[disabled] {
-  background-color: transparent;
-  opacity: 0.4;
-  pointer-events: none;
-}
-
-.project-buttons > button:first-child {
-  border-left-width: 1px;
-}
-
-.project-button-debug {
-  color: #3498DB;
-}
-
-.project-button-debug:hover {
-  background-color: #3498DB;
-  color: #FFF;
-}
-
-.project-button-debug[disabled] {
-  color: #3498DB;
-}
-
-.project-button-update {
-  color: #777;
-}
-
-.project-button-update:hover {
-  background-color: #777;
-  color: #FFF;
-}
-
-.project-button-update[disabled] {
-  color: #777;
-}
-
-
-
-/********* ERRORS AND WARNINGS ***********/
-
-.project-warnings,
-.project-errors,
-.project-item-warnings,
-.project-item-errors {
-  display: none;
-}
-
-[status~="warning"] .project-item-warnings,
-[status~="error"] .project-item-errors {
-  display: inline-block;
-}
-
-[status~="warning"] > .project-warnings,
-[status~="error"] > .project-errors {
-  display: block;
-}
-
-.project-warnings,
-.project-errors {
-  margin: 20px 20px 0;
-  padding: 10px 10px;
-  font-family: monospace;
-}
-
-.project-warnings {
-  border-left: 3px solid #ECB51E;
-  background-color: rgba(236, 181, 20, 0.1);
-}
-
-.project-errors {
-  border-left: 3px solid #ED4C62;
-  background-color: rgba(237,76,98,0.1);
-}
-
-.project-item-warnings {
-  background-image: url('warning.svg');
-}
-
-.project-item-errors {
-  background-image: url('error.svg');
-  color: rgb(227, 79, 34);
-}
-
-.project-item-warnings,
-.project-item-errors {
-  background-repeat: no-repeat;
-  background-size: 12px;
-  background-position: left center;
-  margin-top: 6px;
-}
-
-.project-item-warnings > span,
-.project-item-errors > span {
-  font-size: 11px;
-  padding-left: 16px;
-  font-weight: bold;
-}
-
-
-/********* MANIFEST EDITOR ***********/
-
-.manifest-editor {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-  background-color: #E1E1E1;
-}
-
-.manifest-header {
-  display: flex;
-  flex-direction: row;
-}
-
-.manifest-header > h2 {
-  font-size: 18px;
-  margin: 1em 15px 1em 30px;
-  display: none;
-}
-
-.manifest-header > button {
-  margin: 18px 0;
-  font-size: 11px;
-  border: 1px solid #CCC;
-  border-right-width: 0;
-  padding: 2px;
-  cursor: pointer;
-  background: rgba(255,255,255,0.4);
-  text-transform: uppercase;
-  display: none;
-}
-
-.manifest-header > button[disabled] {
-  background-color: transparent;
-  opacity: 0.4;
-  pointer-events: none;
-}
-
-.manifest-header > button:last-child {
-  border-right-width: 1px;
-}
-
-[type="packaged"] > .editable {
-  display: block;
-}
-
-[type="hosted"] > .viewable {
-  display: block;
-}
-
-.manifest-button-save {
-  color: #777;
-}
-
-.manifest-button-save:hover {
-  background-color: #777;
-  color: #FFF;
-}
-
-.manifest-button-save[disabled] {
-  color: #777;
-}
-
-.variables-view {
-  flex-grow: 1;
-  border: 0;
-  border-top: 5px solid #C9C9C9;
-}
-
-/* Bug 925921: Remove when the manifest editor is always on */
-
-.manifest-editor {
-  display: none;
-}
-
-.project-details {
-  flex-grow: 1;
-}
-
-#lense[manifest-editable] .manifest-editor {
-  display: flex;
-}
-
-#lense[manifest-editable] .project-details {
-  flex-grow: 0;
-}
-
-/* End blocks to remove */
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/remove.svg b/arc-firefox-theme/chrome/browser/devtools/app-manager/remove.svg
deleted file mode 100644
index 9b98e8f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/remove.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- 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="64px" height="64px" viewBox="0 0 64 64">
-  <path fill="#ff6b00" d="m 12.183457,12.241457 c -11.129861,11.12986 -11.129861,29.175226 0,40.305086 11.12986,11.129861 29.175226,11.129861 40.305086,0 11.129861,-11.12986 11.129861,-29.175226 0,-40.305086 -11.12986,-11.129861 -29.175226,-11.129861 -40.305086,0 z m 32.241241,14.52963 -5.531697,5.531696 5.388154,5.388154 c 1.82575,1.82575 1.82575,4.823882 0,6.649632 -1.827164,1.827164 -4.825297,1.827164 -6.651047,0.0014 l -5.388153,-5.388153 -5.527454,5.527453 c -1.781909,1.781909 -4.686704,1.779081 -6.465784,0 -1.779081,-1.77908 -1.781202,-4.684582 0,-6.465784 l 5.527453,-5.527454 -5.388153,-5.388153 c -1.82575,-1.82575 -1.82575,-4.823883 0.0014,-6.651047 1.82575,-1.82575 4.823882,-1.82575 6.649632,0 l 5.388154,5.388154 5.531696,-5.531697 c 1.777667,-1.777666 4.68529,-1.777666 6.46437,0.0014 1.779081,1.77908 1.779081,4.686703 0.0014,6.46437 z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/rocket.svg b/arc-firefox-theme/chrome/browser/devtools/app-manager/rocket.svg
deleted file mode 100644
index a0cca5c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/rocket.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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="24px" height="24px" viewBox="0 0 24 24">
-  <g opacity="0.1">
-    <path fill="#fff" d="M12,2.3c-1.127,0-3.333,3.721-4.084,7.411l-2.535,2.535v6.619l1.767,0l2.464-2.464 c0.252,0.264,0.529,0.486,0.827,0.662h3.118c0.299-0.175,0.579-0.397,0.831-0.662l2.464,2.464l1.767,0v-6.619l-2.535-2.535 C15.333,6.021,13.127,2.3,12,2.3z M12.003,6.181c0.393,0,1.084,1.103,1.515,2.423c-0.466-0.087-0.963-0.135-1.481-0.135 c-0.545,0-1.066,0.054-1.553,0.15C10.914,7.292,11.608,6.181,12.003,6.181z"/>
-    <path fill="#fff" d="M12.792,18.755c0,0.778-0.603,1.408-0.805,1.408c-0.201,0-0.805-0.631-0.805-1.408 c0-0.301,0.055-0.579,0.147-0.809h-0.932c-0.109,0.403-0.171,0.854-0.171,1.33c0,1.714,1.33,3.104,1.774,3.104 s1.774-1.389,1.774-3.103c0-0.477-0.062-0.927-0.171-1.331l-0.957,0C12.738,18.175,12.792,18.453,12.792,18.755z"/>
-    <path fill="#414042" d="M12,2c-1.127,0-3.333,3.721-4.084,7.411l-2.535,2.535v6.619l1.767,0l2.464-2.464 c0.252,0.264,0.529,0.486,0.827,0.662h3.118c0.299-0.175,0.579-0.397,0.831-0.662l2.464,2.464l1.767,0v-6.619l-2.535-2.535 C15.333,5.721,13.127,2,12,2z M12.003,5.881c0.393,0,1.084,1.103,1.515,2.423c-0.466-0.087-0.963-0.135-1.481-0.135 c-0.545,0-1.066,0.054-1.553,0.15C10.914,6.992,11.608,5.881,12.003,5.881z"/>
-    <path fill="#414042" d="M12.792,18.455c0,0.778-0.603,1.408-0.805,1.408c-0.201,0-0.805-0.631-0.805-1.408 c0-0.301,0.055-0.579,0.147-0.809h-0.932c-0.109,0.403-0.171,0.854-0.171,1.33c0,1.714,1.33,3.104,1.774,3.104 s1.774-1.389,1.774-3.103c0-0.477-0.062-0.927-0.171-1.331l-0.957,0C12.738,17.875,12.792,18.153,12.792,18.455z"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/app-manager/warning.svg b/arc-firefox-theme/chrome/browser/devtools/app-manager/warning.svg
deleted file mode 100644
index d26e2e6..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/app-manager/warning.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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="64px" height="64px" viewBox="0 0 64 64">
-  <path fill="#ecb51f" d="M61.689,51.121L36.437,7.384c-2.441-4.227-6.434-4.227-8.875,0L2.311,51.121 c-2.441,4.227-0.444,7.686,4.437,7.686h50.504C62.133,58.807,64.13,55.349,61.689,51.121z M35.968,47.68 c0,2.191-1.688,3.877-3.968,3.877s-3.968-1.686-3.968-3.877v-0.093c0-2.187,1.688-3.873,3.968-3.873s3.968,1.686,3.968,3.873V47.68z M36.059,21.548l-1.961,17.146c-0.137,1.233-0.958,2.009-2.098,2.009s-1.961-0.776-2.098-2.009l-1.961-17.146 c-0.137-1.322,0.592-2.325,1.825-2.325h4.469C35.466,19.223,36.196,20.226,36.059,21.548z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/arrow-e.png b/arc-firefox-theme/chrome/browser/devtools/arrow-e.png
deleted file mode 100644
index cfa950a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/arrow-e.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/arrow-e@2x.png b/arc-firefox-theme/chrome/browser/devtools/arrow-e@2x.png
deleted file mode 100644
index c628ca0..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/arrow-e@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-divider@2x.png b/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-divider@2x.png
deleted file mode 100644
index 9ce5dd7..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-divider@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-scrollbutton.png b/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-scrollbutton.png
deleted file mode 100644
index 5f28c8b..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-scrollbutton.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-scrollbutton@2x.png b/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-scrollbutton@2x.png
deleted file mode 100644
index 22c3c86..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/breadcrumbs-scrollbutton@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css b/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css
deleted file mode 100644
index efeac51..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css
+++ /dev/null
@@ -1,447 +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/. */
-
-
-/* Reload and waiting notices */
-
-.notice-container {
-  margin-top: -50vh;
-  background-color: var(--theme-toolbar-background);
-  color: var(--theme-body-color-alt);
-}
-
-#empty-notice > button {
-  min-width: 30px;
-  min-height: 28px;
-  margin: 0;
-  list-style-image: url(profiler-stopwatch.svg);
-}
-
-#empty-notice > button .button-text {
-  display: none;
-}
-
-#waiting-notice {
-  font-size: 110%;
-}
-
-/* Snapshots pane */
-
-#snapshots-pane > tabs {
-  -moz-border-end: 1px solid;
-}
-
-#snapshots-pane .devtools-toolbar {
-  -moz-border-end: 1px solid;
-}
-
-.theme-dark #snapshots-pane > tabs,
-.theme-dark #snapshots-pane .devtools-toolbar {
-  -moz-border-end-color: black; /* Match the splitter color. */
-}
-
-.theme-light #snapshots-pane > tabs,
-.theme-light #snapshots-pane .devtools-toolbar {
-  -moz-border-end-color: #aaa; /* Match the splitter color. */
-}
-
-#record-snapshot {
-  list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch.svg");
-}
-
-#record-snapshot[checked] {
-  list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch-checked.svg");
-}
-
-/* Snapshots items */
-
-.snapshot-item-thumbnail {
-  image-rendering: -moz-crisp-edges;
-  background-image: linear-gradient(45deg, rgba(128,128,128,0.2) 25%, transparent 25%, transparent 75%, rgba(128,128,128,0.2) 75%, rgba(128,128,128,0.2)), linear-gradient(45deg, rgba(128,128,128,0.2) 25%, transparent 25%, transparent 75%, rgba(128,128,128,0.2) 75%, rgba(128,128,128,0.2));
-  background-size: 12px 12px, 12px 12px;
-  background-position: 0px 0px, 6px 6px;
-  background-repeat: repeat, repeat;
-}
-
-.snapshot-item-thumbnail[flipped=true] {
-  transform: scaleY(-1);
-}
-
-.theme-dark .snapshot-item-thumbnail {
-  background-color: #000;
-}
-
-.theme-light .snapshot-item-thumbnail {
-  background-color: #fff;
-}
-
-.snapshot-item-details {
-  -moz-padding-start: 6px;
-}
-
-.snapshot-item-calls {
-  padding-top: 4px;
-  font-size: 80%;
-}
-
-.snapshot-item-save {
-  padding-bottom: 2px;
-  font-size: 90%;
-}
-
-.snapshot-item-calls,
-.snapshot-item-save {
-  color: var(--theme-body-color-alt);
-}
-
-.snapshot-item-save {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.snapshot-item-save[disabled=true] {
-  text-decoration: none;
-  pointer-events: none;
-}
-
-.snapshot-item-footer.devtools-throbber::before {
-  margin-top: -2px;
-}
-
-#snapshots-list .selected label {
-  /* Text inside a selected item should not be custom colored. */
-  color: inherit !important;
-}
-
-/* Debugging pane controls */
-
-#debugging-controls .devtools-toolbarbutton > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-#resume {
-  list-style-image: url(debugger-play.png);
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-#step-over {
-  list-style-image: url(debugger-step-over.png);
-}
-
-#step-in {
-  list-style-image: url(debugger-step-in.png);
-}
-
-#step-out {
-  list-style-image: url(debugger-step-out.png);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #resume {
-    list-style-image: url(debugger-play@2x.png);
-    -moz-image-region: rect(0px,64px,32px,32px);
-  }
-
-  #step-over {
-    list-style-image: url(debugger-step-over@2x.png);
-  }
-
-  #step-in {
-    list-style-image: url(debugger-step-in@2x.png);
-  }
-
-  #step-out {
-    list-style-image: url(debugger-step-out@2x.png);
-  }
-}
-
-#debugging-controls > toolbarbutton {
-  transition: opacity 0.15s ease-in-out;
-}
-
-#debugging-controls > toolbarbutton[disabled=true] {
-  opacity: 0.5;
-}
-
-#calls-slider {
-  -moz-padding-end: 24px;
-}
-
-#calls-slider .scale-slider {
-  margin: 0;
-}
-
-#debugging-toolbar-sizer-button {
-  /* This button's only purpose in life is to make the
-     container .devtools-toolbar have the right height. */
-  visibility: hidden;
-  min-width: 1px;
-}
-
-/* Calls list pane */
-
-#calls-list .side-menu-widget-container {
-  background: transparent;
-}
-
-#calls-list .side-menu-widget-item {
-  padding: 0;
-}
-
-/* Calls list items */
-
-.theme-dark #calls-list .side-menu-widget-item {
-  border-color: #111;
-  border-bottom-color: transparent;
-}
-
-.theme-light #calls-list .side-menu-widget-item {
-  border-color: #eee;
-  border-bottom-color: transparent;
-}
-
-.theme-dark .call-item-view:hover {
-  background-color: rgba(255,255,255,.025);
-}
-
-.theme-light .call-item-view:hover {
-  background-color: rgba(0,0,0,.025);
-}
-
-.theme-dark .call-item-view[draw-call] {
-  background-color: rgba(112,191,83,0.15);
-}
-
-.theme-light .call-item-view[draw-call] {
-  background-color: rgba(44,187,15,0.1);
-}
-
-.theme-dark .call-item-view[interesting-call] {
-  background-color: rgba(223,128,255,0.15);
-}
-
-.theme-light .call-item-view[interesting-call] {
-  background-color: rgba(184,46,229,0.1);
-}
-
-.call-item-gutter {
-  width: calc(3em + 22px);
-  -moz-padding-start: 22px;
-  -moz-padding-end: 4px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  -moz-border-end: 1px solid;
-  -moz-margin-end: 6px;
-}
-
-.selected .call-item-gutter {
-  background-image: url("editor-debug-location.png");
-  background-repeat: no-repeat;
-  background-position: 6px center;
-  background-size: 12px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .selected .call-item-gutter {
-    background-image: url("editor-debug-location@2x.png");
-  }
-}
-
-.call-item-gutter {
-  background-color: var(--theme-sidebar-background);
-  color: var(--theme-content-color3);
-  border-color: var(--theme-splitter-color);
-}
-
-.call-item-index {
-  text-align: end;
-}
-
-.call-item-context {
-  color: var(--theme-highlight-orange);
-}
-
-.call-item-name {
-  color: var(--theme-highlight-blue);
-}
-
-.call-item-location {
-  -moz-padding-start: 2px;
-  -moz-padding-end: 6px;
-  text-align: end;
-  cursor: pointer;
-  color: var(--theme-highlight-bluegrey);
-}
-
-.call-item-location:hover {
-  color: var(--theme-highlight-blue);
-}
-
-.call-item-view:hover .call-item-location,
-.call-item-view[expanded] .call-item-location {
-  text-decoration: underline;
-}
-
-.theme-dark .call-item-location {
-  border-color: #111;
-}
-
-.theme-light .call-item-location {
-  border-color: #eee;
-}
-
-.call-item-stack {
-  -moz-padding-start: calc(3em + 22px);
-  padding-bottom: 10px;
-}
-
-.theme-dark .call-item-stack {
-  background: rgba(0,0,0,0.9);
-}
-
-.theme-light .call-item-stack {
-  background: rgba(255,255,255,0.9);
-}
-
-.call-item-stack-fn {
-  padding-top: 2px;
-  padding-bottom: 2px;
-}
-
-.call-item-stack-fn-location {
-  -moz-padding-start: 2px;
-  -moz-padding-end: 6px;
-  text-align: end;
-  cursor: pointer;
-  text-decoration: underline;
-}
-
-.call-item-stack-fn-name {
-  color: var(--theme-content-color3);
-}
-
-.call-item-stack-fn-location {
-  color: var(--theme-highlight-bluegrey);
-}
-
-.call-item-stack-fn-location:hover {
-  color: var(--theme-highlight-blue);
-}
-
-#calls-list .selected .call-item-contents > label:not(.call-item-gutter) {
-  /* Text inside a selected item should not be custom colored. */
-  color: inherit !important;
-}
-
-/* Rendering preview */
-
-#screenshot-container {
-  background-image: linear-gradient(45deg, rgba(128,128,128,0.2) 25%, transparent 25%, transparent 75%, rgba(128,128,128,0.2) 75%, rgba(128,128,128,0.2)), linear-gradient(45deg, rgba(128,128,128,0.2) 25%, transparent 25%, transparent 75%, rgba(128,128,128,0.2) 75%, rgba(128,128,128,0.2));
-  background-size: 30px 30px, 30px 30px;
-  background-position: 0px 0px, 15px 15px;
-  background-repeat: repeat, repeat;
-}
-
-.theme-dark #screenshot-container {
-  background-color: #000;
-}
-
-.theme-light #screenshot-container {
-  background-color: #fff;
-}
-
-@media (min-width: 701px) {
-  #screenshot-container {
-    width: 30vw;
-    max-width: 50vw;
-    min-width: 100px;
-  }
-}
-
-@media (max-width: 700px) {
-  #screenshot-container {
-    height: 40vh;
-    max-height: 70vh;
-    min-height: 100px;
-  }
-}
-
-#screenshot-image {
-  background-image: -moz-element(#screenshot-rendering);
-  background-size: contain;
-  background-position: center, center;
-  background-repeat: no-repeat;
-}
-
-#screenshot-image[flipped=true] {
-  transform: scaleY(-1);
-}
-
-#screenshot-dimensions {
-  padding-top: 4px;
-  padding-bottom: 4px;
-  text-align: center;
-}
-
-.theme-dark #screenshot-dimensions {
-  background-color: rgba(0,0,0,0.4);
-}
-
-.theme-light #screenshot-dimensions {
-  background-color: rgba(255,255,255,0.8);
-}
-
-/* Snapshot filmstrip */
-
-#snapshot-filmstrip {
-  overflow: hidden;
-}
-
-.theme-dark #snapshot-filmstrip {
-  border-top: 1px solid #000;
-  color: var(--theme-selection-color);
-}
-
-.theme-light #snapshot-filmstrip {
-  border-top: 1px solid #aaa;
-  color: var(--theme-body-color-alt);
-}
-
-.filmstrip-thumbnail {
-  image-rendering: -moz-crisp-edges;
-  background-image: linear-gradient(45deg, rgba(128,128,128,0.2) 25%, transparent 25%, transparent 75%, rgba(128,128,128,0.2) 75%, rgba(128,128,128,0.2)), linear-gradient(45deg, rgba(128,128,128,0.2) 25%, transparent 25%, transparent 75%, rgba(128,128,128,0.2) 75%, rgba(128,128,128,0.2));
-  background-size: 12px 12px, 12px 12px;
-  background-position: 0px -1px, 6px 5px;
-  background-repeat: repeat, repeat;
-  background-origin: content-box;
-  cursor: pointer;
-  padding-top: 1px;
-  padding-bottom: 1px;
-  transition: opacity 0.1s ease-in-out;
-}
-
-.filmstrip-thumbnail[flipped=true] {
-  transform: scaleY(-1);
-}
-
-.theme-dark .filmstrip-thumbnail {
-  background-color: #000;
-}
-
-.theme-light .filmstrip-thumbnail {
-  background-color: #fff;
-}
-
-.filmstrip-thumbnail {
-  -moz-border-end: 1px solid var(--theme-splitter-color)
-}
-
-#snapshot-filmstrip > .filmstrip-thumbnail:hover,
-#snapshot-filmstrip:not(:hover) > .filmstrip-thumbnail[highlighted] {
-  border: 1px solid var(--theme-highlight-blue);
-  margin: 0 0 0 -1px;
-  padding: 0;
-  opacity: 0.66;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/close.png b/arc-firefox-theme/chrome/browser/devtools/close.png
deleted file mode 100644
index b539412..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/close.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/close@2x.png b/arc-firefox-theme/chrome/browser/devtools/close@2x.png
deleted file mode 100644
index 79ef6ce..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/close@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-console.png b/arc-firefox-theme/chrome/browser/devtools/command-console.png
deleted file mode 100644
index 5c3740e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-console.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-console@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-console@2x.png
deleted file mode 100644
index 00bdc35..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-console@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-eyedropper.png b/arc-firefox-theme/chrome/browser/devtools/command-eyedropper.png
deleted file mode 100644
index a96b8eb..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-eyedropper.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-eyedropper@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-eyedropper@2x.png
deleted file mode 100644
index edfe4c1..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-eyedropper@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-frames.png b/arc-firefox-theme/chrome/browser/devtools/command-frames.png
deleted file mode 100755
index 5c37ccb..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-frames.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-frames@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-frames@2x.png
deleted file mode 100755
index 84b37d3..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-frames@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-paintflashing.png b/arc-firefox-theme/chrome/browser/devtools/command-paintflashing.png
deleted file mode 100644
index 244fb3c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-paintflashing.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-paintflashing@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-paintflashing@2x.png
deleted file mode 100644
index 77435bf..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-paintflashing@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-pick.png b/arc-firefox-theme/chrome/browser/devtools/command-pick.png
deleted file mode 100644
index 37ce97c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-pick.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-pick@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-pick@2x.png
deleted file mode 100644
index 88d739e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-pick@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-responsivemode.png b/arc-firefox-theme/chrome/browser/devtools/command-responsivemode.png
deleted file mode 100644
index 2cad915..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-responsivemode.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-responsivemode@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-responsivemode@2x.png
deleted file mode 100644
index 6fce404..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-responsivemode@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-rulers.png b/arc-firefox-theme/chrome/browser/devtools/command-rulers.png
deleted file mode 100644
index ae7c705..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-rulers.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-rulers@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-rulers@2x.png
deleted file mode 100644
index 8378959..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-rulers@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-scratchpad.png b/arc-firefox-theme/chrome/browser/devtools/command-scratchpad.png
deleted file mode 100644
index f9470b4..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-scratchpad.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-scratchpad@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-scratchpad@2x.png
deleted file mode 100644
index ea5630f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-scratchpad@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-screenshot.png b/arc-firefox-theme/chrome/browser/devtools/command-screenshot.png
deleted file mode 100644
index f6da8e9..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-screenshot.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-screenshot@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-screenshot@2x.png
deleted file mode 100644
index b7cdced..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-screenshot@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-tilt.png b/arc-firefox-theme/chrome/browser/devtools/command-tilt.png
deleted file mode 100644
index 6909b0a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-tilt.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/command-tilt@2x.png b/arc-firefox-theme/chrome/browser/devtools/command-tilt@2x.png
deleted file mode 100644
index 2c35d19..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/command-tilt@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/commandline-icon.png b/arc-firefox-theme/chrome/browser/devtools/commandline-icon.png
deleted file mode 100644
index e51f67f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/commandline-icon.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/commandline-icon@2x.png b/arc-firefox-theme/chrome/browser/devtools/commandline-icon@2x.png
deleted file mode 100644
index 407fdae..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/commandline-icon@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/commandline.css b/arc-firefox-theme/chrome/browser/devtools/commandline.css
deleted file mode 100644
index 7666eed..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/commandline.css
+++ /dev/null
@@ -1,172 +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/. */
-
-
-/* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
-   We are copy/pasting variables from light-theme and dark-theme,
-   since they aren't loaded in this context (within commandlineoutput.xhtml
-   and commandlinetooltip.xhtml). */
-:root[devtoolstheme="light"] {
-  --gcli-background-color: #ebeced; /* --theme-tab-toolbar-background */
-  --gcli-input-focused-background: #f7f7f7; /* --theme-sidebar-background */
-  --gcli-input-color: #18191a; /* --theme-body-color */
-  --gcli-border-color: #aaaaaa; /* --theme-splitter-color */
-}
-
-:root[devtoolstheme="dark"] {
-  --gcli-background-color: #343c45; /* --theme-toolbar-background */
-  --gcli-input-focused-background: #252c33; /* --theme-tab-toolbar-background */
-  --gcli-input-color: #b6babf; /* --theme-body-color-alt */
-  --gcli-border-color: black; /* --theme-splitter-color */
-}
-
-.gcli-body {
-  margin: 0;
-  font: message-box;
-  color: var(--gcli-input-color);
-}
-
-#gcli-output-root,
-#gcli-tooltip-root {
-  border: 1px solid var(--gcli-border-color);
-  border-radius: 3px;
-  background-color: var(--gcli-background-color);
-}
-
-#gcli-output-root {
-  padding: 5px 10px;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom: 0;
-}
-
-#gcli-tooltip-root {
-  padding: 5px 0px;
-}
-
-#gcli-tooltip-connector {
-  margin-top: -1px;
-  margin-left: 8px;
-  width: 20px;
-  height: 10px;
-  border-left: 1px solid var(--gcli-border-color);
-  border-right: 1px solid var(--gcli-border-color);
-  background-color: var(--gcli-background-color);
-}
-
-.gcli-tt-description,
-.gcli-tt-error {
-  padding: 0 10px;
-}
-
-.gcli-row-out {
-  padding: 0 5px;
-  line-height: 1.2em;
-  border-top: none;
-  border-bottom: none;
-  color: var(--gcli-input-color);
-}
-
-.gcli-row-out p,
-.gcli-row-out h1,
-.gcli-row-out h2,
-.gcli-row-out h3 {
-  margin: 5px 0;
-}
-
-.gcli-row-out h1,
-.gcli-row-out h2,
-.gcli-row-out h3,
-.gcli-row-out h4,
-.gcli-row-out h5,
-.gcli-row-out th,
-.gcli-row-out strong,
-.gcli-row-out pre {
-  color: var(--gcli-input-color);
-}
-
-.gcli-row-out pre {
-  font-size: 80%;
-}
-
-.gcli-row-out td {
-  white-space: nowrap;
-}
-
-.gcli-out-shortcut,
-.gcli-help-synopsis {
-  padding: 0 3px;
-  margin: 0 4px;
-  font-weight: normal;
-  font-size: 90%;
-  border-radius: 3px;
-  background-color: var(--gcli-background-color);
-  border: 1px solid var(--gcli-border-color);
-}
-
-.gcli-out-shortcut:before,
-.gcli-help-synopsis:before {
-  color: var(--gcli-input-color);
-  -moz-padding-end: 2px;
-}
-
-.gcli-help-arrow {
-  color: #666;
-}
-
-.gcli-help-description {
-  margin: 0 20px;
-  padding: 0;
-}
-
-.gcli-help-parameter {
-  margin: 0 30px;
-  padding: 0;
-}
-
-.gcli-help-header {
-  margin: 10px 0 6px;
-}
-
-.gcli-menu-name {
-  -moz-padding-start: 8px;
-}
-
-.gcli-menu-desc {
-  -moz-padding-end: 8px;
-  color: var(--gcli-input-color);
-}
-
-.gcli-menu-name:hover,
-.gcli-menu-desc:hover {
-  background-color: var(--gcli-input-focused-background);
-}
-
-.gcli-menu-highlight,
-.gcli-menu-highlight:hover {
-  background-color: hsla(0,100%,100%,.1);
-}
-
-.gcli-menu-typed {
-  color: hsl(25,78%,50%);
-}
-
-.gcli-menu-more {
-  font-size: 80%;
-  text-align: end;
-  -moz-padding-end: 8px;
-}
-
-.gcli-addon-disabled {
-  opacity: 0.6;
-  text-decoration: line-through;
-}
-
-.gcli-breakpoint-label {
-  font-weight: bold;
-}
-
-.gcli-breakpoint-lineText {
-  font-family: monospace;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/common.css b/arc-firefox-theme/chrome/browser/devtools/common.css
index 0a655c7..fb6a8fe 100644
--- a/arc-firefox-theme/chrome/browser/devtools/common.css
+++ b/arc-firefox-theme/chrome/browser/devtools/common.css
@@ -1,274 +1,10 @@
+/* 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/. */
 
-:root {
-  font: message-box;
-  --monospace-font-family: monospace;
-}
+ /**
+  * This file only exists to support add-ons which import this style sheet at a
+  * specific path.
+  */
 
-.devtools-monospace {
-  font-family: var(--monospace-font-family);
-  font-size: 80%;
-}
-
-/* Bottom-docked toolbox minimize transition */
-.devtools-toolbox-bottom-iframe {
-  transition: margin-bottom .1s;
-}
-
-/* Splitters */
-.devtools-horizontal-splitter {
-  -moz-appearance: none;
-  background-image: none;
-  background-color: transparent;
-  border: 0;
-  border-bottom: 1px solid rgba(118, 121, 125, .5);
-  min-height: 3px;
-  height: 3px;
-  margin-top: -3px;
-  position: relative;
-}
-
-.devtools-side-splitter {
-  -moz-appearance: none;
-  background-image: none;
-  background-color: transparent;
-  border: 0;
-  -moz-border-end: 1px solid rgba(118, 121, 125, .5);
-  min-width: 3px;
-  width: 3px;
-  -moz-margin-start: -3px;
-  position: relative;
-  cursor: e-resize;
-}
-
-.devtools-horizontal-splitter.disabled,
-.devtools-side-splitter.disabled {
-  pointer-events: none;
-}
-
-.devtools-toolbox-side-iframe {
-  min-width: 465px;
-}
-
-/* Autocomplete Popup */
-/* Dark and light theme */
-
-.devtools-autocomplete-popup {
-  -moz-appearance: none !important;
-  box-shadow: 0 1px 0 hsla(209,29%,72%,.25) inset;
-  background-color: transparent;
-  border-radius: 3px;
-  overflow-x: hidden;
-  max-height: 32rem;
-}
-
-.devtools-autocomplete-listbox {
-  -moz-appearance: none !important;
-  background-color: transparent;
-  border-width: 0px !important;
-}
-
-.devtools-autocomplete-listbox > richlistitem,
-.devtools-autocomplete-listbox > richlistitem[selected] {
-  width: 100%;
-  background-color: transparent;
-  border-radius: 4px;
-}
-
-.devtools-autocomplete-listbox.dark-theme > richlistitem[selected],
-.devtools-autocomplete-listbox.dark-theme > richlistitem:hover {
-  background-color: rgba(0,0,0,0.5);
-}
-
-.devtools-autocomplete-listbox.dark-theme > richlistitem[selected] > .autocomplete-value,
-.devtools-autocomplete-listbox:focus.dark-theme > richlistitem[selected] > .initial-value {
-  color: hsl(208,100%,60%);
-}
-
-.devtools-autocomplete-listbox.dark-theme > richlistitem[selected] > label {
-  color: #eee;
-}
-
-.devtools-autocomplete-listbox.dark-theme > richlistitem > label {
-  color: #ccc;
-}
-
-.devtools-autocomplete-listbox > richlistitem > .initial-value,
-.devtools-autocomplete-listbox > richlistitem > .autocomplete-value {
-  margin: 0;
-  padding: 1px 0;
-}
-
-.devtools-autocomplete-listbox > richlistitem > .autocomplete-count {
-  text-align: end;
-}
-
-/* Rest of the dark and light theme */
-
-.devtools-autocomplete-popup,
-.theme-dark .CodeMirror-hints,
-.theme-dark .CodeMirror-Tern-tooltip {
-  border: 1px solid hsl(210,11%,10%);
-  background-image: linear-gradient(to bottom, hsla(209,18%,18%,0.9), hsl(210,11%,16%));
-}
-
-.devtools-autocomplete-popup.light-theme,
-.light-theme .CodeMirror-hints,
-.light-theme .CodeMirror-Tern-tooltip {
-  border: 1px solid hsl(210,24%,90%);
-  background-image: linear-gradient(to bottom, hsla(209,18%,100%,0.9), hsl(210,24%,95%));
-}
-
-.devtools-autocomplete-popup.light-theme {
-  box-shadow: 0 1px 0 hsla(209,29%,90%,.25) inset;
-}
-
-.devtools-autocomplete-listbox.light-theme > richlistitem[selected],
-.devtools-autocomplete-listbox.light-theme > richlistitem:hover {
-  background-color: rgba(128,128,128,0.3);
-}
-
-.devtools-autocomplete-listbox.light-theme > richlistitem[selected] > .autocomplete-value,
-.devtools-autocomplete-listbox:focus.light-theme > richlistitem[selected] > .initial-value {
-  color: #222;
-}
-
-.devtools-autocomplete-listbox.light-theme > richlistitem > label {
-  color: #666;
-}
-
-/* Tooltip widget (see browser/devtools/shared/widgets/Tooltip.js) */
-
-.devtools-tooltip .panel-arrowcontent {
-  padding: 4px;
-}
-
-.devtools-tooltip .panel-arrowcontainer {
-  /* Reseting the transition used when panels are shown */
-  transition: none;
-  /* Panels slide up/down/left/right when they appear using a transform.
-  Since we want to remove the transition, we don't need to transform anymore
-  plus it can interfeer by causing mouseleave events on the underlying nodes */
-  transform: none;
-}
-
-.devtools-tooltip[clamped-dimensions] {
-  min-height: 100px;
-  max-height: 400px;
-  min-width: 100px;
-  max-width: 400px;
-}
-.devtools-tooltip[clamped-dimensions-no-min-height] {
-  min-height: 0;
-  max-height: 400px;
-  min-width: 100px;
-  max-width: 400px;
-}
-.devtools-tooltip[clamped-dimensions-no-max-or-min-height] {
-  min-width: 400px;
-  max-width: 400px;
-}
-.devtools-tooltip[clamped-dimensions] .panel-arrowcontent,
-.devtools-tooltip[clamped-dimensions-no-min-height] .panel-arrowcontent,
-.devtools-tooltip[clamped-dimensions-no-max-or-min-height] .panel-arrowcontent {
-  overflow: hidden;
-}
-.devtools-tooltip[wide] {
-  max-width: 600px;
-}
-
-/* Tooltip: Simple Text */
-
-.devtools-tooltip-simple-text {
-  max-width: 400px;
-  margin: 0 -4px; /* Compensate for the .panel-arrowcontent padding. */
-  padding: 8px 12px;
-  white-space: pre-wrap;
-}
-
-.devtools-tooltip-simple-text:first-child {
-  margin-top: -4px;
-}
-
-.devtools-tooltip-simple-text:last-child {
-  margin-bottom: -4px;
-}
-
-/* Tooltip: Alert Icon */
-
-.devtools-tooltip-alert-icon {
-  width: 32px;
-  height: 32px;
-  margin: 6px;
-  -moz-margin-end: 20px;
-}
-
-.devtools-tooltip-alert-icon {
-  list-style-image: url("chrome://global/skin/icons/warning-32.png");
-}
-
-/* Tooltip: Variables View */
-
-.devtools-tooltip-variables-view-box {
-  margin: -4px; /* Compensate for the .panel-arrowcontent padding. */
-}
-
-.devtools-tooltip-variables-view-box .variable-or-property > .title {
-  -moz-padding-end: 6px;
-}
-
-/* Tooltip: Tiles */
-
-.devtools-tooltip-tiles {
-  background-color: #eee;
-  background-image: linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc),
-    linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc);
-  background-size: 20px 20px;
-  background-position: 0 0, 10px 10px;
-}
-
-.devtools-tooltip-iframe {
-  border: none;
-  background: transparent;
-}
-
-/* Eyedropper Widget */
-
-.devtools-eyedropper-panel {
-  pointer-events: none;
-  -moz-appearance: none;
-  width: 156px;
-  height: 120px;
-  background-color: transparent;
-  border: none;
-}
-
-/* links to source code, like displaying `myfile.js:45` */
-
-.devtools-source-link {
-  font-family: var(--monospace-font-family);
-  color: var(--theme-highlight-blue);
-  cursor: pointer;
-  white-space: nowrap;
-  display: flex;
-  text-decoration: none;
-  font-size: 11px;
-  width: 12em; /* probably should be changed for each tool */
-}
-
-.devtools-source-link:hover {
-  text-decoration: underline;
-}
-
-.devtools-source-link > .filename {
-  text-overflow: ellipsis;
-  text-align: end;
-  overflow: hidden;
-  margin: 2px 0px;
-  cursor: pointer;
-}
-
-.devtools-source-link > .line-number {
-  flex: none;
-  margin: 2px 0px;
-  cursor: pointer;
-}
+@import url("chrome://devtools/skin/common.css");
diff --git a/arc-firefox-theme/chrome/browser/devtools/computedview.css b/arc-firefox-theme/chrome/browser/devtools/computedview.css
deleted file mode 100644
index a4eff43..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/computedview.css
+++ /dev/null
@@ -1,203 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-/* From content */
-
-* {
-  box-sizing: border-box;
-}
-
-:root {
-  height: 100%;
-}
-
-body {
-  margin: 0;
-  display : flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-#propertyContainer {
-  -moz-user-select: text;
-  overflow: auto;
-  min-height: 0;
-  flex: 1;
-}
-
-.row-striped {
-  background: var(--theme-body-background);
-}
-
-.property-view-hidden,
-.property-content-hidden {
-  display: none;
-}
-
-.property-view {
-  clear: both;
-  padding: 2px 0 2px 17px;
-}
-
-.property-view > * {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.property-name {
-  /* -12px is so the expander triangle isn't pushed up above the property */
-  width: calc(100% - 12px);
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  outline: 0;
-}
-
-.property-value, .other-property-value {
-  background-image: url(arrow-e.png);
-  background-repeat: no-repeat;
-  background-size: 5px 8px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .property-value, .other-property-value {
-    background-image: url(arrow-e@2x.png);
-  }
-}
-
-.property-value {
-  width: 100%;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  background-position: 2px center;
-  padding-left: 10px;
-  outline: 0;
-}
-
-.other-property-value {
-  background-position: left center;
-  padding-left: 8px;
-}
-
-@media (min-width: 400px) {
-  .property-name {
-    width: 200px;
-  }
-  .property-value {
-    /* -212px is accounting for the 200px property-name and the 12px triangle */
-    width: calc(100% - 212px);
-  }
-}
-
-.property-content {
-  padding-left: 17px;
-}
-
-/* From skin */
-.expander {
-  visibility: hidden;
-  margin-left: -12px!important;
-}
-
-.expandable {
-  visibility: visible;
-}
-
-.match {
-  visibility: hidden;
-}
-
-.matchedselectors > p {
-  clear: both;
-  margin: 0 2px 0 0;
-  padding: 2px;
-  overflow-x: hidden;
-  border-style: dotted;
-  border-color: rgba(128,128,128,0.4);
-  border-width: 1px 1px 0 1px;
-}
-
-.matchedselectors > p:last-of-type {
-  border-bottom-width: 1px;
-}
-
-.matched {
-  text-decoration: line-through;
-}
-
-.parentmatch {
-  opacity: 0.5;
-}
-
-#noResults {
-  font-size: 110%;
-  margin: 5px;
-  text-align: center;
-}
-
-.onlyuserstyles {
-  cursor: pointer;
-}
-
-.legendKey {
-  margin: 0 5px;
-}
-
-#root .devtools-toolbar {
-  width: 100%;
-  display: flex;
-}
-
-.link {
-  padding: 0 3px;
-  cursor: pointer;
-  float: right;
-}
-
-/* Take away these two :visited rules to get a core dumper     */
-/* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */
-
-.link,
-.link:visited {
-  color: #0091ff;
-}
-
-.link,
-.helplink,
-.link:visited,
-.helplink:visited {
-  text-decoration: none;
-}
-
-.link:hover {
-  text-decoration: underline;
-}
-
-.computedview-colorswatch {
-  border-radius: 50%;
-  width: 0.9em;
-  height: 0.9em;
-  vertical-align: middle;
-  -moz-margin-end: 5px;
-  display: inline-block;
-  position: relative;
-}
-
-.computedview-colorswatch::before {
-  content: '';
-  background-color: #eee;
-  background-image: linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc),
-                    linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc);
-  background-size: 12px 12px;
-  background-position: 0 0, 6px 6px;
-  position: absolute;
-  border-radius: 50%;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: -1;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/controls.png b/arc-firefox-theme/chrome/browser/devtools/controls.png
deleted file mode 100644
index 569c266..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/controls.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/controls@2x.png b/arc-firefox-theme/chrome/browser/devtools/controls@2x.png
deleted file mode 100644
index fb06251..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/controls@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/cubic-bezier-swatch.png b/arc-firefox-theme/chrome/browser/devtools/cubic-bezier-swatch.png
deleted file mode 100644
index 2dcb58a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/cubic-bezier-swatch.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/cubic-bezier-swatch@2x.png b/arc-firefox-theme/chrome/browser/devtools/cubic-bezier-swatch@2x.png
deleted file mode 100644
index 64dbef8..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/cubic-bezier-swatch@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/dark-theme.css b/arc-firefox-theme/chrome/browser/devtools/dark-theme.css
deleted file mode 100644
index 22480b2..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/dark-theme.css
+++ /dev/null
@@ -1,1463 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-/* Colors are taken from:
- * https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors.
- * Changes should be kept in sync with commandline.css and commandline.inc.css.
- */
-:root {
-  --theme-body-background: #14171a;
-  --theme-sidebar-background: #181d20;
-  --theme-contrast-background: #b28025;
-
-  --theme-tab-toolbar-background: #252c33;
-  --theme-toolbar-background: #343c45;
-  --theme-selection-background: #1d4f73;
-  --theme-selection-background-semitransparent: rgba(29, 79, 115, .5);
-  --theme-selection-color: #f5f7fa;
-  --theme-splitter-color: black;
-  --theme-comment: #757873;
-
-  --theme-body-color: #8fa1b2;
-  --theme-body-color-alt: #b6babf;
-  --theme-content-color1: #a9bacb;
-  --theme-content-color2: #8fa1b2;
-  --theme-content-color3: #5f7387;
-
-  --theme-highlight-green: #70bf53;
-  --theme-highlight-blue: #46afe3;
-  --theme-highlight-bluegrey: #5e88b0;
-  --theme-highlight-purple: #6b7abb;
-  --theme-highlight-lightorange: #d99b28;
-  --theme-highlight-orange: #d96629;
-  --theme-highlight-red: #eb5368;
-  --theme-highlight-pink: #df80ff;
-
-  /* Colors used in Graphs, like performance tools. Mostly similar to some "highlight-*" colors. */
-  --theme-graphs-green: #70bf53;
-  --theme-graphs-blue: #46afe3;
-  --theme-graphs-bluegrey: #5e88b0;
-  --theme-graphs-purple: #df80ff;
-  --theme-graphs-yellow: #d99b28;
-  --theme-graphs-red: #eb5368;
-  --theme-graphs-grey: #757873;
-}
-
-.theme-body {
-  background: var(--theme-body-background);
-  color: var(--theme-body-color);
-}
-
-.theme-sidebar {
-  background: var(--theme-sidebar-background);
-  color: var(--theme-content-color1);
-}
-
-::-moz-selection {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.theme-bg-darker {
-  background-color: var(--theme-selection-background-semitransparent);
-}
-
-.theme-selected,
-.CodeMirror-hint-active {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.theme-bg-contrast,
-.variable-or-property:not([overridden])[changed] {
-  background: var(--theme-contrast-background);
-}
-
-.theme-link,
-.cm-s-mozilla .cm-link {
-  color: var(--theme-highlight-blue);
-}
-
-/*
- * FIXME: http://bugzil.la/575675 CSS links without :visited set cause assertion
- * failures in debug builds.
- */
-.theme-link:visited,
-.cm-s-mozilla .cm-link:visited,
-.CodeMirror-Tern-type {
-  color: var(--theme-highlight-blue);
-}
-
-
-.theme-comment,
-.cm-s-mozilla .cm-meta,
-.cm-s-mozilla .cm-hr,
-.cm-s-mozilla .cm-comment,
-.variable-or-property .token-undefined,
-.variable-or-property .token-null,
-.CodeMirror-Tern-completion-unknown:before {
-  color: var(--theme-comment);
-}
-
-.theme-gutter {
-  background-color: #0f171f;
-  color: var(--theme-content-color3);
-  border-color: #303b47;
-}
-
-.theme-separator { /* grey */
-  border-color: #303b47;
-}
-
-.theme-fg-color1,
-.cm-s-mozilla .cm-number,
-.variable-or-property .token-number,
-.variable-or-property[return] > .title > .name,
-.variable-or-property[scope] > .title > .name {
-  color: var(--theme-highlight-green);
-}
-
-.CodeMirror-Tern-completion-number:before {
-  background-color: #5c9966;
-}
-
-.theme-fg-color2,
-.cm-s-mozilla .cm-attribute,
-.cm-s-mozilla .cm-variable,
-.cm-s-mozilla .cm-def,
-.cm-s-mozilla .cm-property,
-.cm-s-mozilla .cm-qualifier,
-.variables-view-variable > .title > .name {
-  color: var(--theme-highlight-blue);
-}
-
-.CodeMirror-Tern-completion-object:before {
-  background-color: #3689b2;
-}
-
-.cm-s-mozilla .cm-unused-line {
-  text-decoration: line-through;
-  text-decoration-color: #0072ab;
-}
-
-.cm-s-mozilla .cm-executed-line {
-  background-color: #133c26;
-}
-
-.theme-fg-color3,
-.cm-s-mozilla .cm-builtin,
-.cm-s-mozilla .cm-tag,
-.cm-s-mozilla .cm-header,
-.cm-s-mozilla .cm-bracket,
-.variables-view-property > .title > .name {
-  color: var(--theme-highlight-pink);
-}
-
-.CodeMirror-Tern-completion-array:before {
-  background-color: var(--theme-highlight-bluegrey);
-}
-
-.theme-fg-color4 {
-  color: var(--theme-highlight-purple);
-}
-
-.theme-fg-color5,
-.cm-s-mozilla .cm-keyword {
-  color: var(--theme-highlight-lightorange);
-}
-
-.theme-fg-color6,
-.cm-s-mozilla .cm-string,
-.cm-s-mozilla .cm-string-2,
-.variable-or-property .token-string,
-.CodeMirror-Tern-farg {
-  color: var(--theme-highlight-orange);
-}
-
-.CodeMirror-Tern-completion-string:before,
-.CodeMirror-Tern-completion-fn:before {
-  background-color: #b26b47;
-}
-
-.theme-fg-color7,
-.cm-s-mozilla .cm-atom,
-.cm-s-mozilla .cm-quote,
-.cm-s-mozilla .cm-error,
-.variable-or-property .token-boolean,
-.variable-or-property .token-domnode,
-.variable-or-property[exception] > .title > .name {
-  color: var(--theme-highlight-red);
-}
-
-.CodeMirror-Tern-completion-bool:before {
-  background-color: #bf5656;
-}
-
-.variable-or-property .token-domnode {
-  font-weight: bold;
-}
-
-.theme-toolbar,
-.devtools-toolbar,
-.devtools-sidebar-tabs tabs,
-.devtools-sidebar-alltabs,
-.CodeMirror-dialog { /* General toolbar styling */
-  color: var(--theme-body-color-alt);
-  background-color: var(--theme-toolbar-background);
-  border-color: hsla(210,8%,5%,.6);
-}
-
-.theme-fg-contrast { /* To be used for text on theme-bg-contrast */
-  color: black;
-}
-
-.ruleview-swatch,
-.computedview-colorswatch {
-  box-shadow: 0 0 0 1px #818181;
-}
-
-/* CodeMirror specific styles.
- * Best effort to match the existing theme, some of the colors
- * are duplicated here to prevent weirdness in the main theme. */
-
-.CodeMirror { /* Inherit platform specific font sizing and styles */
-  font-family: inherit;
-  font-size: inherit;
-  background: transparent;
-}
-
-.CodeMirror pre,
-.cm-s-mozilla .cm-variable-2,
-.cm-s-mozilla .cm-variable-3,
-.cm-s-mozilla .cm-operator,
-.cm-s-mozilla .cm-special {
-  color: var(--theme-content-color1);
-}
-
-.cm-s-mozilla .CodeMirror-lines .CodeMirror-cursor {
-  border-left: solid 1px #fff;
-}
-
-.cm-s-mozilla.CodeMirror-focused .CodeMirror-selected { /* selected text (focused) */
-  background: rgb(185, 215, 253);
-}
-
-.cm-s-mozilla .CodeMirror-selected { /* selected text (unfocused) */
-  background: rgb(176, 176, 176);
-}
-
-.cm-s-mozilla .CodeMirror-activeline-background { /* selected color with alpha */
-  background: rgba(185, 215, 253, .15);
-}
-
-div.cm-s-mozilla span.CodeMirror-matchingbracket { /* highlight brackets */
-  outline: solid 1px rgba(255, 255, 255, .25);
-  color: white;
-}
-
-/* Highlight for a line that contains an error. */
-div.CodeMirror div.error-line {
-  background: rgba(255,0,0,0.2);
-}
-
-/* Highlight for a line that represents a stack frame's location. */
-div.CodeMirror div.debug-line {
-  background: rgba(0,128,255,0.1);
-  box-shadow:
-    0 1px 0 0 rgba(0,128,255,0.4),
-    0 -1px 0 0 rgba(0,128,255,0.4);
-}
-
-/* Generic highlighted text */
-div.CodeMirror span.marked-text {
-  background: rgba(255,255,0,0.2);
-  border: 1px dashed rgba(192,192,0,0.6);
-  -moz-margin-start: -1px;
-  -moz-margin-end: -1px;
-}
-
-/* Highlight for evaluating current statement. */
-div.CodeMirror span.eval-text {
-  background-color: #556;
-}
-
-.cm-s-mozilla .CodeMirror-linenumber { /* line number text */
-  color: var(--theme-content-color3);
-}
-
-.cm-s-mozilla .CodeMirror-gutters { /* vertical line next to line numbers */
-  border-right-color: var(--theme-toolbar-background);
-  background-color: var(--theme-sidebar-background);
-}
-
-.cm-s-markup-view pre {
-  line-height: 1.4em;
-  min-height: 1.4em;
-}
-
-/* Twisty and checkbox controls */
-.theme-twisty, .theme-checkbox {
-  width: 14px;
-  height: 14px;
-  background-repeat: no-repeat;
-  background-image: url("chrome://browser/skin/devtools/controls.png");
-  background-size: 56px 28px;
-}
-
-.theme-twisty {
-  cursor: pointer;
-  background-position: -28px -14px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty[open] {
-  background-position: -42px -14px;
-}
-
-.theme-twisty[invisible] {
-  visibility: hidden;
-}
-
-.theme-checkbox {
-  display: inline-block;
-  border: 0;
-  padding: 0;
-  outline: none;
-  background-position: -28px 0;
-}
-
-.theme-checkbox[checked] {
-  background-position: -42px 0;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .theme-twisty, .theme-checkbox {
-    background-image: url("chrome://browser/skin/devtools/controls@2x.png");
-  }
-}
-
-/* XUL panel styling (see browser/devtools/shared/widgets/Tooltip.js) */
-
-.theme-tooltip-panel .panel-arrowcontent {
-  padding: 5px;
-  background: rgba(19, 28, 38, .9);
-  border-radius: 5px;
-  box-shadow: none;
-  border: 3px solid #434850;
-}
-
-/* Overring panel arrow images to fit with our light and dark themes */
-
-.theme-tooltip-panel .panel-arrow[side="top"] {
-  list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-dark.png");
-  margin-bottom: -4px;
-}
-
-.theme-tooltip-panel .panel-arrow[side="bottom"] {
-  list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-dark.png");
-  margin-top: -4px;
-}
-
-.theme-tooltip-panel .panel-arrow[side="left"] {
-  list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-dark.png");
-  margin-right: -4px;
-}
-
-.theme-tooltip-panel .panel-arrow[side="right"] {
-  list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-dark.png");
-  margin-left: -4px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .theme-tooltip-panel .panel-arrow[side="top"],
-  .theme-tooltip-panel .panel-arrow[side="bottom"] {
-    list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-dark@2x.png");
-  }
-
-  .theme-tooltip-panel .panel-arrow[side="left"],
-  .theme-tooltip-panel .panel-arrow[side="right"] {
-    list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-dark@2x.png");
-  }
-}
-
-.theme-tooltip-panel .devtools-tooltip-simple-text {
-  color: white;
-  border-bottom: 1px solid #434850;
-}
-
-.theme-tooltip-panel .devtools-tooltip-simple-text:last-child {
-  border-bottom: 0;
-}
-
-.devtools-textinput,
-.devtools-searchinput {
-  background-color: rgba(24, 29, 32, 1);
-  color: rgba(184, 200, 217, 1);
-}
-
-.CodeMirror-Tern-fname {
-  color: #f7f7f7;
-}
-
-.CodeMirror-hints,
-.CodeMirror-Tern-tooltip {
-  box-shadow: 0 0 4px rgba(255, 255, 255, .3);
-  background-color: #0f171f;
-  color: var(--theme-body-color);
-}
-
-
-
-/* CSS Variables specific to the devtools toolbar that aren't defined by the themes */
-.theme-light {
-  --searchbox-background-color: #ffee99;
-  --searchbox-border-color: #ffbf00;
-  --searcbox-no-match-background-color: #ffe5e5;
-  --searcbox-no-match-border-color: #e52e2e;
-}
-
-.theme-dark {
-  --searchbox-background-color: #4d4222;
-  --searchbox-border-color: #d99f2b;
-  --searcbox-no-match-background-color: #402325;
-  --searcbox-no-match-border-color: #cc3d3d;
-}
-
-/* Toolbars */
-.devtools-toolbar,
-.devtools-sidebar-tabs tabs {
-  -moz-appearance: none;
-  padding: 0;
-  border-width: 0;
-  border-bottom-width: 1px;
-  border-style: solid;
-  height: 24px;
-  line-height: 24px;
-  box-sizing: border-box;
-}
-
-.devtools-toolbar {
-  padding: 0 3px;
-}
-
-.devtools-toolbar checkbox {
-  margin: 0 2px;
-  padding: 0;
-  line-height: -moz-block-height;
-}
-.devtools-toolbar checkbox .checkbox-check {
-  margin: 0;
-  padding: 0;
-  vertical-align: bottom;
-}
-.devtools-toolbar checkbox .checkbox-label-box {
-  border: none !important; /* overrides .checkbox-label-box from checkbox.css */
-}
-.devtools-toolbar checkbox .checkbox-label-box .checkbox-label {
-  margin: 0 6px !important; /* overrides .checkbox-label from checkbox.css */
-  padding: 0;
-}
-
-/* Toolbar buttons */
-.devtools-menulist,
-.devtools-toolbarbutton {
-  -moz-appearance: none;
-  -moz-box-align: center;
-  background: transparent;
-  min-width: 78px;
-  min-height: 18px;
-  padding: 1px;
-  text-shadow: none;
-  border: none;
-  border-radius: 0;
-  margin: 2px 3px;
-  color: inherit;
-  transition: background 0.05s ease-in-out;
-  color: var(--theme-content-color1);
-  background-color: var(--theme-toolbar-background);
-}
-
-.devtools-menulist:-moz-focusring,
-.devtools-toolbarbutton:-moz-focusring {
-  outline: 1px dotted hsla(210,30%,85%,0.7);
-  outline-offset: -4px;
-}
-
-.devtools-toolbarbutton[standalone] {
-  -moz-margin-end: 5px;
-  border-width: 1px;
-  border-style: solid;
-}
-.devtools-toolbarbutton[label][standalone] {
-  min-height: 2em;
-}
-
-.devtools-toolbarbutton:not([label]),
-.devtools-toolbarbutton[text-as-image] {
-  min-width: 32px;
-}
-
-#toolbox-buttons .devtools-toolbarbutton[text-as-image] {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px;
-  min-width: inherit;
-}
-
-/* Command buttons with menupopups should be styled slightly differently -
-   no background color and a bit more narrow */
-#toolbox-buttons .devtools-toolbarbutton:not([text-as-image]):not(:hover):not([open=true]) {
-  background: transparent;
-}
-#toolbox-buttons .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker {
-  padding: 0 2px;
-}
-
-.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
-  display: none;
-}
-
-.devtools-toolbar .devtools-toolbarbutton {
-  border-width: 0;
-}
-
-.devtools-toolbarbutton > .toolbarbutton-icon {
-  margin: 0;
-}
-
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
-  -moz-appearance: none;
-  color: inherit;
-  border-width: 0;
-  -moz-box-orient: horizontal;
-  padding: 0;
-}
-
-.devtools-toolbarbutton[type=menu-button] {
-  padding: 0 1px;
-  -moz-box-align: stretch;
-}
-
-.devtools-toolbarbutton > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  -moz-margin-end: 4px;
-}
-
-.devtools-menulist > .menulist-dropmarker {
-  -moz-appearance: none;
-  display: -moz-box;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
-  -moz-box-align: center;
-  min-width: 16px;
-}
-
-.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-appearance: none !important;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
-  -moz-box-align: center;
-  padding: 0 3px;
-}
-
-.theme-dark .devtools-menulist,
-.theme-dark .devtools-toolbarbutton {
-  border-color: rgba(0, 0, 0, .4); /* Splitters */
-}
-.theme-light .devtools-menulist,
-.theme-light .devtools-toolbarbutton {
-  border-color: rgba(170, 170, 170, .5); /* Splitters */
-}
-
-/* Text-only buttons */
-.theme-light .devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]),
-.theme-light #toolbox-buttons .devtools-toolbarbutton[text-as-image] {
-  background-color: rgba(170, 170, 170, .2); /* Splitter */
-}
-.theme-dark .devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]),
-.theme-dark #toolbox-buttons .devtools-toolbarbutton[text-as-image] {
-  background-color: rgba(0, 0, 0, .2); /* Splitter */
-}
-
-/* Button States */
-.theme-dark .devtools-toolbarbutton:not([disabled]):hover,
-.theme-dark #toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover,
-.theme-dark .devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover {
-  background: rgba(0, 0, 0, .3); /* Splitters */
-}
-.theme-light .devtools-toolbarbutton:not([disabled]):hover,
-.theme-light #toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover,
-.theme-light .devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover {
-  background: rgba(170, 170, 170, .3); /* Splitters */
-}
-
-.theme-dark .devtools-toolbarbutton:not([disabled]):hover:active,
-.theme-dark #toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover:active,
-.theme-dark .devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover:active {
-  background: rgba(0, 0, 0, .4); /* Splitters */
-}
-.theme-light .devtools-toolbarbutton:not([disabled]):hover:active,
-.theme-light #toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover:active,
-.theme-light .devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover:active {
-  background: rgba(170, 170, 170, .4); /* Splitters */
-}
-
-/* Menu type buttons and checked states */
-.theme-dark .devtools-toolbarbutton[checked=true],
-.theme-dark #toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
-  background: rgba(29, 79, 115, .7); /* Select highlight blue */
-  color: var(--theme-selection-color);
-}
-
-.theme-light .devtools-toolbarbutton[checked=true],
-.theme-light #toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
-  background: rgba(76, 158, 217, .2); /* Select highlight blue */
-}
-
-.theme-dark .devtools-menulist[open=true],
-.theme-dark .devtools-toolbarbutton[open=true],
-.theme-dark .devtools-toolbarbutton[open=true]:hover,
-.theme-dark .devtools-toolbarbutton[open=true]:hover:active,
-.theme-dark .devtools-toolbarbutton[checked=true]:hover {
-  background: rgba(29, 79, 115, .8); /* Select highlight blue */
-  color: var(--theme-selection-color);
-}
-
-.theme-light .devtools-menulist[open=true],
-.theme-light .devtools-toolbarbutton[open=true],
-.theme-light .devtools-toolbarbutton[open=true]:hover,
-.theme-light .devtools-toolbarbutton[open=true]:hover:active,
-.theme-light .devtools-toolbarbutton[checked=true]:hover {
-  background: rgba(76, 158, 217, .4); /* Select highlight blue */
-}
-
-.devtools-option-toolbarbutton {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/tool-options.svg");
-  background: none;
-  opacity: .8;
-  border: none;
-}
-
-.devtools-option-toolbarbutton[open=true] {
-  opacity: 1;
-}
-
-/* Toolbar button groups */
-.devtools-toolbarbutton-group > .devtools-toolbarbutton {
-  margin-left: 1px;
-  margin-right: 1px;
-  outline-offset: -3px;
-  box-shadow: none;
-}
-
-.devtools-toolbarbutton-group > .devtools-toolbarbutton:last-child {
-  -moz-margin-end: 0;
-}
-
-.devtools-toolbarbutton-group + .devtools-toolbarbutton {
-  -moz-margin-start: 3px;
-}
-
-.devtools-separator + .devtools-toolbarbutton {
-  -moz-margin-start: 1px;
-}
-
-/* HTML buttons, similar to toolbar buttons, but work in HTML documents */
-
-.devtools-button {
-  border: 0 solid var(--theme-splitter-color);
-  background: var(--theme-toolbar-background);
-  color: var(--theme-body-color);
-  margin: 0;
-  padding: 0;
-  min-width: 32px;
-  min-height: 18px;
-  /* The icon is absolutely positioned in the button using ::before */
-  position: relative;
-}
-
-.devtools-button[standalone] {
-  min-height: 32px;
-  border-width: 1px;
-}
-
-/* Button States */
-.theme-dark .devtools-button:not([disabled]):hover {
-  background: rgba(0, 0, 0, .3); /* Splitters */
-}
-.theme-light .devtools-button:not([disabled]):hover {
-  background: rgba(170, 170, 170, .3); /* Splitters */
-}
-
-.theme-dark .devtools-button:not([disabled]):hover:active {
-  background: rgba(0, 0, 0, .4); /* Splitters */
-}
-.theme-light .devtools-button:not([disabled]):hover:active {
-  background: rgba(170, 170, 170, .4); /* Splitters */
-}
-
-/* Menu type buttons and checked states */
-.theme-dark .devtools-button[checked] {
-  background: rgba(29, 79, 115, .7) !important; /* Select highlight blue */
-  color: var(--theme-selection-color);
-}
-
-.theme-light .devtools-button[checked] {
-  background: rgba(76, 158, 217, .2) !important; /* Select highlight blue */
-}
-
-.devtools-button::before {
-  content: "";
-  display: block;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin: -8px 0 0 -8px;
-  background-repeat: no-repeat;
-}
-
-.devtools-button[disabled]::before,
-.devtools-button:disabled::before {
-  opacity: 0.5;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .devtools-button::before {
-    background-size: 32px;
-  }
-}
-
-/* Text input */
-
-.devtools-textinput,
-.devtools-searchinput {
-  -moz-appearance: none;
-  margin: 0 3px;
-  border: 1px solid;
-  border-radius: 2px;
-  padding: 4px 6px;
-  border-color: var(--theme-splitter-color);
-}
-
-.devtools-searchinput {
-  margin-top: 1px;
-  margin-bottom: 1px;
-  padding: 0;
-  -moz-padding-start: 22px;
-  -moz-padding-end: 4px;
-  background-position: 8px center;
-  background-size: 11px 11px;
-  background-repeat: no-repeat;
-  font-size: inherit;
-}
-
-.theme-dark .devtools-searchinput {
-  background-image: url(magnifying-glass.png);
-}
-
-.theme-light .devtools-searchinput {
-  background-image: url(magnifying-glass-light.png);
-}
-
-.devtools-searchinput:-moz-locale-dir(rtl) {
-  background-position: calc(100% - 8px) center;
-}
-
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-icon {
-  visibility: hidden;
-}
-
-/* Searchbox is a div container element for a search input element */
-.devtools-searchbox {
-  display: flex;
-  flex: 1;
-  position: relative;
-}
-
-.devtools-rule-searchbox {
-  -moz-box-flex: 1;
-  padding-right: 23px;
-  width: 100%;
-  font: inherit;
-}
-
-.devtools-rule-searchbox[filled] {
-  background-color: var(--searchbox-background-color);
-  border-color: var(--searchbox-border-color);
-}
-
-.devtools-style-searchbox-no-match {
-  background-color: var(--searcbox-no-match-background-color) !important;
-  border-color: var(--searcbox-no-match-border-color) !important;
-}
-
-.devtools-no-search-result {
-  border-color: var(--theme-highlight-red) !important;
-}
-
-.devtools-searchinput-clear {
-  position: absolute;
-  top: 3.5px;
-  right: 7px;
-  padding: 0;
-  border: 0;
-  width: 16px;
-  height: 16px;
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-
-.theme-dark .devtools-searchinput-clear {
-  background-image: url("chrome://browser/skin/devtools/search-clear-dark.svg");
-}
-
-.theme-light .devtools-searchinput-clear {
-  background-image: url("chrome://browser/skin/devtools/search-clear-light.svg");
-}
-
-.devtools-style-searchbox-no-match + .devtools-searchinput-clear {
-  background-image: url("chrome://browser/skin/devtools/search-clear-failed.svg") !important;
-}
-
-.devtools-searchinput-clear:hover {
-  background-position: -16px 0;
-}
-
-.theme-dark .devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-  list-style-image: url("chrome://browser/skin/devtools/search-clear-dark.svg");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.theme-light .devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-  list-style-image: url("chrome://browser/skin/devtools/search-clear-light.svg");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  .theme-dark .devtools-searchinput {
-    background-image: url(magnifying-glass@2x.png);
-  }
-
-  .theme-light .devtools-searchinput {
-    background-image: url(magnifying-glass-light@2x.png);
-  }
-}
-
-/* Close button */
-
-.devtools-closebutton {
-  -moz-appearance: none;
-  border: none;
-  margin: 0 4px;
-  min-width: 16px;
-  width: 16px;
-  opacity: 0.8;
-}
-
-.devtools-closebutton > image {
-  width: 16px;
-  height: 16px;
-  -moz-appearance: none;
-  background-size: 16px 16px;
-  background-image: url("chrome://browser/skin/devtools/close@2x.png");
-  background-position: center center;
-  background-repeat: no-repeat;
-}
-
-.devtools-closebutton > .toolbarbutton-icon {
-  /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
-     use evil CSS to give the impression of smaller content */
-  margin: -4px;
-}
-
-.devtools-closebutton > .toolbarbutton-text {
-  display: none;
-}
-
-.devtools-closebutton:hover {
-  opacity: 1;
-}
-
-/* In-tools sidebar */
-.devtools-sidebar-tabs {
-  -moz-appearance: none;
-  margin: 0;
-}
-
-.devtools-sidebar-tabs > tabpanels {
-  -moz-appearance: none;
-  background: transparent;
-  padding: 0;
-  border: 0;
-}
-
-.theme-light .devtools-sidebar-tabs > tabpanels {
-  background: var(--theme-sidebar-background);
-  color: var(--theme-body-color);
-}
-
-.devtools-sidebar-tabs tabs {
-  position: static;
-  font: inherit;
-  margin-bottom: 0;
-  overflow: hidden;
-}
-
-.devtools-sidebar-alltabs {
-  -moz-appearance: none;
-  height: 24px;
-  line-height: 24px;
-  padding: 0 4px;
-  margin: 0;
-  border-width: 0 0 1px 0;
-  -moz-border-start-width: 1px;
-  border-style: solid;
-}
-
-.devtools-sidebar-alltabs .toolbarbutton-icon {
-  display: none;
-}
-
-.devtools-sidebar-tabs tabs > .tabs-right,
-.devtools-sidebar-tabs tabs > .tabs-left {
-  display: none;
-}
-
-.devtools-sidebar-tabs tabs > tab {
-  -moz-appearance: none;
-  /* We want to match the height of a toolbar with a toolbarbutton
-   * First, we need to replicated the padding of toolbar (4px),
-   * then we need to take the border of the buttons into account (1px).
-   */
-  padding: 0 3px;
-  margin: 0;
-  min-width: 78px;
-  text-align: center;
-  background-color: transparent;
-  color: inherit;
-  -moz-box-flex: 1;
-  border-width: 0;
-  -moz-border-start-width: 1px;
-  border-style: solid;
-  border-radius: 0;
-  position: static;
-  text-shadow: none;
-}
-
-.devtools-sidebar-tabs tabs > tab {
-  border-image: linear-gradient(transparent 15%, var(--theme-splitter-color) 15%, var(--theme-splitter-color) 85%, transparent 85%) 1 1;
-}
-
-.devtools-sidebar-tabs tabs > tab[selected],
-.devtools-sidebar-tabs tabs > tab[selected] + tab {
-  border-image: linear-gradient(var(--theme-splitter-color), var(--theme-splitter-color)) 1 1;
-}
-
-.devtools-sidebar-tabs tabs > tab:first-child {
-  -moz-border-start-width: 0;
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab:hover {
-  background: hsla(206,37%,4%,.2);
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab:hover:active {
-  background: hsla(206,37%,4%,.4);
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover {
-  background: hsla(206,37%,4%,.2);
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active {
-  background: hsla(206,37%,4%,.4);
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab[selected],
-.theme-dark .devtools-sidebar-tabs tabs > tab[selected]:hover:active {
-  color: var(--theme-selection-color);
-  background: #1d4f73;
-}
-
-.theme-light .devtools-sidebar-tabs tabs > tab:hover {
-  background: #ddd;
-}
-
-.theme-light .devtools-sidebar-tabs tabs > tab:hover:active {
-  background: #ddd;
-}
-
-.theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab:hover {
-  background: #ddd;
-}
-
-.theme-light .devtools-sidebar-tabs tabs > tab[selected],
-.theme-light .devtools-sidebar-tabs tabs > tab[selected]:hover:active {
-  color: var(--theme-selection-color);
-  background: #4c9ed9;
-}
-
-/* Toolbox - moved from toolbox.css.
- * Rules that apply to the global toolbox like command buttons,
- * devtools tabs, docking buttons, etc. */
-
-#toolbox-controls > toolbarbutton,
-#toolbox-dock-buttons > toolbarbutton {
-  -moz-appearance: none;
-  border: none;
-  margin: 0 4px;
-  min-width: 16px;
-  width: 16px;
-}
-
-#toolbox-controls > toolbarbutton > .toolbarbutton-text,
-#toolbox-dock-buttons > toolbarbutton > .toolbarbutton-text,
-.command-button > .toolbarbutton-text {
-  display: none;
-}
-
-#toolbox-dock-buttons > toolbarbutton > image {
-  -moz-appearance: none;
-  width: 16px;
-  height: 16px;
-  background-size: 16px 16px;
-  background-position: 0 center;
-  background-repeat: no-repeat;
-}
-
-#toolbox-dock-bottom > image {
-  background-image: url("chrome://browser/skin/devtools/dock-bottom@2x.png");
-}
-
-#toolbox-dock-side  > image {
-  background-image: url("chrome://browser/skin/devtools/dock-side@2x.png");
-}
-
-#toolbox-dock-window > image {
-  background-image: url("chrome://browser/skin/devtools/undock@2x.png");
-}
-
-#toolbox-dock-bottom-minimize {
-  /* Bug 1177463 - The minimize button is currently hidden until we agree on
-     the UI for it, and until bug 1173849 is fixed too. */
-  display: none;
-}
-
-#toolbox-dock-bottom-minimize > image {
-  background-image: url("chrome://browser/skin/devtools/dock-bottom-minimize@2x.png");
-}
-
-#toolbox-dock-bottom-minimize.minimized > image {
-  background-image: url("chrome://browser/skin/devtools/dock-bottom-maximize@2x.png");
-}
-
-#toolbox-dock-window,
-#toolbox-dock-bottom,
-#toolbox-dock-side {
-  opacity: 0.8;
-}
-
-#toolbox-dock-window:hover,
-#toolbox-dock-bottom:hover,
-#toolbox-dock-side:hover {
-  opacity: 1;
-}
-
-.devtools-separator {
-  margin: 0 2px;
-  width: 2px;
-  background-image: linear-gradient(transparent, hsla(204,45%,98%,.1), transparent),
-                    linear-gradient(transparent, hsla(206,37%,4%,.6), transparent),
-                    linear-gradient(transparent, hsla(204,45%,98%,.1), transparent);
-  background-size: 1px 100%;
-  background-repeat: no-repeat;
-  background-position: 0, 1px, 2px;
-}
-
-#toolbox-buttons:empty + .devtools-separator,
-.devtools-separator[invisible] {
-  visibility: hidden;
-}
-
-#toolbox-controls-separator {
-  margin: 0;
-}
-
-/* Command buttons */
-
-.command-button {
-  -moz-appearance: none;
-  border: none;
-  padding: 0 8px;
-  margin: 0;
-  width: 32px;
-  position: relative;
-}
-
-.command-button:hover {
-  background-color: hsla(206,37%,4%,.2);
-}
-.command-button:hover:active, .command-button[checked=true]:not(:hover) {
-  background-color: hsla(206,37%,4%,.4);
-}
-
-.command-button > image {
-  -moz-appearance: none;
-  width: 16px;
-  height: 16px;
-  background-size: 64px 16px;
-  background-position: 0 center;
-  background-repeat: no-repeat;
-}
-.command-button:hover > image {
-  background-position: -16px center;
-}
-.command-button:hover:active > image {
-  background-position: -32px center;
-}
-.command-button[checked=true] > image {
-  background-position: -48px center;
-}
-.command-button[open=true] > image {
-  background-position: 0 center;
-}
-
-#command-button-paintflashing > image {
-  background-image: url("chrome://browser/skin/devtools/command-paintflashing.png");
-}
-
-#command-button-screenshot > image {
-  background-image: url("chrome://browser/skin/devtools/command-screenshot.png");
-}
-
-#command-button-responsive > image {
-  background-image: url("chrome://browser/skin/devtools/command-responsivemode.png");
-}
-
-#command-button-tilt > image {
-  background-image: url("chrome://browser/skin/devtools/command-tilt.png");
-}
-
-#command-button-scratchpad > image {
-  background-image: url("chrome://browser/skin/devtools/command-scratchpad.png");
-  background-size: 48px 16px;
-}
-
-#command-button-pick > image {
-  background-image: url("chrome://browser/skin/devtools/command-pick.png");
-}
-
-#command-button-frames > image {
-  background-image: url("chrome://browser/skin/devtools/command-frames.png");
-}
-
-#command-button-splitconsole > image {
-  background-image: url("chrome://browser/skin/devtools/command-console.png");
-}
-
-#command-button-eyedropper > image {
-  background-image: url("chrome://browser/skin/devtools/command-eyedropper.png");
-}
-
-#command-button-rulers > image {
-  background-image: url("chrome://browser/skin/devtools/command-rulers.png");
-}
-
-@media (min-resolution: 1.1dppx) {
-  #command-button-paintflashing > image {
-    background-image: url("chrome://browser/skin/devtools/command-paintflashing@2x.png");
-  }
-
-  #command-button-screenshot > image {
-    background-image: url("chrome://browser/skin/devtools/command-screenshot@2x.png");
-  }
-
-  #command-button-responsive > image {
-    background-image: url("chrome://browser/skin/devtools/command-responsivemode@2x.png");
-  }
-
-  #command-button-tilt > image {
-    background-image: url("chrome://browser/skin/devtools/command-tilt@2x.png");
-  }
-
-  #command-button-scratchpad > image {
-    background-image: url("chrome://browser/skin/devtools/command-scratchpad@2x.png");
-  }
-
-  #command-button-pick > image {
-    background-image: url("chrome://browser/skin/devtools/command-pick@2x.png");
-  }
-
-  #command-button-frames > image {
-    background-image: url("chrome://browser/skin/devtools/command-frames@2x.png");
-  }
-
-  #command-button-splitconsole > image {
-    background-image: url("chrome://browser/skin/devtools/command-console@2x.png");
-  }
-
-  #command-button-eyedropper > image {
-    background-image: url("chrome://browser/skin/devtools/command-eyedropper@2x.png");
-  }
-
-  #command-button-rulers > image {
-    background-image: url("chrome://browser/skin/devtools/command-rulers@2x.png");
-  }
-}
-
-/* Tabs */
-
-.devtools-tabbar {
-  -moz-appearance: none;
-  min-height: 24px;
-  border: 0px solid;
-  border-bottom-width: 1px;
-  padding: 0;
-  background: var(--theme-tab-toolbar-background);
-  border-bottom-color: var(--theme-splitter-color);
-}
-
-.theme-light .devtools-tabbar {
-  box-shadow: 0 -2px 0 rgba(170,170,170,.1) inset;
-}
-
-.theme-dark .devtools-tabbar {
-  box-shadow: 0 -2px 0 rgba(0,0,0,.1) inset;
-}
-
-#toolbox-tabs {
-  margin: 0;
-}
-
-.devtools-tab {
-  -moz-appearance: none;
-  -moz-binding: url("chrome://global/content/bindings/general.xml#control-item");
-  -moz-box-align: center;
-  min-width: 32px;
-  min-height: 24px;
-  max-width: 110px;
-  margin: 0;
-  padding: 0;
-  border-style: solid;
-  border-width: 0;
-  -moz-border-start-width: 1px;
-  -moz-box-align: center;
-}
-
-.theme-dark .devtools-tab {
-  color: var(--theme-body-color-alt);
-  border-color: #42484f;
-}
-
-.theme-light .devtools-tab {
-  color: var(--theme-body-color);
-  border-color: var(--theme-splitter-color);
-}
-
-.theme-dark .devtools-tab:hover {
-  background-color: hsla(206,37%,4%,.2);
-  color: #ced3d9;
-}
-
-.theme-light .devtools-tab:hover {
-  background-color: rgba(170,170,170,.2);
-}
-
-.theme-dark .devtools-tab:hover:active {
-  background-color: hsla(206,37%,4%,.4);
-  color: var(--theme-selection-color);
-}
-
-.theme-light .devtools-tab:hover:active {
-  background-color: rgba(170,170,170,.4);
-}
-
-.devtools-tab:not([selected])[highlighted] {
-  box-shadow: 0 2px 0 var(--theme-highlight-green) inset;
-}
-
-.theme-dark .devtools-tab:not([selected])[highlighted] {
-  background-color: hsla(99,100%,14%,.2);
-}
-
-.theme-light .devtools-tab:not([selected])[highlighted] {
-  background-color: rgba(44, 187, 15, .2);
-}
-
-.devtools-tab > image {
-  border: none;
-  -moz-margin-end: 0;
-  -moz-margin-start: 4px;
-  opacity: 0.6;
-  max-height: 16px;
-  width: 16px; /* Prevents collapse during theme switching */
-}
-
-.devtools-tab > label {
-  white-space: nowrap;
-}
-
-.devtools-tab:hover > image {
-  opacity: 0.8;
-}
-
-.devtools-tab:active > image,
-.devtools-tab[selected] > image {
-  opacity: 1;
-}
-
-.devtools-tabbar .devtools-tab[selected],
-.devtools-tabbar .devtools-tab[selected]:hover:active {
-  color: var(--theme-selection-color);
-  background-color: var(--theme-selection-background);
-}
-
-.theme-dark .devtools-tabbar .devtools-tab[selected] {
-  box-shadow: 0 2px 0 #d7f1ff inset,
-              0 8px 3px -5px #2b82bf inset,
-              0 -2px 0 rgba(0,0,0,.2) inset;
-}
-
-.theme-light .devtools-tabbar .devtools-tab[selected] {
-  box-shadow: 0 2px 0 #d7f1ff inset,
-              0 8px 3px -5px #2b82bf inset,
-              0 -2px 0 rgba(0,0,0,.06) inset;
-}
-
-#toolbox-tabs .devtools-tab[selected],
-#toolbox-tabs .devtools-tab[highlighted] {
-  border-width: 0;
-  -moz-padding-start: 1px;
-}
-
-#toolbox-tabs .devtools-tab[selected]:last-child,
-#toolbox-tabs .devtools-tab[highlighted]:last-child {
-  -moz-padding-end: 1px;
-}
-
-#toolbox-tabs .devtools-tab[selected] + .devtools-tab,
-#toolbox-tabs .devtools-tab[highlighted] + .devtools-tab {
-  -moz-border-start-width: 0;
-  -moz-padding-start: 1px;
-}
-
-#toolbox-tabs .devtools-tab:first-child[selected] {
-  -moz-border-start-width: 0;
-}
-
-#toolbox-tabs .devtools-tab:last-child {
-  -moz-border-end-width: 1px;
-}
-
-.devtools-tab:not([highlighted]) > .highlighted-icon,
-.devtools-tab[selected] > .highlighted-icon,
-.devtools-tab:not([selected])[highlighted] > .default-icon {
-  visibility: collapse;
-}
-
-/* The options tab is special - it doesn't have the same parent
-   as the other tabs (toolbox-option-container vs toolbox-tabs) */
-#toolbox-option-container .devtools-tab:not([selected]) {
-  background-color: transparent;
-}
-#toolbox-option-container .devtools-tab {
-  border-color: transparent;
-  border-width: 0;
-  -moz-padding-start: 1px;
-}
-#toolbox-tab-options > image {
-  margin: 0 8px;
-}
-
-/* Invert the colors of certain dark theme images for displaying
- * inside of the light theme.
- */
-.theme-light .devtools-tab[icon-invertable] > image,
-.theme-light #toolbox-dock-buttons > toolbarbutton > image,
-.theme-light .command-button-invertable > image,
-.theme-light .command-button-invertable:active > image,
-.theme-light .devtools-closebutton > image,
-.theme-light .devtools-toolbarbutton > image,
-.theme-light .devtools-option-toolbarbutton > image,
-.theme-light #breadcrumb-separator-normal,
-.theme-light .scrollbutton-up > .toolbarbutton-icon,
-.theme-light .scrollbutton-down > .toolbarbutton-icon,
-.theme-light #black-boxed-message-button .button-icon,
-.theme-light .notice-container button .button-icon,
-.theme-light #requests-menu-perf-notice-button .button-icon,
-.theme-light #requests-menu-network-summary-button .button-icon,
-.theme-light .event-tooltip-debugger-icon,
-.theme-light .devtools-button::before {
-  filter: url(filters.svg#invert);
-}
-
-/* Since selected backgrounds are blue, we want to use the normal
- * (light) icons. */
-.theme-light .command-button-invertable[checked=true]:not(:active) > image,
-.theme-light .devtools-tab[icon-invertable][selected] > image,
-.theme-light .devtools-tab[icon-invertable][highlighted] > image,
-.theme-light #record-snapshot[checked] > image,
-.theme-light #profiler-start[checked] > image,
-.theme-light .notice-container button[checked] .button-icon {
-  filter: none !important;
-}
-
-.theme-light .command-button:hover {
-  background-color: inherit;
-}
-
-.theme-light .command-button:hover:active,
-.theme-light .command-button[checked=true]:not(:hover) {
-  background-color: inherit;
-}
-
-.hidden-labels-box:not(.visible) > label,
-.hidden-labels-box.visible ~ .hidden-labels-box > label:last-child {
-  display: none;
-}
-
-.devtools-invisible-splitter {
-  border-color: transparent;
-}
-
-.devtools-horizontal-splitter {
-  border-bottom: 1px solid var(--theme-splitter-color);
-}
-
-.devtools-side-splitter {
-  -moz-border-end: 1px solid var(--theme-splitter-color);
-  border-color: var(--theme-splitter-color); /* Needed for responsive container at low width. */
-}
-
-/* Throbbers */
-.devtools-throbber::before {
-  content: "";
-  display: inline-block;
-  vertical-align: bottom;
-  -moz-margin-end: 0.5em;
-  width: 1em;
-  height: 1em;
-  border: 2px solid currentColor;
-  border-right-color: transparent;
-  border-radius: 50%;
-  animation: 1.1s linear throbber-spin infinite;
-}
-
-@keyframes throbber-spin {
-  from {
-    transform: none;
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-blackbox.png b/arc-firefox-theme/chrome/browser/devtools/debugger-blackbox.png
deleted file mode 100644
index c64f4bb..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-blackbox.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-blackbox@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-blackbox@2x.png
deleted file mode 100644
index 2dd33d2..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-blackbox@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-collapse.png b/arc-firefox-theme/chrome/browser/devtools/debugger-collapse.png
deleted file mode 100644
index 9573fc7..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-collapse.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-collapse@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-collapse@2x.png
deleted file mode 100644
index 12f7223..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-collapse@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-expand.png b/arc-firefox-theme/chrome/browser/devtools/debugger-expand.png
deleted file mode 100644
index f317997..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-expand.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-expand@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-expand@2x.png
deleted file mode 100644
index 091601f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-expand@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-pause.png b/arc-firefox-theme/chrome/browser/devtools/debugger-pause.png
deleted file mode 100644
index 8288bdf..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-pause.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-pause@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-pause@2x.png
deleted file mode 100644
index 53ed141..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-pause@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-play.png b/arc-firefox-theme/chrome/browser/devtools/debugger-play.png
deleted file mode 100644
index 9189a0a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-play.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-play@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-play@2x.png
deleted file mode 100644
index 5fe68e1..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-play@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-prettyprint.png b/arc-firefox-theme/chrome/browser/devtools/debugger-prettyprint.png
deleted file mode 100644
index fb59dcc..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-prettyprint.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-prettyprint@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-prettyprint@2x.png
deleted file mode 100644
index e3791bf..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-prettyprint@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-step-in.png b/arc-firefox-theme/chrome/browser/devtools/debugger-step-in.png
deleted file mode 100644
index b16b706..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-step-in.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-step-in@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-step-in@2x.png
deleted file mode 100644
index c0b4500..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-step-in@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-step-out.png b/arc-firefox-theme/chrome/browser/devtools/debugger-step-out.png
deleted file mode 100644
index 859c727..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-step-out.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-step-out@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-step-out@2x.png
deleted file mode 100644
index 1c19679..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-step-out@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-step-over.png b/arc-firefox-theme/chrome/browser/devtools/debugger-step-over.png
deleted file mode 100644
index ec28fc0..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-step-over.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-step-over@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-step-over@2x.png
deleted file mode 100644
index 452f0d4..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-step-over@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-toggleBreakpoints.png b/arc-firefox-theme/chrome/browser/devtools/debugger-toggleBreakpoints.png
deleted file mode 100644
index c4b7dcb..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-toggleBreakpoints.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger-toggleBreakpoints@2x.png b/arc-firefox-theme/chrome/browser/devtools/debugger-toggleBreakpoints@2x.png
deleted file mode 100644
index b8bbadd..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger-toggleBreakpoints@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger.css b/arc-firefox-theme/chrome/browser/devtools/debugger.css
deleted file mode 100644
index e16cdb8..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/debugger.css
+++ /dev/null
@@ -1,677 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-/* Sources and breakpoints pane */
-
-#sources-pane[selectedIndex="0"] + #sources-and-editor-splitter {
-  border-color: transparent;
-}
-
-#sources-pane > tabs {
-  -moz-border-end: 1px solid;
-}
-
-#sources-pane .devtools-toolbar {
-  border: none; /* Remove the devtools-toolbar bottom border. */
-  -moz-border-end: 1px solid;
-}
-
-#sources-pane > tabs,
-#sources-pane .devtools-toolbar {
-  -moz-border-end-color: var(--theme-splitter-color);
-}
-
-/* Sources and breakpoints list */
-
-.dbg-source-item {
-  padding: 2px 0px;
-}
-
-.dbg-breakpoint-line {
-  font-weight: 600;
-}
-
-.dbg-breakpoint-text {
-  -moz-padding-start: 6px;
-  font-style: italic;
-  font-size: 90%;
-}
-
-.dbg-breakpoint-checkbox {
-  width: 16px;
-  height: 16px;
-  margin: 2px;
-}
-
-.dbg-breakpoint-condition-thrown-message {
-  display: none;
-  color: var(--theme-highlight-red);
-}
-
-.dbg-breakpoint.dbg-breakpoint-condition-thrown .dbg-breakpoint-condition-thrown-message {
-  display: block;
-  -moz-padding-start: 0;
-}
-
-/* Sources toolbar */
-
-#sources-toolbar > .devtools-toolbarbutton,
-#sources-controls > .devtools-toolbarbutton {
-  min-width: 32px;
-}
-
-#black-box {
-  list-style-image: url(debugger-blackbox.png);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #black-box {
-    list-style-image: url(debugger-blackbox@2x.png);
-  }
-}
-
-#pretty-print {
-  list-style-image: url(debugger-prettyprint.png);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #pretty-print {
-    list-style-image: url(debugger-prettyprint@2x.png);
-  }
-}
-
-#toggle-breakpoints {
-  list-style-image: url(debugger-toggleBreakpoints.png);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #toggle-breakpoints {
-    list-style-image: url(debugger-toggleBreakpoints@2x.png);
-  }
-}
-
-#toggle-promise-debugger {
-  /* TODO Bug 1186119: Add a toggle promise debugger image */
-}
-
-#sources-toolbar .devtools-toolbarbutton:not([label]) {
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#sources-toolbar .devtools-toolbarbutton:not([label])[checked] {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #sources-toolbar .devtools-toolbarbutton:not([label]) {
-    -moz-image-region: rect(0px,32px,32px,0px);
-  }
-
-  #sources-toolbar .devtools-toolbarbutton:not([label])[checked] {
-    -moz-image-region: rect(0px,64px,32px,32px);
-  }
-}
-
-#sources .black-boxed {
-  color: rgba(128,128,128,0.4);
-}
-
-#sources .selected .black-boxed {
-  color: rgba(255,255,255,0.4);
-}
-
-#sources .black-boxed ~ .dbg-breakpoint {
-  display: none;
-}
-
-/* Debugger unblackbox button */
-
-#black-boxed-message-button > .button-box > .button-icon {
-  width: 16px;
-  height: 16px;
-  background-image: url(debugger-blackbox.png);
-  background-position: 0 0;
-  background-size: 32px 16px;
-  background-repeat: no-repeat;
-  -moz-margin-end: 5px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  #black-boxed-message-button > .button-box > .button-icon {
-    background-image: url(debugger-blackbox@2x.png);
-  }
-}
-
-/* Black box message and source progress meter */
-
-#black-boxed-message,
-#source-progress-container {
-  /* Prevent the container deck from aquiring the size from this message. */
-  min-width: 1px;
-  min-height: 1px;
-}
-
-#source-progress {
-  min-height: 2em;
-  min-width: 40em;
-}
-
-#black-boxed-message-label,
-#black-boxed-message-button {
-  text-align: center;
-  font-size: 120%;
-}
-
-#black-boxed-message-button {
-  margin-top: 1em;
-  padding: .25em;
-}
-
-/* Breadcrumbs stack frames view */
-
-.dbg-stackframe-details {
-  -moz-padding-start: 4px;
-}
-
-/* Classic stack frames view */
-
-.dbg-classic-stackframe {
-  display: block;
-}
-
-.dbg-classic-stackframe-title {
-  font-weight: 600;
-}
-
-.dbg-classic-stackframe-details:-moz-locale-dir(ltr) {
-  float: right;
-}
-
-.dbg-classic-stackframe-details:-moz-locale-dir(rtl) {
-  float: left;
-}
-
-.dbg-classic-stackframe-details-url {
-  max-width: 90%;
-  text-align: end;
-}
-
-.dbg-classic-stackframe-details-url {
-  color: var(--theme-content-color1);
-}
-
-.dbg-classic-stackframe-details-sep {
-  color: var(--theme-body-color-alt)
-}
-
-.dbg-classic-stackframe-details-line {
-  color: var(--theme-highlight-bluegrey);
-}
-
-#callstack-list .selected label {
-  /* Text inside a selected item should not be custom colored. */
-  color: inherit !important;
-}
-
-/* Tracer */
-
-#trace {
-  list-style-image: url(tracer-icon.png);
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#trace[checked] {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #trace {
-    list-style-image: url(tracer-icon@2x.png);
-    -moz-image-region: rect(0px,32px,32px,0px);
-  }
-
-  #trace[checked] {
-    -moz-image-region: rect(0px,64px,32px,32px);
-  }
-}
-
-#clear-tracer {
-  /* Make this button as narrow as the text inside it. */
-  min-width: 1px;
-}
-
-.trace-name {
-  -moz-padding-start: 4px;
-}
-
-/* Tracer dark theme */
-
-.theme-dark .trace-item {
-  color: var(--theme-selection-color);
-}
-
-.theme-dark .trace-item.black-boxed {
-  color: rgba(128,128,128,0.4);
-}
-
-.theme-dark .trace-item.selected-matching {
-  background-color: rgba(29,79,115,.4); /* Select highlight blue at 40% alpha */
-}
-
-.theme-dark .selected > .trace-item {
-  background-color: rgba(29,79,115,.6); /* Select highlight blue at 60% alpha */
-}
-
-.trace-call {
-  color: var(--theme-highlight-blue);
-}
-
-.trace-return,
-.trace-yield {
-  color: var(--theme-highlight-green);
-}
-
-.trace-throw {
-  color: var(--theme-highlight-red);
-}
-
-.trace-param {
-  color: var(--theme-content-color1);
-}
-
-.theme-dark .trace-syntax {
-  color: var(--theme-content-color2);
-}
-
-/* Tracer light theme */
-.theme-light .trace-item {
-  color: var(--theme-content-color1);
-}
-
-.theme-light .trace-item.black-boxed {
-  color: rgba(128,128,128,0.4);
-}
-
-.theme-light .trace-item.selected-matching {
-  background-color: rgba(76,158,217,.4); /* Select highlight blue at 40% alpha */
-}
-
-.theme-light .selected > .trace-item {
-  background-color: rgba(76,158,217,.6); /* Select highlight blue at 60% alpha */
-}
-
-#tracer-traces .selected label {
-  /* Text inside a selected item should not be custom colored. */
-  color: inherit !important;
-}
-
-/* Watch expressions view */
-
-#expressions {
-  min-height: 10px;
-  max-height: 125px;
-}
-
-.dbg-expression {
-  height: 20px;
-}
-
-.dbg-expression-arrow {
-  background-image: url(commandline-icon.png);
-  background-position: -16px 0;
-  background-repeat: no-repeat;
-  background-size: 32px 16px;
-  width: 16px;
-  height: 16px;
-  margin: 2px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .dbg-expression-arrow {
-    background-image: url(commandline-icon@2x.png);
-  }
-}
-
-.dbg-expression-input {
-  color: inherit;
-}
-
-.dbg-expression-button {
-  -moz-appearance: none;
-  border: none;
-  background: none;
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.dbg-expression-button {
-  color: var(--theme-highlight-blue);
-}
-
-/* Event listeners view */
-
-.dbg-event-listener-type {
-  font-weight: 600;
-}
-
-.dbg-event-listener-location {
-  color: var(--theme-content-color1);
-}
-
-.dbg-event-listener-separator {
-  color: var(--theme-body-color-alt);
-}
-
-.dbg-event-listener-targets {
-  color: var(--theme-highlight-bluegrey);
-}
-
-.theme-dark #event-listeners .selected {
-  /* Selected items shouldn't be displayed differently. */
-  background: none;
-  color: #fff;
-}
-
-.theme-light #event-listeners .selected {
-  /* Selected items shouldn't be displayed differently. */
-  background: none;
-  color: #000;
-}
-
-/* Searchbox and the search operations help panel */
-
-#searchbox {
-  min-width: 220px;
-  -moz-margin-start: 1px;
-}
-
-#filter-label {
-  -moz-margin-start: 2px;
-}
-
-#searchbox-panel-operators {
-  margin-top: 5px;
-  margin-bottom: 8px;
-  -moz-margin-start: 2px;
-}
-
-.searchbox-panel-operator-button {
-  min-width: 26px;
-  margin-top: 0;
-  margin-bottom: 0;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 6px;
-  text-align: center;
-}
-
-.searchbox-panel-operator-label {
-  padding-bottom: 2px;
-}
-
-/* Searchbox results panel */
-
-#results-panel {
-  border: none;
-}
-
-.results-panel-item {
-  padding: 6px 8px;
-  border-top: 1px solid rgba(128,128,128,0.2);
-}
-
-.results-panel-item:first-of-type {
-  border-top: none;
-}
-
-.results-panel-item-label {
-  font-weight: 600;
-}
-
-.results-panel-item-label-before {
-  -moz-padding-end: 6px;
-}
-
-.theme-dark .results-panel-item-label {
-  color: var(--theme-selection-color);
-}
-
-.theme-light .results-panel-item-label {
-  color: var(--theme-body-color);
-}
-
-.results-panel-item-label-before {
-  color: var(--theme-highlight-bluegrey);
-}
-
-.results-panel-item-label-below {
-  color: var(--theme-content-color3);
-}
-
-#results-panel .selected label {
-  /* Text inside a selected item should not be custom colored. */
-  color: inherit !important;
-}
-
-/* Sources search view */
-
-#globalsearch {
-  min-height: 10px;
-  max-height: 50vh;
-}
-
-.dbg-results-header {
-  -moz-padding-start: 6px;
-}
-
-.dbg-results-header-location {
-  font-weight: 600;
-}
-
-.dbg-results-header-match-count {
-  -moz-padding-start: 6px;
-}
-
-.dbg-results-line-number {
-  min-width: 3em;
-  -moz-border-end: 1px solid rgba(128,128,128,0.2);
-  -moz-padding-end: 4px;
-  text-align: end;
-}
-
-.dbg-results-line-contents {
-  -moz-padding-start: 4px;
-}
-
-.dbg-results-line-contents-string[match=true] {
-  background-color: rgba(255,255,0,0.2);
-  border: 1px solid rgba(128,128,128,0.7);
-  border-radius: 4px;
-  margin-top: -1px !important;
-  margin-bottom: -1px !important;
-  cursor: pointer;
-}
-
-.dbg-results-line-contents-string[match=true][focusing] {
-  transition: transform 0.3s ease-in-out;
-}
-
-.dbg-results-line-contents-string[match=true][focused] {
-  transition-duration: 0.1s;
-  transform: scale(1.75, 1.75);
-}
-
-.dbg-source-results:not(.selected):hover {
-  background-color: var(--theme-sidebar-background);
-}
-
-.dbg-results-header {
-  background-color: var(--theme-tab-toolbar-background);
-}
-
-.theme-dark .dbg-results-header {
-  color: var(--theme-content-color1);
-}
-
-.theme-light .dbg-results-header {
-  color: var(--theme-content-color3);
-}
-
-.theme-dark .dbg-search-result:hover {
-  background-color: rgba(29,79,115,.2); /* Select highlight blue at 40% alpha */
-}
-
-.theme-light .dbg-search-result:hover {
-  background-color: rgba(76,158,217,.2); /* Select highlight blue at 40% alpha */
-}
-
-.dbg-results-header-match-count {
-  color: var(--theme-content-color3);
-}
-
-.dbg-results-line-number {
-  background-color: var(--theme-tab-toolbar-background);
-  color: var(--theme-body-color-alt);
-}
-
-.dbg-results-line-contents-string {
-  color: var(--theme-body-color-alt);
-}
-
-.theme-dark .dbg-results-line-contents-string[match=true] {
-  color: var(--theme-selection-color);
-}
-
-.theme-light .dbg-results-line-contents-string[match=true] {
-  color: var(--theme-body-color);
-}
-
-/* Toolbar controls */
-
-#debugger-toolbar .devtools-toolbarbutton:not([label]) > .toolbarbutton-icon,
-#sources-toolbar .devtools-toolbarbutton:not([label]) > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-#resume {
-  list-style-image: url(debugger-pause.png);
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#resume[checked] {
-  list-style-image: url(debugger-play.png);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #resume {
-    list-style-image: url(debugger-pause@2x.png);
-    -moz-image-region: rect(0px,32px,32px,0px);
-  }
-
-  #resume[checked] {
-    list-style-image: url(debugger-play@2x.png);
-    -moz-image-region: rect(0px,64px,32px,32px);
-  }
-}
-
-#debugger-controls toolbarbutton {
-  transition: opacity 0.15s ease-in-out;
-}
-
-#debugger-controls toolbarbutton[disabled] {
-  opacity: .5;
-  transition: none;
-}
-
-#resume[break-on-next] {
-  background: var(--theme-highlight-lightorange);
-}
-
-#step-over {
-  list-style-image: url(debugger-step-over.png);
-}
-
-#step-in {
-  list-style-image: url(debugger-step-in.png);
-}
-
-#step-out {
-  list-style-image: url(debugger-step-out.png);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #step-over {
-    list-style-image: url(debugger-step-over@2x.png);
-  }
-
-  #step-in {
-    list-style-image: url(debugger-step-in@2x.png);
-  }
-
-  #step-out {
-    list-style-image: url(debugger-step-out@2x.png);
-  }
-}
-
-#instruments-pane-toggle {
-  background: none;
-  box-shadow: none;
-  border: none;
-  list-style-image: url(debugger-collapse.png);
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#instruments-pane-toggle[pane-collapsed] {
-  list-style-image: url(debugger-expand.png);
-}
-
-#instruments-pane-toggle:hover {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #instruments-pane-toggle {
-    list-style-image: url(debugger-collapse@2x.png);
-    -moz-image-region: rect(0px,32px,32px,0px);
-  }
-
-  #instruments-pane-toggle[pane-collapsed] {
-    list-style-image: url(debugger-expand@2x.png);
-  }
-
-  #instruments-pane-toggle:hover {
-    -moz-image-region: rect(0px,64px,32px,32px);
-  }
-}
-
-/* Horizontal vs. vertical layout */
-
-#vertical-layout-panes-container {
-  min-height: 35vh;
-  max-height: 80vh;
-}
-
-#body[layout=vertical] #sources-pane > tabs {
-  -moz-border-end: none;
-}
-
-#body[layout=vertical] #instruments-pane {
-  margin: 0 !important;
-  /* To prevent all the margin hacks to hide the sidebar. */
-}
-
-#body[layout=vertical] .side-menu-widget-container,
-#body[layout=vertical] .side-menu-widget-empty-text {
-  box-shadow: none !important;
-}
-
-#body[layout=vertical] .side-menu-widget-item-arrow {
-  background-image: none !important;
-}
-
-#body[layout=vertical] .side-menu-widget-group,
-#body[layout=vertical] .side-menu-widget-item {
-  -moz-margin-end: 0;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/dock-bottom-maximize@2x.png b/arc-firefox-theme/chrome/browser/devtools/dock-bottom-maximize@2x.png
deleted file mode 100644
index feb4d78..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/dock-bottom-maximize@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/dock-bottom-minimize@2x.png b/arc-firefox-theme/chrome/browser/devtools/dock-bottom-minimize@2x.png
deleted file mode 100644
index a82983c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/dock-bottom-minimize@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/dock-bottom@2x.png b/arc-firefox-theme/chrome/browser/devtools/dock-bottom@2x.png
deleted file mode 100644
index d5df16f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/dock-bottom@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/dock-side@2x.png b/arc-firefox-theme/chrome/browser/devtools/dock-side@2x.png
deleted file mode 100644
index 17de7f1..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/dock-side@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/dropmarker.svg b/arc-firefox-theme/chrome/browser/devtools/dropmarker.svg
deleted file mode 100644
index 7592790..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/dropmarker.svg
+++ /dev/null
@@ -1,6 +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/. -->

-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="4" viewBox="0 0 8 4">

-  <polygon points="0,0 4,4 8,0" fill="#b6babf"/>

-</svg>

diff --git a/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint.png b/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint.png
deleted file mode 100644
index 401f26b..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint@2x.png b/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint@2x.png
deleted file mode 100644
index 7253aee..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/editor-debug-location.png b/arc-firefox-theme/chrome/browser/devtools/editor-debug-location.png
deleted file mode 100644
index d590573..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/editor-debug-location.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/editor-debug-location@2x.png b/arc-firefox-theme/chrome/browser/devtools/editor-debug-location@2x.png
deleted file mode 100644
index b1dd7ee..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/editor-debug-location@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/editor-error.png b/arc-firefox-theme/chrome/browser/devtools/editor-error.png
deleted file mode 100644
index 39ef81e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/editor-error.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/eyedropper.css b/arc-firefox-theme/chrome/browser/devtools/eyedropper.css
deleted file mode 100644
index cf22caf..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/eyedropper.css
+++ /dev/null
@@ -1,45 +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/. */
-
-#canvas {
-  image-rendering: -moz-crisp-edges;
-  cursor: none;
-  border: 3px solid #E0E0E0;
-  border-radius: 50%;
-}
-
-#canvas-overflow {
-  overflow: hidden;
-  width: 96px;
-  height: 96px;
-}
-
-#color-preview {
-  width: 16px;
-  height: 16px;
-  box-shadow: 0px 0px 0px black;
-  border: solid 1px #fff;
-  margin: 3px;
-}
-
-#color-value-box {
-  background-color: #E0E0E0;
-  border-radius: 1px;
-  width: 150px;
-}
-
-#color-value {
-  padding: 0.3em;
-  text-shadow: 1px 1px 1px #fff;
-}
-
-#color-value.highlight {
-  font-family: inherit;
-}
-
-window {
-  /* inexplicably, otherwise background shows up on Linux */
-  border: 1px solid transparent;
-  background-color: transparent;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/fast-forward.png b/arc-firefox-theme/chrome/browser/devtools/fast-forward.png
deleted file mode 100644
index f2c6c52..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/fast-forward.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/fast-forward@2x.png b/arc-firefox-theme/chrome/browser/devtools/fast-forward@2x.png
deleted file mode 100644
index 4c3cf88..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/fast-forward@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/filetype-dir-close.svg b/arc-firefox-theme/chrome/browser/devtools/filetype-dir-close.svg
deleted file mode 100644
index ae6f221..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/filetype-dir-close.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- 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 512 512" xmlns="http://www.w3.org/2000/svg" fill="#0A0805" width="16" height="16">

-  <path d="M 0.00,160.00 L 512.00,160.00 L 480.00,480.00 L 32.00,480.00 L 0.00,160.00 Z M 464.00,96.00 L 480.00,128.00 L 32.00,128.00 L 64.00,64.00 L 240.00,64.00 L 256.00,96.00 L 464.00,96.00 Z"/>

-</svg>

diff --git a/arc-firefox-theme/chrome/browser/devtools/filetype-dir-open.svg b/arc-firefox-theme/chrome/browser/devtools/filetype-dir-open.svg
deleted file mode 100644
index c7fafc2..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/filetype-dir-open.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- 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 512 512" xmlns="http://www.w3.org/2000/svg" fill="#0A0805" width="16" height="16">

-  <path d="M 416.00,480.00L 512.00,224.00L 96.00,224.00L0.00,480.00 zM 64.00,192.00 L 0.00,480.00 L 0.00,64.00 L 144.00,64.00 L 208.00,128.00 L 416.00,128.00 L 416.00,192.00 Z"/>

-</svg>

diff --git a/arc-firefox-theme/chrome/browser/devtools/filetype-globe.svg b/arc-firefox-theme/chrome/browser/devtools/filetype-globe.svg
deleted file mode 100644
index a5580b4..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/filetype-globe.svg
+++ /dev/null
@@ -1,6 +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/. -->

-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="0 0 878 1024">

-  <path fill="#0A0805" d="M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM595.429 370.857q-1.143 0.571-5.429 5.429t-7.714 5.429q1.143 0 2.571-2.857t2.857-6.286 2-4q3.429-4 12.571-8.571 8-3.429 29.714-6.857 19.429-4.571 29.143 6.286-1.143-1.143 5.429-7.429t8.286-6.857q1.714-1.143 8.571-2.571t8.571-4.286l1.143-12.571q-6.857 0.571-10-4t-3.714-12q0 1.143-3.429 4.571 0-4-2.571-4.571t-6.571 0.571-5.143 0.571q-5.714-1.714-8.571-4.286t-4.571-9.429-2.286-8.571q-1.143-2.857-5.429-6t-5.429-6q-0.571-1.143-1.429-3.143t-1.714-3.714-2.286-3.143-3.143-1.429-4 2.857-4.286 5.714-2.571 2.857q-1.714-1.143-3.429-0.857t-2.571 0.571-2.571 1.714-2.857 2q-1.714 1.143-4.857 1.714t-4.857 1.143q8.571-2.857-0.571-6.286-5.714-2.286-9.143-1.714 5.143-2.286 4.286-6.857t-4.857-8h2.857q-0.571-2.286-4.857-4.857t-10-4.857-7.429-3.429q-4.571-2.857-19.429-5.429t-18.857-0.286q-2.857 3.429-2.571 6t2.286 8 2 7.143q0.571 3.429-3.143 7.429t-3.714 6.857q0 4 8 8.857t5.714 12.286q-1.714 4.571-9.143 9.143t-9.143 6.857q-2.857 4.571-0.857 10.571t6 9.429q1.143 1.143 0.857 2.286t-2 2.571-3.143 2.286-3.714 2l-1.714 1.143q-6.286 2.857-11.714-3.429t-7.714-14.857q-4-14.286-9.143-17.143-13.143-4.571-16.571 0.571-2.857-7.429-23.429-14.857-14.286-5.143-33.143-2.286 3.429-0.571 0-8.571-4-8.571-10.857-6.857 1.714-3.429 2.286-10t0.571-7.714q1.714-7.429 6.857-13.143 0.571-0.571 4-4.857t5.429-7.714 0.286-3.429q20 2.286 28.571-6.286 2.857-2.857 6.571-9.714t6-9.714q5.143-3.429 8-3.143t8.286 3.143 8.286 2.857q8 0.571 8.857-6.286t-4.286-11.429q6.857 0.571 1.714-9.714-2.857-4-4.571-5.143-6.857-2.286-15.429 2.857-4.571 2.286 1.143 4.571-0.571-0.571-5.429 6t-9.429 10-9.143-2.857q-0.571-0.571-3.143-7.714t-5.429-7.714q-4.571 0-9.143 8.571 1.714-4.571-6.286-8.571t-13.714-4.571q10.857-6.857-4.571-15.429-4-2.286-11.714-2.857t-11.143 2.286q-2.857 4-3.143 6.571t2.857 4.571 6 3.143 6.571 2.286 4.857 1.714q8 5.714 4.571 8-1.143 0.571-4.857 2t-6.571 2.571-3.429 2.286q-1.714 2.286 0 8t-1.143 8q-2.857-2.857-5.143-10t-4-9.429q4 5.143-14.286 3.429l-5.714-0.571q-2.286 0-9.143 1.143t-11.714 0.571-7.714-4.571q-2.286-4.571 0-11.429 0.571-2.286 2.286-1.143-2.286-1.714-6.286-5.429t-5.714-4.857q-26.286 8.571-53.714 23.429 3.429 0.571 6.857-0.571 2.857-1.143 7.429-3.714t5.714-3.143q19.429-8 24-4l2.857-2.857q8 9.143 11.429 14.286-4-2.286-17.143-0.571-11.429 3.429-12.571 6.857 4 6.857 2.857 10.286-2.286-1.714-6.571-5.714t-8.286-6.286-8.571-2.857q-9.143 0-12.571 0.571-83.429 45.714-134.286 126.857 4 4 6.857 4.571 2.286 0.571 2.857 5.143t1.429 6.286 6.571-1.714q5.143 4.571 1.714 10.857 0.571-0.571 25.143 15.429 10.857 9.714 12 12 1.714 6.286-5.714 10.286-0.571-1.143-5.143-5.143t-5.143-2.286q-1.714 2.857 0.286 10.571t6 7.143q-4 0-5.429 9.143t-1.429 20.286-0.571 13.429l1.143 0.571q-1.714 6.857 3.143 19.714t12.286 11.143q-7.429 1.714 11.429 24.571 3.429 4.571 4.571 5.143 1.714 1.143 6.857 4.286t8.571 5.714 5.714 6q2.286 2.857 5.714 12.857t8 13.429q-1.143 3.429 5.429 11.429t6 13.143q-0.571 0-1.429 0.571t-1.429 0.571q1.714 4 8.857 8t8.857 7.429q0.571 1.714 1.143 5.714t1.714 6.286 4.571 1.143q1.143-11.429-13.714-35.429-8.571-14.286-9.714-16.571-1.714-2.857-3.143-8.857t-2.571-8.286q1.143 0 3.429 0.857t4.857 2 4.286 2.286 1.143 1.714q-1.714 4 1.143 10t6.857 10.571 9.714 10.857 6.857 7.429q3.429 3.429 8 11.143t0 7.714q5.143 0 11.429 5.714t9.714 11.429q2.857 4.571 4.571 14.857t2.857 13.714q1.143 4 4.857 7.714t7.143 5.429l9.143 4.571t7.429 4q2.857 1.143 10.571 6t12.286 6.571q5.714 2.286 9.143 2.286t8.286-1.429 7.714-2q8.571-1.143 16.571 8.571t12 12q20.571 10.857 31.429 6.286-1.143 0.571 0.286 4.286t4.571 8.857 5.143 8.286 3.143 4.857q2.857 3.429 10.286 8.571t10.286 8.571q3.429-2.286 4-5.143-1.714 4.571 4 11.429t10.286 5.714q8-1.714 8-18.286-17.714 8.571-28-10.286 0-0.571-1.429-3.143t-2.286-4.857-1.429-4.857 0-4.286 2.857-1.714q5.143 0 5.714-2t-1.143-7.143-2.286-7.429q-0.571-4.571-6.286-11.429t-6.857-8.571q-2.857 5.143-9.143 4.571t-9.143-5.143q0 0.571-0.857 3.143t-0.857 3.714q-7.429 0-8.571-0.571 0.571-1.714 1.429-10t2-12.857q0.571-2.286 3.143-6.857t4.286-8.286 2.286-7.143-2.571-5.429-10-1.429q-10.857 0.571-14.857 11.429-0.571 1.714-1.714 6t-2.857 6.571-5.143 4q-4 1.714-13.714 1.143t-13.714-2.857q-7.429-4.571-12.857-16.571t-5.429-21.143q0-5.714 1.429-15.143t1.714-14.286-3.143-14q1.714-1.143 5.143-5.429t5.714-6q1.143-0.571 2.571-0.857t2.571 0 2.286-0.857 1.714-3.429q-0.571-0.571-2.286-1.714-1.714-1.714-2.286-1.714 4 1.714 16.286-0.857t15.714 0.857q8.571 6.286 12.571-1.143 0-0.571-1.429-5.429t-0.286-7.714q2.857 15.429 16.571 5.143 1.714 1.714 8.857 2.857t10 2.857q1.714 1.143 4 3.143t3.143 2.571 2.857-0.286 4.857-3.714q5.714 8 6.857 13.714 6.286 22.857 10.857 25.143 4 1.714 6.286 1.143t2.571-5.429 0-8-0.857-7.143l-0.571-4.571v-10.286l-0.571-4.571q-8.571-1.714-10.571-6.857t0.857-10.571 8.571-10.571q0.571-0.571 4.571-2t8.857-3.714 7.143-4.571q12-10.857 8.571-20 4 0 6.286-5.143-0.571 0-2.857-1.714t-4.286-2.857-2.571-1.143q5.143-2.857 1.143-9.143 2.857-1.714 4.286-6.286t4.286-5.714q5.143 6.857 12 1.143 4-4.571 0.571-9.143 2.857-4 11.714-6t10.571-5.429q4 1.143 4.571-1.143t0.571-6.857 1.714-6.857q2.286-2.857 8.571-5.143t7.429-2.857l9.714-6.286q1.714-2.286 0-2.286 10.286 1.143 17.714-6.286 5.714-6.286-3.429-11.429 1.714-3.429-1.714-5.429t-8.571-3.143q1.714-0.571 6.571-0.286t6-0.857q8.571-5.714-4-9.143-9.714-2.857-24.571 6.857zM502.286 872q117.714-20.571 200.571-108-1.714-1.714-7.143-2.571t-7.143-2q-10.286-4-13.714-4.571 0.571-4-1.429-7.429t-4.571-5.143-7.143-4.571-6.286-4q-1.143-1.143-4-3.429t-4-3.143-4.286-2.571-4.857-1.143-5.714 0.571l-1.714 0.571q-1.714 0.571-3.143 1.429t-3.143 1.714-2.286 1.714 0 1.429q-12-9.714-20.571-12.571-2.857-0.571-6.286-3.143t-6-4-5.714-0.857-6.571 4q-2.857 2.857-3.429 8.571t-1.143 7.429q-4-2.857 0-10t1.143-10.571q-1.714-3.429-6-2.571t-6.857 2.571-6.571 4.857-5.143 3.714-4.857 3.143-4.857 4.286q-1.714 2.286-3.429 6.857t-2.857 6.286q-1.143-2.286-6.571-3.714t-5.429-3.143q1.143 5.714 2.286 20t2.857 21.714q4 17.714-6.857 27.429-15.429 14.286-16.571 22.857-2.286 12.571 6.857 14.857 0 4-4.571 11.714t-4 12.286q0 3.429 1.143 9.143z"/>

-</svg>

diff --git a/arc-firefox-theme/chrome/browser/devtools/filetype-store.svg b/arc-firefox-theme/chrome/browser/devtools/filetype-store.svg
deleted file mode 100644
index c85c560..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/filetype-store.svg
+++ /dev/null
@@ -1,8 +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/. -->
-<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" fill="#0A0805">
-  <path d="m1.3,12.5v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6,0-6.6-2.7-6.6-2.7z"/>
-  <path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/>
-  <path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/filter-swatch.svg b/arc-firefox-theme/chrome/browser/devtools/filter-swatch.svg
deleted file mode 100644
index 1f63b4f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/filter-swatch.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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 12 12" width="12px" height="12px">
-  <mask id="mask">
-    <rect width="100%" height="100%" fill="#fff"/>
-    <polygon points="12,0 0,0 0,12"/>
-  </mask>
-  <circle cx="6" cy="6" r="6" fill="#fff"/>
-  <circle cx="6" cy="6" r="6" mask="url(#mask)" fill="#aeb0b1"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/filters.svg b/arc-firefox-theme/chrome/browser/devtools/filters.svg
deleted file mode 100644
index 700fdbf..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/filters.svg
+++ /dev/null
@@ -1,25 +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/. -->
-
-<svg height="0" xmlns="http://www.w3.org/2000/svg">
-  <filter id="invert" x="0%" y="0%" width="100%" height="100%"
-          primitiveUnits="objectBoundingBox">
-    <feComponentTransfer>
-      <feFuncR type="table" tableValues=".1 0"/>
-      <feFuncG type="table" tableValues=".1 0"/>
-      <feFuncB type="table" tableValues=".1 0"/>
-    </feComponentTransfer>
-  </filter>
-
-  <!-- Web Audio Gradients -->
-  <linearGradient id="bypass-light" x1="6%" y1="8%" x2="12%" y2="12%" spreadMethod="repeat">
-    <stop offset="0%" stop-color="#f0f1f2"/> <!-- theme-toolbar-background -->
-    <stop offset="50%" stop-color="#fff"/>
-  </linearGradient>
-
-  <linearGradient id="bypass-dark" x1="6%" y1="8%" x2="12%" y2="12%" spreadMethod="repeat">
-    <stop offset="0%" stop-color="#343c45"/> <!-- theme-toolbar-background -->
-    <stop offset="50%" stop-color="transparent"/>
-  </linearGradient>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars-light.css b/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars-light.css
deleted file mode 100644
index 01b622f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars-light.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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://browser/skin/devtools/floating-scrollbars.css");
-
-scrollbar thumb {
-  background-color: rgba(170,170,170,0.2) !important;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars.css b/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars.css
deleted file mode 100644
index 61c66c8..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars.css
+++ /dev/null
@@ -1,34 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-scrollbar {
-  -moz-appearance: none !important;
-  position: relative;
-  background-color: transparent;
-  background-image: none;
-  z-index: 2147483647;
-  padding: 2px;
-}
-
-/* Scrollbar code will reset the margin to the correct side depending on
-   where layout actually puts the scrollbar */
-scrollbar[orient="vertical"] {
-  margin-left: -10px;
-  min-width: 10px;
-  max-width: 10px;
-}
-
-scrollbar[orient="horizontal"] {
-  margin-top: -10px;
-  min-height: 10px;
-  max-height: 10px;
-}
-
-scrollbar thumb {
-  -moz-appearance: none !important;
-  border-width: 0px !important;
-  background-color: rgba(170,170,170,0.2) !important;
-  border-radius: 3px !important;
-}
-scrollbar scrollbarbutton, scrollbar gripper {
-  display: none;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/font-inspector.css b/arc-firefox-theme/chrome/browser/devtools/font-inspector.css
deleted file mode 100644
index 2c4a365..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/font-inspector.css
+++ /dev/null
@@ -1,80 +0,0 @@
-* {
-  box-sizing: border-box;
-}
-
-body {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  margin: 0;
-  padding-bottom: 20px;
-}
-
-#all-fonts {
-  padding: 0;
-  margin: 0;
-}
-
-#showall {
-  border-radius: 0;
-  border: 1px solid black;
-  margin: 3px;
-  cursor: pointer;
-  position: fixed;
-  bottom: 0;
-  right: 0;
-}
-
-.font {
-  padding: 10px 10px;
-}
-
-.theme-dark .font {
-  border-bottom: 1px solid #444;
-}
-
-.theme-light .font {
-  border-bottom: 1px solid #DDD;
-}
-
-.font:last-of-type {
-  border-bottom: 0;
-}
-
-.theme-light .font:nth-child(even) {
-  background: #F4F4F4;
-}
-
-.font-preview {
-  margin-left: -4px;
-  height: 60px;
-  display: block;
-}
-
-.font-info {
-  display: block;
-}
-
-.font-name {
-  display: inline;
-}
-
-.font-css-code {
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 5px;
-}
-
-.theme-light .font-css-code,
-.theme-light .font-url {
-  border: 1px solid #CCC;
-  background: white;
-}
-
-.theme-dark .font-css-code,
-.theme-dark .font-url {
-  border: 1px solid #333;
-  background: black;
-  color: white;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/inspector.css b/arc-firefox-theme/chrome/browser/devtools/inspector.css
deleted file mode 100644
index a892ec3..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/inspector.css
+++ /dev/null
@@ -1,155 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-
-#inspector-searchbox {
-  transition-property: max-width, -moz-padding-end, -moz-padding-start;
-  transition-duration: 250ms;
-  transition-timing-function: ease;
-}
-
-#inspector-searchbox:not([focused]):not([filled]) > .textbox-input-box {
-  overflow: hidden;
-}
-
-#inspector-searchbox:not([focused]):not([filled]) {
-  max-width: 20px !important;
-  -moz-padding-end: 5px;
-  -moz-padding-start: 22px;
-  background-position: 8px center, top left, top left;
-}
-
-#inspector-searchbox[focused],
-#inspector-searchbox[filled] {
-  max-width: 200px !important;
-}
-
-/* Expand/collapse panel toolbar button */
-
-#inspector-pane-toggle {
-  background: none;
-  box-shadow: none;
-  border: none;
-  list-style-image: url(debugger-collapse.png);
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#inspector-pane-toggle > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-#inspector-pane-toggle[pane-collapsed] {
-  list-style-image: url(debugger-expand.png);
-}
-
-#inspector-pane-toggle:active {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #inspector-pane-toggle {
-    list-style-image: url(debugger-collapse@2x.png);
-    -moz-image-region: rect(0px,32px,32px,0px);
-  }
-
-  #inspector-pane-toggle[pane-collapsed] {
-    list-style-image: url(debugger-expand@2x.png);
-  }
-
-  #inspector-pane-toggle:active {
-    -moz-image-region: rect(0px,64px,32px,32px);
-  }
-}
-
-/* Tooltip: Events */
-
-#devtools-tooltip-events-container {
-  margin: -4px; /* Compensate for the .panel-arrowcontent padding. */
-  max-width: 590px;
-  overflow-y: auto;
-}
-
-.event-header {
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-}
-
-.event-tooltip-event-type,
-.event-tooltip-filename,
-.event-tooltip-attributes {
-  -moz-margin-start: 0;
-  flex-shrink: 0;
-  cursor: pointer;
-}
-
-.event-tooltip-event-type {
-  font-weight: bold;
-  font-size: 13px;
-}
-
-.event-tooltip-filename {
-  -moz-margin-end: 0;
-  font-size: 100%;
-  flex-shrink: 1;
-}
-
-.event-tooltip-debugger-icon {
-  width: 16px;
-  height: 16px;
-  -moz-margin-end: 4px;
-  opacity: 0.6;
-  flex-shrink: 0;
-}
-
-.event-tooltip-debugger-icon:hover {
-  opacity: 1;
-}
-
-.event-tooltip-content-box {
-  display: none;
-  overflow: auto;
-  -moz-margin-end: 0;
-}
-
-.event-tooltip-content-box[open] {
-  display: block;
-}
-
-.event-tooltip-source-container {
-  margin-top: 5px;
-  margin-bottom: 10px;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 0;
-}
-
-.event-tooltip-source {
-  margin-bottom: 0;
-}
-
-.event-tooltip-attributes-container {
-  display: flex;
-  flex-shrink: 0;
-  flex-grow: 1;
-  justify-content: flex-end;
-}
-
-.event-tooltip-attributes-box {
-  display: flex;
-  flex-shrink: 0;
-  align-items: center;
-  border-radius: 3px;
-  padding: 2px;
-  -moz-margin-start: 5px;
-  background-color: var(--theme-body-color-alt);
-  color: var(--theme-toolbar-background);
-}
-
-.event-tooltip-attributes {
-  margin: 0;
-  font-size: 9px;
-  padding-top: 2px;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/itemArrow-dark-ltr.svg b/arc-firefox-theme/chrome/browser/devtools/itemArrow-dark-ltr.svg
deleted file mode 100644
index c2accab..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/itemArrow-dark-ltr.svg
+++ /dev/null
@@ -1,7 +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/. -->
-<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12">
-  <path fill="#181d20" d="M7,11.6 7,.4 1.5,6z"/>
-  <path fill="#000" d="M7,0 6,0 0,6 6,12 7,12 7,11.6 1.5,6 7,.4z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/itemArrow-dark-rtl.svg b/arc-firefox-theme/chrome/browser/devtools/itemArrow-dark-rtl.svg
deleted file mode 100644
index 18d3702..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/itemArrow-dark-rtl.svg
+++ /dev/null
@@ -1,7 +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/. -->

-<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12">

-  <path fill="#181d20" d="M0,11.6 0,.4 5.5,6z"/>

-  <path fill="#000" d="M1,0 0,0 0,.4 5.5,6 0,11.6 0,12 1,12 7,6z"/>

-</svg>

diff --git a/arc-firefox-theme/chrome/browser/devtools/itemArrow-ltr.svg b/arc-firefox-theme/chrome/browser/devtools/itemArrow-ltr.svg
deleted file mode 100644
index bca667a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/itemArrow-ltr.svg
+++ /dev/null
@@ -1,7 +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/. -->
-<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12">
-  <path fill="#f7f7f7" d="M7,11.6 7,.4 1.5,6z"/>
-  <path fill="#ababab" d="M7,0 6,0 0,6 6,12 7,12 7,11.6 1.5,6 7,.4z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/itemArrow-rtl.svg b/arc-firefox-theme/chrome/browser/devtools/itemArrow-rtl.svg
deleted file mode 100755
index e83fa63..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/itemArrow-rtl.svg
+++ /dev/null
@@ -1,7 +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/. -->
-<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12">
-  <path fill="#f7f7f7" d="M0,11.6 0,.4 5.5,6z"/>
-  <path fill="#ababab" d="M1,0 0,0 0,.4 5.5,6 0,11.6 0,12 1,12 7,6z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/itemToggle.png b/arc-firefox-theme/chrome/browser/devtools/itemToggle.png
deleted file mode 100644
index dc30c22..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/itemToggle.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/itemToggle@2x.png b/arc-firefox-theme/chrome/browser/devtools/itemToggle@2x.png
deleted file mode 100644
index 9042128..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/itemToggle@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/layoutview.css b/arc-firefox-theme/chrome/browser/devtools/layoutview.css
deleted file mode 100644
index 642e89c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/layoutview.css
+++ /dev/null
@@ -1,339 +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/ */
-
-.theme-sidebar {
-  box-sizing: border-box;
-}
-
-body {
-  /* The view will grow bigger as the window gets resized, until 400px */
-  max-width: 400px;
-  margin: 0px auto;
-  padding: 0;
-  /* "Contain" the absolutely positioned #main element */
-  position: relative;
-}
-
-/* Header: contains the position and size of the element */
-
-#header {
-  box-sizing: border-box;
-  width: 100%;
-  padding: 4px 14px;
-  display: -moz-box;
-  vertical-align: top;
-}
-
-#header:-moz-dir(rtl) {
-  -moz-box-direction: reverse;
-}
-
-#header > span {
-  display: -moz-box;
-}
-
-#element-size {
-  -moz-box-flex: 1;
-}
-
-#element-size:-moz-dir(rtl) {
-  -moz-box-pack: end;
-}
-
-@media (max-height: 228px) {
-  #header {
-    padding-top: 0;
-    padding-bottom: 0;
-    margin-top: 10px;
-    margin-bottom: 8px;
-  }
-}
-
-/* Main: contains the box-model regions */
-
-#main {
-  position: absolute;
-  box-sizing: border-box;
-  /* The regions are semi-transparent, so the white background is partly
-     visible */
-  background-color: white;
-  color: var(--theme-selection-color);
-  /* Make sure there is some space between the window's edges and the regions */
-  margin: 0 14px 10px 14px;
-  width: calc(100% - 2 * 14px);
-}
-
-.margin,
-.size {
-  color: var(--theme-highlight-blue);
-}
-
-/* Regions are 3 nested elements with wide borders and outlines */
-
-#content {
-  height: 25px;
-}
-
-#margins,
-#borders,
-#padding {
-  border-color: hsla(210,100%,85%,0.2);
-  border-width: 25px;
-  border-style: solid;
-  outline: dotted 1px hsl(210,100%,85%);
-}
-
-#margins {
-  /* This opacity applies to all of the regions, since they are nested */
-  opacity: .8;
-}
-
-/* Respond to window size change by changing the size of the regions */
-
-@media (max-height: 228px) {
-  #content {
-    height: 18px;
-  }
-
-  #margins,
-  #borders,
-  #padding {
-    border-width: 18px;
-  }
-}
-
-/* Regions colors */
-
-#margins {
-  border-color: #edff64;
-}
-
-#borders {
-  border-color: #444444;
-}
-
-#padding {
-  border-color: #6a5acd;
-}
-
-#content {
-  background-color: #87ceeb;
-}
-
-/* Editable region sizes are contained in absolutely positioned <p> */
-
-#main > p {
-  position: absolute;
-  pointer-events: none;
-}
-
-#main > p {
-  margin: 0;
-  text-align: center;
-}
-
-#main > p > span {
-  vertical-align: middle;
-  pointer-events: auto;
-}
-
-/* Coordinates for the region sizes */
-
-.top,
-.bottom {
-  width: calc(100% - 2px);
-  text-align: center;
-}
-
-.padding.top {
-  top: 55px;
-}
-
-.padding.bottom {
-  bottom: 57px;
-}
-
-.border.top {
-  top: 30px;
-}
-
-.border.bottom {
-  bottom: 31px;
-}
-
-.margin.top {
-  top: 5px;
-}
-
-.margin.bottom {
-  bottom: 6px;
-}
-
-.size,
-.margin.left,
-.margin.right,
-.border.left,
-.border.right,
-.padding.left,
-.padding.right {
-  top: 22px;
-  line-height: 132px;
-}
-
-.size {
-  width: calc(100% - 2px);
-}
-
-.margin.right,
-.margin.left,
-.border.left,
-.border.right,
-.padding.right,
-.padding.left {
-  width: 25px;
-}
-
-.padding.left {
-  left: 52px;
-}
-
-.padding.right {
-  right: 51px;
-}
-
-.border.left {
-  left: 26px;
-}
-
-.border.right {
-  right: 26px;
-}
-
-.margin.right {
-  right: 0;
-}
-
-.margin.left {
-  left: 0;
-}
-
-.rotate.left:not(.editing) {
-  transform: rotate(-90deg);
-}
-
-.rotate.right:not(.editing) {
-  transform: rotate(90deg);
-}
-
-/* Coordinates should be different when the window is small, because we make
-   the regions smaller then */
-
-@media (max-height: 228px) {
-  .padding.top {
-    top: 37px;
-  }
-
-  .padding.bottom {
-    bottom: 38px;
-  }
-
-  .border.top {
-    top: 19px;
-  }
-
-  .border.bottom {
-    bottom: 20px;
-  }
-
-  .margin.top {
-    top: 1px;
-  }
-
-  .margin.bottom {
-    bottom: 2px;
-  }
-
-  .size,
-  .margin.left,
-  .margin.right,
-  .border.left,
-  .border.right,
-  .padding.left,
-  .padding.right {
-    line-height: 80px;
-  }
-
-  .margin.right,
-  .margin.left,
-  .border.left,
-  .border.right,
-  .padding.right,
-  .padding.left {
-    width: 21px;
-  }
-
-  .padding.left {
-    left: 35px;
-  }
-
-  .padding.right {
-    right: 35px;
-  }
-
-  .border.left {
-    left: 16px;
-  }
-
-  .border.right {
-    right: 17px;
-  }
-}
-
-/* Legend, displayed inside regions */
-
-.legend {
-  position: absolute;
-  margin: 5px 6px;
-  z-index: 1;
-}
-
-.legend[data-box="margin"] {
-  color: var(--theme-highlight-blue);
-}
-
-@media (max-height: 228px) {
-  .legend {
-    margin: 2px 6px;
-  }
-}
-
-/* Editable fields */
-
-.editable {
-  border: 1px dashed transparent;
-  -moz-user-select: text;
-}
-
-.editable:hover {
-  border-bottom-color: hsl(0, 0%, 50%);
-}
-
-.styleinspector-propertyeditor {
-  border: 1px solid #ccc;
-  padding: 0;
-}
-
-/* Make sure the content size doesn't appear as editable like the other sizes */
-
-.size > span {
-  cursor: default;
-}
-
-/* Hide all values when the view is inactive */
-
-body.inactive > #header > #element-position,
-body.inactive > #header > #element-size,
-body.inactive > #main > p {
-   visibility: hidden;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/light-theme.css b/arc-firefox-theme/chrome/browser/devtools/light-theme.css
deleted file mode 100644
index 276b34a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/light-theme.css
+++ /dev/null
@@ -1,1461 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-/* Colors are taken from:
- * https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors.
- * Changes should be kept in sync with commandline.css and commandline.inc.css.
- */
-:root {
-  --theme-body-background: #fcfcfc;
-  --theme-sidebar-background: #f7f7f7;
-  --theme-contrast-background: #e6b064;
-
-  --theme-tab-toolbar-background: #ebeced;
-  --theme-toolbar-background: #f0f1f2;
-  --theme-selection-background: #4c9ed9;
-  --theme-selection-background-semitransparent: rgba(76, 158, 217, .23);
-  --theme-selection-color: #f5f7fa;
-  --theme-splitter-color: #aaaaaa;
-  --theme-comment: #757873;
-
-  --theme-body-color: #18191a;
-  --theme-body-color-alt: #585959;
-  --theme-content-color1: #292e33;
-  --theme-content-color2: #8fa1b2;
-  --theme-content-color3: #667380;
-
-  --theme-highlight-green: #2cbb0f;
-  --theme-highlight-blue: #0088cc;
-  --theme-highlight-bluegrey: #0072ab;
-  --theme-highlight-purple: #5b5fff;
-  --theme-highlight-lightorange: #d97e00;
-  --theme-highlight-orange: #f13c00;
-  --theme-highlight-red: #ed2655;
-  --theme-highlight-pink: #b82ee5;
-
-  /* Colors used in Graphs, like performance tools. Similar colors to Chrome's timeline. */
-  --theme-graphs-green: #85d175;
-  --theme-graphs-blue: #83b7f6;
-  --theme-graphs-bluegrey: #0072ab;
-  --theme-graphs-purple: #b693eb;
-  --theme-graphs-yellow: #efc052;
-  --theme-graphs-red: #e57180;
-  --theme-graphs-grey: #cccccc;
-}
-
-.theme-body {
-  background: var(--theme-body-background);
-  color: var(--theme-body-color);
-}
-
-.theme-sidebar {
-  background: var(--theme-sidebar-background);
-  color: var(--theme-body-color);
-}
-
-::-moz-selection {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.theme-bg-darker {
-  background: var(--theme-selection-background-semitransparent);
-}
-
-.theme-selected,
-.CodeMirror-hint-active {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.theme-bg-contrast,
-.variable-or-property:not([overridden])[changed] {
-  background: var(--theme-contrast-background);
-}
-
-.theme-link,
-.cm-s-mozilla .cm-link,
-.CodeMirror-Tern-type {
-  color: var(--theme-highlight-blue);
-}
-
-/*
- * FIXME: http://bugzil.la/575675 CSS links without :visited set cause assertion
- * failures in debug builds.
- */
-.theme-link:visited,
-.cm-s-mozilla .cm-link:visited {
-  color: var(--theme-highlight-blue);
-}
-
-.theme-comment,
-.cm-s-mozilla .cm-meta,
-.cm-s-mozilla .cm-hr,
-.cm-s-mozilla .cm-comment,
-.variable-or-property .token-undefined,
-.variable-or-property .token-null,
-.CodeMirror-Tern-completion-unknown:before {
-  color: var(--theme-comment);
-}
-
-.theme-gutter {
-  background-color: hsl(0,0%,90%);
-  color: var(--theme-content-color3);
-  border-color: hsl(0,0%,65%);
-}
-
-.theme-separator { /* grey */
-  border-color: #cddae5;
-}
-
-.cm-s-mozilla .cm-unused-line {
-  text-decoration: line-through;
-  text-decoration-color: var(--theme-highlight-bluegrey);
-}
-
-.cm-s-mozilla .cm-executed-line {
-  background-color: #fcfffc;
-}
-
-.theme-fg-color1,
-.cm-s-mozilla .cm-number,
-.variable-or-property .token-number,
-.variable-or-property[return] > .title > .name,
-.variable-or-property[scope] > .title > .name {
-  color: var(--theme-highlight-green);
-}
-
-.CodeMirror-Tern-completion-number:before {
-  background-color: hsl(72,100%,27%);
-}
-
-.theme-fg-color2,
-.cm-s-mozilla .cm-attribute,
-.cm-s-mozilla .cm-builtin,
-.cm-s-mozilla .cm-def,
-.cm-s-mozilla .cm-property,
-.cm-s-mozilla .cm-qualifier,
-.variables-view-variable > .title > .name {
-  color: var(--theme-highlight-blue);
-}
-
-.CodeMirror-Tern-completion-object:before {
-  background-color: hsl(208,56%,40%);
-}
-
-.theme-fg-color3,
-.cm-s-mozilla .cm-variable,
-.cm-s-mozilla .cm-tag,
-.cm-s-mozilla .cm-header,
-.cm-s-mozilla .cm-bracket,
-.variables-view-property > .title > .name {
-  color: var(--theme-highlight-bluegrey);
-}
-
-.CodeMirror-Tern-completion-array:before {
-  background-color: var(--theme-highlight-bluegrey);
-}
-
-.theme-fg-color4 {
-  color: var(--theme-highlight-orange);
-}
-
-.theme-fg-color5,
-.cm-s-mozilla .cm-keyword {
-  color: var(--theme-highlight-lightorange);
-}
-
-.theme-fg-color6,
-.cm-s-mozilla .cm-string,
-.cm-s-mozilla .cm-string-2,
-.variable-or-property .token-string,
-.CodeMirror-Tern-farg {
-  color: var(--theme-highlight-orange);
-}
-
-.CodeMirror-Tern-completion-string:before,
-.CodeMirror-Tern-completion-fn:before {
-  background-color: hsl(24,85%,39%);
-}
-
-.theme-fg-color7,
-.cm-s-mozilla .cm-atom,
-.cm-s-mozilla .cm-quote,
-.cm-s-mozilla .cm-error,
-.variable-or-property .token-boolean,
-.variable-or-property .token-domnode,
-.variable-or-property[exception] > .title > .name {
-  color: var(--theme-highlight-red);
-}
-
-.CodeMirror-Tern-completion-bool:before {
-  background-color: #bf5656;
-}
-
-.variable-or-property .token-domnode {
-  font-weight: bold;
-}
-
-.theme-fg-contrast { /* To be used for text on theme-bg-contrast */
-  color: black;
-}
-
-.theme-toolbar,
-.devtools-toolbar,
-.devtools-sidebar-tabs tabs,
-.devtools-sidebar-alltabs,
-.CodeMirror-dialog { /* General toolbar styling */
-  color: var(--theme-body-color-alt);
-  background-color: var(--theme-toolbar-background);
-  border-color: var(--theme-splitter-color);
-}
-
-.ruleview-swatch,
-.computedview-colorswatch {
-  box-shadow: 0 0 0 1px #c4c4c4;
-}
-
-/* CodeMirror specific styles.
- * Best effort to match the existing theme, some of the colors
- * are duplicated here to prevent weirdness in the main theme. */
-
-.CodeMirror { /* Inherit platform specific font sizing and styles */
-  font-family: inherit;
-  font-size: inherit;
-  background: transparent;
-}
-
-.CodeMirror pre,
-.cm-s-mozilla .cm-variable-2,
-.cm-s-mozilla .cm-variable-3,
-.cm-s-mozilla .cm-operator,
-.cm-s-mozilla .cm-special {
-  color: var(--theme-body-color);
-}
-
-.cm-s-mozilla .CodeMirror-lines .CodeMirror-cursor {
-  border-left: solid 1px black;
-}
-
-.cm-s-mozilla.CodeMirror-focused .CodeMirror-selected { /* selected text (focused) */
-  background: rgb(185, 215, 253);
-}
-
-.cm-s-mozilla .CodeMirror-selected { /* selected text (unfocused) */
-  background: rgb(176, 176, 176);
-}
-
-.cm-s-mozilla .CodeMirror-activeline-background { /* selected color with alpha */
-  background: rgba(185, 215, 253, .35);
-}
-
-div.cm-s-mozilla span.CodeMirror-matchingbracket { /* highlight brackets */
-  outline: solid 1px rgba(0, 0, 0, .25);
-  color: black;
-}
-
-/* Highlight for a line that contains an error. */
-div.CodeMirror div.error-line {
-  background: rgba(255,0,0,0.2);
-}
-
-/* Highlight for a line that represents a stack frame's location. */
-div.CodeMirror div.debug-line {
-  background: rgba(0,128,255,0.1);
-  box-shadow:
-    0 1px 0 0 rgba(0,128,255,0.4),
-    0 -1px 0 0 rgba(0,128,255,0.4);
-}
-
-/* Generic highlighted text */
-div.CodeMirror span.marked-text {
-  background: rgba(255,255,0,0.2);
-  border: 1px dashed rgba(192,192,0,0.6);
-  -moz-margin-start: -1px;
-  -moz-margin-end: -1px;
-}
-
-/* Highlight for evaluating current statement. */
-div.CodeMirror span.eval-text {
-  background-color: #ccd;
-}
-
-.cm-s-mozilla .CodeMirror-linenumber { /* line number text */
-  color: var(--theme-content-color3);
-}
-
-.cm-s-mozilla .CodeMirror-gutters { /* vertical line next to line numbers */
-  border-right-color: var(--theme-splitter-color);
-  background-color: var(--theme-sidebar-background);
-}
-
-.cm-s-markup-view pre {
-  line-height: 1.4em;
-  min-height: 1.4em;
-}
-
-/* Twisty and checkbox controls */
-
-.theme-twisty, .theme-checkbox {
-  width: 14px;
-  height: 14px;
-  background-repeat: no-repeat;
-  background-image: url("chrome://browser/skin/devtools/controls.png");
-  background-size: 56px 28px;
-}
-
-.theme-twisty {
-  cursor: pointer;
-  background-position: 0 -14px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty[open] {
-  background-position: -14px -14px;
-}
-
-.theme-twisty[invisible] {
-  visibility: hidden;
-}
-
-/* Use white twisty when next to a selected item in markup view */
-.theme-selected ~ .theme-twisty {
-  background-position: -28px -14px;
-}
-
-.theme-selected ~ .theme-twisty[open] {
-  background-position: -42px -14px;
-}
-
-.theme-checkbox {
-  display: inline-block;
-  border: 0;
-  padding: 0;
-  outline: none;
-  background-position: 0 0;
-}
-
-.theme-checkbox[checked] {
-  background-position: -14px 0;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .theme-twisty, .theme-checkbox {
-    background-image: url("chrome://browser/skin/devtools/controls@2x.png");
-  }
-}
-
-/* XUL panel styling (see browser/devtools/shared/widgets/Tooltip.js) */
-
-.theme-tooltip-panel .panel-arrowcontent {
-  padding: 4px;
-  background: rgba(255, 255, 255, .9);
-  border-radius: 5px;
-  box-shadow: none;
-  border: 3px solid #d9e1e8;
-}
-
-/* Overring panel arrow images to fit with our light and dark themes */
-
-.theme-tooltip-panel .panel-arrow[side="top"] {
-  list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-light.png");
-  margin-bottom: -4px;
-}
-
-.theme-tooltip-panel .panel-arrow[side="bottom"] {
-  list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-light.png");
-  margin-top: -4px;
-}
-
-.theme-tooltip-panel .panel-arrow[side="left"] {
-  list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-light.png");
-  margin-right: -4px;
-}
-
-.theme-tooltip-panel .panel-arrow[side="right"] {
-  list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-light.png");
-  margin-left: -4px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .theme-tooltip-panel .panel-arrow[side="top"],
-  .theme-tooltip-panel .panel-arrow[side="bottom"] {
-    list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-light@2x.png");
-  }
-
-  .theme-tooltip-panel .panel-arrow[side="left"],
-  .theme-tooltip-panel .panel-arrow[side="right"] {
-    list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-horizontal-light@2x.png");
-  }
-}
-
-.theme-tooltip-panel .devtools-tooltip-simple-text {
-  color: black;
-  border-bottom: 1px solid #d9e1e8;
-}
-
-.theme-tooltip-panel .devtools-tooltip-simple-text:last-child {
-  border-bottom: 0;
-}
-
-.CodeMirror-hints,
-.CodeMirror-Tern-tooltip {
-  box-shadow: 0 0 4px rgba(128, 128, 128, .5);
-  background-color: var(--theme-sidebar-background);
-}
-
-
-
-/* CSS Variables specific to the devtools toolbar that aren't defined by the themes */
-.theme-light {
-  --searchbox-background-color: #ffee99;
-  --searchbox-border-color: #ffbf00;
-  --searcbox-no-match-background-color: #ffe5e5;
-  --searcbox-no-match-border-color: #e52e2e;
-}
-
-.theme-dark {
-  --searchbox-background-color: #4d4222;
-  --searchbox-border-color: #d99f2b;
-  --searcbox-no-match-background-color: #402325;
-  --searcbox-no-match-border-color: #cc3d3d;
-}
-
-/* Toolbars */
-.devtools-toolbar,
-.devtools-sidebar-tabs tabs {
-  -moz-appearance: none;
-  padding: 0;
-  border-width: 0;
-  border-bottom-width: 1px;
-  border-style: solid;
-  height: 24px;
-  line-height: 24px;
-  box-sizing: border-box;
-}
-
-.devtools-toolbar {
-  padding: 0 3px;
-}
-
-.devtools-toolbar checkbox {
-  margin: 0 2px;
-  padding: 0;
-  line-height: -moz-block-height;
-}
-.devtools-toolbar checkbox .checkbox-check {
-  margin: 0;
-  padding: 0;
-  vertical-align: bottom;
-}
-.devtools-toolbar checkbox .checkbox-label-box {
-  border: none !important; /* overrides .checkbox-label-box from checkbox.css */
-}
-.devtools-toolbar checkbox .checkbox-label-box .checkbox-label {
-  margin: 0 6px !important; /* overrides .checkbox-label from checkbox.css */
-  padding: 0;
-}
-
-/* Toolbar buttons */
-.devtools-menulist,
-.devtools-toolbarbutton {
-  -moz-appearance: none;
-  -moz-box-align: center;
-  background: transparent;
-  min-width: 78px;
-  min-height: 18px;
-  padding: 1px;
-  text-shadow: none;
-  border: none;
-  border-radius: 0;
-  margin: 2px 3px;
-  color: inherit;
-  transition: background 0.05s ease-in-out;
-  color: var(--theme-content-color1);
-  background-color: var(--theme-toolbar-background);
-}
-
-.devtools-menulist:-moz-focusring,
-.devtools-toolbarbutton:-moz-focusring {
-  outline: 1px dotted hsla(210,30%,85%,0.7);
-  outline-offset: -4px;
-}
-
-.devtools-toolbarbutton[standalone] {
-  -moz-margin-end: 5px;
-  border-width: 1px;
-  border-style: solid;
-}
-.devtools-toolbarbutton[label][standalone] {
-  min-height: 2em;
-}
-
-.devtools-toolbarbutton:not([label]),
-.devtools-toolbarbutton[text-as-image] {
-  min-width: 32px;
-}
-
-#toolbox-buttons .devtools-toolbarbutton[text-as-image] {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px;
-  min-width: inherit;
-}
-
-/* Command buttons with menupopups should be styled slightly differently -
-   no background color and a bit more narrow */
-#toolbox-buttons .devtools-toolbarbutton:not([text-as-image]):not(:hover):not([open=true]) {
-  background: transparent;
-}
-#toolbox-buttons .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker {
-  padding: 0 2px;
-}
-
-.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
-  display: none;
-}
-
-.devtools-toolbar .devtools-toolbarbutton {
-  border-width: 0;
-}
-
-.devtools-toolbarbutton > .toolbarbutton-icon {
-  margin: 0;
-}
-
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
-  -moz-appearance: none;
-  color: inherit;
-  border-width: 0;
-  -moz-box-orient: horizontal;
-  padding: 0;
-}
-
-.devtools-toolbarbutton[type=menu-button] {
-  padding: 0 1px;
-  -moz-box-align: stretch;
-}
-
-.devtools-toolbarbutton > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  -moz-margin-end: 4px;
-}
-
-.devtools-menulist > .menulist-dropmarker {
-  -moz-appearance: none;
-  display: -moz-box;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
-  -moz-box-align: center;
-  min-width: 16px;
-}
-
-.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-appearance: none !important;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
-  -moz-box-align: center;
-  padding: 0 3px;
-}
-
-.theme-dark .devtools-menulist,
-.theme-dark .devtools-toolbarbutton {
-  border-color: rgba(0, 0, 0, .4); /* Splitters */
-}
-.theme-light .devtools-menulist,
-.theme-light .devtools-toolbarbutton {
-  border-color: rgba(170, 170, 170, .5); /* Splitters */
-}
-
-/* Text-only buttons */
-.theme-light .devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]),
-.theme-light #toolbox-buttons .devtools-toolbarbutton[text-as-image] {
-  background-color: rgba(170, 170, 170, .2); /* Splitter */
-}
-.theme-dark .devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]),
-.theme-dark #toolbox-buttons .devtools-toolbarbutton[text-as-image] {
-  background-color: rgba(0, 0, 0, .2); /* Splitter */
-}
-
-/* Button States */
-.theme-dark .devtools-toolbarbutton:not([disabled]):hover,
-.theme-dark #toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover,
-.theme-dark .devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover {
-  background: rgba(0, 0, 0, .3); /* Splitters */
-}
-.theme-light .devtools-toolbarbutton:not([disabled]):hover,
-.theme-light #toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover,
-.theme-light .devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover {
-  background: rgba(170, 170, 170, .3); /* Splitters */
-}
-
-.theme-dark .devtools-toolbarbutton:not([disabled]):hover:active,
-.theme-dark #toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover:active,
-.theme-dark .devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover:active {
-  background: rgba(0, 0, 0, .4); /* Splitters */
-}
-.theme-light .devtools-toolbarbutton:not([disabled]):hover:active,
-.theme-light #toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover:active,
-.theme-light .devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover:active {
-  background: rgba(170, 170, 170, .4); /* Splitters */
-}
-
-/* Menu type buttons and checked states */
-.theme-dark .devtools-toolbarbutton[checked=true],
-.theme-dark #toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
-  background: rgba(29, 79, 115, .7); /* Select highlight blue */
-  color: var(--theme-selection-color);
-}
-
-.theme-light .devtools-toolbarbutton[checked=true],
-.theme-light #toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
-  background: rgba(76, 158, 217, .2); /* Select highlight blue */
-}
-
-.theme-dark .devtools-menulist[open=true],
-.theme-dark .devtools-toolbarbutton[open=true],
-.theme-dark .devtools-toolbarbutton[open=true]:hover,
-.theme-dark .devtools-toolbarbutton[open=true]:hover:active,
-.theme-dark .devtools-toolbarbutton[checked=true]:hover {
-  background: rgba(29, 79, 115, .8); /* Select highlight blue */
-  color: var(--theme-selection-color);
-}
-
-.theme-light .devtools-menulist[open=true],
-.theme-light .devtools-toolbarbutton[open=true],
-.theme-light .devtools-toolbarbutton[open=true]:hover,
-.theme-light .devtools-toolbarbutton[open=true]:hover:active,
-.theme-light .devtools-toolbarbutton[checked=true]:hover {
-  background: rgba(76, 158, 217, .4); /* Select highlight blue */
-}
-
-.devtools-option-toolbarbutton {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/tool-options.svg");
-  background: none;
-  opacity: .8;
-  border: none;
-}
-
-.devtools-option-toolbarbutton[open=true] {
-  opacity: 1;
-}
-
-/* Toolbar button groups */
-.devtools-toolbarbutton-group > .devtools-toolbarbutton {
-  margin-left: 1px;
-  margin-right: 1px;
-  outline-offset: -3px;
-  box-shadow: none;
-}
-
-.devtools-toolbarbutton-group > .devtools-toolbarbutton:last-child {
-  -moz-margin-end: 0;
-}
-
-.devtools-toolbarbutton-group + .devtools-toolbarbutton {
-  -moz-margin-start: 3px;
-}
-
-.devtools-separator + .devtools-toolbarbutton {
-  -moz-margin-start: 1px;
-}
-
-/* HTML buttons, similar to toolbar buttons, but work in HTML documents */
-
-.devtools-button {
-  border: 0 solid var(--theme-splitter-color);
-  background: var(--theme-toolbar-background);
-  color: var(--theme-body-color);
-  margin: 0;
-  padding: 0;
-  min-width: 32px;
-  min-height: 18px;
-  /* The icon is absolutely positioned in the button using ::before */
-  position: relative;
-}
-
-.devtools-button[standalone] {
-  min-height: 32px;
-  border-width: 1px;
-}
-
-/* Button States */
-.theme-dark .devtools-button:not([disabled]):hover {
-  background: rgba(0, 0, 0, .3); /* Splitters */
-}
-.theme-light .devtools-button:not([disabled]):hover {
-  background: rgba(170, 170, 170, .3); /* Splitters */
-}
-
-.theme-dark .devtools-button:not([disabled]):hover:active {
-  background: rgba(0, 0, 0, .4); /* Splitters */
-}
-.theme-light .devtools-button:not([disabled]):hover:active {
-  background: rgba(170, 170, 170, .4); /* Splitters */
-}
-
-/* Menu type buttons and checked states */
-.theme-dark .devtools-button[checked] {
-  background: rgba(29, 79, 115, .7) !important; /* Select highlight blue */
-  color: var(--theme-selection-color);
-}
-
-.theme-light .devtools-button[checked] {
-  background: rgba(76, 158, 217, .2) !important; /* Select highlight blue */
-}
-
-.devtools-button::before {
-  content: "";
-  display: block;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin: -8px 0 0 -8px;
-  background-repeat: no-repeat;
-}
-
-.devtools-button[disabled]::before,
-.devtools-button:disabled::before {
-  opacity: 0.5;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .devtools-button::before {
-    background-size: 32px;
-  }
-}
-
-/* Text input */
-
-.devtools-textinput,
-.devtools-searchinput {
-  -moz-appearance: none;
-  margin: 0 3px;
-  border: 1px solid;
-  border-radius: 2px;
-  padding: 4px 6px;
-  border-color: var(--theme-splitter-color);
-}
-
-.devtools-searchinput {
-  margin-top: 1px;
-  margin-bottom: 1px;
-  padding: 0;
-  -moz-padding-start: 22px;
-  -moz-padding-end: 4px;
-  background-position: 8px center;
-  background-size: 11px 11px;
-  background-repeat: no-repeat;
-  font-size: inherit;
-}
-
-.theme-dark .devtools-searchinput {
-  background-image: url(magnifying-glass.png);
-}
-
-.theme-light .devtools-searchinput {
-  background-image: url(magnifying-glass-light.png);
-}
-
-.devtools-searchinput:-moz-locale-dir(rtl) {
-  background-position: calc(100% - 8px) center;
-}
-
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-icon {
-  visibility: hidden;
-}
-
-/* Searchbox is a div container element for a search input element */
-.devtools-searchbox {
-  display: flex;
-  flex: 1;
-  position: relative;
-}
-
-.devtools-rule-searchbox {
-  -moz-box-flex: 1;
-  padding-right: 23px;
-  width: 100%;
-  font: inherit;
-}
-
-.devtools-rule-searchbox[filled] {
-  background-color: var(--searchbox-background-color);
-  border-color: var(--searchbox-border-color);
-}
-
-.devtools-style-searchbox-no-match {
-  background-color: var(--searcbox-no-match-background-color) !important;
-  border-color: var(--searcbox-no-match-border-color) !important;
-}
-
-.devtools-no-search-result {
-  border-color: var(--theme-highlight-red) !important;
-}
-
-.devtools-searchinput-clear {
-  position: absolute;
-  top: 3.5px;
-  right: 7px;
-  padding: 0;
-  border: 0;
-  width: 16px;
-  height: 16px;
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-
-.theme-dark .devtools-searchinput-clear {
-  background-image: url("chrome://browser/skin/devtools/search-clear-dark.svg");
-}
-
-.theme-light .devtools-searchinput-clear {
-  background-image: url("chrome://browser/skin/devtools/search-clear-light.svg");
-}
-
-.devtools-style-searchbox-no-match + .devtools-searchinput-clear {
-  background-image: url("chrome://browser/skin/devtools/search-clear-failed.svg") !important;
-}
-
-.devtools-searchinput-clear:hover {
-  background-position: -16px 0;
-}
-
-.theme-dark .devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-  list-style-image: url("chrome://browser/skin/devtools/search-clear-dark.svg");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.theme-light .devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-  list-style-image: url("chrome://browser/skin/devtools/search-clear-light.svg");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  .theme-dark .devtools-searchinput {
-    background-image: url(magnifying-glass@2x.png);
-  }
-
-  .theme-light .devtools-searchinput {
-    background-image: url(magnifying-glass-light@2x.png);
-  }
-}
-
-/* Close button */
-
-.devtools-closebutton {
-  -moz-appearance: none;
-  border: none;
-  margin: 0 4px;
-  min-width: 16px;
-  width: 16px;
-  opacity: 0.8;
-}
-
-.devtools-closebutton > image {
-  width: 16px;
-  height: 16px;
-  -moz-appearance: none;
-  background-size: 16px 16px;
-  background-image: url("chrome://browser/skin/devtools/close@2x.png");
-  background-position: center center;
-  background-repeat: no-repeat;
-}
-
-.devtools-closebutton > .toolbarbutton-icon {
-  /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
-     use evil CSS to give the impression of smaller content */
-  margin: -4px;
-}
-
-.devtools-closebutton > .toolbarbutton-text {
-  display: none;
-}
-
-.devtools-closebutton:hover {
-  opacity: 1;
-}
-
-/* In-tools sidebar */
-.devtools-sidebar-tabs {
-  -moz-appearance: none;
-  margin: 0;
-}
-
-.devtools-sidebar-tabs > tabpanels {
-  -moz-appearance: none;
-  background: transparent;
-  padding: 0;
-  border: 0;
-}
-
-.theme-light .devtools-sidebar-tabs > tabpanels {
-  background: var(--theme-sidebar-background);
-  color: var(--theme-body-color);
-}
-
-.devtools-sidebar-tabs tabs {
-  position: static;
-  font: inherit;
-  margin-bottom: 0;
-  overflow: hidden;
-}
-
-.devtools-sidebar-alltabs {
-  -moz-appearance: none;
-  height: 24px;
-  line-height: 24px;
-  padding: 0 4px;
-  margin: 0;
-  border-width: 0 0 1px 0;
-  -moz-border-start-width: 1px;
-  border-style: solid;
-}
-
-.devtools-sidebar-alltabs .toolbarbutton-icon {
-  display: none;
-}
-
-.devtools-sidebar-tabs tabs > .tabs-right,
-.devtools-sidebar-tabs tabs > .tabs-left {
-  display: none;
-}
-
-.devtools-sidebar-tabs tabs > tab {
-  -moz-appearance: none;
-  /* We want to match the height of a toolbar with a toolbarbutton
-   * First, we need to replicated the padding of toolbar (4px),
-   * then we need to take the border of the buttons into account (1px).
-   */
-  padding: 0 3px;
-  margin: 0;
-  min-width: 78px;
-  text-align: center;
-  background-color: transparent;
-  color: inherit;
-  -moz-box-flex: 1;
-  border-width: 0;
-  -moz-border-start-width: 1px;
-  border-style: solid;
-  border-radius: 0;
-  position: static;
-  text-shadow: none;
-}
-
-.devtools-sidebar-tabs tabs > tab {
-  border-image: linear-gradient(transparent 15%, var(--theme-splitter-color) 15%, var(--theme-splitter-color) 85%, transparent 85%) 1 1;
-}
-
-.devtools-sidebar-tabs tabs > tab[selected],
-.devtools-sidebar-tabs tabs > tab[selected] + tab {
-  border-image: linear-gradient(var(--theme-splitter-color), var(--theme-splitter-color)) 1 1;
-}
-
-.devtools-sidebar-tabs tabs > tab:first-child {
-  -moz-border-start-width: 0;
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab:hover {
-  background: hsla(206,37%,4%,.2);
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab:hover:active {
-  background: hsla(206,37%,4%,.4);
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover {
-  background: hsla(206,37%,4%,.2);
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active {
-  background: hsla(206,37%,4%,.4);
-}
-
-.theme-dark .devtools-sidebar-tabs tabs > tab[selected],
-.theme-dark .devtools-sidebar-tabs tabs > tab[selected]:hover:active {
-  color: var(--theme-selection-color);
-  background: #1d4f73;
-}
-
-.theme-light .devtools-sidebar-tabs tabs > tab:hover {
-  background: #ddd;
-}
-
-.theme-light .devtools-sidebar-tabs tabs > tab:hover:active {
-  background: #ddd;
-}
-
-.theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab:hover {
-  background: #ddd;
-}
-
-.theme-light .devtools-sidebar-tabs tabs > tab[selected],
-.theme-light .devtools-sidebar-tabs tabs > tab[selected]:hover:active {
-  color: var(--theme-selection-color);
-  background: #4c9ed9;
-}
-
-/* Toolbox - moved from toolbox.css.
- * Rules that apply to the global toolbox like command buttons,
- * devtools tabs, docking buttons, etc. */
-
-#toolbox-controls > toolbarbutton,
-#toolbox-dock-buttons > toolbarbutton {
-  -moz-appearance: none;
-  border: none;
-  margin: 0 4px;
-  min-width: 16px;
-  width: 16px;
-}
-
-#toolbox-controls > toolbarbutton > .toolbarbutton-text,
-#toolbox-dock-buttons > toolbarbutton > .toolbarbutton-text,
-.command-button > .toolbarbutton-text {
-  display: none;
-}
-
-#toolbox-dock-buttons > toolbarbutton > image {
-  -moz-appearance: none;
-  width: 16px;
-  height: 16px;
-  background-size: 16px 16px;
-  background-position: 0 center;
-  background-repeat: no-repeat;
-}
-
-#toolbox-dock-bottom > image {
-  background-image: url("chrome://browser/skin/devtools/dock-bottom@2x.png");
-}
-
-#toolbox-dock-side  > image {
-  background-image: url("chrome://browser/skin/devtools/dock-side@2x.png");
-}
-
-#toolbox-dock-window > image {
-  background-image: url("chrome://browser/skin/devtools/undock@2x.png");
-}
-
-#toolbox-dock-bottom-minimize {
-  /* Bug 1177463 - The minimize button is currently hidden until we agree on
-     the UI for it, and until bug 1173849 is fixed too. */
-  display: none;
-}
-
-#toolbox-dock-bottom-minimize > image {
-  background-image: url("chrome://browser/skin/devtools/dock-bottom-minimize@2x.png");
-}
-
-#toolbox-dock-bottom-minimize.minimized > image {
-  background-image: url("chrome://browser/skin/devtools/dock-bottom-maximize@2x.png");
-}
-
-#toolbox-dock-window,
-#toolbox-dock-bottom,
-#toolbox-dock-side {
-  opacity: 0.8;
-}
-
-#toolbox-dock-window:hover,
-#toolbox-dock-bottom:hover,
-#toolbox-dock-side:hover {
-  opacity: 1;
-}
-
-.devtools-separator {
-  margin: 0 2px;
-  width: 2px;
-  background-image: linear-gradient(transparent, hsla(204,45%,98%,.1), transparent),
-                    linear-gradient(transparent, hsla(206,37%,4%,.6), transparent),
-                    linear-gradient(transparent, hsla(204,45%,98%,.1), transparent);
-  background-size: 1px 100%;
-  background-repeat: no-repeat;
-  background-position: 0, 1px, 2px;
-}
-
-#toolbox-buttons:empty + .devtools-separator,
-.devtools-separator[invisible] {
-  visibility: hidden;
-}
-
-#toolbox-controls-separator {
-  margin: 0;
-}
-
-/* Command buttons */
-
-.command-button {
-  -moz-appearance: none;
-  border: none;
-  padding: 0 8px;
-  margin: 0;
-  width: 32px;
-  position: relative;
-}
-
-.command-button:hover {
-  background-color: hsla(206,37%,4%,.2);
-}
-.command-button:hover:active, .command-button[checked=true]:not(:hover) {
-  background-color: hsla(206,37%,4%,.4);
-}
-
-.command-button > image {
-  -moz-appearance: none;
-  width: 16px;
-  height: 16px;
-  background-size: 64px 16px;
-  background-position: 0 center;
-  background-repeat: no-repeat;
-}
-.command-button:hover > image {
-  background-position: -16px center;
-}
-.command-button:hover:active > image {
-  background-position: -32px center;
-}
-.command-button[checked=true] > image {
-  background-position: -48px center;
-}
-.command-button[open=true] > image {
-  background-position: 0 center;
-}
-
-#command-button-paintflashing > image {
-  background-image: url("chrome://browser/skin/devtools/command-paintflashing.png");
-}
-
-#command-button-screenshot > image {
-  background-image: url("chrome://browser/skin/devtools/command-screenshot.png");
-}
-
-#command-button-responsive > image {
-  background-image: url("chrome://browser/skin/devtools/command-responsivemode.png");
-}
-
-#command-button-tilt > image {
-  background-image: url("chrome://browser/skin/devtools/command-tilt.png");
-}
-
-#command-button-scratchpad > image {
-  background-image: url("chrome://browser/skin/devtools/command-scratchpad.png");
-  background-size: 48px 16px;
-}
-
-#command-button-pick > image {
-  background-image: url("chrome://browser/skin/devtools/command-pick.png");
-}
-
-#command-button-frames > image {
-  background-image: url("chrome://browser/skin/devtools/command-frames.png");
-}
-
-#command-button-splitconsole > image {
-  background-image: url("chrome://browser/skin/devtools/command-console.png");
-}
-
-#command-button-eyedropper > image {
-  background-image: url("chrome://browser/skin/devtools/command-eyedropper.png");
-}
-
-#command-button-rulers > image {
-  background-image: url("chrome://browser/skin/devtools/command-rulers.png");
-}
-
-@media (min-resolution: 1.1dppx) {
-  #command-button-paintflashing > image {
-    background-image: url("chrome://browser/skin/devtools/command-paintflashing@2x.png");
-  }
-
-  #command-button-screenshot > image {
-    background-image: url("chrome://browser/skin/devtools/command-screenshot@2x.png");
-  }
-
-  #command-button-responsive > image {
-    background-image: url("chrome://browser/skin/devtools/command-responsivemode@2x.png");
-  }
-
-  #command-button-tilt > image {
-    background-image: url("chrome://browser/skin/devtools/command-tilt@2x.png");
-  }
-
-  #command-button-scratchpad > image {
-    background-image: url("chrome://browser/skin/devtools/command-scratchpad@2x.png");
-  }
-
-  #command-button-pick > image {
-    background-image: url("chrome://browser/skin/devtools/command-pick@2x.png");
-  }
-
-  #command-button-frames > image {
-    background-image: url("chrome://browser/skin/devtools/command-frames@2x.png");
-  }
-
-  #command-button-splitconsole > image {
-    background-image: url("chrome://browser/skin/devtools/command-console@2x.png");
-  }
-
-  #command-button-eyedropper > image {
-    background-image: url("chrome://browser/skin/devtools/command-eyedropper@2x.png");
-  }
-
-  #command-button-rulers > image {
-    background-image: url("chrome://browser/skin/devtools/command-rulers@2x.png");
-  }
-}
-
-/* Tabs */
-
-.devtools-tabbar {
-  -moz-appearance: none;
-  min-height: 24px;
-  border: 0px solid;
-  border-bottom-width: 1px;
-  padding: 0;
-  background: var(--theme-tab-toolbar-background);
-  border-bottom-color: var(--theme-splitter-color);
-}
-
-.theme-light .devtools-tabbar {
-  box-shadow: 0 -2px 0 rgba(170,170,170,.1) inset;
-}
-
-.theme-dark .devtools-tabbar {
-  box-shadow: 0 -2px 0 rgba(0,0,0,.1) inset;
-}
-
-#toolbox-tabs {
-  margin: 0;
-}
-
-.devtools-tab {
-  -moz-appearance: none;
-  -moz-binding: url("chrome://global/content/bindings/general.xml#control-item");
-  -moz-box-align: center;
-  min-width: 32px;
-  min-height: 24px;
-  max-width: 110px;
-  margin: 0;
-  padding: 0;
-  border-style: solid;
-  border-width: 0;
-  -moz-border-start-width: 1px;
-  -moz-box-align: center;
-}
-
-.theme-dark .devtools-tab {
-  color: var(--theme-body-color-alt);
-  border-color: #42484f;
-}
-
-.theme-light .devtools-tab {
-  color: var(--theme-body-color);
-  border-color: var(--theme-splitter-color);
-}
-
-.theme-dark .devtools-tab:hover {
-  background-color: hsla(206,37%,4%,.2);
-  color: #ced3d9;
-}
-
-.theme-light .devtools-tab:hover {
-  background-color: rgba(170,170,170,.2);
-}
-
-.theme-dark .devtools-tab:hover:active {
-  background-color: hsla(206,37%,4%,.4);
-  color: var(--theme-selection-color);
-}
-
-.theme-light .devtools-tab:hover:active {
-  background-color: rgba(170,170,170,.4);
-}
-
-.devtools-tab:not([selected])[highlighted] {
-  box-shadow: 0 2px 0 var(--theme-highlight-green) inset;
-}
-
-.theme-dark .devtools-tab:not([selected])[highlighted] {
-  background-color: hsla(99,100%,14%,.2);
-}
-
-.theme-light .devtools-tab:not([selected])[highlighted] {
-  background-color: rgba(44, 187, 15, .2);
-}
-
-.devtools-tab > image {
-  border: none;
-  -moz-margin-end: 0;
-  -moz-margin-start: 4px;
-  opacity: 0.6;
-  max-height: 16px;
-  width: 16px; /* Prevents collapse during theme switching */
-}
-
-.devtools-tab > label {
-  white-space: nowrap;
-}
-
-.devtools-tab:hover > image {
-  opacity: 0.8;
-}
-
-.devtools-tab:active > image,
-.devtools-tab[selected] > image {
-  opacity: 1;
-}
-
-.devtools-tabbar .devtools-tab[selected],
-.devtools-tabbar .devtools-tab[selected]:hover:active {
-  color: var(--theme-selection-color);
-  background-color: var(--theme-selection-background);
-}
-
-.theme-dark .devtools-tabbar .devtools-tab[selected] {
-  box-shadow: 0 2px 0 #d7f1ff inset,
-              0 8px 3px -5px #2b82bf inset,
-              0 -2px 0 rgba(0,0,0,.2) inset;
-}
-
-.theme-light .devtools-tabbar .devtools-tab[selected] {
-  box-shadow: 0 2px 0 #d7f1ff inset,
-              0 8px 3px -5px #2b82bf inset,
-              0 -2px 0 rgba(0,0,0,.06) inset;
-}
-
-#toolbox-tabs .devtools-tab[selected],
-#toolbox-tabs .devtools-tab[highlighted] {
-  border-width: 0;
-  -moz-padding-start: 1px;
-}
-
-#toolbox-tabs .devtools-tab[selected]:last-child,
-#toolbox-tabs .devtools-tab[highlighted]:last-child {
-  -moz-padding-end: 1px;
-}
-
-#toolbox-tabs .devtools-tab[selected] + .devtools-tab,
-#toolbox-tabs .devtools-tab[highlighted] + .devtools-tab {
-  -moz-border-start-width: 0;
-  -moz-padding-start: 1px;
-}
-
-#toolbox-tabs .devtools-tab:first-child[selected] {
-  -moz-border-start-width: 0;
-}
-
-#toolbox-tabs .devtools-tab:last-child {
-  -moz-border-end-width: 1px;
-}
-
-.devtools-tab:not([highlighted]) > .highlighted-icon,
-.devtools-tab[selected] > .highlighted-icon,
-.devtools-tab:not([selected])[highlighted] > .default-icon {
-  visibility: collapse;
-}
-
-/* The options tab is special - it doesn't have the same parent
-   as the other tabs (toolbox-option-container vs toolbox-tabs) */
-#toolbox-option-container .devtools-tab:not([selected]) {
-  background-color: transparent;
-}
-#toolbox-option-container .devtools-tab {
-  border-color: transparent;
-  border-width: 0;
-  -moz-padding-start: 1px;
-}
-#toolbox-tab-options > image {
-  margin: 0 8px;
-}
-
-/* Invert the colors of certain dark theme images for displaying
- * inside of the light theme.
- */
-.theme-light .devtools-tab[icon-invertable] > image,
-.theme-light #toolbox-dock-buttons > toolbarbutton > image,
-.theme-light .command-button-invertable > image,
-.theme-light .command-button-invertable:active > image,
-.theme-light .devtools-closebutton > image,
-.theme-light .devtools-toolbarbutton > image,
-.theme-light .devtools-option-toolbarbutton > image,
-.theme-light #breadcrumb-separator-normal,
-.theme-light .scrollbutton-up > .toolbarbutton-icon,
-.theme-light .scrollbutton-down > .toolbarbutton-icon,
-.theme-light #black-boxed-message-button .button-icon,
-.theme-light .notice-container button .button-icon,
-.theme-light #requests-menu-perf-notice-button .button-icon,
-.theme-light #requests-menu-network-summary-button .button-icon,
-.theme-light .event-tooltip-debugger-icon,
-.theme-light .devtools-button::before {
-  filter: url(filters.svg#invert);
-}
-
-/* Since selected backgrounds are blue, we want to use the normal
- * (light) icons. */
-.theme-light .command-button-invertable[checked=true]:not(:active) > image,
-.theme-light .devtools-tab[icon-invertable][selected] > image,
-.theme-light .devtools-tab[icon-invertable][highlighted] > image,
-.theme-light #record-snapshot[checked] > image,
-.theme-light #profiler-start[checked] > image,
-.theme-light .notice-container button[checked] .button-icon {
-  filter: none !important;
-}
-
-.theme-light .command-button:hover {
-  background-color: inherit;
-}
-
-.theme-light .command-button:hover:active,
-.theme-light .command-button[checked=true]:not(:hover) {
-  background-color: inherit;
-}
-
-.hidden-labels-box:not(.visible) > label,
-.hidden-labels-box.visible ~ .hidden-labels-box > label:last-child {
-  display: none;
-}
-
-.devtools-invisible-splitter {
-  border-color: transparent;
-}
-
-.devtools-horizontal-splitter {
-  border-bottom: 1px solid var(--theme-splitter-color);
-}
-
-.devtools-side-splitter {
-  -moz-border-end: 1px solid var(--theme-splitter-color);
-  border-color: var(--theme-splitter-color); /* Needed for responsive container at low width. */
-}
-
-/* Throbbers */
-.devtools-throbber::before {
-  content: "";
-  display: inline-block;
-  vertical-align: bottom;
-  -moz-margin-end: 0.5em;
-  width: 1em;
-  height: 1em;
-  border: 2px solid currentColor;
-  border-right-color: transparent;
-  border-radius: 50%;
-  animation: 1.1s linear throbber-spin infinite;
-}
-
-@keyframes throbber-spin {
-  from {
-    transform: none;
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/magnifying-glass-light.png b/arc-firefox-theme/chrome/browser/devtools/magnifying-glass-light.png
deleted file mode 100644
index e8c1841..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/magnifying-glass-light.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/magnifying-glass-light@2x.png b/arc-firefox-theme/chrome/browser/devtools/magnifying-glass-light@2x.png
deleted file mode 100644
index d784870..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/magnifying-glass-light@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/magnifying-glass.png b/arc-firefox-theme/chrome/browser/devtools/magnifying-glass.png
deleted file mode 100644
index bd09ffb..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/magnifying-glass.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/magnifying-glass@2x.png b/arc-firefox-theme/chrome/browser/devtools/magnifying-glass@2x.png
deleted file mode 100644
index 1784285..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/magnifying-glass@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/markup-view.css b/arc-firefox-theme/chrome/browser/devtools/markup-view.css
deleted file mode 100644
index fb3d958..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/markup-view.css
+++ /dev/null
@@ -1,112 +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/. */
-
-* {
-  padding: 0;
-  margin: 0;
-}
-
-.more-nodes {
-  padding-left: 16px;
-}
-
-.styleinspector-propertyeditor {
-  border: 1px solid #CCC;
-}
-
-/* Draw a circle next to nodes that have a pseudo class lock.
-   Center vertically with the 1.4em line height on .tag-line */
-.child.pseudoclass-locked::before {
-  content: "";
-  background: var(--theme-highlight-lightorange);
-  border-radius: 50%;
-  width: .8em;
-  height: .8em;
-  margin-top: .3em;
-  left: 1px;
-  position: absolute;
-}
-
-/* Selected nodes in the tree should have light selected text.
-   theme-selected doesn't work in this case since the text is a
-   sibling of the class, not a child. */
-.theme-selected ~ .editor,
-.theme-selected ~ .editor .theme-fg-color1,
-.theme-selected ~ .editor .theme-fg-color2,
-.theme-selected ~ .editor .theme-fg-color3,
-.theme-selected ~ .editor .theme-fg-color4,
-.theme-selected ~ .editor .theme-fg-color5,
-.theme-selected ~ .editor .theme-fg-color6,
-.theme-selected ~ .editor .theme-fg-color7 {
-  color: var(--theme-selection-color);
-}
-
-/* In case a node isn't displayed in the page, we fade the syntax highlighting */
-.not-displayed .open,
-.not-displayed .close {
-  opacity: .7;
-}
-
-.tag-line {
-  padding-left: 2px;
-}
-
-/* Preview */
-
-#previewbar {
-  position: fixed;
-  top: 0;
-  right: 0;
-  width: 90px;
-  background: black;
-  border-left: 1px solid;
-  border-bottom: 1px solid;
-  overflow: hidden;
-}
-
-#previewbar {
-  background: var(--theme-tab-toolbar-background);
-  border-color: var(--theme-splitter-color);
-}
-
-#preview {
-  position: absolute;
-  top: 0;
-  right: 5px;
-  width: 80px;
-  height: 100%;
-  background-image: -moz-element(#root);
-  background-repeat: no-repeat;
-}
-
-#previewbar.hide,
-#previewbar.disabled {
-  display: none;
-}
-
-#viewbox {
-  position: absolute;
-  top: 0;
-  right: 5px;
-  width: 80px;
-  border: 1px dashed #888;
-  background: rgba(205,205,255,0.2);
-  outline: 1px solid transparent;
-}
-
-/* Events */
-.markupview-events {
-  font-size: 8px;
-  font-weight: bold;
-  line-height: 10px;
-  border-radius: 3px;
-  padding: 0px 2px;
-  -moz-margin-start: 5px;
-  -moz-user-select: none;
-}
-
-.markupview-events {
-  background-color: var(--theme-body-color-alt);
-  color: var(--theme-body-background);
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/memory.css b/arc-firefox-theme/chrome/browser/devtools/memory.css
deleted file mode 100644
index 78f8f1f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/memory.css
+++ /dev/null
@@ -1,81 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-/* CSS Variables specific to this panel that aren't defined by the themes */
-.theme-dark {
-  --cell-border-color: rgba(255,255,255,0.15);
-  --cell-border-color-light: rgba(255,255,255,0.1);
-  --focus-cell-border-color: rgba(255,255,255,0.5);
-  --row-alt-background-color: rgba(29,79,115,0.15);
-  --row-hover-background-color: rgba(29,79,115,0.25);
-}
-
-.theme-light {
-  --cell-border-color: rgba(0,0,0,0.15);
-  --cell-border-color-light: rgba(0,0,0,0.1);
-  --focus-cell-border-color: rgba(0,0,0,0.3);
-  --row-alt-background-color: rgba(76,158,217,0.1);
-  --row-hover-background-color: rgba(76,158,217,0.2);
-}
-
-.heap-view {
-  position: relative;
-}
-
-.heap-view .theme-twisty {
-  text-align: end;
-}
-
-.heap-tree-item {
-  list-style-type: none;
-  /* display: none; */
-}
-
-.heap-tree-item[expanded] {
-  display: block;
-}
-
-.heap-tree-item:nth-child(2n) {
-  background-color: var(--row-alt-background-color);
-}
-
-.heap-tree-item:hover {
-  background-color: var(--row-hover-background-color);
-}
-
-.heap-tree-item:focus {
-  background-color: var(--theme-selection-background);
-}
-
-.heap-tree-item:focus description {
-  color: var(--theme-selection-color) !important;
-}
-
-.heap-tree-item:focus .call-tree-cell {
-  -moz-border-end-color: var(--focus-cell-border-color);
-}
-
-
-.heap-tree-cell[type="bytes"], .heap-tree-cell[type="count"] {
-  position: absolute;
-  text-align: right;
-  width: 40px;
-}
-
-.heap-tree-cell[type="name"] {
-  width: 150px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: block;
-}
-
-.heap-tree-cell[type="count"] {
-  left: 300px;
-}
-
-.heap-tree-cell[type="bytes"] {
-  left: 250px;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/netmonitor.css b/arc-firefox-theme/chrome/browser/devtools/netmonitor.css
deleted file mode 100644
index d47f112..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/netmonitor.css
+++ /dev/null
@@ -1,864 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-:root.theme-dark {
-  --table-splitter-color: rgba(255,255,255,0.15);
-  --table-zebra-background: rgba(255,255,255,0.05);
-}
-:root.theme-light {
-  --table-splitter-color: rgba(0,0,0,0.15);
-  --table-zebra-background: rgba(0,0,0,0.05);
-}
-
-#requests-menu-empty-notice {
-  margin: 0;
-  padding: 12px;
-  font-size: 120%;
-}
-
-#notice-perf-message {
-  margin-top: 2px;
-}
-
-#requests-menu-perf-notice-button {
-  min-width: 30px;
-  min-height: 26px;
-  margin: 0;
-  list-style-image: url(profiler-stopwatch.svg);
-}
-
-#requests-menu-perf-notice-button .button-text {
-  display: none;
-}
-
-#requests-menu-reload-notice-button {
-  min-height: 26px;
-  margin: 0;
-}
-
-/* Network requests table */
-
-#requests-menu-toolbar {
-  padding: 0;
-}
-
-.requests-menu-header:first-child,
-.requests-menu-subitem:first-child {
-  -moz-padding-start: 6px;
-}
-
-.requests-menu-subitem {
-  padding: 3px;
-}
-
-.requests-menu-header:not(:last-child),
-.requests-menu-subitem:not(:last-child) {
-  -moz-border-end: 1px solid var(--table-splitter-color);
-}
-
-.requests-menu-header-button {
-  -moz-appearance: none;
-  background: none;
-  min-width: 1px;
-  min-height: 24px;
-  margin: 0;
-  border: none;
-  padding: 0;
-  color: inherit;
-  font-weight: inherit !important;
-  transition: background-color 0.1s ease-in-out;
-}
-
-.requests-menu-header-button:hover {
-  background: rgba(0,0,0,0.10);
-}
-
-.requests-menu-header-button:hover:active {
-  background: rgba(0,0,0,0.25);
-}
-
-.requests-menu-header-button:not(:active)[sorted] {
-  background: rgba(0,0,0,0.15);
-}
-
-.requests-menu-header-button:not(:active)[sorted=ascending] {
-  background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3));
-  background-size: 100% 1px;
-  background-repeat: no-repeat;
-}
-
-.requests-menu-header-button:not(:active)[sorted=descending] {
-  background-image: radial-gradient(farthest-side at center bottom, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3));
-  background-size: 100% 1px;
-  background-repeat: no-repeat;
-  background-position: bottom;
-}
-
-/* Network requests table: specific column dimensions */
-
-.requests-menu-status-and-method {
-  width: 12em;
-}
-
-.requests-menu-status {
-  width: 20px;
-  height: 10px;
-}
-
-.requests-menu-method {
-  text-align: center;
-  font-weight: 600;
-}
-
-.requests-menu-icon-and-file {
-  width: 20vw;
-  min-width: 4em;
-}
-
-.requests-menu-icon {
-  background: #fff;
-  width: calc(1em + 4px);
-  height: calc(1em + 4px);
-  margin: -4px 0px;
-  -moz-margin-end: 4px;
-}
-
-.requests-menu-icon {
-  outline: 1px solid var(--table-splitter-color);
-}
-
-.requests-menu-file {
-  text-align: start;
-}
-
-.requests-menu-security-and-domain {
-  width: 14vw;
-  min-width: 10em;
-}
-
-.requests-security-state-icon {
-  width: 16px;
-  height: 16px;
-  -moz-margin-end: 4px;
-  cursor: pointer;
-}
-
-.security-state-insecure {
-  list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg);
-}
-
-.security-state-secure {
-  list-style-image: url(chrome://browser/skin/identity-secure.svg);
-}
-
-.security-state-weak {
-  list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg);
-}
-
-.security-state-broken {
-  list-style-image: url(chrome://browser/skin/controlcenter/warning-gray.svg);
-}
-
-.security-state-local {
-  list-style-image: url(chrome://browser/skin/identity-not-secure.svg);
-}
-
-.requests-menu-type {
-  text-align: center;
-  width: 4em;
-}
-
-.requests-menu-size {
-  text-align: center;
-  width: 8em;
-}
-
-.requests-menu-transferred {
-  text-align: center;
-  width: 8em;
-}
-
-/* Network requests table: status codes */
-
-box.requests-menu-status {
-  background: #fff;
-  width: 10px;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 5px;
-  border-radius: 10px;
-  transition: box-shadow 0.5s ease-in-out;
-}
-
-label.requests-menu-status-code {
-  -moz-margin-start: 3px !important;
-  width: 3em;
-  -moz-margin-end: -3em !important;
-}
-
-box.requests-menu-status:not([code]) {
-  background-color: var(--theme-highlight-red);
-  border-radius: 0; /* squares */
-}
-
-box.requests-menu-status[code="cached"] {
-  border: 2px solid var(--theme-content-color2);
-  background-color: transparent;  
-}
-
-box.requests-menu-status[code^="1"] {
-  background-color: var(---theme-highlight-blue);
-}
-
-box.requests-menu-status[code^="2"] {
-  background-color: var(--theme-highlight-green);
-}
-
-/* 3xx are triangles */
-box.requests-menu-status[code^="3"] {
-  background-color: transparent;
-  width: 0;
-  height: 0;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 10px solid var(--theme-highlight-lightorange);
-  border-radius: 0;
-}
-
-/* 4xx and 5xx are squares - error codes */
-box.requests-menu-status[code^="4"] {
-  background-color: var(--theme-highlight-red);
-  border-radius: 0; /* squares */
-}
-
-box.requests-menu-status[code^="5"] {
-  background-color: var(--theme-highlight-pink);
-  border-radius: 0;
-  transform: rotate(45deg);
-}
-
-/* Network requests table: waterfall header */
-
-#requests-menu-waterfall-label {
-  -moz-padding-start: 8px;
-  -moz-padding-end: 8px;
-}
-
-.requests-menu-timings-division {
-  width: 100px;
-  padding-top: 2px;
-  -moz-padding-start: 4px;
-  font-size: 75%;
-  pointer-events: none;
-}
-
-.requests-menu-timings-division:not(:first-child) {
-  -moz-border-start: 1px dotted;
-  -moz-margin-start: -100px !important; /* Don't affect layout. */
-}
-
-.requests-menu-timings-division:-moz-locale-dir(ltr) {
-  transform-origin: left center;
-}
-
-.requests-menu-timings-division:-moz-locale-dir(rtl) {
-  transform-origin: right center;
-}
-
-.theme-dark .requests-menu-timings-division[division-scale=millisecond] {
-  -moz-border-start-color: var(--theme-selection-color) !important;
-}
-
-.theme-light .requests-menu-timings-division[division-scale=millisecond] {
-  -moz-border-start-color: var(--theme-body-color-alt) !important;
-}
-
-.theme-dark .requests-menu-timings-division[division-scale=second] {
-  -moz-border-start-color: var(--theme-selection-color) !important;
-  font-weight: 600;
-}
-
-.theme-light .requests-menu-timings-division[division-scale=second] {
-  -moz-border-start-color: var(--theme-body-color-alt) !important;
-  font-weight: 600;
-}
-
-.theme-dark .requests-menu-timings-division[division-scale=minute] {
-  -moz-border-start-color: var(--theme-selection-color) !important;
-  font-weight: 600;
-}
-
-.theme-light .requests-menu-timings-division[division-scale=minute] {
-  -moz-border-start-color: var(--theme-body-color-alt) !important;
-  font-weight: 600;
-}
-
-/* Network requests table: waterfall items */
-
-.requests-menu-subitem.requests-menu-waterfall {
-  -moz-padding-start: 0px;
-  -moz-padding-end: 4px;
-  /* Background created on a <canvas> in js. */
-  /* @see browser/devtools/netmonitor/netmonitor-view.js */
-  background-image: -moz-element(#waterfall-background);
-  background-repeat: repeat-y;
-  background-position: -1px center;
-}
-
-.requests-menu-subitem.requests-menu-waterfall:-moz-locale-dir(rtl) {
-  background-position: right center;
-}
-
-.requests-menu-timings:-moz-locale-dir(ltr) {
-  transform-origin: left center;
-}
-
-.requests-menu-timings:-moz-locale-dir(rtl) {
-  transform-origin: right center;
-}
-
-.requests-menu-timings-total:-moz-locale-dir(ltr) {
-  transform-origin: left center;
-}
-
-.requests-menu-timings-total:-moz-locale-dir(rtl) {
-  transform-origin: right center;
-}
-
-.requests-menu-timings-total {
-  -moz-padding-start: 4px;
-  font-size: 85%;
-  font-weight: 600;
-}
-
-.requests-menu-timings-box {
-  height: 9px;
-}
-
-.requests-menu-timings-box.blocked {
-  background-color: rgba(235, 83, 104, 0.8); /* red */
-}
-
-.requests-menu-timings-box.dns {
-  background-color: rgba(223, 128, 255, 0.8); /* pink */
-}
-
-.requests-menu-timings-box.connect {
-  background-color: rgba(217, 102, 41, 0.8); /* orange */
-}
-
-/* Use custom colors for dark and light theme on remaining timing types. */
-.theme-dark .requests-menu-timings-box.send {
-  background-color: rgba(70, 175, 227, 0.8); /* light blue */
-}
-
-.theme-light .requests-menu-timings-box.send {
-  background-color: rgba(0, 136, 204, 0.8); /* blue */
-}
-
-.theme-dark .requests-menu-timings-box.wait {
-  background-color: rgba(94, 136, 176, 0.8); /* blue grey */
-}
-
-.theme-light .requests-menu-timings-box.wait {
-  background-color: rgba(95, 136, 176, 0.8); /* blue grey */
-}
-
-.theme-dark .requests-menu-timings-box.receive {
-  background-color: rgba(112, 191, 83, 0.8); /* green */
-}
-
-.theme-light .requests-menu-timings-box.receive {
-  background-color: rgba(44, 187, 15, 0.8); /* green */
-}
-
-/* SideMenuWidget */
-#network-table .side-menu-widget-empty-text,
-#network-table .side-menu-widget-container {
-  background-color: var(--theme-body-background);
-}
-
-#network-table .side-menu-widget-item {
-  border-top-color: transparent;
-  border-bottom-color: transparent;
-}
-
-.side-menu-widget-item-contents {
-  padding: 0px;
-}
-
-.side-menu-widget-item:not(.selected)[odd] {
-  background-color: var(--table-zebra-background);
-}
-
-.side-menu-widget-item:not(.selected):hover {
-  background-color: var(--theme-selection-background-semitransparent);
-}
-
-/* Network request details */
-
-#details-pane-toggle {
-  background: none;
-  box-shadow: none;
-  border-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#details-pane-toggle > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-#details-pane-toggle[pane-collapsed] {
-  list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
-}
-
-#details-pane-toggle:active {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-@media (min-resolution: 1.1dppx) {
-  #details-pane-toggle {
-    list-style-image: url("chrome://browser/skin/devtools/debugger-collapse@2x.png");
-    -moz-image-region: rect(0px,32px,32px,0px);
-  }
-
-  #details-pane-toggle[pane-collapsed] {
-    list-style-image: url("chrome://browser/skin/devtools/debugger-expand@2x.png");
-  }
-
-  #details-pane-toggle:active {
-    -moz-image-region: rect(0px,64px,32px,32px);
-  }
-}
-
-/* Network request details tabpanels */
-
-.tabpanel-content {
-  background-color: var(--theme-sidebar-background);
-}
-
-.theme-dark .tabpanel-content {
-  color: var(--theme-selection-color);
-}
-
-#headers-tabpanel {
-  background-color: var(--theme-toolbar-background);
-}
-
-/* Summary tabpanel */
-
-.tabpanel-summary-container {
-  padding: 1px;
-}
-
-.tabpanel-summary-label {
-  -moz-padding-start: 4px;
-  -moz-padding-end: 3px;
-  font-weight: 600;
-}
-
-.tabpanel-summary-value {
-  color: inherit;
-  -moz-padding-start: 3px;
-}
-
-.theme-dark .tabpanel-summary-value {
-  color: var(--theme-selection-color);
-}
-
-/* Headers tabpanel */
-
-#headers-summary-status,
-#headers-summary-version {
-  padding-bottom: 2px;
-}
-
-#headers-summary-size {
-  padding-top: 2px;
-}
-
-#headers-summary-resend {
-  margin-top: -10px;
-  -moz-margin-end: 6px;
-}
-
-#toggle-raw-headers {
-  margin-top: -10px;
-  -moz-margin-end: 6px;
-}
-
-.raw-response-textarea {
-  height: 50vh;
-}
-
-/* Response tabpanel */
-
-#response-content-info-header {
-  margin: 0;
-  padding: 3px 8px;
-  background-color: var(--theme-highlight-red);
-  color: var(--theme-selection-color);
-}
-
-#response-content-image-box {
-  padding-top: 10px;
-  padding-bottom: 10px;
-}
-
-#response-content-image {
-  background: #fff;
-  border: 1px dashed GrayText;
-  margin-bottom: 10px;
-}
-
-/* Preview tabpanel */
-
-#preview-tabpanel {
-  background: #fff;
-}
-
-#response-preview {
-  display: -moz-box;
-  -moz-box-flex: 1;
-}
-
-/* Timings tabpanel */
-
-#timings-tabpanel .tabpanel-summary-label {
-  width: 10em;
-}
-
-#timings-tabpanel .requests-menu-timings-box {
-  transition: transform 0.2s ease-out;
-  border: none;
-  min-width: 1px;
-}
-
-#timings-tabpanel .requests-menu-timings-total {
-  transition: transform 0.2s ease-out;
-}
-
-/* Security tabpanel */
-.security-info-section {
-  -moz-padding-start: 1em;
-}
-
-.theme-dark #security-error-message {
-  color: var(--theme-selection-color);
-}
-
-#security-tabpanel {
-  overflow: auto;
-}
-
-.security-warning-icon {
-  background-image: url(alerticon-warning.png);
-  background-size: 13px 12px;
-  -moz-margin-start: 5px;
-  vertical-align: top;
-  width: 13px;
-  height: 12px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .security-warning-icon {
-    background-image: url(alerticon-warning@2x.png);
-  }
-}
-
-/* Custom request form */
-
-#custom-pane {
-  padding: 0.6em 0.5em;
-}
-
-.custom-header {
-  font-size: 1.1em;
-}
-
-.custom-section {
-  margin-top: 0.5em;
-}
-
-#custom-method-value {
-  width: 4.5em;
-}
-
-/* Footer */
-
-#requests-menu-footer {
-  background-color: var(--theme-toolbar-background);
-  border-top: 1px solid var(--table-splitter-color);
-}
-
-.requests-menu-footer-button,
-.requests-menu-footer-label {
-  min-width: 1em;
-  margin: 0;
-  border: none;
-  padding: 2px 1vw;
-}
-
-.theme-dark .requests-menu-footer-button,
-.theme-dark .requests-menu-footer-label {
-  color: var(--theme-selection-color);
-}
-
-.theme-light .requests-menu-footer-button,
-.theme-light .requests-menu-footer-label {
-  color: var(--theme-body-color);
-}
-
-.requests-menu-footer-spacer {
-  min-width: 2px;
-}
-
-.theme-dark .requests-menu-footer-spacer:not(:first-child),
-.theme-dark .requests-menu-footer-button:not(:first-child) {
-  -moz-border-start: 1px solid var(--table-splitter-color);
-}
-
-.theme-light .requests-menu-footer-spacer:not(:first-child),
-.theme-light .requests-menu-footer-button:not(:first-child) {
-  -moz-border-start: 1px solid var(--table-splitter-color);
-}
-
-.requests-menu-footer-button {
-  -moz-appearance: none;
-  background: rgba(0,0,0,0.025);
-}
-
-.requests-menu-footer-button:hover {
-  background: rgba(0,0,0,0.10);
-}
-
-.requests-menu-footer-button:hover:active {
-  background-color: var(--theme-selection-background-semitransparent);
-}
-
-.requests-menu-footer-button:not(:active)[checked] {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.requests-menu-footer-label {
-  padding-top: 3px;
-  font-weight: 600;
-}
-
-#requests-menu-filter-freetext-text {
-  transition-property: max-width, -moz-padding-end, -moz-padding-start;
-  transition-duration: 250ms;
-  transition-timing-function: ease;
-}
-
-#requests-menu-filter-freetext-text:not([focused]):not([filled]) > .textbox-input-box {
-  overflow: hidden;
-}
-
-#requests-menu-filter-freetext-text:not([focused]):not([filled]) {
-  max-width: 20px !important;
-  -moz-padding-end: 5px;
-  -moz-padding-start: 22px;
-  background-position: 8px center, top left, top left;
-}
-
-#requests-menu-filter-freetext-text[focused],
-#requests-menu-filter-freetext-text[filled] {
-  max-width: 200px !important;
-}
-
-/* Performance analysis buttons */
-
-#requests-menu-network-summary-button {
-  background: none;
-  box-shadow: none;
-  border-color: transparent;
-  list-style-image: url(profiler-stopwatch.svg);
-  -moz-padding-end: 0;
-  cursor: pointer;
-}
-
-#requests-menu-network-summary-label {
-  -moz-padding-start: 0;
-  cursor: pointer;
-}
-
-#requests-menu-network-summary-label:hover {
-  text-decoration: underline;
-}
-
-/* Performance analysis view */
-
-#network-statistics-toolbar {
-  border: none;
-  margin: 0;
-  padding: 0;
-}
-
-#network-statistics-back-button {
-  min-width: 4em;
-  min-height: 100vh;
-  margin: 0;
-  padding: 0;
-  border-radius: 0;
-  border-top: none;
-  border-bottom: none;
-  -moz-border-start: none;
-}
-
-#network-statistics-view-splitter {
-  border-color: rgba(0,0,0,0.2);
-  cursor: default;
-  pointer-events: none;
-}
-
-#network-statistics-charts {
-  min-height: 1px;
-}
-
-#network-statistics-charts {
-  background-color: var(--theme-sidebar-background);
-}
-
-#network-statistics-charts .pie-chart-container {
-  -moz-margin-start: 3vw;
-  -moz-margin-end: 1vw;
-}
-
-#network-statistics-charts .table-chart-container {
-  -moz-margin-start: 1vw;
-  -moz-margin-end: 3vw;
-}
-
-.chart-colored-blob[name=html] {
-  fill: var(--theme-highlight-bluegrey);
-  background: var(--theme-highlight-bluegrey);
-}
-
-.chart-colored-blob[name=css] {
-  fill: var(--theme-highlight-blue);
-  background: var(--theme-highlight-blue);
-}
-
-.chart-colored-blob[name=js] {
-  fill: var(--theme-highlight-lightorange);
-  background: var(--theme-highlight-lightorange);
-}
-
-.chart-colored-blob[name=xhr] {
-  fill: var(--theme-highlight-orange);
-  background: var(--theme-highlight-orange);
-}
-
-.chart-colored-blob[name=fonts] {
-  fill: var(--theme-highlight-purple);
-  background: var(--theme-highlight-purple);
-}
-
-.chart-colored-blob[name=images] {
-  fill: var(--theme-highlight-pink);
-  background: var(--theme-highlight-pink);
-}
-
-.chart-colored-blob[name=media] {
-  fill: var(--theme-highlight-green);
-  background: var(--theme-highlight-green);
-}
-
-.chart-colored-blob[name=flash] {
-  fill: var(--theme-highlight-red);
-  background: var(--theme-highlight-red);
-}
-
-.table-chart-row-label[name=cached] {
-  display: none;
-}
-
-.table-chart-row-label[name=count] {
-  width: 3em;
-  text-align: end;
-}
-
-.table-chart-row-label[name=label] {
-  width: 7em;
-}
-
-.table-chart-row-label[name=size] {
-  width: 7em;
-}
-
-.table-chart-row-label[name=time] {
-  width: 7em;
-}
-
-/* Responsive sidebar */
-@media (max-width: 700px) {
-  #requests-menu-toolbar {
-    height: 22px;
-  }
-
-  .requests-menu-header-button {
-    min-height: 20px;
-  }
-
-  #details-pane {
-    margin: 0 !important;
-    /* To prevent all the margin hacks to hide the sidebar. */
-  }
-
-  .requests-menu-status-and-method {
-    width: 16vw;
-  }
-
-  .requests-menu-icon-and-file {
-    width: 30vw;
-  }
-
-  .requests-menu-security-and-domain {
-    width: 30vw;
-  }
-
-  .requests-menu-type {
-    width: 8vw;
-  }
-
-  .requests-menu-size {
-    width: 16vw;
-    border-width: 0 !important;
-    box-shadow: none !important;
-    /* The "Timeline" header is not visible anymore, and thus the
-       right border and box-shadow of "Size" column should be hidden. */
-  }
-}
-
-/* Platform overrides (copied in from the old platform specific files) */
-#headers-summary-resend {
-  padding: 4px;
-}
-
-#toggle-raw-headers {
-  padding: 4px;
-}
-
-.requests-menu-status-and-method {
-  width: 9em;
-}
-
-.requests-menu-security-and-domain {
-  width: 16vw;
-}
-
-.requests-menu-size {
-  width: 6em;
-}
-
-/* Responsive sidebar */
-@media (max-width: 700px) {
-  .requests-menu-header-button {
-    font-size: 85%;
-  }
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/newtab-inverted.png b/arc-firefox-theme/chrome/browser/devtools/newtab-inverted.png
deleted file mode 100644
index 2d29c2c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/newtab-inverted.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/newtab-inverted@2x.png b/arc-firefox-theme/chrome/browser/devtools/newtab-inverted@2x.png
deleted file mode 100644
index 6feba0e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/newtab-inverted@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/newtab.png b/arc-firefox-theme/chrome/browser/devtools/newtab.png
deleted file mode 100644
index 32e42b0..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/newtab.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/newtab@2x.png b/arc-firefox-theme/chrome/browser/devtools/newtab@2x.png
deleted file mode 100644
index ffde5f0..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/newtab@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/noise.png b/arc-firefox-theme/chrome/browser/devtools/noise.png
deleted file mode 100644
index 01d340a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/noise.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/performance-icons.svg b/arc-firefox-theme/chrome/browser/devtools/performance-icons.svg
deleted file mode 100644
index a115938..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/performance-icons.svg
+++ /dev/null
@@ -1,45 +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/. -->

-<svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px">

-  <style>

-    g {

-      fill: #babec3;

-    }

-    g:not(:target) {

-      display: none;

-    }

-  </style>

-  <g id="overview-markers">

-    <rect x="0px" y="3px" width="5px" height="2.5px" rx="1" ry="1"/>

-    <rect x="7px" y="3px" width="9px" height="2.5px" rx="1" ry="1"/>

-    <rect x="0px" y="7px" width="9px" height="2.5px" rx="1" ry="1"/>

-    <rect x="10px" y="7px" width="6px" height="2.5px" rx="1" ry="1"/>

-    <rect x="4px" y="11px" width="5px" height="2.5px" rx="1" ry="1"/>

-    <rect x="12px" y="11px" width="4px" height="2.5px" rx="1" ry="1"/>

-  </g>

-  <g id="overview-frames">

-    <rect x="1px" y="4px" width="2px" height="12px" rx="1" ry="1"/>

-    <rect x="5px" y="12px" width="2px" height="4px" rx="1" ry="1"/>

-    <rect x="9px" y="9px" width="2px" height="7px" rx="1" ry="1"/>

-    <rect x="13px" y="7px" width="2px" height="9px" rx="1" ry="1"/>

-  </g>

-  <g id="details-waterfall">

-    <rect x="0px" y="3px" width="9px" height="2.5px" rx="1" ry="1"/>

-    <rect x="5px" y="7px" width="8px" height="2.5px" rx="1" ry="1"/>

-    <rect x="7px" y="11px" width="9px" height="2.5px" rx="1" ry="1"/>

-  </g>

-  <g id="details-call-tree">

-    <rect x="0px" y="3px" width="16px" height="2px" rx="1" ry="1"/>

-    <rect x="0px" y="6px" width="8px" height="2px" rx="1" ry="1"/>

-    <rect x="0px" y="9px" width="11px" height="2px" rx="1" ry="1"/>

-    <rect x="0px" y="12px" width="6px" height="2px" rx="1" ry="1"/>

-  </g>

-  <g id="details-flamegraph">

-    <rect x="0px" y="3px" width="16px" height="2px" rx="1" ry="1"/>

-    <rect x="0px" y="6px" width="8px" height="2px" rx="1" ry="1"/>

-    <rect x="10px" y="6px" width="6px" height="2px" rx="1" ry="1"/>

-    <rect x="2px" y="9px" width="6px" height="2px" rx="1" ry="1"/>

-    <rect x="5px" y="12px" width="3px" height="2px" rx="1" ry="1"/>

-  </g>

-</svg>

diff --git a/arc-firefox-theme/chrome/browser/devtools/performance.css b/arc-firefox-theme/chrome/browser/devtools/performance.css
deleted file mode 100644
index 4279a16..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/performance.css
+++ /dev/null
@@ -1,758 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-/* CSS Variables specific to this panel that aren't defined by the themes */
-.theme-dark {
-  --cell-border-color: rgba(255,255,255,0.15);
-  --cell-border-color-light: rgba(255,255,255,0.1);
-  --focus-cell-border-color: rgba(255,255,255,0.5);
-  --row-alt-background-color: rgba(29,79,115,0.15);
-  --row-hover-background-color: rgba(29,79,115,0.25);
-}
-
-.theme-light {
-  --cell-border-color: rgba(0,0,0,0.15);
-  --cell-border-color-light: rgba(0,0,0,0.1);
-  --focus-cell-border-color: rgba(0,0,0,0.3);
-  --row-alt-background-color: rgba(76,158,217,0.1);
-  --row-hover-background-color: rgba(76,158,217,0.2);
-}
-
-/**
- * A generic class to hide elements, replacing the `element.hidden` attribute
- * that we use to hide elements that can later be active
- */
-.hidden {
-  display: none;
-  width: 0px;
-  height: 0px;
-}
-
-/* Toolbar */
-
-#performance-toolbar-control-other {
-  -moz-padding-end: 5px;
-}
-
-#performance-toolbar-controls-detail-views .toolbarbutton-text {
-  -moz-padding-start: 4px;
-  -moz-padding-end: 8px;
-}
-
-#filter-button {
-  list-style-image: url(timeline-filter.svg#filter);
-  min-width: 24px;
-}
-
-#filter-button[disabled] {
-  list-style-image: url(timeline-filter.svg#filter-disabled);
-}
-
-#filter-button[open] {
-  list-style-image: url(timeline-filter.svg#filter-open);
-}
-
-#performance-filter-menupopup > menuitem:before {
-  content: "";
-  display: block;
-  width: 8px;
-  height: 8px;
-  margin: 0 8px;
-  border-radius: 1px;
-}
-
-/* Details panel buttons */
-
-#select-waterfall-view {
-  list-style-image: url(performance-icons.svg#details-waterfall);
-}
-
-#select-js-calltree-view,
-#select-memory-calltree-view {
-  list-style-image: url(performance-icons.svg#details-call-tree);
-}
-
-#select-js-flamegraph-view,
-#select-memory-flamegraph-view {
-  list-style-image: url(performance-icons.svg#details-flamegraph);
-}
-
-#select-optimizations-view {
-  list-style-image: url(profiler-stopwatch.svg);
-}
-
-/* Recording buttons */
-
-#main-record-button {
-  list-style-image: url(profiler-stopwatch.svg);
-}
-
-#main-record-button[checked] {
-  list-style-image: url(profiler-stopwatch-checked.svg);
-}
-
-#main-record-button .button-icon {
-  margin: 0;
-}
-
-#main-record-button .button-text {
-  display: none;
-}
-
-.notice-container .record-button {
-  padding: 5px !important;
-}
-
-.notice-container .record-button[checked],
-.notice-container .record-button[checked] {
-  color: var(--theme-selection-color) !important;
-  background: var(--theme-selection-background) !important;
-}
-
-.record-button[locked] {
-  pointer-events: none;
-  opacity: 0.5;
-}
-
-/* Sidebar & recording items */
-
-.recording-item {
-  padding: 4px;
-}
-
-.recording-item-title {
-  font-size: 110%;
-}
-
-.recording-item-footer {
-  padding-top: 4px;
-  font-size: 90%;
-}
-
-.recording-item-save {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.recording-item-duration,
-.recording-item-save {
-  color: var(--theme-body-color-alt);
-}
-
-#recordings-list .selected label {
-  /* Text inside a selected item should not be custom colored. */
-  color: inherit !important;
-}
-
-/* Recording notices */
-
-.notice-container {
-  font-size: 120%;
-  background-color: var(--theme-toolbar-background);
-  color: var(--theme-body-color);
-  padding-bottom: 20vh;
-}
-
-.console-profile-command {
-  font-family: monospace;
-  margin: 3px 2px;
-}
-
-.realtime-disabled-message,
-.realtime-disabled-on-e10s-message {
-  display: none;
-}
-
-#performance-view[e10s="disabled"] .realtime-disabled-on-e10s-message {
-  display: initial;
-  opacity: 0.5;
-
-}
-#performance-view[e10s="unsupported"] .realtime-disabled-message {
-  display: initial;
-  opacity: 0.5;
-}
-
-.buffer-status-message,
-.buffer-status-message-full {
-  display: none;
-}
-
-#details-pane-container[buffer-status="in-progress"] .buffer-status-message {
-  display: initial;
-  opacity: 0.5;
-}
-
-#details-pane-container[buffer-status="full"] .buffer-status-message {
-  display: initial;
-  color: var(--theme-highlight-red);
-  font-weight: bold;
-  opacity: 1;
-}
-
-#details-pane-container[buffer-status="full"] .buffer-status-message-full {
-  display: initial;
-}
-
-/* Profile call tree */
-
-.call-tree-cells-container {
-  overflow: auto;
-}
-
-.call-tree-cells-container[categories-hidden] .call-tree-category {
-  display: none;
-}
-
-.call-tree-header {
-  font-size: 90%;
-  padding-top: 2px !important;
-  padding-bottom: 2px !important;
-}
-
-.call-tree-header[type="duration"],
-.call-tree-cell[type="duration"],
-.call-tree-header[type="self-duration"],
-.call-tree-cell[type="self-duration"] {
-  width: 6vw;
-}
-
-.call-tree-header[type="percentage"],
-.call-tree-cell[type="percentage"],
-.call-tree-header[type="self-percentage"],
-.call-tree-cell[type="self-percentage"] {
-  width: 5vw;
-}
-
-.call-tree-header[type="samples"],
-.call-tree-cell[type="samples"] {
-  width: 4.5vw;
-}
-
-.call-tree-header[type="count"],
-.call-tree-cell[type="count"],
-.call-tree-header[type="self-count"],
-.call-tree-cell[type="self-count"],
-.call-tree-header[type="size"],
-.call-tree-cell[type="size"],
-.call-tree-header[type="self-size"],
-.call-tree-cell[type="self-size"],
-.call-tree-header[type="count-percentage"],
-.call-tree-cell[type="count-percentage"],
-.call-tree-header[type="self-count-percentage"],
-.call-tree-cell[type="self-count-percentage"],
-.call-tree-header[type="size-percentage"],
-.call-tree-cell[type="size-percentage"],
-.call-tree-header[type="self-size-percentage"],
-.call-tree-cell[type="self-size-percentage"] {
-  width: 6vw;
-}
-
-.call-tree-header[type="function"],
-.call-tree-cell[type="function"] {
-  -moz-box-flex: 1;
-}
-
-.call-tree-header,
-.call-tree-cell {
-  -moz-box-align: center;
-  overflow: hidden;
-  padding: 1px 4px;
-  color: var(--theme-body-color);
-  -moz-border-end-color: var(--cell-border-color);
-}
-
-.call-tree-header:not(:last-child),
-.call-tree-cell:not(:last-child) {
-  -moz-border-end-width: 1px;
-  -moz-border-end-style: solid;
-}
-
-.call-tree-header:not(:last-child) {
-  text-align: center;
-}
-
-.call-tree-cell:not(:last-child) {
-  text-align: end;
-}
-
-.call-tree-header {
-  background-color: var(--theme-tab-toolbar-background);
-}
-
-.call-tree-item:last-child {
-  border-bottom: 1px solid var(--cell-border-color);
-}
-
-.call-tree-item:nth-child(2n) {
-  background-color: var(--row-alt-background-color);
-}
-
-.call-tree-item:hover {
-  background-color: var(--row-hover-background-color);
-}
-
-.call-tree-item:focus {
-  background-color: var(--theme-selection-background);
-}
-
-.call-tree-item:focus description {
-  color: var(--theme-selection-color) !important;
-}
-
-.call-tree-item:focus .call-tree-cell {
-  -moz-border-end-color: var(--focus-cell-border-color);
-}
-
-.call-tree-item:not([origin="content"]) .call-tree-name,
-.call-tree-item:not([origin="content"]) .call-tree-url,
-.call-tree-item:not([origin="content"]) .call-tree-line,
-.call-tree-item:not([origin="content"]) .call-tree-column {
-  /* Style chrome and non-JS nodes differently. */
-  opacity: 0.6;
-}
-
-.call-tree-name {
-  -moz-margin-end: 4px !important;
-}
-
-.call-tree-url {
-  cursor: pointer;
-}
-
-.call-tree-url:hover {
-  text-decoration: underline;
-}
-
-.call-tree-url, .tree-widget-item:not(.theme-selected) .opt-url {
-  color: var(--theme-highlight-blue);
-}
-
-.call-tree-line, .tree-widget-item:not(.theme-selected) .opt-line {
-  color: var(--theme-highlight-orange);
-}
-
-.call-tree-column {
-  color: var(--theme-highlight-orange);
-  opacity: 0.6;
-}
-
-.call-tree-host {
-  -moz-margin-start: 8px !important;
-  font-size: 90%;
-  color: var(--theme-content-color2);
-}
-
-.call-tree-category {
-  transform: scale(0.75);
-  transform-origin: center right;
-}
-
-/**
- * Waterfall ticks header
- */
-
-.waterfall-header-ticks {
-  overflow: hidden;
-}
-
-.waterfall-header-name {
-  padding: 2px 4px;
-  font-size: 90%;
-}
-
-.waterfall-header-tick {
-  width: 100px;
-  font-size: 9px;
-  transform-origin: left center;
-  color: var(--theme-body-color);
-}
-
-.waterfall-header-tick:not(:first-child) {
-  -moz-margin-start: -100px !important; /* Don't affect layout. */
-}
-
-.waterfall-background-ticks {
-  /* Background created on a <canvas> in js. */
-  /* @see browser/devtools/timeline/widgets/waterfall.js */
-  background-image: -moz-element(#waterfall-background);
-  background-repeat: repeat-y;
-  background-position: -1px center;
-}
-
-/**
- * Markers waterfall breakdown
- */
-
-#waterfall-breakdown {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.theme-light .waterfall-tree-item:not([level="0"]) {
-  background-image: repeating-linear-gradient(
-    -45deg,
-    transparent 0px,
-    transparent 2px,
-    rgba(0,0,0,0.025) 2px,
-    rgba(0,0,0,0.025) 4px
-  );
-}
-
-.theme-dark .waterfall-tree-item:not([level="0"]) {
-  background-image: repeating-linear-gradient(
-    -45deg,
-    transparent 0px,
-    transparent 2px,
-    rgba(255,255,255,0.05) 2px,
-    rgba(255,255,255,0.05) 4px
-  );
-}
-
-.theme-light .waterfall-tree-item[expandable] .waterfall-marker-bullet,
-.theme-light .waterfall-tree-item[expandable] .waterfall-marker-bar {
-  background-image: repeating-linear-gradient(
-    -45deg,
-    transparent 0px,
-    transparent 5px,
-    rgba(255,255,255,0.35) 5px,
-    rgba(255,255,255,0.35) 10px
-  );
-}
-
-.theme-dark .waterfall-tree-item[expandable] .waterfall-marker-bullet,
-.theme-dark .waterfall-tree-item[expandable] .waterfall-marker-bar {
-  background-image: repeating-linear-gradient(
-    -45deg,
-    transparent 0px,
-    transparent 5px,
-    rgba(0,0,0,0.35) 5px,
-    rgba(0,0,0,0.35) 10px
-  );
-}
-
-.waterfall-tree-item[expanded],
-.waterfall-tree-item:not([level="0"]) + .waterfall-tree-item[level="0"] {
-  box-shadow: 0 -1px var(--cell-border-color-light);
-}
-
-.waterfall-tree-item:nth-child(2n) > .waterfall-marker {
-  background-color: var(--row-alt-background-color);
-}
-
-.waterfall-tree-item:hover {
-  background-color: var(--row-hover-background-color);
-}
-
-.waterfall-tree-item:last-child {
-  border-bottom: 1px solid var(--cell-border-color);
-}
-
-.waterfall-tree-item:focus {
-  background-color: var(--theme-selection-background);
-}
-
-.waterfall-tree-item:focus description {
-  color: var(--theme-selection-color) !important;
-}
-
-/**
- * Marker left sidebar
- */
-
-.waterfall-sidebar {
-  -moz-border-end: 1px solid var(--cell-border-color);
-}
-
-.waterfall-tree-item > .waterfall-sidebar:hover,
-.waterfall-tree-item:hover > .waterfall-sidebar,
-.waterfall-tree-item:focus > .waterfall-sidebar {
-  background: transparent;
-}
-
-.waterfall-marker-bullet {
-  width: 8px;
-  height: 8px;
-  -moz-margin-start: 8px;
-  -moz-margin-end: 6px;
-  border-radius: 1px;
-}
-
-.waterfall-marker-name {
-  font-size: 95%;
-  padding-bottom: 1px !important;
-}
-
-/**
- * Marker timebar
- */
-
-.waterfall-marker {
-  overflow: hidden;
-}
-
-.waterfall-marker-bar {
-  height: 9px;
-  transform-origin: left center;
-  border-radius: 1px;
-}
-
-.waterfall-marker > .theme-twisty {
-  /* Don't affect layout. */
-  width: 14px;
-  -moz-margin-end: -14px;
-}
-
-/**
- * Marker details view
- */
-
-#waterfall-details {
-  -moz-padding-start: 8px;
-  -moz-padding-end: 8px;
-  padding-top: 2vh;
-  overflow: auto;
-  min-width: 50px;
-}
-
-#waterfall-details > * {
-  padding-top: 3px;
-}
-
-.marker-details-bullet {
-  width: 8px;
-  height: 8px;
-  border-radius: 1px;
-}
-
-.marker-details-labelname {
-  -moz-padding-end: 4px;
-}
-
-.marker-details-type {
-  font-size: 1.2em;
-  font-weight: bold;
-}
-
-.marker-details-duration {
-  font-weight: bold;
-}
-
-.marker-details-customcontainer .custom-button {
-  padding: 2px 5px;
-  border-width: 1px;
-}
-
-/**
- * Marker colors
- */
-
-menuitem.marker-color-graphs-green:before,
-.marker-color-graphs-green {
-  background-color: var(--theme-graphs-green);
-}
-menuitem.marker-color-graphs-blue:before,
-.marker-color-graphs-blue {
-  background-color: var(--theme-graphs-blue);
-}
-menuitem.marker-color-graphs-bluegrey:before,
-.marker-color-graphs-bluegrey {
-  background-color: var(--theme-graphs-bluegrey);
-}
-menuitem.marker-color-graphs-purple:before,
-.marker-color-graphs-purple {
-  background-color: var(--theme-graphs-purple);
-}
-menuitem.marker-color-graphs-yellow:before,
-.marker-color-graphs-yellow {
-  background-color: var(--theme-graphs-yellow);
-}
-menuitem.marker-color-graphs-red:before,
-.marker-color-graphs-red {
-  background-color: var(--theme-graphs-red);
-}
-menuitem.marker-color-graphs-grey:before,
-.marker-color-graphs-grey{
-  background-color: var(--theme-graphs-grey);
-}
-
-/**
- * JIT View
- */
-
-#jit-optimizations-view {
-  width: 350px;
-  overflow-x: hidden;
-  overflow-y: auto;
-  min-width: 200px;
-}
-
-#optimizations-graph {
-  height: 30px;
-}
-
-#jit-optimizations-view.empty #optimizations-graph {
-  display: none !important;
-}
-
-/* override default styles for tree widget */
-#jit-optimizations-view .tree-widget-empty-text {
-  font-size: inherit;
-  padding: 0px;
-  margin: 8px;
-}
-
-#jit-optimizations-view:not(.empty) .tree-widget-empty-text {
-  display: none;
-}
-
-#jit-optimizations-toolbar {
-  height: 18px;
-  min-height: 0px; /* override .devtools-toolbar min-height */
-}
-
-.jit-optimizations-title {
-  margin: 0px 4px;
-  font-weight: 600;
-}
-
-#jit-optimizations-raw-view {
-  font-size: 90%;
-}
-
-/* override default .tree-widget-item line-height */
-#jit-optimizations-raw-view .tree-widget-item {
-  line-height: 20px !important;
-  display: block;
-  overflow: hidden;
-}
-
-#jit-optimizations-raw-view .tree-widget-item[level="1"] {
-  font-weight: 600;
-}
-
-#jit-optimizations-view .opt-outcome::before {
-  content: "→";
-  margin: 4px 0px;
-  color: var(--theme-body-color);
-}
-#jit-optimizations-view .theme-selected .opt-outcome::before {
-  color: var(--theme-selection-color);
-}
-
-#jit-optimizations-view .tree-widget-item:not(.theme-selected) .opt-outcome[outcome=success] {
-  color: var(--theme-highlight-green);
-}
-#jit-optimizations-view .tree-widget-item:not(.theme-selected) .opt-outcome[outcome=failure] {
-  color: var(--theme-highlight-red);
-}
-#jit-optimizations-view .tree-widget-container {
-  -moz-margin-end: 0px;
-}
-#jit-optimizations-view .tree-widget-container > li,
-#jit-optimizations-view .tree-widget-children > li {
-  overflow: hidden;
-}
-
-.opt-line::before {
-  content: ":";
-  color: var(--theme-highlight-orange);
-}
-.theme-selected .opt-line::before {
-  color: var(--theme-selection-color);
-}
-.opt-line.header-line::before {
-  color: var(--theme-body-color);
-}
-#jit-optimizations-view.empty .opt-line.header-line::before {
-  display: none;
-}
-
-.opt-url {
-  -moz-margin-start: 4px !important;
-}
-.opt-url:hover {
-  text-decoration: underline;
-}
-.opt-url.debugger-link {
-  cursor: pointer;
-}
-
-.opt-icon::before {
-  content: "";
-  background-image: url(chrome://browser/skin/devtools/webconsole.svg);
-  background-repeat: no-repeat;
-  background-size: 72px 60px;
-  /* show grey "i" bubble by default */
-  background-position: -36px -36px;
-  width: 12px;
-  height: 12px;
-  display: inline-block;
-
-  max-height: 12px;
-}
-
-#jit-optimizations-view .opt-icon::before {
-  margin: 5px 6px 0 0;
-}
-description.opt-icon {
-  margin: 0px 0px 0px 0px;
-}
-description.opt-icon::before {
-  margin: 1px 4px 0px 0px;
-}
-.theme-light .opt-icon::before {
-  background-image: url(chrome://browser/skin/devtools/webconsole.svg#light-icons);
-}
-.opt-icon[severity=warning]::before {
-  background-position: -24px -24px;
-}
-
-ul.frames-list {
-  list-style-type: none;
-  padding: 0px;
-  margin: 0px;
-}
-
-ul.frames-list li {
-  cursor: pointer;
-}
-
-ul.frames-list li.selected {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-/**
- * Configurable Options
- *
- * Elements can be tagged with a class and visibility is controlled via a
- * preference being applied or removed.
- */
-
-/**
- * devtools.performance.ui.experimental
- */
-menuitem.experimental-option::before {
-  content: "";
-  background-image: url(chrome://browser/skin/devtools/webconsole.svg);
-  background-repeat: no-repeat;
-  background-size: 72px 60px;
-  width: 12px;
-  height: 12px;
-  display: inline-block;
-
-  background-position: -24px -24px;
-  margin: 2px 5px 0 0;
-  max-height: 12px;
-}
-.theme-light menuitem.experimental-option::before {
-  background-image: url(chrome://browser/skin/devtools/webconsole.svg#light-icons);
-}
-
-#performance-options-menupopup:not(.experimental-enabled) .experimental-option,
-#performance-options-menupopup:not(.experimental-enabled) .experimental-option::before {
-  display: none;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/power.svg b/arc-firefox-theme/chrome/browser/devtools/power.svg
deleted file mode 100644
index d3a3284..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/power.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-Logo from raphaeljs.com, MIT License
-
-Copyright © 2008 Dmitry Baranovskiy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
--->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
-  <path stroke="#babec3" stroke-width="0" fill="#babec3" d="m10.89891,2.50043c-0.49827,-0.24134 -1.09841,-0.03411 -1.34129,0.46514c-0.24185,0.49928 -0.03311,1.09942 0.46517,1.34128c1.56306,0.76071 2.64193,2.36094 2.64092,4.21555c-0.00501,2.58626 -2.09749,4.6787 -4.68322,4.68321c-2.58623,-0.005 -4.67869,-2.09746 -4.68371,-4.68321c-0.001,-1.85561 1.07834,-3.45731 2.64294,-4.21654c0.49928,-0.24185 0.7065,-0.84201 0.46514,-1.34129c-0.24185,-0.49825 -0.84098,-0.70697 -1.34029,-0.46513c-2.23396,1.08135 -3.77446,3.37351 -3.77545,6.02296c0.00099,3.69518 2.99518,6.68989 6.69138,6.69088c3.6957,-0.00099 6.69037,-2.9957 6.69089,-6.69088c-0.00102,-2.64846 -1.53948,-4.9391 -3.77247,-6.02197zm-2.91842,4.9346c0.55398,0 1.00309,-0.44861 1.00309,-1.00357l0,-4.68373c0,-0.55446 -0.44911,-1.00309 -1.00309,-1.00309c-0.555,0 -1.00358,0.44911 -1.00358,1.00309l0,4.68321c0,0.55499 0.44858,1.00409 1.00358,1.00409z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/profiler-stopwatch-checked.svg b/arc-firefox-theme/chrome/browser/devtools/profiler-stopwatch-checked.svg
deleted file mode 100644
index abe68dc..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/profiler-stopwatch-checked.svg
+++ /dev/null
@@ -1,17 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="#3bace5" fill-rule="evenodd">
-    <path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
-    <path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-    <path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
-    <path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
-    <g opacity=".3">
-      <path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
-      <path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
-      <path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
-      <path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
-    </g>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/profiler-stopwatch.svg b/arc-firefox-theme/chrome/browser/devtools/profiler-stopwatch.svg
deleted file mode 100644
index 690fc7d..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/profiler-stopwatch.svg
+++ /dev/null
@@ -1,17 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="#babec3" fill-rule="evenodd">
-    <path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
-    <path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-    <path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
-    <path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
-    <g opacity=".3">
-      <path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
-      <path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
-      <path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
-      <path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
-    </g>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/projecteditor/projecteditor.css b/arc-firefox-theme/chrome/browser/devtools/projecteditor/projecteditor.css
deleted file mode 100644
index 9ea540e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/projecteditor/projecteditor.css
+++ /dev/null
@@ -1,188 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
- :root {
-  color: #18191a;
-}
-
-.view-project-detail {
-  overflow: auto;
-}
-
-.plugin-hidden {
-  display: none;
-}
-
-.arrow {
-  -moz-appearance: treetwisty;
-  width: 20px;
-  height: 20px;
-}
-
-.arrow[open] {
-  -moz-appearance: treetwistyopen;
-}
-
-.arrow[invisible] {
-  visibility: hidden;
-}
-
-#projecteditor-menubar {
-  display: none;
-}
-
-#projecteditor-toolbar,
-#projecteditor-toolbar-bottom {
-  display: none; /* For now don't show the status bars */
-  min-height: 22px;
-  height: 22px;
-  background: rgb(237, 237, 237);
-}
-
-#sources {
-  overflow: auto;
-}
-
-.sources-tree {
-  overflow:auto;
-  overflow-x: hidden;
-  -moz-user-focus: normal;
-
-  /* Allows this to expand inside of parent xul element, while
-     still supporting child flexbox elements, including ellipses. */
-  -moz-box-flex: 1;
-  display: block;
-}
-
-.sources-tree input {
-  margin: 2px;
-  border: 1px solid gray;
-}
-
-#main-deck .sources-tree {
-  background: rgb(225, 225, 225);
-  min-width: 100px;
-}
-
-.entry {
-  color: #18191A;
-  display: flex;
-  align-items: center;
-}
-
-.entry .file-label {
-  display: flex;
-  flex: 1;
-  align-items: center;
-}
-
-.entry {
-  border: none;
-  box-shadow: none;
-  white-space: nowrap;
-  cursor: pointer;
-}
-
-.entry:hover:not(.entry-group-title):not(.selected) {
-  background: rgba(0, 0, 0, .05);
-}
-
-.entry.selected {
-  background: rgba(56, 117, 215, 1);
-  color: #F5F7FA;
-  outline: none;
-}
-
-.entry-group-title {
-  background: rgba(56, 117, 215, 0.8);
-  color: #F5F7FA;
-  font-weight: bold;
-  font-size: 1.05em;
-  line-height: 35px;
-  padding: 0 10px;
-}
-
-.sources-tree .entry-group-title .expander {
-  display: none;
-}
-
-.entry .expander {
-  width: 16px;
-  padding: 0;
-}
-
-.tree-collapsed .children {
-  display: none;
-}
-
-/* Plugins */
-
-#projecteditor-toolbar textbox {
-  margin: 0;
-}
-
-.projecteditor-basic-display {
-  padding: 0 3px;
-}
-
-/* App Manager */
-.project-name-label {
-  font-weight: bold;
-  padding-left: 10px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.project-flex {
-  flex: 1;
-}
-
-.project-image {
-  max-height: 25px;
-  margin-left: -10px;
-}
-
-.project-image,
-.project-status,
-.project-options {
-  flex-shrink: 0;
-}
-
-.project-status {
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
-  border: solid 1px rgba(255, 255, 255, .5);
-  margin-right: 10px;
-  visibility: hidden;
-}
-
-.project-status[status=valid] {
-  background: #70bf53;
-  visibility: visible;
-}
-
-.project-status[status=warning] {
-  background: #d99b28;
-  visibility: visible;
-}
-
-.project-status[status=error] {
-  background: #ed2655;
-  visibility: visible;
-}
-
-/* Status Bar */
-.projecteditor-file-label {
-  font-weight: bold;
-  padding-left: 29px;
-  padding-right: 10px;
-  flex: 1;
-}
-
-/* Image View */
-.editor-image {
-  padding: 10px;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/promisedebugger.css b/arc-firefox-theme/chrome/browser/devtools/promisedebugger.css
deleted file mode 100644
index e003224..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/promisedebugger.css
+++ /dev/null
@@ -1,3 +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/. */
diff --git a/arc-firefox-theme/chrome/browser/devtools/pseudo-class.svg b/arc-firefox-theme/chrome/browser/devtools/pseudo-class.svg
deleted file mode 100644
index 830d5fa..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/pseudo-class.svg
+++ /dev/null
@@ -1,29 +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/. -->
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <style>
-      use[id^="pseudo-class"]:not(:target) {
-        display: none;
-      }
-    </style>
-    <rect id="class-block-maskBG" width="8" height="8" fill="#fff"/>
-    <rect id="class-block" width="8" height="8" rx="1" ry="1"/>
-    <mask id="mask-block-solid">
-      <use xlink:href="#class-block-maskBG"/>
-      <use xlink:href="#class-block" transform="translate(3 3)" fill="#000"/>
-    </mask>
-    <g id="pseudo-class-shape">
-      <rect x=".5" y=".5" width="7" height="7" rx="1" ry="1" mask="url(#mask-block-solid)" fill="none" stroke="currentColor" stroke-width="1"/>
-      <use xlink:href="#class-block" mask="url(#mask-block-solid)" fill="currentColor" fill-opacity=".4"/>
-      <use xlink:href="#class-block" mask="url(#mask-block-solid)" fill="currentColor" transform="translate(4 4)"/>
-      <g transform="translate(8 8)" fill="currentColor">
-        <path d="M2.5,0C2.2,0,2,0.2,2,0.5C2,0.8,2.2,1,2.5,1C2.8,1,3,0.8,3,0.5 C3,0.2,2.8,0,2.5,0z M4.5,0C4.2,0,4,0.2,4,0.5C4,0.8,4.2,1,4.5,1C4.8,1,5,0.8,5,0.5C5,0.2,4.8,0,4.5,0z M0.5,6C0.8,6,1,5.8,1,5.5 C1,5.2,0.8,5,0.5,5C0.2,5,0,5.2,0,5.5C0,5.8,0.2,6,0.5,6z M0.5,4C0.8,4,1,3.8,1,3.5C1,3.2,0.8,3,0.5,3C0.2,3,0,3.2,0,3.5 C0,3.8,0.2,4,0.5,4z M7.5,2C7.2,2,7,2.2,7,2.5C7,2.8,7.2,3,7.5,3C7.8,3,8,2.8,8,2.5C8,2.2,7.8,2,7.5,2z M7.5,4C7.2,4,7,4.2,7,4.5 C7,4.8,7.2,5,7.5,5C7.8,5,8,4.8,8,4.5C8,4.2,7.8,4,7.5,4z M5.5,7C5.2,7,5,7.2,5,7.5C5,7.8,5.2,8,5.5,8C5.8,8,6,7.8,6,7.5 C6,7.2,5.8,7,5.5,7z M3.5,7C3.2,7,3,7.2,3,7.5C3,7.8,3.2,8,3.5,8C3.8,8,4,7.8,4,7.5C4,7.2,3.8,7,3.5,7z M0.5,2C0.8,2,1,1.8,1,1.5v-1 C1,0.2,0.8,0,0.5,0C0.2,0,0,0.2,0,0.5v1C0,1.8,0.2,2,0.5,2z M8,0.5C8,0.2,7.8,0,7.5,0h-1C6.2,0,6,0.2,6,0.5C6,0.8,6.2,1,6.5,1h1 C7.8,1,8,0.8,8,0.5z M7.5,6C7.2,6,7,6.2,7,6.5v1C7,7.8,7.2,8,7.5,8C7.8,8,8,7.8,8,7.5v-1C8,6.2,7.8,6,7.5,6z M1.5,7h-1 C0.2,7,0,7.2,0,7.5C0,7.8,0.2,8,0.5,8h1C1.8,8,2,7.8,2,7.5C2,7.2,1.8,7,1.5,7z"/>
-        <use xlink:href="#class-block" fill-opacity=".2"/>
-      </g>
-    </g>
-  </defs>
-  <use xlink:href="#pseudo-class-shape" id="pseudo-class" color="#babec3"/>
-  <use xlink:href="#pseudo-class-shape" id="pseudo-class-checked" color="#3089C9"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsive-horizontal-resizer.png b/arc-firefox-theme/chrome/browser/devtools/responsive-horizontal-resizer.png
deleted file mode 100644
index 7d113f0..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsive-horizontal-resizer.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsive-horizontal-resizer@2x.png b/arc-firefox-theme/chrome/browser/devtools/responsive-horizontal-resizer@2x.png
deleted file mode 100644
index bb3c4bd..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsive-horizontal-resizer@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsive-se-resizer.png b/arc-firefox-theme/chrome/browser/devtools/responsive-se-resizer.png
deleted file mode 100644
index 35b54d6..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsive-se-resizer.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsive-se-resizer@2x.png b/arc-firefox-theme/chrome/browser/devtools/responsive-se-resizer@2x.png
deleted file mode 100644
index 9dbf4fe..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsive-se-resizer@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsive-vertical-resizer.png b/arc-firefox-theme/chrome/browser/devtools/responsive-vertical-resizer.png
deleted file mode 100644
index 3b4e78c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsive-vertical-resizer.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsive-vertical-resizer@2x.png b/arc-firefox-theme/chrome/browser/devtools/responsive-vertical-resizer@2x.png
deleted file mode 100644
index cbae606..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsive-vertical-resizer@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsiveui-home.png b/arc-firefox-theme/chrome/browser/devtools/responsiveui-home.png
deleted file mode 100644
index 43379d0..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsiveui-home.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsiveui-rotate.png b/arc-firefox-theme/chrome/browser/devtools/responsiveui-rotate.png
deleted file mode 100644
index 2bacbd2..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsiveui-rotate.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsiveui-rotate@2x.png b/arc-firefox-theme/chrome/browser/devtools/responsiveui-rotate@2x.png
deleted file mode 100644
index eeeb823..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsiveui-rotate@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsiveui-screenshot.png b/arc-firefox-theme/chrome/browser/devtools/responsiveui-screenshot.png
deleted file mode 100644
index 084220e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsiveui-screenshot.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsiveui-screenshot@2x.png b/arc-firefox-theme/chrome/browser/devtools/responsiveui-screenshot@2x.png
deleted file mode 100644
index 927c5cf..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsiveui-screenshot@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsiveui-touch.png b/arc-firefox-theme/chrome/browser/devtools/responsiveui-touch.png
deleted file mode 100644
index 9058703..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsiveui-touch.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/responsiveui-touch@2x.png b/arc-firefox-theme/chrome/browser/devtools/responsiveui-touch@2x.png
deleted file mode 100644
index e464503..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/responsiveui-touch@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/rewind.png b/arc-firefox-theme/chrome/browser/devtools/rewind.png
deleted file mode 100644
index 098e256..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/rewind.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/rewind@2x.png b/arc-firefox-theme/chrome/browser/devtools/rewind@2x.png
deleted file mode 100644
index eaac45d..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/rewind@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/ruleview.css b/arc-firefox-theme/chrome/browser/devtools/ruleview.css
deleted file mode 100644
index e9ae604..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/ruleview.css
+++ /dev/null
@@ -1,329 +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/. */
-
-/* CSS Variables specific to this panel that aren't defined by the themes */
-.theme-light {
-  --rule-highlight-background-color: #ffee99;
-  --rule-filter-icon: url(magnifying-glass-light.png);
-}
-
-.theme-dark {
-  --rule-highlight-background-color: #594724;
-  --rule-filter-icon: url(magnifying-glass.png);
-}
-
-.ruleview {
-  height: 100%;
-}
-
-.ruleview-rule-source {
-  text-align: end;
-  float: right;
-  -moz-user-select: none;
-  margin-bottom: 2px;
-}
-
-.ruleview-rule-source > label {
-  cursor: pointer;
-  margin: 0;
-}
-
-.ruleview-rule-source[unselectable],
-.ruleview-rule-source[unselectable] > label {
-  cursor: default;
-}
-
-.ruleview-rule-source:not([unselectable]):hover {
-  text-decoration: underline;
-}
-
-.ruleview-header {
-  border-top-width: 1px;
-  border-bottom-width: 1px;
-  border-top-style: solid;
-  border-bottom-style: solid;
-  padding: 1px 4px;
-  -moz-user-select: none;
-  word-wrap: break-word;
-  margin-top: 4px;
-}
-
-.ruleview-rule-pseudo-element {
-  padding-left:20px;
-  border-left: solid 10px;
-}
-
-.ruleview-rule,
-#noResults {
-  padding: 2px 4px;
-}
-
-/**
- * Display rules that don't match the current selected element and uneditable
- * user agent styles differently
- */
-.ruleview-rule[unmatched=true],
-.ruleview-rule[uneditable=true] {
-  background: var(--theme-tab-toolbar-background);
-}
-
-.ruleview-rule[uneditable=true] :focus {
-  outline: none;
-}
-
-.ruleview-rule[uneditable=true] .theme-link {
-  color: var(--theme-highlight-bluegrey);
-}
-
-.ruleview-rule[uneditable=true] .ruleview-enableproperty {
-  visibility: hidden;
-}
-
-.ruleview-rule[uneditable=true] .ruleview-swatch {
-  cursor: default;
-}
-
-.ruleview-rule[uneditable=true] .ruleview-namecontainer > .ruleview-propertyname,
-.ruleview-rule[uneditable=true] .ruleview-propertyvaluecontainer >
-.ruleview-propertyvalue {
-  border-bottom-color: transparent;
-}
-
-#noResults {
-  font: message-box;
-  color: GrayText;
-}
-
-.ruleview-rule + .ruleview-rule {
-  border-top-width: 1px;
-  border-top-style: dotted;
-}
-
-.ruleview-warning {
-  background-image: url(alerticon-warning.png);
-  background-size: 13px 12px;
-  -moz-margin-start: 5px;
-  display: inline-block;
-  width: 13px;
-  height: 12px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .ruleview-warning {
-    background-image: url(alerticon-warning@2x.png);
-  }
-}
-
-.ruleview-overridden-rule-filter {
-  background-image: var(--rule-filter-icon);
-  background-size: 11px 11px;
-  -moz-margin-start: 5px;
-  display: inline-block;
-  width: 11px;
-  height: 11px;
-}
-
-.ruleview-ruleopen {
-  -moz-padding-end: 5px;
-}
-
-.ruleview-ruleclose {
-  cursor: text;
-  padding-right: 20px;
-}
-
-.ruleview-propertylist {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.ruleview-rule:not(:hover) .ruleview-enableproperty {
-  visibility: hidden;
-}
-
-.ruleview-expander {
-  display: inline-block;
-}
-
-.ruleview-newproperty {
-  /* (enable checkbox width: 12px) + (expander width: 15px) */
-  -moz-margin-start: 27px;
-}
-
-.ruleview-namecontainer,
-.ruleview-propertyvaluecontainer,
-.ruleview-propertyname,
-.ruleview-propertyvalue {
-  text-decoration: inherit;
-}
-
-.ruleview-computedlist {
-  list-style: none;
-  padding: 0;
-}
-
-.ruleview-computed {
-  -moz-margin-start: 35px;
-}
-
-.ruleview-swatch {
-  cursor: pointer;
-  border-radius: 50%;
-  width: 0.9em;
-  height: 0.9em;
-  vertical-align: middle;
-  -moz-margin-end: 5px;
-  display: inline-block;
-  position: relative;
-}
-
-.ruleview-colorswatch::before {
-  content: '';
-  background-color: #eee;
-  background-image: linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc),
-                    linear-gradient(45deg, #ccc 25%, transparent 25%, transparent 75%, #ccc 75%, #ccc);
-  background-size: 12px 12px;
-  background-position: 0 0, 6px 6px;
-  position: absolute;
-  border-radius: 50%;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: -1;
-}
-
-.ruleview-bezierswatch {
-  background: url("chrome://browser/skin/devtools/cubic-bezier-swatch.png");
-  background-size: 1em;
-}
-
-.ruleview-filterswatch {
-  background: url("chrome://browser/skin/devtools/filter-swatch.svg");
-  background-size: 1em;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .ruleview-bezierswatch {
-    background: url("chrome://browser/skin/devtools/cubic-bezier-swatch@2x.png");
-    background-size: 1em;
-  }
-}
-
-.ruleview-overridden {
-  text-decoration: line-through;
-}
-
-.theme-light .ruleview-overridden {
-  text-decoration-color: var(--theme-content-color3);
-}
-
-.styleinspector-propertyeditor {
-  border: 1px solid #CCC;
-  padding: 0;
-}
-
-.ruleview-property {
-  border-left: 3px solid transparent;
-  clear: right;
-}
-
-.ruleview-propertycontainer  > * {
-  vertical-align: middle;
-}
-
-.ruleview-property[dirty] {
-  border-left-color: var(--theme-highlight-green);
-}
-
-.ruleview-highlight {
-  background-color: var(--rule-highlight-background-color);
-}
-
-.ruleview-namecontainer > .ruleview-propertyname,
-.ruleview-propertyvaluecontainer > .ruleview-propertyvalue {
-  border-bottom: 1px dashed transparent;
-}
-
-.ruleview-namecontainer:hover > .ruleview-propertyname,
-.ruleview-propertyvaluecontainer:hover > .ruleview-propertyvalue {
-  border-bottom-color: hsl(0,0%,50%);
-}
-
-.ruleview-selectorcontainer {
-  word-wrap: break-word;
-  cursor: text;
-}
-
-.ruleview-selector-separator, .ruleview-selector-unmatched {
-  color: #888;
-}
-
-.ruleview-selector-matched > .ruleview-selector-attribute {
-  /* TODO: Bug 1178535 Awaiting UX feedback on highlight colors */
-}
-
-.ruleview-selector-matched > .ruleview-selector-pseudo-class {
-  /* TODO: Bug 1178535 Awaiting UX feedback on highlight colors */
-}
-
-.ruleview-selector-matched > .ruleview-selector-pseudo-class-lock {
-  font-weight: bold;
-  color: var(--theme-highlight-orange);
-}
-
-.ruleview-selectorhighlighter {
-  background: url("chrome://browser/skin/devtools/vview-open-inspector.png") no-repeat 0 0;
-  padding-left: 16px;
-  margin-left: 5px;
-  cursor: pointer;
-}
-
-.ruleview-selectorhighlighter:hover {
-  background-position: -32px 0;
-}
-
-.ruleview-selectorhighlighter:active,
-.ruleview-selectorhighlighter.highlighted {
-  background-position: -16px 0;
-}
-
-#ruleview-add-rule-button::before {
-  background-image: url("chrome://browser/skin/devtools/add.svg");
-  background-size: cover;
-}
-
-#pseudo-class-panel-toggle::before {
-  background-image: url("chrome://browser/skin/devtools/pseudo-class.svg#pseudo-class");
-  background-size: cover;
-}
-#pseudo-class-panel-toggle[checked]::before {
-  background-image: url("chrome://browser/skin/devtools/pseudo-class.svg#pseudo-class-checked");
-  filter: none !important;
-}
-
-/**
- * These buttons are using opacity instead of background color to indicate
- * the state
- */
-#ruleview-add-rule-button,
-#pseudo-class-panel-toggle,
-.ruleview-overridden-rule-filter {
-  opacity: 0.8;
-}
-
-#ruleview-add-rule-button:not([disabled]):hover,
-#pseudo-class-panel-toggle:hover,
-#pseudo-class-panel-toggle[checked],
-.ruleview-overridden-rule-filter:hover {
-  opacity: 1;
-}
-
-#ruleview-add-rule-button,
-#pseudo-class-panel-toggle,
-#pseudo-class-panel-toggle:hover,
-#pseudo-class-panel-toggle[checked]::before {
-  background-color: transparent !important;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/scratchpad.css b/arc-firefox-theme/chrome/browser/devtools/scratchpad.css
deleted file mode 100644
index 4c8a5d1..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/scratchpad.css
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#scratchpad-sidebar > tabs {
-  height: 0;
-  border: none;
-}
-
-#sp-toolbar {
-  border: none;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/search-clear-dark.svg b/arc-firefox-theme/chrome/browser/devtools/search-clear-dark.svg
deleted file mode 100644
index 422a7ce..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/search-clear-dark.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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="32" height="16" viewBox="0 0 32 16">
-  <defs>
-    <path id="glyphShape-clear" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8s8-3.6,8-8C16,3.6,12.4,0,8,0 z M11.9,10.5l-1.4,1.4L8,9.4l-2.4,2.4l-1.4-1.4L6.6,8L4.2,5.6l1.4-1.4L8,6.6l2.4-2.4l1.4,1.4L9.4,8L11.9,10.5z"/>
-    <style>
-      .icon-state-default { fill: #f5f7fa; fill-opacity: .6; }
-      .icon-state-pressed { fill: #7d7e80; fill-opacity: .8; }
-    </style>
-  </defs>
-  <use xlink:href="#glyphShape-clear" class="icon-state-default"/>
-  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/search-clear-failed.svg b/arc-firefox-theme/chrome/browser/devtools/search-clear-failed.svg
deleted file mode 100644
index a8f9fd8..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/search-clear-failed.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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="32" height="16" viewBox="0 0 32 16">
-  <defs>
-    <path id="glyphShape-clear" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8s8-3.6,8-8C16,3.6,12.4,0,8,0 z M11.9,10.5l-1.4,1.4L8,9.4l-2.4,2.4l-1.4-1.4L6.6,8L4.2,5.6l1.4-1.4L8,6.6l2.4-2.4l1.4,1.4L9.4,8L11.9,10.5z"/>
-    <style>
-      .icon-state-default { fill: #cc3d3d; fill-opacity: 1; }
-      .icon-state-pressed { fill: #802d2d; fill-opacity: 1; }
-    </style>
-  </defs>
-  <use xlink:href="#glyphShape-clear" class="icon-state-default"/>
-  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/search-clear-light.svg b/arc-firefox-theme/chrome/browser/devtools/search-clear-light.svg
deleted file mode 100644
index 066ef44..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/search-clear-light.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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="32" height="16" viewBox="0 0 32 16">
-  <defs>
-    <path id="glyphShape-clear" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8s8-3.6,8-8C16,3.6,12.4,0,8,0 z M11.9,10.5l-1.4,1.4L8,9.4l-2.4,2.4l-1.4-1.4L6.6,8L4.2,5.6l1.4-1.4L8,6.6l2.4-2.4l1.4,1.4L9.4,8L11.9,10.5z"/>
-    <style>
-      .icon-state-default { fill: #1d2126; fill-opacity: .5; }
-      .icon-state-pressed { fill: #1d2126; fill-opacity: .8; }
-    </style>
-  </defs>
-  <use xlink:href="#glyphShape-clear" class="icon-state-default"/>
-  <use xlink:href="#glyphShape-clear" class="icon-state-pressed" transform="translate(16)"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/shadereditor.css b/arc-firefox-theme/chrome/browser/devtools/shadereditor.css
deleted file mode 100644
index 4626a38..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/shadereditor.css
+++ /dev/null
@@ -1,119 +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/. */
-
-/* Reload and waiting notices */
-
-.notice-container {
-  margin-top: -50vh;
-  background-color: var(--theme-toolbar-background);
-  color: var(--theme-body-color-alt);
-}
-
-#reload-notice {
-  font-size: 120%;
-}
-
-#waiting-notice {
-  font-size: 110%;
-}
-
-/* Shaders pane */
-
-#shaders-pane {
-  min-width: 150px;
-}
-
-#shaders-pane + .devtools-side-splitter {
-  border-color: transparent;
-}
-
-.program-item {
-  padding: 2px 0px;
-}
-
-.side-menu-widget-item-checkbox {
-  -moz-appearance: none;
-  opacity: 0;
-  transition: opacity .15s ease-out 0s;
-}
-
-/* Only show the checkbox when the source is hovered over, is selected, or if it
- * is not checked. */
-.side-menu-widget-item:hover > .side-menu-widget-item-checkbox,
-.side-menu-widget-item.selected > .side-menu-widget-item-checkbox,
-.side-menu-widget-item-checkbox:not([checked]) {
-  opacity: 1;
-  transition: opacity .15s ease-out 0s;
-}
-
-.side-menu-widget-item-checkbox .checkbox-check {
-  -moz-appearance: none;
-  background-image: url(itemToggle.png);
-  background-color: transparent;
-  background-repeat: no-repeat;
-  background-clip: content-box;
-  background-size: 32px 16px;
-  background-position: -16px 0;
-  width: 16px;
-  height: 16px;
-  border: 0;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .side-menu-widget-item-checkbox .checkbox-check {
-    background-image: url(itemToggle@2x.png);
-  }
-}
-
-.side-menu-widget-item-checkbox[checked] .checkbox-check {
-  background-position: 0 0;
-}
-
-/* Invert all toggle icons but the one in the active row for light theme */
-.theme-light .side-menu-widget-item:not(.selected) .checkbox-check {
-  filter: url(filters.svg#invert);
-}
-
-/* Shader source editors */
-
-.editor-label {
-  padding: 1px 12px;
-  border-top: 1px solid;
-}
-
-.editor-label {
-  background: var(--theme-toolbar-background);
-  border-color: var(--theme-splitter-color);
-  color: var(--theme-body-color-alt);
-}
-
-.editor-label[selected] {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-/* Responsive sidebar */
-
-@media (max-width: 700px) {
-  #shaders-pane {
-    max-height: 60vh;
-  }
-
-  #editors-splitter {
-    border-color: transparent;
-  }
-
-  .side-menu-widget-container {
-    box-shadow: none !important;
-  }
-
-  .side-menu-widget-item-arrow {
-    background-image: none !important;
-  }
-
-  .editor-label {
-    -moz-box-ordinal-group: 0;
-    border-bottom: 1px solid;
-  }
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/splitview.css b/arc-firefox-theme/chrome/browser/devtools/splitview.css
deleted file mode 100644
index 902fedb..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/splitview.css
+++ /dev/null
@@ -1,135 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-
-.splitview-nav-container .devtools-throbber {
-  display: none;
-  text-align: center;
-}
-
-.loading .splitview-nav-container .devtools-throbber {
-  display: block;
-}
-
-.theme-dark .splitview-nav-container {
-  background-color: var(--theme-toolbar-background);
-}
-
-.splitview-nav {
-  -moz-appearance: none;
-  list-style-image: none;
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.theme-dark .splitview-nav {
-  box-shadow: inset -1px 0 0 #000;
-}
-
-.theme-dark .splitview-nav:-moz-locale-dir(rtl) {
-  box-shadow: inset 1px 0 0 #000;
-}
-
-.theme-light .splitview-nav {
-  box-shadow: inset -1px 0 0 #aaa;
-}
-
-.theme-light .splitview-nav:-moz-locale-dir(rtl) {
-  box-shadow: inset 1px 0 0 #aaa;
-}
-
-.splitview-nav > li {
-  /* To compensate for the top and bottom borders */
-  margin-top: -1px;
-  margin-bottom: -1px;
-  -moz-padding-end: 8px;
-  -moz-box-align: center;
-  outline: 0;
-  vertical-align: bottom;
-}
-
-.theme-dark .splitview-nav > li {
-  border-top: 1px solid rgba(0,0,0,0.2);
-  border-bottom: 1px solid rgba(128,128,128,0.15);
-}
-
-.theme-dark .splitview-nav > li:last-of-type {
-  box-shadow: inset 0 -1px 0 rgba(0,0,0,0.2);
-}
-
-.theme-light  .splitview-nav > li {
-  border-top: 1px solid rgba(128,128,128,0.15);
-  border-bottom: 1px solid transparent;
-}
-
-.theme-light .splitview-nav > li:last-of-type {
-  box-shadow: inset 0 -1px 0 rgba(128,128,128,0.15);
-}
-
-.placeholder {
-  -moz-box-flex: 1;
-  text-align: center;
-}
-
-.splitview-nav > li.splitview-active {
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center right, center right, top left;
-  background-size: auto, 1px, auto;
-}
-
-.splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center left, center left, top right;
-}
-
-.theme-dark .splitview-nav > li.splitview-active {
-  background-image: url(itemArrow-dark-ltr.svg),
-                    linear-gradient(#000, #000),
-                    linear-gradient(#1d4f73, #1d4f73);
-}
-
-.theme-dark .splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-dark-rtl.svg),
-                    linear-gradient(#000, #000),
-                    linear-gradient(#1d4f73, #1d4f73);
-}
-
-.theme-light .splitview-nav > li.splitview-active {
-  background-image: url(itemArrow-ltr.svg),
-                    linear-gradient(#aaa, #aaa),
-                    linear-gradient(#4c9ed9, #4c9ed9);
-}
-
-.theme-light .splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-rtl.svg),
-                    linear-gradient(#aaa, #aaa),
-                    linear-gradient(#4c9ed9, #4c9ed9);
-}
-
-/* Toolbars */
-
-.splitview-main > .devtools-toolbar {
-  background-origin: border-box;
-  background-clip: border-box;
-}
-
-.theme-dark .splitview-main > toolbar,
-.theme-dark .loading .splitview-nav-container {
-  -moz-border-end: 1px solid #000;
-}
-
-.theme-light .splitview-main > toolbar,
-.theme-light .loading .splitview-nav-container {
-  -moz-border-end: 1px solid #aaa;
-}
-
-.splitview-main > .devtools-toolbarbutton {
-  font-size: 11px;
-  padding: 0 8px;
-  width: auto;
-  min-width: 48px;
-  min-height: 0;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/storage.css b/arc-firefox-theme/chrome/browser/devtools/storage.css
deleted file mode 100644
index a5a897e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/storage.css
+++ /dev/null
@@ -1,48 +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/. */
-
-/* Storage Host Tree */
-
-#storage-tree {
-  min-width: 220px;
-  max-width: 500px;
-  overflow: auto;
-}
-
-#storage-tree {
-  background: var(--theme-sidebar-background);
-}
-
-#storage-tree .tree-widget-item[type="store"]:after {
-  background-image: url(chrome://browser/skin/devtools/filetype-store.svg);
-  background-size: 18px 18px;
-  background-position: -1px 0;
-}
-
-/* Columns with date should have a min width so that date is visible */
-#expires, #lastAccessed, #creationTime {
-  min-width: 150px;
-}
-
-/* Variables View Sidebar */
-
-#storage-sidebar {
-  max-width: 500px;
-  min-width: 250px;
-}
-
-/* Responsive sidebar */
-@media (max-width: 700px) {
-  #storage-tree {
-    max-width: 100%;
-  }
-
-  #storage-table #path {
-    display: none;
-  }
-
-  #storage-table .table-widget-cell {
-    min-width: 100px;
-  }
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/styleeditor.css b/arc-firefox-theme/chrome/browser/devtools/styleeditor.css
deleted file mode 100644
index 0cc2fca..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/styleeditor.css
+++ /dev/null
@@ -1,305 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-.stylesheet-title,
-.stylesheet-name {
-  text-decoration: none;
-}
-
-.stylesheet-name {
-  font-size: 13px;
-}
-
-.theme-dark .stylesheet-title,
-.theme-dark .stylesheet-name {
-  color: var(--theme-selection-color);
-}
-
-.theme-dark .stylesheet-rule-count,
-.theme-dark .stylesheet-linked-file,
-.theme-dark .stylesheet-saveButton {
-  color: var(--theme-body-color-alt);
-}
-
-.theme-light .stylesheet-title,
-.theme-light .stylesheet-name {
-  color: var(--theme-body-color-alt);
-}
-
-.theme-light .stylesheet-rule-count,
-.theme-light .stylesheet-linked-file,
-.theme-light .stylesheet-saveButton {
-  color: var(--theme-body-color);
-}
-
-.stylesheet-saveButton {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.splitview-active .stylesheet-title,
-.splitview-active .stylesheet-name,
-.theme-light .splitview-active .stylesheet-rule-count,
-.theme-light .splitview-active .stylesheet-linked-file,
-.theme-light .splitview-active .stylesheet-saveButton {
-  color: var(--theme-selection-color);
-}
-
-.splitview-nav:focus {
-  outline: 0; /* focus ring is on the stylesheet name */
-}
-
-.splitview-nav > li.unsaved > hgroup .stylesheet-name {
-  font-style: italic;
-}
-
-.splitview-nav:-moz-locale-dir(ltr) > li.unsaved > hgroup .stylesheet-name:before,
-.splitview-nav:-moz-locale-dir(rtl) > li.unsaved > hgroup .stylesheet-name:after {
-  font-style: italic;
-}
-
-.splitview-nav.empty > p {
-  padding: 0 10px;
-}
-
-.stylesheet-sidebar {
-  max-width: 400px;
-  min-width: 100px;
-}
-
-.theme-light .stylesheet-sidebar {
-  border-color: #aaa; /* Splitters */
-}
-
-.theme-dark .stylesheet-sidebar {
-  border-color: #000;  /* Splitters */
-}
-
-.theme-light .media-rule-label {
-  border-bottom-color: #cddae5; /* Grey */
-}
-
-.theme-dark .media-rule-label {
-  border-bottom-color: #303b47; /* Grey */
-}
-
-.media-rule-label {
-  padding: 4px;
-  cursor: pointer;
-  border-bottom: 1px solid;
-}
-
-.media-rule-line {
-  -moz-padding-start: 4px;
-}
-
-.theme-light .media-condition-unmatched {
-  color: grey;
-}
-
-.theme-dark .media-condition-unmatched {
-  color: #606C75;
-}
-
-.stylesheet-enabled {
-  padding: 8px 0;
-  margin: 0 8px;
-  background-image: url(itemToggle.png);
-  background-repeat: no-repeat;
-  background-clip: content-box;
-  background-position: 0 8px;
-  background-size: 48px 24px;
-  width: 24px;
-  height: 40px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .stylesheet-enabled {
-    background-image: url(itemToggle@2x.png);
-  }
-}
-
-.disabled > .stylesheet-enabled {
-  background-position: -24px 8px;
-}
-
-/* Invert all toggle icons but the one in the active row for light theme */
-.theme-light .splitview-nav > li:not(.splitview-active) .stylesheet-enabled {
-  filter: url(filters.svg#invert);
-}
-
-.splitview-nav > li > .stylesheet-enabled:focus,
-.splitview-nav > li:hover > .stylesheet-enabled {
-  outline: 0;
-}
-
-.stylesheet-linked-file:not(:empty){
-  -moz-margin-end: 0.4em;
-}
-
-.stylesheet-linked-file:not(:empty):before {
-  -moz-margin-start: 0.4em;
-}
-
-li.linked-file-error .stylesheet-linked-file:after {
-  font-size: 110%;
-}
-
-.stylesheet-more > h3 {
-  font-size: 11px;
-  -moz-margin-end: 2px;
-}
-
-.devtools-searchinput {
-  max-width: 25ex;
-  font-size: 11px;
-}
-
-.placeholder a {
-  text-decoration: underline;
-}
-
-h1,
-h2,
-h3 {
-  font-size: inherit;
-  font-weight: normal;
-  margin: 0;
-  padding: 0;
-}
-
-@media (max-width: 700px) {
-  .stylesheet-sidebar {
-    width: 150px;
-  }
-}
-
-/* portrait mode */
-@media (max-width: 550px) {
-  .splitview-nav {
-    box-shadow: none;
-  }
-
-  .splitview-nav > li.splitview-active {
-    background-size: 0 0, 0 0, auto;
-  }
-
-  .stylesheet-enabled {
-    padding: 0;
-    background-position: 0 0;
-    height: 24px;
-  }
-
-  .disabled > .stylesheet-enabled {
-    background-position: -24px 0;
-  }
-
-  .splitview-nav > li > hgroup.stylesheet-info {
-    -moz-box-align: baseline;
-  }
-
-  .stylesheet-sidebar {
-    width: 180px;
-  }
-}
-
-.csscoverage-report {
-  background-color: var(--theme-toolbar-background);
-}
-
-.csscoverage-report-container {
-  height: 100vh;
-  padding: 0 30px;
-}
-
-.csscoverage-report-content {
-  margin: 20px auto;
-  -moz-column-width: 300px;
-  font-size: 13px;
-}
-
-.csscoverage-report h1 {
-  font-size: 120%;
-}
-
-.csscoverage-report h2 {
-  font-size: 110%;
-}
-
-.csscoverage-report h1,
-.csscoverage-report h2,
-.csscoverage-report h3 {
-  font-weight: bold;
-  margin: 10px 0;
-}
-
-.csscoverage-list:after {
-  content: ', ';
-}
-
-.csscoverage-list:last-child:after {
-  display: none;
-}
-
-.csscoverage-report textarea {
-  width: 100%;
-  height: 100px;
-}
-
-.csscoverage-report a {
-  cursor: pointer;
-  text-decoration: underline;
-}
-
-.csscoverage-report > .csscoverage-toolbar {
-  border: none;
-  margin: 0;
-  padding: 0;
-}
-
-.csscoverage-report > .csscoverage-toolbarbutton {
-  min-width: 4em;
-  min-height: 100vh;
-  margin: 0;
-  padding: 0;
-  border-radius: 0;
-  border-top: none;
-  border-bottom: none;
-  -moz-border-start: none;
-}
-
-.chart-colored-blob[name="Used Preload"] {
-  fill: var(--theme-highlight-pink);
-  background: var(--theme-highlight-pink);;
-}
-
-.chart-colored-blob[name=Used] {
-  fill: var(--theme-highlight-green);
-  background: var(--theme-highlight-green);
-}
-
-.chart-colored-blob[name=Unused] {
-  fill: var(--theme-highlight-lightorange);
-  background: var(--theme-highlight-lightorange);
-}
-
-/* Undo 'largest' customization */
-.theme-dark .pie-chart-slice[largest] {
-  stroke-width: 1px;
-  stroke: rgba(0,0,0,0.2);
-}
-
-.theme-light .pie-chart-slice[largest] {
-  stroke-width: 1px;
-  stroke: rgba(255,255,255,0.8);
-}
-
-.csscoverage-report .pie-chart-slice {
-  cursor: default;
-}
-
-.csscoverage-report-chart {
-  margin: 0 50px;
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/timeline-filter.svg b/arc-firefox-theme/chrome/browser/devtools/timeline-filter.svg
deleted file mode 100644
index 1919e2c..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/timeline-filter.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.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/. -->
-<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;
-    }
-    use {
-      fill: #babec3;
-    }
-    use[id$="-disabled"] {
-      fill-opacity: 0.5;
-    }
-    use[id$="-open"] {
-      fill: #3bace5;
-    }
-  </style>
-  <defs>
-    <path id="filter-shape" d="M 2,2 v 3 l 5,4 v 6 h 2 v -6 l 5,-4 v -3 L 14,2 z"/>
-  </defs>
-  <use id="filter" xlink:href="#filter-shape"/>
-  <use id="filter-disabled" xlink:href="#filter-shape"/>
-  <use id="filter-open" xlink:href="#filter-shape"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/toggle-tools.png b/arc-firefox-theme/chrome/browser/devtools/toggle-tools.png
deleted file mode 100644
index 4954393..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/toggle-tools.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/toggle-tools@2x.png b/arc-firefox-theme/chrome/browser/devtools/toggle-tools@2x.png
deleted file mode 100644
index 971f414..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/toggle-tools@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-debugger-paused.svg b/arc-firefox-theme/chrome/browser/devtools/tool-debugger-paused.svg
deleted file mode 100644
index 998f21b..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-debugger-paused.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <path fill="#71c054" fill-rule="evenodd" d="m8,1c-3.9,0-7,3.1-7,7 0,3.9 3.1,7 7,7 3.9,0 7-3.1 7-7 0-3.9-3.1-7-7-7zm2,11h-1-5c-.6,0-1-.4-1-1v-6c0-.6 .4-1 1-1h5 1l4,4-4,4z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-debugger.svg b/arc-firefox-theme/chrome/browser/devtools/tool-debugger.svg
deleted file mode 100644
index 655d482..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-debugger.svg
+++ /dev/null
@@ -1,10 +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/. -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <g fill="#edf0f1" fill-rule="evenodd">
-    <path d="m8,1c-3.9,0-7,3.1-7,7 0,3.9 3.1,7 7,7 3.9,0 7-3.1 7-7 0-3.9-3.1-7-7-7zm0,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5 2.8,0 5,2.2 5,5 0,2.8-2.2,5-5,5z"/>
-    <path d="m6,5c.6,0 1,.4 1,1v4c0,.6-.4,1-1,1-.6,0-1-.4-1-1v-4c0-.6 .4-1 1-1z"/>
-    <path d="m10,5c.6,0 1,.4 1,1v4c0,.6-.4,1-1,1-.6,0-1-.4-1-1v-4c0-.6 .4-1 1-1z"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-inspector.svg b/arc-firefox-theme/chrome/browser/devtools/tool-inspector.svg
deleted file mode 100644
index 45ec67f..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-inspector.svg
+++ /dev/null
@@ -1,12 +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/. -->
-<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16">
-  <path fill="#eef0f2" fill-rule="evenodd" d="M2,4v9h11V4H2z M11,11H4V6h7V11z"/>
-  <g opacity=".8">
-    <path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M0,8h2v1H0V8z"/>
-    <path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M13,8h2v1h-2V8z"/>
-    <path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M7,2h1v2H7V2z"/>
-    <path opacity=".8" fill="#eef0f2" fill-rule="evenodd" d="M7,13h1v2H7V13z"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-network.svg b/arc-firefox-theme/chrome/browser/devtools/tool-network.svg
deleted file mode 100644
index 8e232d6..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-network.svg
+++ /dev/null
@@ -1,39 +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/. -->
-<svg width="17" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 16">
-  <g fill="#edf0f1" fill-rule="evenodd">
-    <path opacity=".1" d="M2.1,0h12.8C16,0,17,1,17,2.1v10.6c0,1.2-1,2.1-2.1,2.1H2.1c-1.2,0-2.1-1-2.1-2.1V2.1C0,1,1,0,2.1,0z"/>
-    <path d="m2.1,2.1h9.6c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-9.6c-.6,0-1.1-.5-1.1-1.1 .1-.6 .5-1.1 1.1-1.1z"/>
-  </g>
-  <g opacity=".7">
-    <g opacity=".75">
-      <path fill="#edf0f1" fill-rule="evenodd" d="m7.4,5.3h7.4c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-7.4c-.5-.1-1-.5-1-1.1 0-.6 .5-1.1 1-1.1z"/>
-    </g>
-    <g opacity=".85">
-      <path fill="#edf0f1" d="m14.9,5.7c.4,0 .7,.3 .7,.7s-.4,.6-.7,.6h-7.5c-.3,0-.6-.3-.6-.6s.3-.7 .7-.7h7.4m0-.4h-7.5c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h7.4c.6,0 1.1-.5 1.1-1.1 0-.6-.4-1.1-1-1.1z"/>
-    </g>
-  </g>
-  <g opacity=".75">
-    <path fill="#edf0f1" fill-rule="evenodd" d="m5.3,8.5h3.2c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-3.2c-.6,0-1.1-.5-1.1-1.1 .1-.6 .5-1.1 1.1-1.1z"/>
-  </g>
-  <g opacity=".85">
-    <path fill="#edf0f1" d="m8.5,8.9c.4,0 .7,.3 .7,.7 0,.4-.3,.7-.7,.7h-3.2c-.4,0-.7-.3-.7-.7 0-.4 .3-.7 .7-.7h3.2m0-.4h-3.2c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h3.2c.6,0 1.1-.5 1.1-1.1 0-.6-.5-1.1-1.1-1.1z"/>
-  </g>
-  <g opacity=".7">
-    <g opacity=".75">
-      <path fill="#edf0f1" fill-rule="evenodd" d="m4.3,11.7h2.1c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1h-2.1c-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-    </g>
-    <g opacity=".85">
-      <path fill="#edf0f1" d="m6.4,12.1c.4,0 .7,.3 .7,.7 0,.4-.3,.7-.7,.7h-2.1c-.4,0-.7-.3-.7-.7 0-.4 .3-.7 .7-.7h2.1m0-.4h-2.1c-.6,0-1.1,.5-1.1,1.1 0,.6 .5,1.1 1.1,1.1h2.1c.6,0 1.1-.5 1.1-1.1-.1-.6-.5-1.1-1.1-1.1z"/>
-    </g>
-  </g>
-  <g opacity=".05" fill="#edf0f1" fill-rule="evenodd">
-    <path d="m7.4,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
-    <path d="m4.2,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
-    <path d="m1,14.6c0-.1 0-.1 0-.2v-13.9c0-.1 0-.1 0-.2-.6,.4-1,1-1,1.8v10.6c0,.8 .4,1.5 1,1.9z"/>
-    <path d="m16,.3c0,.1 0,.1 0,.2v13.8c0,.1 0,.1 0,.2 .6-.4 1-1 1-1.8v-10.6c0-.7-.4-1.4-1-1.8z"/>
-    <path d="m13.8,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
-    <path d="m10.6,14.3v-13.8c0-.3-.2-.5-.5-.5-.3,0-.5,.2-.5,.5v13.8c0,.3 .2,.5 .5,.5 .3,.1 .5-.2 .5-.5z"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-options.svg b/arc-firefox-theme/chrome/browser/devtools/tool-options.svg
deleted file mode 100644
index 2885ef9..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-options.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <path fill="#edf0f1" 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"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-profiler-active.svg b/arc-firefox-theme/chrome/browser/devtools/tool-profiler-active.svg
deleted file mode 100644
index 0882cca..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-profiler-active.svg
+++ /dev/null
@@ -1,17 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="#71c054" fill-rule="evenodd">
-    <path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
-    <path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-    <path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
-    <path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
-    <g opacity=".3">
-      <path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
-      <path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
-      <path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
-      <path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
-    </g>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-profiler.svg b/arc-firefox-theme/chrome/browser/devtools/tool-profiler.svg
deleted file mode 100644
index 8441af3..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-profiler.svg
+++ /dev/null
@@ -1,17 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g fill="#edf0f1" fill-rule="evenodd">
-    <path d="m8,1c-3.9,0-7,3.1-7,7s3.1,7 7,7c3.9,0 7-3.1 7-7s-3.1-7-7-7zm-.1,12c-2.8,0-5-2.2-5-5 0-2.8 2.2-5 5-5s5,2.2 5,5c0,2.8-2.2,5-5,5z"/>
-    <path d="m8,6.9c.6,0 1.1,.5 1.1,1.1 0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1 0-.6 .5-1.1 1.1-1.1z"/>
-    <path d="m11.3,4.6l-3.9,2.5 1.5,1.4 2.4-3.9z"/>
-    <path opacity=".4" d="m4.6,10c.7,1.2 2,2 3.4,2 1.5,0 2.7-.8 3.4-2h-6.8z"/>
-    <g opacity=".3">
-      <path d="m7.1,5.1l-.6-1.3-.9,.4 .7,1.3c.2-.1 .5-.3 .8-.4z"/>
-      <path d="m9.8,5.6l.7-1.4-.9-.4-.7,1.3c.3,.2 .6,.3 .9,.5z"/>
-      <path d="m10.8,7c.1,.3 .2,.7 .2,1h2v-1h-2.2z"/>
-      <path d="m5,8c0-.3 .1-.7 .2-1h-2.2l-.1,1h2.1z"/>
-    </g>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-scratchpad.svg b/arc-firefox-theme/chrome/browser/devtools/tool-scratchpad.svg
deleted file mode 100644
index c1e8e08..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-scratchpad.svg
+++ /dev/null
@@ -1,9 +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/. -->
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <g fill="#edf0f1" fill-rule="evenodd">
-    <path opacity=".3" d="m1.1,6.3c0-.3 .3-.6 .6-.6h4.6c.3,0 .6,.3 .6,.6s-.3,.6-.6,.6h-4.6c-.3,0-.6-.3-.6-.6zm12,1.7h-10.2c-.4,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h10.3c.3,0 .6-.3 .6-.6-.1-.3-.3-.6-.7-.6zm-5.7,3.4c.3,0 .6-.3 .6-.6 0-.3-.3-.6-.6-.6h-4.5c-.3,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h4.5zm2.3,1.2h-8c-.3,0-.6,.3-.6,.6 0,.3 .3,.6 .6,.6h8c.3,0 .6-.3 .6-.6 0-.4-.3-.6-.6-.6z"/>
-    <path d="m14.3,2.3h-.6v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.1-.1-.1-.1-.2-.2-.2-.1-.3-.1-.4-.1-.3,0-.6,.3-.6,.6v1.7h-1.1v1.1c0,.6-.5,1.1-1.1,1.1-.7,.1-1.2-.4-1.2-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.1-.1-.2-.2-.3-.2-.1-.1-.1-.1-.2-.1-.3,0-.6,.3-.6,.6v1.7h-1.1v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.3-.1-.3-.2-.4-.2-.1-.1-.2-.1-.3-.1-.3,0-.5,.3-.5,.6v1.7h-1.2v1.1c0,.6-.5,1.1-1.1,1.1-.6,0-1.1-.5-1.1-1.1v-.5c0,.3 .3,.6 .6,.6 .3,0 .6-.3 .6-.6v-.6-1.7c0-.1 0-.2-.1-.3-.2-.1-.2-.2-.3-.2-.1-.1-.2-.1-.3-.1-.3,0-.6,.3-.6,.6v1.7h-.5c-.3,0-.6,.2-.6,.6v12.6c0,.2 .3,.5 .6,.5h13.7c.3,0 .6-.3 .6-.6v-12.5c0-.4-.3-.6-.6-.6zm-12.6,3.4h4.6c.3,0 .6,.3 .6,.6s-.3,.6-.6,.6h-4.6c-.3,0-.6-.3-.6-.6s.3-.6 .6-.6zm8,8h-8c-.3,0-.6-.3-.6-.6 0-.3 .3-.6 .6-.6h8c.3,0 .6,.3 .6,.6 0,.4-.3,.6-.6,.6zm-7.4-2.8c0-.3 .3-.6 .6-.6h4.6c.3,0 .6,.3 .6,.6 0,.3-.3,.6-.6,.6h-4.6c-.4-.1-.6-.3-.6-.6zm10.8-1.8h-10.2c-.3,0-.6-.3-.6-.6 0-.2 .2-.5 .6-.5h10.3c.3,0 .6,.3 .6,.6-.1,.3-.3,.5-.7,.5z"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-shadereditor.svg b/arc-firefox-theme/chrome/browser/devtools/tool-shadereditor.svg
deleted file mode 100644
index e4e239a..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-shadereditor.svg
+++ /dev/null
@@ -1,26 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <rect x="2" y="2" width="12" height="12" fill="#edf0f1" fill-opacity=".1"/>
-  <polygon points="2,2 14,14 2,14" fill="#edf0f1" fill-opacity=".35"/>
-  <rect x="2.5" y="2.5" width="11" height="11" fill="none" stroke="#edf0f1" stroke-width="1"/>
-  <g fill="#edf0f1" fill-opacity=".65">
-    <polygon points="3,3 5,3 5,5"/>
-    <rect x="11" y="3" width="2" height="2"/>
-    <rect x="7" y="3" width="2" height="2"/>
-    <polygon points="5,5 7,5 7,7"/>
-    <rect x="9" y="5" width="2" height="2"/>
-    <polygon points="7,7 9,7 9,9"/>
-    <rect x="11" y="7" width="2" height="2"/>
-    <polygon points="9,9 11,9 11,11"/>
-    <polygon points="11,11 13,11 13,13"/>
-  </g>
-  <line x1="3" y1="3" x2="13" y2="13" stroke="#edf0f1" stroke-width="1"/>
-  <g fill="#edf0f1">
-    <circle cx="2" cy="2" r="1"/>
-    <circle cx="14" cy="2" r="1"/>
-    <circle cx="2" cy="14" r="1"/>
-    <circle cx="14" cy="14" r="1"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-storage.svg b/arc-firefox-theme/chrome/browser/devtools/tool-storage.svg
deleted file mode 100644
index 8c2c291..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-storage.svg
+++ /dev/null
@@ -1,10 +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/. -->
-<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16">
-  <g fill="#edf0f1">
-    <path d="m1.3,12.5v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6,0-6.6-2.7-6.6-2.7z"/>
-    <path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/>
-    <path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-styleeditor.svg b/arc-firefox-theme/chrome/browser/devtools/tool-styleeditor.svg
deleted file mode 100644
index e123f45..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-styleeditor.svg
+++ /dev/null
@@ -1,9 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="17" height="16" viewBox="0 0 17 16">
-  <g fill="#edf0f1" fill-rule="evenodd">
-    <path d="m10,11.1 0,2.3-7.8,0 0-11.2 5.6-0 1.1,1.1 1.7-1.6-1.7-1.7-8.9,0 0,15.6 12.2,0 0-6.7z"/>
-    <path d="M6.7,7.8L14.5,0l2.2,2.2L8.9,10l-3.3,1.1L6.7,7.8z"/>
-  </g>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-webaudio.svg b/arc-firefox-theme/chrome/browser/devtools/tool-webaudio.svg
deleted file mode 100644
index cd317de..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-webaudio.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="-6.167 -16.135 100 100">
-  <path fill="none" stroke="#edf0f1" stroke-width="8" stroke-linecap="round" stroke-miterlimit="10" d="M86.666,33.864  c-0.797,5.297-3.467,32.799-10.518,32.866c-7.086,0.066-9.973-27.596-10.9-32.866C64.322,28.597,61.436,0.933,54.35,1  c-7.105,0.068-9.644,27.561-10.517,32.864c-0.874,5.305-3.412,32.799-10.517,32.866c-7.087,0.066-9.974-27.596-10.899-32.866  C21.49,28.597,18.604,0.933,11.517,1C4.466,1.067,1.796,28.569,1,33.864"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tool-webconsole.svg b/arc-firefox-theme/chrome/browser/devtools/tool-webconsole.svg
deleted file mode 100644
index f62307d..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tool-webconsole.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path fill="#edf0f1" fill-rule="evenodd" d="M2,2h5.4l6.5,6.5L7.4,15H2l6.5-6.5L2,2z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-dark.png b/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-dark.png
deleted file mode 100644
index 751fbc3..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-dark.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-dark@2x.png b/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-dark@2x.png
deleted file mode 100644
index e4db35e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-dark@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-light.png b/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-light.png
deleted file mode 100644
index 298ced1..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-light.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-light@2x.png b/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-light@2x.png
deleted file mode 100644
index 7dec134..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-horizontal-light@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-dark.png b/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-dark.png
deleted file mode 100644
index dfd5354..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-dark.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-dark@2x.png b/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-dark@2x.png
deleted file mode 100644
index 721bb0d..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-dark@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-light.png b/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-light.png
deleted file mode 100644
index 5a57fc3..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-light.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-light@2x.png b/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-light@2x.png
deleted file mode 100644
index c2b95c4..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tooltip/arrow-vertical-light@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tracer-icon.png b/arc-firefox-theme/chrome/browser/devtools/tracer-icon.png
deleted file mode 100644
index 8229dd7..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tracer-icon.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/tracer-icon@2x.png b/arc-firefox-theme/chrome/browser/devtools/tracer-icon@2x.png
deleted file mode 100644
index de0ded4..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/tracer-icon@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/undock@2x.png b/arc-firefox-theme/chrome/browser/devtools/undock@2x.png
deleted file mode 100644
index 137d6df..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/undock@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/vview-delete.png b/arc-firefox-theme/chrome/browser/devtools/vview-delete.png
deleted file mode 100644
index db4b062..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/vview-delete.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/vview-delete@2x.png b/arc-firefox-theme/chrome/browser/devtools/vview-delete@2x.png
deleted file mode 100644
index ae6fbb2..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/vview-delete@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/vview-edit.png b/arc-firefox-theme/chrome/browser/devtools/vview-edit.png
deleted file mode 100644
index f575032..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/vview-edit.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/vview-edit@2x.png b/arc-firefox-theme/chrome/browser/devtools/vview-edit@2x.png
deleted file mode 100644
index a34c8ed..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/vview-edit@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/vview-lock.png b/arc-firefox-theme/chrome/browser/devtools/vview-lock.png
deleted file mode 100644
index b68cc5e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/vview-lock.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/vview-lock@2x.png b/arc-firefox-theme/chrome/browser/devtools/vview-lock@2x.png
deleted file mode 100644
index 5d7640b..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/vview-lock@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/vview-open-inspector.png b/arc-firefox-theme/chrome/browser/devtools/vview-open-inspector.png
deleted file mode 100644
index ee1d7a5..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/vview-open-inspector.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/vview-open-inspector@2x.png b/arc-firefox-theme/chrome/browser/devtools/vview-open-inspector@2x.png
deleted file mode 100644
index 2b09f01..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/vview-open-inspector@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css b/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css
deleted file mode 100644
index 3be55bd..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css
+++ /dev/null
@@ -1,253 +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/. */
-
-/* Reload and waiting notices */
-.notice-container {
-  margin-top: -50vh;
-  background-color: var(--theme-toolbar-background);
-  color: var(--theme-body-color-alt);
-}
-
-#reload-notice {
-  font-size: 120%;
-}
-
-#waiting-notice {
-  font-size: 110%;
-}
-
-/* Context Graph */
-svg {
-  overflow: hidden;
-  -moz-box-flex: 1;
-}
-
-/* Edges in graph */
-.edgePath path {
-  stroke-width: 1px;
-  fill: none;
-}
-
-.theme-dark .edgePath path {
-  stroke: #b6babf; /* Grey foreground text */
-}
-.theme-light .edgePath path {
-  stroke: #aaaaaa; /* Splitters */
-}
-
-/* AudioParam connection edges */
-g.edgePath.param-connection {
-  stroke-dasharray: 5,5;
-}
-
-.theme-dark .edgePath.param-connection path {
-  stroke: #b6babf; /* Grey foreground text */
-}
-.theme-light .edgePath.param-connection path {
-  stroke: #aaaaaa; /* Splitters */
-}
-
-/* Labels in AudioParam connection should have background that match
- * the main background so there's whitespace around the label, on top of the
- * dotted lines. */
-.theme-dark g.edgeLabel rect {
-  fill: #14171a;
-}
-.theme-light g.edgeLabel rect {
-  fill: #fcfcfc; /* Background - Editor */
-}
-.theme-dark g.edgeLabel tspan {
-  fill: var(--theme-body-color-alt);
-}
-.theme-light g.edgeLabel tspan {
-  fill: #585959; /* Grey foreground text */
-}
-
-/* Audio Nodes */
-.nodes rect {
-  stroke-width: 1px;
-  cursor: pointer;
-}
-
-.nodes rect {
-  stroke: var(--theme-tab-toolbar-background);
-}
-.theme-light rect {
-  fill: var(--theme-tab-toolbar-background);
-}
-.theme-dark rect {
-  fill: var(--theme-toolbar-background);
-}
-
-/**
- * Bypassed Nodes
- */
-
-.theme-light .nodes g.bypassed rect {
-  fill: url(chrome://browser/skin/devtools/filters.svg#bypass-light);
-}
-.theme-dark .nodes g.bypassed rect {
-  fill: url(chrome://browser/skin/devtools/filters.svg#bypass-dark);
-}
-.nodes g.bypassed.selected rect {
-  stroke: var(--theme-selection-background);
-}
-
-/*
-.nodes g.bypassed text {
-  opacity: 0.8;
-}
-*/
-
-/**
- * Selected Nodes
- */
-.nodes g.selected rect {
-  fill: var(--theme-selection-background);
-}
-
-/* Don't style bypassed nodes text different because it'd be illegible in light-theme */
-.theme-light g.selected:not(.bypassed) text {
-  fill: var(--theme-toolbar-background);
-}
-
-
-/* Text in nodes and edges */
-text {
-  cursor: default; /* override the "text" cursor */
-  font-weight: 300;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serf;
-  font-size: 14px;
-}
-
-text {
-  fill: var(--theme-body-color-alt);
-}
-
-
-.nodes text {
-  cursor: pointer;
-}
-
-/**
- * Inspector Styles
- */
-
-/* hide the variables view scope title as its redundant,
- * because there's only one scope displayed. */
-.variables-view-scope > .title {
-  display: none;
-}
-
-#web-audio-inspector-title {
-  margin: 6px;
-}
-
-.web-audio-inspector .error {
-  background-image: url(alerticon-warning.png);
-  background-size: 13px 12px;
-  -moz-appearance: none;
-  opacity: 0;
-  transition: opacity .5s ease-out 0s;
-}
-
-#inspector-pane-toggle {
-  background: none;
-  box-shadow: none;
-  border: none;
-  list-style-image: url(debugger-collapse.png);
-  -moz-image-region: rect(0px,16px,16px,0px);
-}
-
-#inspector-pane-toggle > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-#inspector-pane-toggle[pane-collapsed] {
-  list-style-image: url(debugger-expand.png);
-}
-
-#inspector-pane-toggle:active {
-  -moz-image-region: rect(0px,32px,16px,16px);
-}
-
-/**
- * Automation Styles
- */
-
-#automation-param-toolbar .automation-param-button[selected] {
-  color: var(--theme-selection-color);
-  background-color: var(--theme-selection-background);
-}
-
-#automation-graph {
-  overflow: hidden;
-  -moz-box-flex: 1;
-}
-
-@media (min-resolution: 1.1dppx) {
-  #inspector-pane-toggle {
-    list-style-image: url(debugger-collapse@2x.png);
-    -moz-image-region: rect(0px,32px,32px,0px);
-  }
-
-  #inspector-pane-toggle[pane-collapsed] {
-    list-style-image: url(debugger-expand@2x.png);
-  }
-
-  #inspector-pane-toggle:active {
-    -moz-image-region: rect(0px,64px,32px,32px);
-  }
-
-  .web-audio-inspector .error {
-    background-image: url(alerticon-warning@2x.png);
-  }
-}
-
-/**
- * Inspector toolbar
- */
-
-#audio-node-toolbar .bypass {
-  list-style-image: url(power.svg);
-}
-
-#audio-node-toolbar toolbarbutton[disabled] {
-  opacity: 0.5;
-  background-color: transparent;
-}
-
-.theme-dark #audio-node-toolbar toolbarbutton[checked] {
-  background-color: #1d4f73; /* Select Highlight Blue */
-}
-.theme-light #audio-node-toolbar toolbarbutton[checked] {
-  background-color: #4c9ed9; /* Select Highlight Blue */
-}
-
-/* don't invert checked buttons so we can have white icons on light theme */
-#audio-node-toolbar toolbarbutton[checked] > .toolbarbutton-icon {
-  filter: none;
-}
-
-
-/**
- * Responsive Styles
- * `.devtools-responsive-container` takes care of most of
- * the changing of host types.
- */
-@media (max-width: 700px) {
-  /**
-   * Override the inspector toggle so it's always open
-   * in the portrait view, with the toggle button hidden.
-   */
-  #inspector-pane-toggle {
-    display: none;
-  }
-
-  #web-audio-inspector {
-    margin-left: 0px !important;
-    margin-right: 0px !important;
-  }
-}
diff --git a/arc-firefox-theme/chrome/browser/devtools/webconsole.css b/arc-firefox-theme/chrome/browser/devtools/webconsole.css
deleted file mode 100644
index d17690e..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/webconsole.css
+++ /dev/null
@@ -1,598 +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/. */
-
-/* General output styles */
-
-a {
-  -moz-user-focus: normal;
-  -moz-user-input: enabled;
-  cursor: pointer;
-  text-decoration: underline;
-}
-
-/* Workaround for Bug 575675 - FindChildWithRules aRelevantLinkVisited
- * assertion when loading HTML page with links in XUL iframe */
-*:visited { }
-
-.message {
-  display: flex;
-  flex: none;
-  padding: 0 7px;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.message > .prefix,
-.message > .timestamp {
-  flex: none;
-  color: GrayText;
-  margin: 3px 6px 0 0;
-}
-
-.message > .indent {
-  flex: none;
-}
-
-.message > .icon {
-  flex: none;
-  margin: 3px 6px 0 0;
-  padding: 0 4px;
-  height: 1em;
-  align-self: flex-start;
-}
-
-.message > .icon::before {
-  content: "";
-  background-image: url(chrome://browser/skin/devtools/webconsole.svg);
-  background-position: 12px 12px;
-  background-repeat: no-repeat;
-  background-size: 72px 60px;
-  width: 12px;
-  height: 12px;
-  display: inline-block;
-}
-
-.theme-light .message > .icon::before {
-  background-image: url(chrome://browser/skin/devtools/webconsole.svg#light-icons);
-}
-
-.message > .message-body-wrapper {
-  flex: 1 1 100%;
-  margin: 3px;
-}
-
-.message-body-wrapper .table-widget-body {
-  overflow: visible;
-}
-
-/* The red bubble that shows the number of times a message is repeated */
-.message-repeats {
-  -moz-user-select: none;
-  flex: none;
-  margin: 2px 6px;
-  padding: 0 6px;
-  height: 1.25em;
-  color: white;
-  background-color: red;
-  border-radius: 40px;
-  font: message-box;
-  font-size: 0.9em;
-  font-weight: 600;
-}
-
-.message-repeats[value="1"] {
-  display: none;
-}
-
-.message-location {
-  display: flex;
-  flex: none;
-  align-self: flex-start;
-  justify-content: flex-end;
-  width: 10em;
-  margin-top: 3px;
-  color: -moz-nativehyperlinktext;
-  text-decoration: none;
-  white-space: nowrap;
-}
-
-.message-location:hover,
-.message-location:focus {
-  text-decoration: underline;
-}
-
-.message-location > .filename {
-  text-overflow: ellipsis;
-  text-align: end;
-  overflow: hidden;
-}
-
-.message-location > .line-number {
-  flex: none;
-}
-
-.message-flex-body {
-  display: flex;
-}
-
-.message-body > * {
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-
-.message-flex-body > .message-body {
-  display: block;
-  flex: 1 1 auto;
-  vertical-align: middle;
-}
-
-.message-flex-body > .message-location {
-  margin-top: 0;
-}
-
-.jsterm-input-container {
-  border-top-width: 1px;
-  border-top-style: solid;
-}
-
-#output-wrapper {
-  direction: ltr;
-  overflow: auto;
-}
-
-#output-container {
-  -moz-user-select: text;
-  -moz-box-flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
-
-#output-container.hideTimestamps > .message {
-  -moz-padding-start: 0;
-  -moz-margin-start: 7px;
-  width: calc(100% - 7px);
-}
-
-#output-container.hideTimestamps > .message > .timestamp {
-  display: none;
-}
-
-#output-container.hideTimestamps > .message > .indent {
-  background-color: var(--theme-body-background);
-}
-
-.filtered-by-type,
-.filtered-by-string {
-  display: none;
-}
-
-.hidden-message {
-  display: block;
-  visibility: hidden;
-  height: 0;
-  overflow: hidden;
-}
-
-/* WebConsole colored drops */
-
-.webconsole-filter-button {
-  -moz-user-focus: normal;
-}
-
-.webconsole-filter-button > .toolbarbutton-menubutton-button:before {
-  content: "";
-  display: inline-block;
-  height: 8px;
-  width: 8px;
-  border-radius: 50%;
-  margin-left: 5px;
-  border-width: 1px;
-  border-style: solid;
-}
-
-/* Network styles */
-.webconsole-filter-button[category="net"] > .toolbarbutton-menubutton-button:before {
-  background-image: linear-gradient(#444444, #000000);
-  border-color: #777;
-}
-
-.message:hover {
-  background-color: var(--theme-selection-background-semitransparent) !important;
-}
-
-.theme-light .message[severity=error] {
-  background-color: rgba(255, 150, 150, 0.3);
-}
-
-.theme-dark .message[severity=error] {
-  background-color: rgba(235, 83, 104, 0.17);
-}
-
-.console-string {
-  color: var(--theme-highlight-lightorange);
-}
-
-.theme-selected .console-string,
-.theme-selected .cm-number,
-.theme-selected .cm-variable,
-.theme-selected .kind-ArrayLike {
-  color: #f5f7fa !important; /* Selection Text Color */
-}
-
-.message[category=network] > .indent {
-  -moz-border-end: solid #000 6px;
-}
-
-.message[category=network][severity=error] > .icon::before {
-  background-position: -12px 0;
-}
-
-.message[category=network] > .message-body {
-  display: flex;
-}
-
-.message[category=network] .method {
-  flex: none;
-}
-
-.message[category=network]:not(.navigation-marker) .url {
-  flex: 1 1 auto;
-  /* Make sure the URL is very small initially, let flex change width as needed. */
-  width: 100px;
-  min-width: 5em;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.message[category=network] .status {
-  flex: none;
-  -moz-margin-start: 6px;
-}
-
-.message[category=network].mixed-content .url {
-  color: #FF0000;
-}
-
-.message .learn-more-link {
-  color: -moz-nativehyperlinktext;
-  margin: 0 6px;
-}
-
-.message[category=network] .xhr {
-  background-color: var(--theme-body-color-alt);
-  color: var(--theme-body-background);
-  border-radius: 3px;
-  font-weight: bold;
-  font-size: 10px;
-  padding: 2px;
-  line-height: 10px;
-  -moz-margin-end: 1ex;
-}
-
-/* CSS styles */
-.webconsole-filter-button[category="css"] > .toolbarbutton-menubutton-button:before {
-  background-image: linear-gradient(#2DC3F3, #00B6F0);
-  border-color: #1BA2CC;
-}
-
-.message[category=cssparser] > .indent {
-  -moz-border-end: solid #00b6f0 6px;
-}
-
-.message[category=cssparser][severity=error] > .icon::before {
-  background-position: -12px -12px;
-}
-
-.message[category=cssparser][severity=warn] > .icon::before {
-  background-position: -24px -12px;
-}
-
-/* JS styles */
-.webconsole-filter-button[category="js"] > .toolbarbutton-menubutton-button:before {
-  background-image: linear-gradient(#FCB142, #FB9500);
-  border-color: #E98A00;
-}
-
-.message[category=exception] > .indent {
-  -moz-border-end: solid #fb9500 6px;
-}
-
-.message[category=exception][severity=error] > .icon::before {
-  background-position: -12px -24px;
-}
-
-.message[category=exception][severity=warn] > .icon::before {
-  background-position: -24px -24px;
-}
-
-/* Web Developer styles */
-.webconsole-filter-button[category="logging"] > .toolbarbutton-menubutton-button:before {
-  background-image: linear-gradient(#B9B9B9, #AAAAAA);
-  border-color: #929292;
-}
-
-.message[category=console] > .indent {
-  -moz-border-end: solid #cbcbcb 6px;
-}
-
-.message[category=console][severity=error] > .icon::before,
-.message[category=output][severity=error] > .icon::before,
-.message[category=server][severity=error] > .icon::before {
-  background-position: -12px -36px;
-}
-
-.message[category=console][severity=warn] > .icon::before,
-.message[category=server][severity=warn] > .icon::before {
-  background-position: -24px -36px;
-}
-
-.message[category=console][severity=info] > .icon::before,
-.message[category=server][severity=info] > .icon::before {
-  background-position: -36px -36px;
-}
-
-/* Server Logging Styles */
-
-.webconsole-filter-button[category="server"] > .toolbarbutton-menubutton-button:before {
-  background-image: linear-gradient(rgb(144, 176, 144), rgb(99, 151, 99));
-  border-color: rgb(76, 143, 76);
-}
-
-.message[category=server] > .indent {
-  -moz-border-end: solid #90B090 6px;
-}
-
-/* Input and output styles */
-.message[category=input] > .indent,
-.message[category=output] > .indent {
-  -moz-border-end: solid #808080 6px;
-}
-
-.message[category=input] > .icon::before {
-  background-position: -48px -36px;
-}
-
-.message[category=output] > .icon::before {
-  background-position: -60px -36px;
-}
-
-/* JSTerm Styles */
-.jsterm-input-node,
-.jsterm-complete-node {
-  border: none;
-  padding: 0 0 0 16px;
-  -moz-appearance: none;
-  background-color: transparent;
-}
-
-.jsterm-input-node {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
-  background-repeat: no-repeat;
-  background-size: 16px 16px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .jsterm-input-node {
-    background-image: -moz-image-rect(url('chrome://browser/skin/devtools/commandline-icon@2x.png'), 0, 64, 32, 32);
-  }
-}
-
-:-moz-any(.jsterm-input-node,
-          .jsterm-complete-node) > .textbox-input-box > .textbox-textarea {
-  overflow-x: hidden;
-}
-
-.inlined-variables-view .message-body {
-  display: flex;
-  flex-direction: column;
-  resize: vertical;
-  overflow: auto;
-  min-height: 200px;
-}
-.inlined-variables-view iframe {
-  display: block;
-  flex: 1;
-  margin-top: 5px;
-  margin-bottom: 15px;
-  -moz-margin-end: 15px;
-  border: 1px solid rgba(128, 128, 128, .5);
-  border-radius: 3px;
-}
-
-#webconsole-sidebar > tabs {
-  height: 0;
-  border: none;
-}
-
-.devtools-side-splitter ~ #webconsole-sidebar[hidden] {
-  display: none;
-}
-
-/* Security styles */
-
-.message[category=security] > .indent {
-  -moz-border-end: solid red 6px;
-}
-
-.webconsole-filter-button[category="security"] > .toolbarbutton-menubutton-button:before {
-  background-image: linear-gradient(#FF3030, #FF7D7D);
-  border-color: #D12C2C;
-}
-
-.message[category=security][severity=error] > .icon::before {
-  background-position: -12px -48px;
-}
-
-.message[category=security][severity=warn] > .icon::before {
-  background-position: -24px -48px;
-}
-
-.navigation-marker {
-  color: #aaa;
-  background: linear-gradient(#aaa, #aaa) no-repeat left 50%;
-  background-size: 100% 2px;
-  margin-top: 6px;
-  margin-bottom: 6px;
-  font-size: 0.9em;
-}
-
-.navigation-marker .url {
-  -moz-padding-end: 9px;
-  text-decoration: none;
-}
-
-.stacktrace {
-  display: none;
-  list-style: none;
-  padding: 0 1em 0 1.5em;
-  margin: 5px 0 0 0;
-  max-height: 10em;
-  overflow-y: auto;
-  border: 1px solid rgb(200,200,200);
-  border-radius: 3px;
-}
-
-.consoletable {
-  margin: 5px 0 0 0;
-}
-
-.theme-light .message[severity=error] .stacktrace {
-  background-color: rgba(255, 255, 255, 0.5);
-}
-
-.theme-dark .message[severity=error] .stacktrace {
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.message[open] .stacktrace {
-  display: block;
-}
-
-.message .theme-twisty {
-  display: inline-block;
-  vertical-align: middle;
-  margin: 0 3px 0 0;
-}
-
-.stacktrace li {
-  display: flex;
-  margin: 0;
-}
-
-.stacktrace .function {
-  display: block;
-  flex: 1 1 auto;
-}
-
-.cm-s-mozilla a[class] {
-  font-style: italic;
-  text-decoration: none;
-}
-
-.cm-s-mozilla a[class]:hover,
-.cm-s-mozilla a[class]:focus {
-  text-decoration: underline;
-}
-
-/* Open DOMNode in inspector button */
-.open-inspector {
-  background: url("chrome://browser/skin/devtools/vview-open-inspector.png") no-repeat 0 0;
-  padding-left: 16px;
-  margin-left: 5px;
-  cursor: pointer;
-}
-
-.elementNode:hover .open-inspector,
-.open-inspector:hover {
-  background-position: -32px 0;
-}
-
-.open-inspector:active {
-  background-position: -16px 0;
-}
-
-.jsterm-input-container {
-  background-color: var(--theme-tab-toolbar-background);
-  border-color: var(--theme-body-background);
-}
-
-.jsterm-input-node {
-  color: var(--theme-content-color1);
-}
-
-.jsterm-complete-node {
-  color: var(--theme-comment);
-}
-
-.navigation-marker .url {
-  background: var(--theme-body-background);
-}
-
-.theme-dark .inlined-variables-view iframe {
-  border-color: #333;
-}
-
-.theme-dark .stacktrace {
-  border-color: #333;
-}
-
-.theme-light .jsterm-input-container {
-  /* For light theme use a white background for the input - it looks better
-     than off-white */
-  background-color: #fff;
-  border-color: ThreeDShadow;
-}
-.theme-light .navigation-marker .url {
-  background: #fff;
-}
-
-.theme-light .inlined-variables-view iframe {
-  border-color: #ccc;
-}
-
-.theme-light .stacktrace {
-  border-color: #ccc;
-}
-
-@media (max-width: 500px) {
-  .message > .timestamp {
-    display: none;
-  }
-  .hud-console-filter-toolbar .webconsole-filter-button .toolbarbutton-text {
-    display: none;
-  }
-  .hud-console-filter-toolbar .webconsole-filter-button {
-    min-width: 40px;
-  }
-  .hud-console-filter-toolbar .webconsole-clear-console-button {
-    min-width: 25px;
-  }
-  .webconsole-filter-button > .toolbarbutton-menubutton-button:before {
-    width: 12px;
-    height: 12px;
-    margin-left: 1px;
-  }
-  .toolbarbutton-menubutton-dropmarker {
-    margin: 0px;
-  }
-}
-
-@media (max-width: 300px) {
-  .hud-console-filter-toolbar {
-    -moz-box-orient: vertical;
-  }
-  .toolbarbutton-text {
-    display: -moz-box;
-  }
-  .devtools-toolbarbutton {
-    margin-top: 3px;
-  }
-  .hud-console-filter-toolbar .hud-filter-box,
-  .hud-console-filter-toolbar .devtools-toolbarbutton {
-    margin-top: 5px;
-  }
-}
-
diff --git a/arc-firefox-theme/chrome/browser/devtools/webconsole.svg b/arc-firefox-theme/chrome/browser/devtools/webconsole.svg
deleted file mode 100644
index 6c21e54..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/webconsole.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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="72" height="60" viewBox="0 0 72 60">
-  <defs>
-    <rect id="glyphShape-colorSwatch" width="8" height="8" ry="2" rx="2"/>
-    <rect id="glyphShape-colorSwatch-border" width="10" height="10" ry="2" rx="2"/>
-    <polygon id="glyphShape-errorX" points="9.9,8.5 8.5,9.9 6,7.4 3.6,9.8 2.2,8.4 4.6,6 2.2,3.6 3.6,2.2 6,4.6 8.4,2.2 9.8,3.6 7.4,6"/>
-    <path id="glyphShape-warningTriangle" d="M9.9,8.6l-3.1-6C6.6,2.2,6.3,2,6,2C5.7,2,5.4,2.2,5.2,2.5l-3.1,6C2,8.9,2,9.3,2.1,9.6C2.3,9.8,2.6,10,2.9,10 h6.1c0.4,0,0.6-0.2,0.8-0.4C10,9.3,10,8.9,9.9,8.6z"/>
-    <path id="glyphShape-exclamationPoint" d="M6,7.7c-0.6,0-1,0.4-1,0.8C5,9,5.4,9.3,6,9.3c0.6,0,1-0.4,1-0.8 C7,8.1,6.6,7.7,6,7.7z M6,7c0.6,0,1-0.4,1-1V5c0-0.6-0.4-1-1-1S5,4.4,5,5v1C5,6.6,5.4,7,6,7z"/>
-    <circle id="glyphShape-infoCircle" cx="6" cy="6" r="4"/>
-    <path id="glyphShape-infoGlyph" d="M6,6C5.4,6,5,6.4,5,7v1c0,0.6,0.4,1,1,1s1-0.4,1-1V7C7,6.4,6.6,6,6,6z M6,5c0.6,0,1-0.4,1-1S6.6,3,6,3S5,3.4,5,4S5.4,5,6,5z"/>
-    <style>
-      .icon-colorSwatch-border {
-        fill: #fff;
-        fill-opacity: .7;
-      }
-      .icon-colorSwatch-network {
-        fill: #000;
-      }
-      .icon-colorSwatch-css {
-        fill: #00b6f0;
-      }
-      .icon-colorSwatch-js {
-        fill: #fb9500;
-      }
-      .icon-colorSwatch-logging {
-        fill: #808080;
-      }
-      .icon-colorSwatch-security {
-        fill: #ec1e0d;
-      }
-      .icon-glyphOverlay {
-        fill: #fff;
-      }
-
-      #icon-indicator-input {
-        fill: #8fa1b2;
-      }
-      #icon-indicator-output {
-        fill: #667380;
-      }
-      #light-icons:target #icon-indicator-input {
-        fill: #45494d;
-      }
-      #light-icons:target #icon-indicator-output {
-        fill: #8a9199;
-      }
-    </style>
-  </defs>
-  <g id="icon-colorSwatch-network">
-    <use xlink:href="#glyphShape-colorSwatch-border" class="icon-colorSwatch-border" x="1" y="1"/>
-    <use xlink:href="#glyphShape-colorSwatch" class="icon-colorSwatch-network" x="2" y="2"/>
-  </g>
-  <g id="icon-colorSwatch-css" transform="translate(0 12)">
-    <use xlink:href="#glyphShape-colorSwatch-border" class="icon-colorSwatch-border" x="1" y="1"/>
-    <use xlink:href="#glyphShape-colorSwatch" class="icon-colorSwatch-css" x="2" y="2"/>
-  </g>
-  <g id="icon-colorSwatch-js" transform="translate(0 24)">
-    <use xlink:href="#glyphShape-colorSwatch-border" class="icon-colorSwatch-border" x="1" y="1"/>
-    <use xlink:href="#glyphShape-colorSwatch" class="icon-colorSwatch-js" x="2" y="2"/>
-  </g>
-  <g id="icon-colorSwatch-logging" transform="translate(0 36)">
-    <use xlink:href="#glyphShape-colorSwatch-border" class="icon-colorSwatch-border" x="1" y="1"/>
-    <use xlink:href="#glyphShape-colorSwatch" class="icon-colorSwatch-logging" x="2" y="2"/>
-  </g>
-  <g id="icon-colorSwatch-security" transform="translate(0 48)">
-    <use xlink:href="#glyphShape-colorSwatch-border" class="icon-colorSwatch-border" x="1" y="1"/>
-    <use xlink:href="#glyphShape-colorSwatch" class="icon-colorSwatch-security" x="2" y="2"/>
-  </g>
-  <use xlink:href="#glyphShape-errorX" id="icon-errorX-network" class="icon-colorSwatch-network" transform="translate(12)"/>
-  <use xlink:href="#glyphShape-errorX" id="icon-errorX-css" class="icon-colorSwatch-css" transform="translate(12 12)"/>
-  <use xlink:href="#glyphShape-errorX" id="icon-errorX-js" class="icon-colorSwatch-js" transform="translate(12 24)"/>
-  <use xlink:href="#glyphShape-errorX" id="icon-errorX-logging" class="icon-colorSwatch-logging" transform="translate(12 36)"/>
-  <use xlink:href="#glyphShape-errorX" id="icon-errorX-security" class="icon-colorSwatch-security" transform="translate(12 48)"/>
-  <g id="icon-warningTriangle-css" transform="translate(24 12)">
-    <use xlink:href="#glyphShape-warningTriangle" class="icon-colorSwatch-css"/>
-    <use xlink:href="#glyphShape-exclamationPoint" class="icon-glyphOverlay"/>
-  </g>
-  <g id="icon-warningTriangle-js" transform="translate(24 24)">
-    <use xlink:href="#glyphShape-warningTriangle" class="icon-colorSwatch-js"/>
-    <use xlink:href="#glyphShape-exclamationPoint" class="icon-glyphOverlay"/>
-  </g>
-  <g id="icon-warningTriangle-logging" transform="translate(24 36)">
-    <use xlink:href="#glyphShape-warningTriangle" class="icon-colorSwatch-logging"/>
-    <use xlink:href="#glyphShape-exclamationPoint" class="icon-glyphOverlay"/>
-  </g>
-  <g id="icon-warningTriangle-security" transform="translate(24 48)">
-    <use xlink:href="#glyphShape-warningTriangle" class="icon-colorSwatch-security"/>
-    <use xlink:href="#glyphShape-exclamationPoint" class="icon-glyphOverlay"/>
-  </g>
-  <g id="icon-infoCircle-logging" transform="translate(36 36)">
-    <use xlink:href="#glyphShape-infoCircle" class="icon-colorSwatch-logging"/>
-    <use xlink:href="#glyphShape-infoGlyph" class="icon-glyphOverlay"/>
-  </g>
-  <g id="light-icons">
-    <path id="icon-indicator-input" d="M6.5,1.2L5.4,2.3L9,6L5.3,9.7l1.1,1.1L11,6L6.5,1.2z M1.5,1.2 L0.4,2.3L4,6L0.3,9.7l1.1,1.1L6,6L1.5,1.2z" transform="translate(48 36)"/>
-    <polygon id="icon-indicator-output" points="10,5 4.3,5 6.8,2.4 5.5,1.2 1,6 5.5,10.8 6.9,9.6 4.3,7 10,7" transform="translate(60 36)"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/browser/devtools/widgets.css b/arc-firefox-theme/chrome/browser/devtools/widgets.css
deleted file mode 100644
index a23f0f5..0000000
--- a/arc-firefox-theme/chrome/browser/devtools/widgets.css
+++ /dev/null
@@ -1,1590 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* 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/. */
-
-.theme-dark {
-  --table-splitter-color: rgba(255,255,255,0.15);
-  --table-zebra-background: rgba(255,255,255,0.05);
-}
-.theme-light {
-  --table-splitter-color: rgba(0,0,0,0.15);
-  --table-zebra-background: rgba(0,0,0,0.05);
-}
-
-/* Generic pane helpers */
-
-.generic-toggled-side-pane {
-  -moz-margin-start: 0 !important;
-  /* Unfortunately, transitions don't work properly with locale-aware properties,
-     so both the left and right margins are set via js, while the start margin
-     is always overridden here. */
-}
-
-.generic-toggled-side-pane[animated] {
-  transition: margin 0.25s ease-in-out;
-}
-
-/* Responsive container */
-
-.devtools-responsive-container {
-  -moz-box-orient: horizontal;
-}
-
-.devtools-main-content {
-  min-width: 50px;
-}
-
-.devtools-main-content,
-.devtools-sidebar-tabs {
-  /* Prevent some children that should be hidden from remaining visible as this is shrunk (Bug 971959) */
-  position: relative;
-}
-
-@media (max-width: 700px) {
-  .devtools-responsive-container {
-    -moz-box-orient: vertical;
-  }
-
-  .devtools-responsive-container > .devtools-side-splitter {
-    /* This is a normally vertical splitter, but we have turned it horizontal
-       due to the smaller resolution */
-    min-height: 3px;
-    height: 3px;
-    margin-top: -3px;
-
-    /* Reset the vertical splitter styles */
-    border-width: 0;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    -moz-margin-start: 0;
-    width: auto;
-    min-width: 0;
-
-    /* In some edge case the cursor is not changed to n-resize */
-    cursor: n-resize;
-  }
-
-  .devtools-responsive-container > .devtools-sidebar-tabs {
-    min-height: 35vh;
-    max-height: 75vh;
-  }
-}
-
-/* BreacrumbsWidget */
-
-.breadcrumbs-widget-container {
-  -moz-margin-end: 3px;
-  max-height: 24px; /* Set max-height for proper sizing on linux */
-  height: 24px; /* Set height to prevent starting small waiting for content */
-}
-
-.scrollbutton-up,
-.scrollbutton-down {
-  -moz-appearance: none;
-  background: transparent;
-  box-shadow: none;
-  border: none;
-  list-style-image: none;
-  margin: 0;
-  padding: 0;
-}
-
-.scrollbutton-up > .toolbarbutton-icon,
-.scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
-  width: 7px;
-  height: 16px;
-  background-size: 14px 16px;
-  background-position: 0 center;
-  background-repeat: no-repeat;
-  background-image: url("breadcrumbs-scrollbutton.png");
-  list-style-image: none;
-  margin: 0 8px;
-  padding: 0;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .scrollbutton-up > .toolbarbutton-icon,
-  .scrollbutton-down > .toolbarbutton-icon {
-    background-image: url("breadcrumbs-scrollbutton@2x.png");
-  }
-}
-
-.scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-.scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  background-position: -7px center;
-}
-
-.scrollbutton-up[disabled] > .toolbarbutton-icon,
-.scrollbutton-down[disabled] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
-/* Draw shadows to indicate there is more content 'behind' scrollbuttons. */
-.scrollbutton-up:-moz-locale-dir(ltr),
-.scrollbutton-down:-moz-locale-dir(rtl) {
-  border-right: solid 1px rgba(255, 255, 255, .1);
-  border-left: solid 1px transparent;
-  box-shadow: 3px 0px 3px -3px var(--theme-sidebar-background);
-}
-
-.scrollbutton-down:-moz-locale-dir(ltr),
-.scrollbutton-up:-moz-locale-dir(rtl) {
-  border-right: solid 1px transparent;
-  border-left: solid 1px rgba(255, 255, 255, .1);
-  box-shadow: -3px 0px 3px -3px var(--theme-sidebar-background);
-}
-
-.scrollbutton-up[disabled],
-.scrollbutton-down[disabled] {
-  box-shadow: none;
-  border-color: transparent;
-}
-
-.scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-.scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-/* The breadcrumb separator elements are used as background images with
- * -moz-element, so we position them offscreen since we don't care about
- * seeing the original elements.
- */
-.breadcrumb-separator-container {
-  position: fixed;
-  top: -1000px;
-  left: -1000px;
-}
-
-#breadcrumb-separator-before,
-#breadcrumb-separator-after,
-#breadcrumb-separator-normal {
-  width: 12px;
-  height: 24px;
-  overflow: hidden;
-}
-
-#breadcrumb-separator-before,
-#breadcrumb-separator-after:after {
-  background: var(--theme-selection-background);
-}
-
-#breadcrumb-separator-after,
-#breadcrumb-separator-before:after {
-  background: var(--theme-toolbar-background);
-}
-
-/* This chevron arrow cannot be replicated easily in CSS, so we are using
- * a background image for it (still keeping it in a separate element so
- * we can handle RTL support with a CSS transform).
- */
-#breadcrumb-separator-normal {
-  background: url(breadcrumbs-divider@2x.png) no-repeat center right;
-  background-size: 12px 24px;
-}
-
-/* Fake a triangle by rotating a rectangle inside the elements */
-#breadcrumb-separator-before:after,
-#breadcrumb-separator-after:after {
-  content: "";
-  display: block;
-  width: 25px;
-  height: 24px;
-  transform: translateX(-18px) rotate(45deg);
-  -moz-box-sizing: border-box;
-}
-
-.breadcrumbs-widget-item {
-  background-color: transparent;
-  -moz-appearance: none;
-  min-height: 24px;
-  min-width: 65px;
-  margin: 0;
-  padding: 0 8px 0 20px;
-  border: none;
-  outline: none;
-  color: hsl(210,30%,85%);
-}
-
-.breadcrumbs-widget-item > .button-box {
-  border: none;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-
-.breadcrumbs-widget-item:not([checked]) {
-  background: -moz-element(#breadcrumb-separator-normal) no-repeat center left;
-}
-
-.breadcrumbs-widget-item[checked] + .breadcrumbs-widget-item {
-  background: -moz-element(#breadcrumb-separator-after) no-repeat 0 0;
-}
-
-.breadcrumbs-widget-item[checked] {
-  background: -moz-element(#breadcrumb-separator-before) no-repeat 0 0;
-}
-
-.breadcrumbs-widget-item[checked] {
-  background-color: var(--theme-selection-background);
-}
-
-.breadcrumbs-widget-item:first-child {
-  background-image: none;
-}
-
-/* RTL support: move the images that were on the left to the right,
- * and move images that were on the right to the left.
- */
-.breadcrumbs-widget-item:-moz-locale-dir(rtl) {
-  padding: 0 20px 0 8px;
-}
-
-.breadcrumbs-widget-item:-moz-locale-dir(rtl),
-.breadcrumbs-widget-item[checked] + .breadcrumbs-widget-item:-moz-locale-dir(rtl) {
-  background-position: center right;
-}
-
-#breadcrumb-separator-before:-moz-locale-dir(rtl),
-#breadcrumb-separator-after:-moz-locale-dir(rtl),
-#breadcrumb-separator-normal:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
-
-#breadcrumb-separator-before:-moz-locale-dir(rtl):after,
-#breadcrumb-separator-after:-moz-locale-dir(rtl):after {
-  transform: translateX(-5px) rotate(45deg);
-}
-
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-id,
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-tag,
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-pseudo-classes,
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-classes {
-  color: var(--theme-selection-color);
-}
-
-.theme-dark .breadcrumbs-widget-item {
-  color: var(--theme-selection-color);
-}
-
-.theme-light .breadcrumbs-widget-item {
-  color: var(--theme-body-color);
-}
-
-.breadcrumbs-widget-item-id {
-  color: var(--theme-body-color-alt);
-}
-
-.breadcrumbs-widget-item-classes {
-  color: var(--theme-content-color1);
-}
-
-.breadcrumbs-widget-item-pseudo-classes {
-  color: var(--theme-highlight-lightorange);
-}
-
-.theme-dark .breadcrumbs-widget-item:not([checked]):hover label {
-  color: white;
-}
-
-.theme-light .breadcrumbs-widget-item:not([checked]):hover label {
-  color: black;
-}
-
-/* SimpleListWidget */
-
-.simple-list-widget-container {
-  /* Hack: force hardware acceleration */
-  transform: translateZ(1px);
-}
-
-.simple-list-widget-item.selected {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.theme-dark .simple-list-widget-item:not(.selected):hover {
-  background-color: rgba(255,255,255,.05);
-}
-
-.theme-light .simple-list-widget-item:not(.selected):hover {
-  background-color: rgba(0,0,0,.05);
-}
-
-.simple-list-widget-empty-text,
-.simple-list-widget-perma-text {
-  padding: 4px 8px;
-}
-
-.simple-list-widget-empty-text,
-.simple-list-widget-perma-text {
-  color: var(--theme-body-color-alt);
-}
-
-/* FastListWidget */
-
-.fast-list-widget-container {
-  /* Hack: force hardware acceleration */
-  transform: translateZ(1px);
-}
-
-.fast-list-widget-empty-text {
-  padding: 4px 8px;
-}
-
-.fast-list-widget-empty-text {
-  color: var(--theme-body-color-alt);
-}
-
-/* SideMenuWidget */
-
-.side-menu-widget-container {
-  /* Hack: force hardware acceleration */
-  transform: translateZ(1px);
-}
-
-/* SideMenuWidget container */
-
-.theme-dark .side-menu-widget-container:-moz-locale-dir(ltr),
-.theme-dark .side-menu-widget-empty-text:-moz-locale-dir(ltr) {
-  box-shadow: inset -1px 0 0 #000;
-}
-
-.theme-dark .side-menu-widget-container:-moz-locale-dir(rtl),
-.theme-dark .side-menu-widget-empty-text:-moz-locale-dir(rtl) {
-  box-shadow: inset 1px 0 0 #000;
-}
-
-.side-menu-widget-container:-moz-locale-dir(ltr),
-.side-menu-widget-empty-text:-moz-locale-dir(ltr) {
-  box-shadow: inset -1px 0 0 #aaa;
-}
-
-.side-menu-widget-container:-moz-locale-dir(rtl),
-.side-menu-widget-empty-text:-moz-locale-dir(rtl) {
-  box-shadow: inset 1px 0 0 #aaa;
-}
-
-.side-menu-widget-group {
-  /* To allow visibility of the dark margin shadow. */
-  -moz-margin-end: 1px;
-}
-
-.side-menu-widget-container[with-arrows=true] .side-menu-widget-item {
-  /* To compensate for the arrow image's dark margin. */
-  -moz-margin-end: -1px;
-}
-
-/* SideMenuWidget groups */
-
-.side-menu-widget-group-title {
-  padding: 4px;
-  background-color: var(--theme-tab-toolbar-background);
-}
-
-.theme-dark .side-menu-widget-group-title {
-  color: var(--theme-content-color1);
-}
-
-.theme-light .side-menu-widget-group-title {
-  color: var(--theme-content-color3);
-}
-
-/* SideMenuWidget items */
-
-.side-menu-widget-item {
-  /* To compensate for the top and bottom borders */
-  margin-top: -1px;
-  margin-bottom: -1px;
-  background-clip: padding-box;
-}
-
-.theme-dark .side-menu-widget-item {
-  border-top: 1px solid rgba(0,0,0,0.2);
-  border-bottom: 1px solid rgba(128,128,128,0.15);
-  color: var(--theme-selection-color);
-}
-
-.theme-dark .side-menu-widget-item:last-of-type {
-  box-shadow: inset 0 -1px 0 rgba(0,0,0,0.2);
-}
-
-.theme-light .side-menu-widget-item {
-  border-top: 1px solid rgba(128,128,128,0.15);
-  border-bottom: 1px solid transparent;
-  color: var(--theme-body-color);
-}
-
-.theme-light .side-menu-widget-item:last-of-type {
-  box-shadow: inset 0 -1px 0 rgba(128,128,128,0.15);
-}
-
-.side-menu-widget-item.selected {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.side-menu-widget-item-arrow {
-  -moz-margin-start: -7px;
-  width: 7px; /* The image's width is 7 pixels */
-  /* Cover the border of the side-menu-widget-item */
-  margin-top: -1px;
-  margin-bottom: -1px;
-}
-
-.side-menu-widget-item.selected > .side-menu-widget-item-arrow {
-  background-size: auto, 1px 100%;
-  background-repeat: no-repeat;
-}
-
-.side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
-  background-position: center right, top right;
-}
-
-.side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
-  background-position: center left, top left;
-}
-
-.theme-dark .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
-  background-image: url(itemArrow-dark-ltr.svg), linear-gradient(to right, #000, #000);
-}
-
-.theme-dark .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-dark-rtl.svg), linear-gradient(to right, #000, #000);
-}
-
-.theme-light .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
-  background-image: url(itemArrow-ltr.svg), linear-gradient(to right, #aaa, #aaa);
-}
-
-.theme-light .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-rtl.svg), linear-gradient(to right, #aaa, #aaa);
-}
-
-/* SideMenuWidget items contents */
-
-.side-menu-widget-item-contents {
-  padding: 4px;
-  /* To avoid having content overlapping the arrow image. */
-  -moz-padding-end: 8px;
-}
-
-.side-menu-widget-item-other {
-  /* To avoid having content overlapping the arrow image. */
-  -moz-padding-end: 8px;
-  /* To compensate for the .side-menu-widget-item-contents padding. */
-  -moz-margin-start: -4px;
-  -moz-margin-end: -8px;
-}
-
-.side-menu-widget-item-other:first-of-type {
-  margin-top: 4px;
-}
-
-.side-menu-widget-item-other:last-of-type {
-  margin-bottom: -4px;
-}
-
-.theme-dark .side-menu-widget-item-other {
-  background-color: rgba(0,0,0,.1);
-}
-
-.theme-light .side-menu-widget-item-other {
-  background-color: rgba(128,128,128,.1);
-}
-
-.theme-dark .side-menu-widget-item.selected .side-menu-widget-item-other {
-  background-color: rgba(0,0,0,.2); /* Darken the selection by 20% */
-  color: var(--theme-selection-color);
-}
-
-.theme-light .side-menu-widget-item.selected .side-menu-widget-item-other {
-  background-color: rgba(255,255,255,.8); /* Lighten the selection by 20% */
-  color: var(--theme-body-color);
-}
-
-.side-menu-widget-item.selected .side-menu-widget-item-other.selected {
-  background-color: transparent;
-  color: var(--theme-selection-color);
-}
-
-/* SideMenuWidget checkboxes */
-
-.side-menu-widget-group-checkbox {
-  margin: 0;
-  -moz-margin-end: 4px;
-}
-
-.side-menu-widget-item-checkbox {
-  margin: 0;
-  -moz-margin-start: 4px;
-}
-
-/* SideMenuWidget misc */
-
-.theme-dark .side-menu-widget-container,
-.theme-dark .side-menu-widget-empty-text {
-  background-color: var(--theme-toolbar-background);
-}
-
-.side-menu-widget-empty-text {
-  padding: 4px 8px;
-}
-
-/* VariablesView */
-
-.variables-view-container {
-  /* Hack: force hardware acceleration */
-  transform: translateZ(1px);
-}
-
-.variables-view-empty-notice {
-  padding: 2px;
-}
-
-.variables-view-empty-notice {
-  color: var(--theme-body-color-alt);
-}
-
-.variables-view-scope:focus > .title,
-.variable-or-property:focus > .title {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.variables-view-scope > .title {
-  border-top-width: 1px;
-  border-top-style: solid;
-  margin-top: -1px;
-}
-
-/* Generic variables traits */
-
-.variables-view-variable:not(:last-child) {
-  border-bottom: 1px solid rgba(128, 128, 128, .15);
-}
-
-.variables-view-variable > .title > .name {
-  font-weight: 600;
-}
-
-/* Generic variables *and* properties traits */
-
-.variable-or-property:focus > .title > label {
-  color: inherit !important;
-}
-
-.variables-view-container .theme-twisty {
-  margin: 2px;
-}
-
-.variable-or-property > .title > .theme-twisty {
-  -moz-margin-start: 5px;
-}
-
-.variable-or-property:not([untitled]) > .variables-view-element-details {
-  -moz-margin-start: 7px;
-}
-
-/* Traits applied when variables or properties are changed or overridden */
-
-.variable-or-property:not([overridden]) {
-  transition: background 1s ease-in-out;
-}
-
-.variable-or-property:not([overridden])[changed] {
-  transition-duration: .4s;
-}
-
-.variable-or-property[overridden] {
-  background: rgba(128,128,128,0.05);
-}
-
-.variable-or-property[overridden] .title > label {
-  /* Cross out the title for this variable and all child properties. */
-  font-style: italic;
-  text-decoration: line-through;
-  border-bottom: none !important;
-  color: rgba(128,128,128,0.9);
-  opacity: 0.7;
-}
-
-/* Traits applied when variables or properties are editable */
-
-.variable-or-property[editable] > .title > .value {
-  cursor: text;
-}
-
-.variable-or-property[overridden] .title > .value {
-  /* Disallow editing this variable and all child properties. */
-  pointer-events: none;
-}
-
-/* Custom configurable/enumerable/writable or frozen/sealed/extensible
- * variables and properties */
-
-.variable-or-property[non-enumerable]:not([self]):not([pseudo-item]) > .title > .name {
-  opacity: 0.6;
-}
-
-.variable-or-property-non-writable-icon {
-  background: url("chrome://browser/skin/devtools/vview-lock.png") no-repeat;
-  background-size: cover;
-  width: 16px;
-  height: 16px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .variable-or-property-non-writable-icon {
-    background-image: url("chrome://browser/skin/devtools/vview-lock@2x.png");
-  }
-}
-
-.variable-or-property-frozen-label,
-.variable-or-property-sealed-label,
-.variable-or-property-non-extensible-label {
-  height: 16px;
-  -moz-padding-end: 4px;
-}
-
-.variable-or-property:not(:focus) > .title > .variable-or-property-frozen-label,
-.variable-or-property:not(:focus) > .title > .variable-or-property-sealed-label,
-.variable-or-property:not(:focus) > .title > .variable-or-property-non-extensible-label {
-  color: #666;
-}
-
-/* Aligned values */
-
-.variables-view-container[aligned-values] .title > .separator {
-  -moz-box-flex: 1;
-}
-
-.variables-view-container[aligned-values] .title > .value {
-  -moz-box-flex: 0;
-  width: 70vw;
-}
-
-.variables-view-container[aligned-values] .title > .element-value-input {
-  width: calc(70vw - 10px);
-}
-
-/* Actions first */
-
-.variables-view-open-inspector {
-  -moz-box-ordinal-group: 1;
-}
-
-.variables-view-edit,
-.variables-view-add-property {
-  -moz-box-ordinal-group: 2;
-}
-
-.variable-or-property-frozen-label,
-.variable-or-property-sealed-label,
-.variable-or-property-non-extensible-label,
-.variable-or-property-non-writable-icon {
-  -moz-box-ordinal-group: 3;
-}
-
-.variables-view-delete {
-  -moz-box-ordinal-group: 4;
-}
-
-.variables-view-container[actions-first] .variables-view-delete,
-.variables-view-container[actions-first] .variables-view-add-property,
-.variables-view-container[actions-first] .variables-view-open-inspector {
-  -moz-box-ordinal-group: 0;
-}
-
-.variables-view-container[actions-first] [invisible] {
-  visibility: hidden;
-}
-
-/* Variables and properties tooltips */
-
-.variable-or-property > tooltip > label {
-  margin: 0 2px 0 2px;
-}
-
-.variable-or-property[non-enumerable] > tooltip > label.enumerable,
-.variable-or-property[non-configurable] > tooltip > label.configurable,
-.variable-or-property[non-writable] > tooltip > label.writable,
-.variable-or-property[non-extensible] > tooltip > label.extensible {
-  color: #800;
-  text-decoration: line-through;
-}
-
-.variable-or-property[overridden] > tooltip > label.overridden {
-  -moz-padding-start: 4px;
-  -moz-border-start: 1px dotted #000;
-}
-
-.variable-or-property[safe-getter] > tooltip > label.WebIDL {
-  -moz-padding-start: 4px;
-  -moz-border-start: 1px dotted #000;
-  color: #080;
-}
-
-/* Variables and properties editing */
-
-.variables-view-delete {
-  background: url("chrome://browser/skin/devtools/vview-delete.png");
-  background-size: cover;
-  width: 16px;
-  height: 16px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .variables-view-delete {
-    background-image: url("chrome://browser/skin/devtools/vview-delete@2x.png");
-  }
-}
-
-.variables-view-delete:hover {
-  background-position: 16px;
-}
-
-.variables-view-delete:active {
-  background-position: 32px;
-}
-
-.variable-or-property:focus > .title > .variables-view-delete {
-  background-position: 0px;
-}
-
-.variables-view-edit {
-  background: url("chrome://browser/skin/devtools/vview-edit.png");
-  background-size: cover;
-  width: 16px;
-  height: 16px;
-  cursor: pointer;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .variables-view-edit {
-    background-image: url("chrome://browser/skin/devtools/vview-edit@2x.png");
-  }
-}
-
-.variables-view-edit:hover {
-  background-position: 16px;
-}
-
-.variables-view-edit:active {
-  background-position: 32px;
-}
-
-.variable-or-property:focus > .title > .variables-view-edit {
-  background-position: 0px;
-}
-
-.variables-view-open-inspector {
-  background: url("chrome://browser/skin/devtools/vview-open-inspector.png");
-  background-size: cover;
-  width: 16px;
-  height: 16px;
-  cursor: pointer;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .variables-view-open-inspector {
-    background-image: url("chrome://browser/skin/devtools/vview-open-inspector@2x.png");
-  }
-}
-
-.variables-view-open-inspector:hover {
-  background-position: 16px;
-}
-
-.variables-view-open-inspector:active {
-  background-position: 32px;
-}
-
-.variable-or-property:focus > .title > .variables-view-open-inspector {
-  background-position: 0px;
-}
-
-/* Variables and properties input boxes */
-
-.variable-or-property > .title > .separator + .element-value-input {
-  -moz-margin-start: -2px !important;
-  -moz-margin-end: 2px !important;
-}
-
-.variable-or-property > .title > .separator[hidden=true] + .element-value-input {
-  -moz-margin-start: 4px !important;
-  -moz-margin-end: 2px !important;
-}
-
-.element-name-input {
-  -moz-margin-start: -2px !important;
-  -moz-margin-end: 2px !important;
-  font-weight: 600;
-}
-
-.element-value-input,
-.element-name-input {
-  border: 1px solid rgba(128, 128, 128, .5) !important;
-  border-radius: 0;
-  color: inherit;
-}
-
-/* Variables and properties searching */
-
-.variable-or-property[unmatched] {
-  border: none;
-  margin: 0;
-}
-
-/* Canvas graphs */
-
-.graph-widget-container {
-  position: relative;
-}
-
-.graph-widget-canvas {
-  width: 100%;
-  height: 100%;
-}
-
-.graph-widget-canvas[input=hovering-background] {
-  cursor: text;
-}
-
-.graph-widget-canvas[input=hovering-region] {
-  cursor: pointer;
-}
-
-.graph-widget-canvas[input=hovering-selection-start-boundary],
-.graph-widget-canvas[input=hovering-selection-end-boundary],
-.graph-widget-canvas[input=adjusting-selection-boundary] {
-  cursor: col-resize;
-}
-
-.graph-widget-canvas[input=adjusting-view-area] {
-  cursor: grabbing;
-}
-
-.graph-widget-canvas[input=hovering-selection-contents] {
-  cursor: grab;
-}
-
-.graph-widget-canvas[input=dragging-selection-contents] {
-  cursor: grabbing;
-}
-
-/* Line graph widget */
-
-.line-graph-widget-gutter {
-  position: absolute;
-  width: 10px;
-  height: 100%;
-  top: 0;
-  left: 0;
-  pointer-events: none;
-  -moz-border-end: 1px solid;
-}
-
-.theme-light .line-graph-widget-gutter {
-  background: rgba(255,255,255,0.75);
-  -moz-border-end-color: rgba(255,255,255,0.25);
-}
-
-.theme-dark .line-graph-widget-gutter {
-  background: rgba(0,0,0,0.5);
-  -moz-border-end-color: rgba(0,0,0,0.25);
-}
-
-.line-graph-widget-gutter-line {
-  position: absolute;
-  width: 100%;
-  border-top: 1px solid;
-}
-
-.line-graph-widget-gutter-line[type=maximum] {
-  border-color: #2cbb0f;
-}
-
-.line-graph-widget-gutter-line[type=minimum] {
-  border-color: #ed2655;
-}
-
-.line-graph-widget-gutter-line[type=average] {
-  border-color: #d97e00;
-}
-
-.line-graph-widget-tooltip {
-  position: absolute;
-  border-radius: 2px;
-  line-height: 15px;
-  -moz-padding-start: 6px;
-  -moz-padding-end: 6px;
-  transform: translateY(-50%);
-  font-size: 0.8rem !important;
-  z-index: 1;
-  pointer-events: none;
-}
-
-.theme-light .line-graph-widget-tooltip {
-  background: rgba(255,255,255,0.75);
-}
-
-.theme-dark .line-graph-widget-tooltip {
-  background: rgba(0,0,0,0.5);
-}
-
-.line-graph-widget-tooltip[with-arrows=true]::before {
-  content: "";
-  position: absolute;
-  border-top: 3px solid transparent;
-  border-bottom: 3px solid transparent;
-  top: calc(50% - 3px);
-}
-
-.line-graph-widget-tooltip[arrow=start][with-arrows=true]::before {
-  -moz-border-end: 3px solid;
-  left: -3px;
-}
-
-.line-graph-widget-tooltip[arrow=end][with-arrows=true]::before {
-  -moz-border-start: 3px solid;
-  right: -3px;
-}
-
-.theme-light .line-graph-widget-tooltip[arrow=start][with-arrows=true]::before {
-  -moz-border-end-color: rgba(255,255,255,0.75);
-}
-
-.theme-dark .line-graph-widget-tooltip[arrow=start][with-arrows=true]::before {
-  -moz-border-end-color: rgba(0,0,0,0.5);
-}
-
-.theme-light .line-graph-widget-tooltip[arrow=end][with-arrows=true]::before {
-  -moz-border-start-color: rgba(255,255,255,0.75);
-}
-
-.theme-dark .line-graph-widget-tooltip[arrow=end][with-arrows=true]::before {
-  -moz-border-start-color: rgba(0,0,0,0.5);
-}
-
-.line-graph-widget-tooltip[type=maximum] {
-  left: 14px;
-}
-
-.line-graph-widget-tooltip[type=minimum] {
-  left: 14px;
-}
-
-.line-graph-widget-tooltip[type=average] {
-  right: 4px;
-}
-
-.line-graph-widget-tooltip > [text=info] {
-  color: var(--theme-content-color1);
-}
-
-.line-graph-widget-tooltip > [text=value] {
-  -moz-margin-start: 3px;
-}
-
-.line-graph-widget-tooltip > [text=metric] {
-  -moz-margin-start: 1px;
-  color: var(--theme-content-color3);
-}
-
-.theme-light .line-graph-widget-tooltip > [text=value],
-.theme-light .line-graph-widget-tooltip > [text=metric] {
-  text-shadow: 1px  0px rgba(255,255,255,0.5),
-              -1px  0px rgba(255,255,255,0.5),
-               0px -1px rgba(255,255,255,0.5),
-               0px  1px rgba(255,255,255,0.5);
-}
-
-.theme-dark .line-graph-widget-tooltip > [text=value],
-.theme-dark .line-graph-widget-tooltip > [text=metric] {
-  text-shadow: 1px  0px rgba(0,0,0,0.5),
-              -1px  0px rgba(0,0,0,0.5),
-               0px -1px rgba(0,0,0,0.5),
-               0px  1px rgba(0,0,0,0.5);
-}
-
-.line-graph-widget-tooltip[type=maximum] > [text=value] {
-  color: var(--theme-highlight-green);
-}
-
-.line-graph-widget-tooltip[type=minimum] > [text=value] {
-  color: var(--theme-highlight-red);
-}
-
-.line-graph-widget-tooltip[type=average] > [text=value] {
-  color: var(--theme-highlight-orange);
-}
-
-/* Bar graph widget */
-
-.bar-graph-widget-legend {
-  position: absolute;
-  top: 4px;
-  left: 8px;
-  color: #292e33;
-  font-size: 80%;
-  pointer-events: none;
-}
-
-.bar-graph-widget-legend-item {
-  float: left;
-  -moz-margin-end: 8px;
-}
-
-.bar-graph-widget-legend-item > [view="color"],
-.bar-graph-widget-legend-item > [view="label"] {
-  vertical-align: middle;
-}
-
-.bar-graph-widget-legend-item > [view="color"] {
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border: 1px solid #fff;
-  border-radius: 1px;
-  -moz-margin-end: 4px;
-  pointer-events: all;
-  cursor: pointer;
-}
-
-.bar-graph-widget-legend-item > [view="label"] {
-  text-shadow: 1px  0px rgba(255,255,255,0.8),
-              -1px  0px rgba(255,255,255,0.8),
-               0px -1px rgba(255,255,255,0.8),
-               0px  1px rgba(255,255,255,0.8);
-}
-
-/* Charts */
-
-.generic-chart-container {
-  /* Hack: force hardware acceleration */
-  transform: translateZ(1px);
-}
-
-.theme-dark .generic-chart-container {
-  color: var(--theme-selection-color);
-}
-
-.theme-light .generic-chart-container {
-  color: var(--theme-body-color-alt);
-}
-
-.chart-colored-blob {
-  fill: var(--theme-content-color2);
-  background: var(--theme-content-color2);
-}
-
-/* Charts: Pie */
-
-.pie-chart-slice {
-  stroke-width: 1px;
-  cursor: pointer;
-}
-
-.theme-dark .pie-chart-slice {
-  stroke: rgba(0,0,0,0.2);
-}
-
-.theme-light .pie-chart-slice {
-  stroke: rgba(255,255,255,0.8);
-}
-
-.theme-dark .pie-chart-slice[largest] {
-  stroke-width: 2px;
-  stroke: #fff;
-}
-
-.theme-light .pie-chart-slice[largest] {
-  stroke: #000;
-}
-
-.pie-chart-label {
-  text-anchor: middle;
-  dominant-baseline: middle;
-  pointer-events: none;
-}
-
-.theme-dark .pie-chart-label {
-  fill: #000;
-}
-
-.theme-light .pie-chart-label {
-  fill: #fff;
-}
-
-.pie-chart-container[slices="1"] > .pie-chart-slice {
-  stroke-width: 0px;
-}
-
-.pie-chart-slice,
-.pie-chart-label {
-  transition: all 0.1s ease-out;
-}
-
-.pie-chart-slice:not(:hover):not([focused]),
-.pie-chart-slice:not(:hover):not([focused]) + .pie-chart-label {
-  transform: none !important;
-}
-
-/* Charts: Table */
-
-.table-chart-title {
-  padding-bottom: 10px;
-  font-size: 120%;
-  font-weight: 600;
-}
-
-.table-chart-row {
-  margin-top: 1px;
-  cursor: pointer;
-}
-
-.table-chart-grid:hover > .table-chart-row {
-  transition: opacity 0.1s ease-in-out;
-}
-
-.table-chart-grid:not(:hover) > .table-chart-row {
-  transition: opacity 0.2s ease-in-out;
-}
-
-.generic-chart-container:hover > .table-chart-grid:hover > .table-chart-row:not(:hover),
-.generic-chart-container:hover ~ .table-chart-container > .table-chart-grid > .table-chart-row:not([focused]) {
-  opacity: 0.4;
-}
-
-.table-chart-row-box {
-  width: 8px;
-  height: 1.5em;
-  -moz-margin-end: 10px;
-}
-
-.table-chart-row-label {
-  width: 8em;
-  -moz-padding-end: 6px;
-  cursor: inherit;
-}
-
-.table-chart-totals {
-  margin-top: 8px;
-  padding-top: 6px;
-}
-
-.table-chart-totals {
-  border-top: 1px solid var(--theme-body-color-alt); /* Grey foreground text */
-}
-
-.table-chart-summary-label {
-  font-weight: 600;
-  padding: 1px 0px;
-}
-
-.theme-dark .table-chart-summary-label {
-  color: var(--theme-selection-color);
-}
-
-.theme-light .table-chart-summary-label {
-  color: var(--theme-body-color);
-}
-
-/* Table Widget */
-
-/* Table body */
-
-.table-widget-body > .devtools-side-splitter {
-  border: none;
-}
-
-.table-widget-body {
-  overflow: auto;
-}
-
-.table-widget-body,
-.table-widget-empty-text {
-  background-color: var(--theme-body-background);
-}
-
-/* Column Headers */
-
-.table-widget-column-header,
-.table-widget-cell {
-  -moz-border-end: 1px solid var(--table-splitter-color) !important;
-}
-
-/* Table widget column header colors are taken from netmonitor.inc.css to match
-   the look of both the tables. This needs to be updated along with netmonitor
-   header colors in bug 951714 */
-
-.table-widget-column-header {
-  background: rgba(0,0,0,0);
-  position: sticky;
-  top: 0;
-  width: 100%;
-  padding: 5px 0 0 !important;
-  color: inherit;
-  text-align: center;
-  font-weight: inherit !important;
-  transition: background-color 0.1s ease-in-out;
-}
-
-.table-widget-column-header:hover {
-  background-image: linear-gradient(rgba(0,0,0,0.10), rgba(0,0,0,0.10));
-}
-
-.table-widget-column-header:hover:active {
-  background-image: linear-gradient(rgba(0,0,0,0.25), rgba(0,0,0,0.25));
-}
-
-.table-widget-column-header:not(:active)[sorted] {
-  background-image: linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15));
-}
-
-.table-widget-column-header:not(:active)[sorted=ascending] {
-  background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)),
-                    linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15));
-  background-size: 100% 1px, auto;
-  background-repeat: no-repeat, repeat;
-}
-
-.table-widget-column-header:not(:active)[sorted=descending] {
-  background-image: radial-gradient(farthest-side at center bottom, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)),
-                    linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15));
-  background-size: 100% 1px, auto;
-  background-repeat: no-repeat, repeat;
-  background-position: bottom;
-}
-
-/* Cells */
-
-.table-widget-cell {
-  width: 100%;
-  padding: 3px 4px;
-  background-clip: padding-box;
-  min-width: 100px;
-  -moz-user-focus: normal;
-  margin-bottom: -1px !important;
-  border-bottom: 1px solid transparent;
-  color: var(--theme-body-color);
-}
-
-.table-widget-cell:last-child {
-  border-bottom: 1px solid var(--table-splitter-color);
-}
-
-:root:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected),
-.table-widget-cell:not(.theme-selected)[odd] {
-  background: var(--table-zebra-background);
-}
-
-.table-widget-cell.flash-out {
-  animation: flash-out 0.5s ease-in;
-}
-
-@keyframes flash-out {
-  to {
-    background: var(--theme-contrast-background);
-  }
-}
-
-/* Empty text and initial text */
-
-.table-widget-empty-text {
-  display: none;
-  text-align: center;
-  font-size: large;
-  margin-top: -20px !important;
-}
-
-.table-widget-body:empty + .table-widget-empty-text:not([value=""]),
-.table-widget-body[empty] + .table-widget-empty-text:not([value=""]) {
-  display: block;
-}
-
-/* Tree Widget */
-
-.tree-widget-container {
-  padding: 0;
-  margin: 0;
-  width: 100%;
-  height: 100%;
-  list-style: none;
-  overflow: hidden;
-  -moz-margin-end: 40px;
-}
-
-.tree-widget-container:-moz-focusring,
-.tree-widget-container *:-moz-focusring {
-  outline-style: none;
-}
-
-.tree-widget-empty-text {
-  padding: 10px 20px;
-  font-size: medium;
-  background: transparent;
-  pointer-events: none;
-}
-
-/* Tree Item */
-
-.tree-widget-container .tree-widget-item {
-  padding: 2px 0px 4px;
-  /* OSX has line-height 14px by default, which causes weird alignment issues
-   * because of 20px high icons. thus making line-height consistent with that of
-   * windows.
-   */
-  line-height: 17px !important;
-  display: inline-block;
-  width: 100%;
-  word-break: keep-all; /* To prevent long urls like http://foo.com/bar from
-                           breaking in multiple lines */
-}
-
-.tree-widget-container .tree-widget-children {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-.tree-widget-item[level="1"] {
-  font-weight: 700;
-}
-
-/* Twisties */
-.tree-widget-item::before {
-  content: "";
-  width: 14px;
-  height: 14px;
-  float: left;
-  margin: 3px 2px -3px;
-  background-repeat: no-repeat;
-  background-image: url("chrome://browser/skin/devtools/controls.png");
-  background-size: 56px 28px;
-  cursor: pointer;
-  background-position: -28px -14px;
-}
-
-.tree-widget-item:-moz-locale-dir(rtl)::before {
-  float: right;
-  transform: scaleX(-1);
-}
-
-.theme-light .tree-widget-item:not(.theme-selected)::before {
-  background-position: 0 -14px;
-}
-
-.tree-widget-item[empty]::before {
-  background: transparent;
-}
-
-.tree-widget-item[expanded]::before {
-  background-position: -42px -14px;
-}
-
-.theme-light .tree-widget-item:not(.theme-selected)[expanded]:before {
-  background-position: -14px -14px;
-}
-
-.tree-widget-item + ul {
-  overflow: hidden;
-  animation: collapse-tree-item 0.2s;
-  max-height: 0;
-}
-
-.tree-widget-item[expanded] + ul {
-  animation: expand-tree-item 0.3s;
-  max-height: unset;
-}
-
-@keyframes collapse-tree-item {
-  from {
-    max-height: 300px;
-  }
-  to {
-    max-height: 0;
-  }
-}
-
-@keyframes expand-tree-item {
-  from {
-    max-height: 0;
-  }
-  to {
-    max-height: 500px;
-  }
-}
-
-@media (min-resolution: 1.1dppx) {
-  .tree-widget-item:before {
-    background-image: url("chrome://browser/skin/devtools/controls@2x.png");
-  }
-}
-
-/* Indentation of child items in the tree */
-
-/* For level > 6 */
-.tree-widget-item[level] + ul > li > .tree-widget-item {
-  -moz-padding-start: 98px;
-}
-
-/* First level */
-.tree-widget-item[level="1"] + ul > li > .tree-widget-item {
-  -moz-padding-start: 14px;
-}
-
-/* Second level */
-.tree-widget-item[level="2"] + ul > li > .tree-widget-item {
-  -moz-padding-start: 28px;
-}
-
-/* Third level */
-.tree-widget-item[level="3"] + ul > li > .tree-widget-item {
-  -moz-padding-start: 42px;
-}
-
-/* Fourth level */
-.tree-widget-item[level="4"] + ul > li > .tree-widget-item {
-  -moz-padding-start: 56px;
-}
-
-/* Fifth level */
-.tree-widget-item[level="5"] + ul > li > .tree-widget-item {
-  -moz-padding-start: 70px;
-}
-
-/* Sixth level */
-.tree-widget-item[level="6"] + ul > li > .tree-widget-item {
-  -moz-padding-start: 84px;
-}
-
-/* Custom icons for certain tree items indicating the type of the item */
-
-.tree-widget-item[type]::after {
-  content: "";
-  float: left;
-  width: 16px;
-  height: 17px;
-  -moz-margin-end: 4px;
-  background-repeat: no-repeat;
-  background-size: 20px auto;
-  background-position: 0 0;
-  background-size: auto 20px;
-  opacity: 0.75;
-}
-
-.tree-widget-item.theme-selected[type]::after {
-  opacity: 1;
-}
-
-.tree-widget-item:-moz-locale-dir(rtl)::after {
-  float: right;
-}
-
-.theme-light .tree-widget-item.theme-selected[type]::after,
-.theme-dark .tree-widget-item[type]::after {
-  filter: invert(1);
-}
-
-.tree-widget-item[type="dir"]::after {
-  background-image: url(chrome://browser/skin/devtools/filetype-dir-close.svg);
-  background-position: 2px 0;
-  background-size: auto 16px;
-  width: 20px;
-}
-
-.tree-widget-item[type="dir"][expanded]:not([empty])::after {
-  background-image: url(chrome://browser/skin/devtools/filetype-dir-open.svg);
-}
-
-.tree-widget-item[type="url"]::after {
-  background-image: url(chrome://browser/skin/devtools/filetype-globe.svg);
-  background-size: auto 18px;
-  width: 18px;
-}
-
-/* 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/. */
-
-/* Manifest Editor overrides */
-
-.variables-view-container.manifest-editor {
-  background-color: #F5F5F5;
-  padding: 20px 2px;
-}
-
-.manifest-editor .variable-or-property:focus > .title {
-  background-color: #EDEDED;
-  color: #000;
-  border-radius: 4px;
-}
-
-.manifest-editor .variables-view-property > .title > .name {
-  color: #27406A;
-}
-
-.manifest-editor .variable-or-property > .title > label,
-.manifest-editor textbox  {
-  font-family: monospace;
-}
-
-.manifest-editor .variable-or-property > .title > .token-string {
-  color: #54BC6A;
-  font-weight: bold;
-}
-
-.manifest-editor .variable-or-property > .title > .token-boolean,
-.manifest-editor .variable-or-property > .title > .token-number {
-  color: #009BD4;
-  font-weight: bold;
-}
-
-.manifest-editor .variable-or-property > .title > .token-undefined {
-  color: #bbb;
-}
-
-.manifest-editor .variable-or-property > .title > .token-null {
-  color: #999;
-}
-
-.manifest-editor .variable-or-property > .title > .token-other {
-  color: #333;
-}
-
-.manifest-editor .variables-view-variable {
-  border-bottom: none;
-}
-
-.manifest-editor .variables-view-delete,
-.manifest-editor .variables-view-delete:hover,
-.manifest-editor .variables-view-delete:active,
-.manifest-editor .variable-or-property:focus .variables-view-delete,
-.manifest-editor .variables-view-add-property,
-.manifest-editor .variables-view-add-property:hover,
-.manifest-editor .variables-view-add-property:active,
-.manifest-editor .variable-or-property:focus .variables-view-add-property {
-  list-style-image: none;
-  -moz-image-region: initial;
-}
-
-.manifest-editor .variables-view-delete::before,
-.manifest-editor .variables-view-add-property::before {
-  width: 11px;
-  height: 11px;
-  content: "";
-  display: inline-block;
-  background-size: 11px auto;
-}
-
-.manifest-editor .variables-view-delete::before {
-  background-image: url("app-manager/remove.svg");
-}
-
-.manifest-editor .variables-view-add-property::before {
-  background-image: url("app-manager/add.svg");
-  -moz-margin-end: 2px;
-}
diff --git a/arc-firefox-theme/chrome/browser/magnifier.png b/arc-firefox-theme/chrome/browser/magnifier.png
deleted file mode 100644
index bcce4ad..0000000
--- a/arc-firefox-theme/chrome/browser/magnifier.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/magnifier@2x.png b/arc-firefox-theme/chrome/browser/magnifier@2x.png
deleted file mode 100644
index 6aef26a..0000000
--- a/arc-firefox-theme/chrome/browser/magnifier@2x.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/newtab/newTab.css b/arc-firefox-theme/chrome/browser/newtab/newTab.css
index 16a21d3..4cab8c4 100644
--- a/arc-firefox-theme/chrome/browser/newtab/newTab.css
+++ b/arc-firefox-theme/chrome/browser/newtab/newTab.css
@@ -134,6 +134,12 @@
   overflow: hidden;
 }
 
+/***
+ * If you change the sizes here, change them in newTab.css
+ * and the preference values:
+ * toolkit.pageThumbs.minWidth
+ * toolkit.pageThumbs.minHeight
+ */
 /* THUMBNAILS */
 .newtab-thumbnail {
   background-origin: padding-box;
diff --git a/arc-firefox-theme/chrome/browser/notification-16.png b/arc-firefox-theme/chrome/browser/notification-16.png
deleted file mode 100644
index 6b2df73..0000000
--- a/arc-firefox-theme/chrome/browser/notification-16.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/notification-64.png b/arc-firefox-theme/chrome/browser/notification-64.png
deleted file mode 100644
index a01d0ab..0000000
--- a/arc-firefox-theme/chrome/browser/notification-64.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css
index 16d0aee..b308d91 100644
--- a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css
+++ b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css
@@ -94,8 +94,8 @@
 .pref-icon[type="geo"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
-.pref-icon[type="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png);
+.pref-icon[type="desktop-notification"] {
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
index 30b860f..a7bf8c5 100644
--- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
+++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
@@ -170,6 +170,10 @@ treecol {
   margin-right: 4px !important;
 }
 
+#notificationsPolicyLearnMore {
+  -moz-margin-start: 1.5em !important;
+}
+
 #defaultFontSizeLabel {
   /* !important needed to override common !important rule */
   -moz-margin-start: 4px !important;
@@ -270,7 +274,9 @@ description > html|a {
 }
 
 .indent {
-  -moz-margin-start: 33px;
+  /* !important needed to override -moz-margin-start:0 !important; rule
+     define in common.css for labels */
+  -moz-margin-start: 33px !important;
 }
 
 .text-link {
@@ -588,6 +594,7 @@ description > html|a {
 }
 
 .fxaAccountBoxButtons > button {
+  text-align: center;
   padding-left: 11px;
   padding-right: 11px;
   margin: 0;
@@ -616,8 +623,7 @@ description > html|a {
 }
 
 .fxaMobilePromo {
-  margin-top: 14px;
-  margin-bottom: 41px;
+  margin-bottom: 31px;
 }
 
 #fxaLoginRejectedWarning {
@@ -630,28 +636,16 @@ description > html|a {
   margin-bottom: 27.5px;
 }
 
-.androidLogo {
-  list-style-image: url(chrome://browser/skin/fxa/android.png);
-  max-width: 24px;
-  position: relative;
-  top: 8px;
-  margin: 0px;
-  margin-inline-end: 5px;
-}
-
-.androidLink {
+.androidLink,
+.iOSLink {
   margin: 0;
 }
 
 #tosPP-small {
+  margin-top: 20px;
   margin-bottom: 20px;
 }
 
-.androidAttribution {
-  font-size: 12px;
-  color: #D1D2D3;
-}
-
 @media (min-resolution: 1.1dppx) {
   .fxaSyncIllustration {
     list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
@@ -659,9 +653,6 @@ description > html|a {
   .fxaFirefoxLogo {
     list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
   }
-  .androidLogo {
-    list-style-image: url(chrome://browser/skin/fxa/android@2x.png);
-  }
   #fxaProfileImage {
     list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png);
   }
diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
index fd0d813..25e56b1 100644
--- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
+++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
@@ -67,6 +67,10 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path);
   background-color: rgba(0,0,0,.3);
 }
 
+//#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
+//  background-image: linear-gradient(rgba(255,255,255,.4), rgba(255,255,255,.4));
+//}
+
 #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-appearance: none;
   border-style: none;
@@ -600,6 +604,18 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 }
 
 /* Primary toolbar buttons */
+
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px;
+}
+
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  max-width: 18px;
+}
+
 .findbar-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 {
@@ -630,15 +646,11 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   padding: 3px 7px;
 }
 
-/* Help SDK icons fit: */
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-  width: 16px;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
-  width: 32px;
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  /* horizontal padding + border + actual icon width */
+  max-width: 32px !important /* bug 561154 */;
 }
 
 #nav-bar #PanelUI-menu-button {
@@ -715,18 +727,33 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   padding: 3px;
 }
 
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons > .toolbarbutton-1 {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons:not(:hover) > separator,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
   content: "";
   display: -moz-box;
   width: 1px;
   height: 18px;
   -moz-margin-end: -1px;
-  background-image: var(--toolbarbutton-combined-backgroundimage);
-  background-clip: padding-box;
+  background-image: linear-gradient(currentColor 0, currentColor 100%);
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px;
-  box-shadow: var(--toolbarbutton-combined-boxshadow);
+  opacity: .2;
+}
+
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbaritem-combined-buttons > separator,
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
+  opacity: .3;
 }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
@@ -735,6 +762,16 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   //margin-bottom: 3px;
 }
 
+//:-moz-any(#back-button, #forward-button) > .toolbarbutton-icon {
+//  border-color: var(--urlbar-border-color) !important /* bug 561154 */;
+//}
+
+//:-moz-any(#back-button, #forward-button):not(:hover):not(:active):not([open=true]) > .toolbarbutton-icon,
+//:-moz-any(#back-button, #forward-button)[disabled=true] > .toolbarbutton-icon {
+//  background-color: rgba(255,255,255,.25) !important /* bug 561154 */;
+//  background-clip: padding-box;
+//}
+
 //#back-button {
 //  padding-top: 3px;
 //  padding-bottom: 3px;
@@ -755,41 +792,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 
 //#back-button > .toolbarbutton-icon {
 //  border-radius: 10000px;
-//  background-clip: padding-box;
 //  padding: 6px;
-//  border: none;
-//  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
-//              0 0 0 1px hsla(0,0%,100%,.3) inset,
-//              0 0 0 1px hsla(210,54%,20%,.25),
-//              0 1px 0 hsla(210,54%,20%,.35);
-//  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
-//  transition-property: background-color, box-shadow;
-//  transition-duration: 250ms;
-//}
-
-//#back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
-//  background-color: hsla(210,48%,96%,.75);
-//  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
-//              0 0 0 1px hsla(0,0%,100%,.3) inset,
-//              0 0 0 1px hsla(210,54%,20%,.3),
-//              0 1px 0 hsla(210,54%,20%,.4),
-//              0 0 4px hsla(210,54%,20%,.2);
-//}
-
-//#back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon,
-//#back-button[open="true"] > .toolbarbutton-icon {
-//  background-color: hsla(210,54%,20%,.15);
-//  box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
-//              0 0 1px hsla(210,54%,20%,.2) inset,
-//              0 0 0 1px hsla(210,54%,20%,.4),
-//              0 1px 0 hsla(210,54%,20%,.2);
-//  transition: none;
-//}
-
-//#main-window:not([customizing]) #back-button[disabled] > .toolbarbutton-icon {
-//  box-shadow: 0 0 0 1px hsla(210,54%,20%,.55),
-//              0 1px 0 hsla(210,54%,20%,.65) !important;
-//  transition: none;
+//  max-width: 32px; /* horizontal padding + border + icon width */
 //}
 
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
@@ -1706,7 +1710,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   &:active { list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/window-controls/minimize_pressed.svg"); }
 }
 
-/* Location bar */
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
@@ -1727,6 +1730,17 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
 //  background-color: -moz-field;
 //}
 
+#urlbar:-moz-lwtheme,
+.searchbar-textbox:-moz-lwtheme {
+  background-color: rgba(255,255,255,.8);
+  color: black;
+}
+
+#urlbar:-moz-lwtheme[focused=true],
+.searchbar-textbox:-moz-lwtheme[focused=true] {
+  background-color: white;
+}
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center;
@@ -1741,7 +1755,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   transition: opacity 0.15s ease;
 }
 
-#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#navigator-toolbox:not(:hover) .urlbar-history-dropmarker {
   opacity: 0;
 }
 
@@ -2026,6 +2040,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   list-style-image: url(chrome://browser/skin/identity-secure.svg);
 }
 
+.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
 .mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg);
 }
@@ -2063,10 +2078,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
 
-.popup-notification-icon[popupid="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png);
-}
-
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
 .popup-notification-icon[popupid="addon-install-origin-blocked"] {
@@ -2102,7 +2113,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 }
 
 .popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png);
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
@@ -2189,10 +2200,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   list-style-image: url(chrome://browser/skin/Geolocation-16.png);
 }
 
-#push-notification-icon {
-  list-style-image: url(chrome://browser/skin/Push-16.png);
-}
-
 #addons-notification-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
 }
@@ -2301,7 +2308,18 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-16.png);
+  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.web-notifications-notification-icon:hover,
+#web-notifications-notification-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.web-notifications-notification-icon:hover:active,
+#web-notifications-notification-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 .pointerLock-notification-icon,
@@ -3456,6 +3474,31 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%;
 }
 
+/* User Context UI - change tab decoration depending on userContextId.
+   Defaults to gray for unknown usercontextids. */
+.tabbrowser-tab[usercontextid] {
+  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
+  background-size: auto 2px;
+  background-repeat: no-repeat;
+}
+
+/* Personal User Context */
+.tabbrowser-tab[usercontextid="1"] {
+  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%);
+}
+/* Work User Context */
+.tabbrowser-tab[usercontextid="2"] {
+  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%);
+}
+/* Banking User Context */
+.tabbrowser-tab[usercontextid="3"] {
+  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%);
+}
+/* Shopping User Context */
+.tabbrowser-tab[usercontextid="4"] {
+  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%);
+}
+
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none;
@@ -3478,13 +3521,23 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   position: absolute;
 }
 
-.tabbrowser-tab[pinned][titlechanged]:not([visuallyselected="true"]) > .tab-stack > .tab-content {
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
+.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
   background-image: radial-gradient(farthest-corner at center bottom, rgb(255,255,255) 3%, rgba(186,221,251,0.75) 20%, rgba(127,179,255,0.25) 40%, transparent 70%);
   background-position: center bottom var(--tab-toolbar-navbar-overlap);
   background-repeat: no-repeat;
   background-size: 85% 100%;
 }
 
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([visuallyselected="true"]) {
+  background-position: left bottom var(--tab-toolbar-navbar-overlap);
+  background-size: 34px 100%;
+}
+
+.tab-label[attention]:not([visuallyselected="true"]) {
+  font-weight: bold;
+}
+
 /* Tab separators */
 
 //.tabbrowser-tab::after,
@@ -3696,6 +3749,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio);
 }
 
+menuitem:hover > hbox > .alltabs-endimage[muted] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-muted-hover);
+}
+
+menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-hover);
+}
+
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
@@ -3784,7 +3845,7 @@ toolbarbutton.chevron > .toolbarbutton-icon {
 }
 
 #sync-start-panel-subtitle {
-  margin: 0;
+  margin-bottom: 0;
 }
 
 /* Status panel */
@@ -3967,7 +4028,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px;
@@ -3993,7 +4054,7 @@ html|*#fullscreen-exit-button {
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;
 }
@@ -4004,25 +4065,25 @@ html|*#fullscreen-exit-button {
 }
 
 .devtools-responsiveui-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  list-style-image: url("chrome://devtools/skin/images/close.png");
 }
 
 .devtools-responsiveui-rotate {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate.png");
 }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-close {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png");
   }
 
   .devtools-responsiveui-rotate {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate@2x.png");
   }
 }
 
 .devtools-responsiveui-touch {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
@@ -4032,7 +4093,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-touch {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px,32px,32px,0px);
   }
 
@@ -4042,12 +4103,12 @@ html|*#fullscreen-exit-button {
 }
 
 .devtools-responsiveui-screenshot {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot.png");
 }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-screenshot {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot@2x.png");
   }
 }
 
@@ -4057,7 +4118,7 @@ html|*#fullscreen-exit-button {
   cursor: ew-resize;
   transform: translate(12px, -12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer.png");
 }
 
 .devtools-responsiveui-resizebarH {
@@ -4066,7 +4127,7 @@ html|*#fullscreen-exit-button {
   cursor: ns-resize;
   transform: translate(-12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer.png");
 }
 
 .devtools-responsiveui-resizehandle {
@@ -4075,7 +4136,7 @@ html|*#fullscreen-exit-button {
   cursor: se-resize;
   transform: translate(12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer.png");
 }
 
 /* FxOS custom mode with additional buttons and phone look'n feel */
@@ -4123,7 +4184,7 @@ html|*#fullscreen-exit-button {
   -moz-user-focus: ignore;
   width: 40px;
   height: 30px;
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-home.png");
 }
 
 .devtools-responsiveui-sleep-button {
@@ -4182,15 +4243,15 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-resizebarV {
-    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizebarH {
-    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer@2x.png");
   }
 
   .devtools-responsiveui-resizehandle {
-    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png");
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer@2x.png");
   }
 }
 
@@ -4242,7 +4303,7 @@ html|*#fullscreen-exit-button {
 
 :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image,
 :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before  {
-  filter: url("chrome://browser/skin/devtools/filters.svg#invert");
+  filter: url("chrome://devtools/skin/images/filters.svg#invert");
 }
 
 .developer-toolbar-button > .toolbarbutton-icon,
@@ -4252,7 +4313,7 @@ html|*#fullscreen-exit-button {
 }
 
 #developer-toolbar-toolbox-button {
-  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
@@ -4274,7 +4335,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-toolbox-button {
-    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px);
   }
 
@@ -4292,7 +4353,7 @@ html|*#fullscreen-exit-button {
 }
 
 #developer-toolbar-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  list-style-image: url("chrome://devtools/skin/images/close.png");
   -moz-appearance: none;
   border: none;
   margin: 0 4px;
@@ -4303,7 +4364,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-closebutton {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png");
   }
 }
 
@@ -4380,7 +4441,7 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
   background-position: 0 center;
   background-size: 32px 16px;
 }
@@ -4391,7 +4452,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 1.1dppx) {
   .gclitoolbar-input-node::before {
-    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png");
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png");
   }
 }
 
@@ -4634,10 +4695,6 @@ notification.pluginVulnerable .messageImage {
   background-image: -moz-image-rect(url("chrome://browser/skin/custom_images/#{$asset_path}/toolbar-icons.svg"), 18, 198, 36, 180);
 }
 
-//toolbar[brighttext] #downloads-button[cui-areatype="toolbar"][attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
-//  background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 18, 198, 36, 180);
-//}
-
 #downloads-button[cui-areatype="menu-panel"][attention] {
   list-style-image: url("chrome://browser/skin/downloads/download-glow-menuPanel.png");
   -moz-image-region: auto;
@@ -4930,6 +4987,14 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   transform: none;
 }
 
+chatbox[src^="about:loopconversation#"] .chat-minimize-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white");
+}
+
+chatbox[src^="about:loopconversation#"] .chat-swap-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white");
+}
+
 .chat-loop-hangup {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white");
   background-color: #d13f1a;
@@ -4954,6 +5019,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   cursor: inherit;
 }
 
+chatbox[src^="about:loopconversation#"] .chat-title {
+  color: white;
+}
+
 .chat-titlebar {
   height: 26px;
   min-height: 26px;
@@ -4972,6 +5041,11 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   background-color: #f0f0f0;
 }
 
+chatbox[src^="about:loopconversation#"] > .chat-titlebar {
+  background-color: #00a9dc;
+  border-color: #00a9dc;
+}
+
 .chat-titlebar > .notification-anchor-icon {
   margin-left: 2px;
   margin-right: 2px;
@@ -6031,6 +6105,77 @@ notification.heartbeat {
   -moz-margin-end: 0 !important;
 }
 
-.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent {
+.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
   padding: 0;
+  overflow: hidden;
+}
+
+/* User Context UI browser styles */
+
+#menu_newUserContextTabPersonal {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg");
+}
+
+#menu_newUserContextTabWork {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg");
+}
+
+#menu_newUserContextTabBanking {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg");
+}
+
+#menu_newUserContextTabShopping {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg");
+}
+
+/* URL Bar Decoration */
+
+#userContext-indicator {
+  height: 16px;
+  width: 16px;
+}
+
+#userContext-label {
+  margin-inline-end: 3px;
+  color: #909090;
+}
+
+#userContext-icons:not([usercontextid]) {
+  display: none;
+}
+
+#userContext-icons {
+  -moz-box-align: center;
+}
+
+/* Personal User Context */
+#userContext-icons[usercontextid="1"] > #userContext-label {
+  color: #00a7e0;
+}
+#userContext-icons[usercontextid="1"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg");
+}
+
+/* Work User Context */
+#userContext-icons[usercontextid="2"] > #userContext-label {
+  color: #f89c24;
+}
+#userContext-icons[usercontextid="2"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg");
+}
+
+/* Banking User Context */
+#userContext-icons[usercontextid="3"] > #userContext-label {
+  color: #7dc14c;
+}
+#userContext-icons[usercontextid="3"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg");
+}
+
+/* Shopping User Context */
+#userContext-icons[usercontextid="4"] > #userContext-label {
+  color: #ee5195;
+}
+#userContext-icons[usercontextid="4"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg");
 }
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
index f636bac..3d525a6 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
@@ -482,6 +482,15 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("chrome://global/skin/console/console.png"); }
 
 /* Primary toolbar buttons */
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px; }
+
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  max-width: 18px; }
+
 .findbar-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 {
@@ -508,14 +517,11 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px; }
 
-/* Help SDK icons fit: */
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-  width: 16px; }
-
-:-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
-  width: 32px; }
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  /* horizontal padding + border + actual icon width */
+  max-width: 32px !important; }
 
 #nav-bar #PanelUI-menu-button {
   -moz-padding-start: 5px;
@@ -580,18 +586,30 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:hover:active {
   padding: 3px; }
 
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons {
+  margin-left: 2px;
+  margin-right: 2px; }
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons > .toolbarbutton-1 {
+  padding-left: 0;
+  padding-right: 0; }
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons:not(:hover) > separator,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
   content: "";
   display: -moz-box;
   width: 1px;
   height: 18px;
   -moz-margin-end: -1px;
-  background-image: var(--toolbarbutton-combined-backgroundimage);
-  background-clip: padding-box;
+  background-image: linear-gradient(currentColor 0, currentColor 100%);
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px;
-  box-shadow: var(--toolbarbutton-combined-boxshadow); }
+  opacity: .2; }
+
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbaritem-combined-buttons > separator,
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
+  opacity: .3; }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-margin-start: -4px; }
@@ -1284,7 +1302,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   #minimize-button:active {
     list-style-image: url("chrome://browser/skin/custom_images/dark/window-controls/minimize_pressed.svg"); }
 
-/* Location bar */
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
@@ -1305,6 +1322,15 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
 .searchbar-textbox {
   border-radius: 20px; }
 
+#urlbar:-moz-lwtheme,
+.searchbar-textbox:-moz-lwtheme {
+  background-color: rgba(255, 255, 255, 0.8);
+  color: black; }
+
+#urlbar:-moz-lwtheme[focused=true],
+.searchbar-textbox:-moz-lwtheme[focused=true] {
+  background-color: white; }
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center; }
@@ -1316,7 +1342,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   -moz-appearance: toolbarbutton-dropdown;
   transition: opacity 0.15s ease; }
 
-#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#navigator-toolbox:not(:hover) .urlbar-history-dropmarker {
   opacity: 0; }
 
 #urlbar-container {
@@ -1490,6 +1516,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-secure.svg); }
 
+.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
 .mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); }
 
@@ -1519,9 +1546,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon[popupid="geolocation"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png); }
 
-.popup-notification-icon[popupid="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png); }
-
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
 .popup-notification-icon[popupid="addon-install-origin-blocked"] {
@@ -1549,7 +1573,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); }
 
 .popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png); }
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg); }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
 .popup-notification-icon[popupid*="offline-app-requested"],
@@ -1614,9 +1638,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 #geo-notification-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png); }
 
-#push-notification-icon {
-  list-style-image: url(chrome://browser/skin/Push-16.png); }
-
 #addons-notification-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); }
 
@@ -1700,7 +1721,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-16.png); }
+  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
+  -moz-image-region: rect(0, 16px, 16px, 0); }
+
+.web-notifications-notification-icon:hover,
+#web-notifications-notification-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px); }
+
+.web-notifications-notification-icon:hover:active,
+#web-notifications-notification-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px); }
 
 .pointerLock-notification-icon,
 #pointerLock-notification-icon {
@@ -2571,6 +2601,29 @@ lwtHeader;*/
   background-repeat: no-repeat;
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; }
 
+/* User Context UI - change tab decoration depending on userContextId.
+   Defaults to gray for unknown usercontextids. */
+.tabbrowser-tab[usercontextid] {
+  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
+  background-size: auto 2px;
+  background-repeat: no-repeat; }
+
+/* Personal User Context */
+.tabbrowser-tab[usercontextid="1"] {
+  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%); }
+
+/* Work User Context */
+.tabbrowser-tab[usercontextid="2"] {
+  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%); }
+
+/* Banking User Context */
+.tabbrowser-tab[usercontextid="3"] {
+  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%); }
+
+/* Shopping User Context */
+.tabbrowser-tab[usercontextid="4"] {
+  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%); }
+
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none; }
@@ -2589,12 +2642,20 @@ lwtHeader;*/
   height: 100%;
   position: absolute; }
 
-.tabbrowser-tab[pinned][titlechanged]:not([visuallyselected="true"]) > .tab-stack > .tab-content {
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
+.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
   background-image: radial-gradient(farthest-corner at center bottom, white 3%, rgba(186, 221, 251, 0.75) 20%, rgba(127, 179, 255, 0.25) 40%, transparent 70%);
   background-position: center bottom var(--tab-toolbar-navbar-overlap);
   background-repeat: no-repeat;
   background-size: 85% 100%; }
 
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([visuallyselected="true"]) {
+  background-position: left bottom var(--tab-toolbar-navbar-overlap);
+  background-size: 34px 100%; }
+
+.tab-label[attention]:not([visuallyselected="true"]) {
+  font-weight: bold; }
+
 /* Tab separators */
 /* Also show separators beside the selected tab when dragging it. */
 /* New tab button */
@@ -2729,6 +2790,12 @@ lwtHeader;*/
 .alltabs-endimage[soundplaying] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); }
 
+menuitem:hover > hbox > .alltabs-endimage[muted] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-muted-hover); }
+
+menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-hover); }
+
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
@@ -2798,7 +2865,7 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin-bottom: 5px; }
 
 #sync-start-panel-subtitle {
-  margin: 0; }
+  margin-bottom: 0; }
 
 /* Status panel */
 .statuspanel-label {
@@ -2951,7 +3018,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px; }
@@ -2973,7 +3040,7 @@ html|*#fullscreen-exit-button {
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px; }
 
@@ -2982,19 +3049,19 @@ html|*#fullscreen-exit-button {
   margin-left: 0; }
 
 .devtools-responsiveui-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png"); }
+  list-style-image: url("chrome://devtools/skin/images/close.png"); }
 
 .devtools-responsiveui-rotate {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate.png"); }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-close {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); }
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png"); }
 
   .devtools-responsiveui-rotate {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate@2x.png"); } }
 .devtools-responsiveui-touch {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
 .devtools-responsiveui-touch[checked] {
@@ -3002,24 +3069,24 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-touch {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px); }
 
   .devtools-responsiveui-touch[checked] {
     -moz-image-region: rect(0px, 64px, 32px, 32px); } }
 .devtools-responsiveui-screenshot {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot.png"); }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-screenshot {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot@2x.png"); } }
 .devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
   cursor: ew-resize;
   transform: translate(12px, -12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer.png"); }
 
 .devtools-responsiveui-resizebarH {
   width: 24px;
@@ -3027,7 +3094,7 @@ html|*#fullscreen-exit-button {
   cursor: ns-resize;
   transform: translate(-12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer.png"); }
 
 .devtools-responsiveui-resizehandle {
   width: 16px;
@@ -3035,7 +3102,7 @@ html|*#fullscreen-exit-button {
   cursor: se-resize;
   transform: translate(12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer.png"); }
 
 /* FxOS custom mode with additional buttons and phone look'n feel */
 /* Hide devtools manual resizer */
@@ -3071,7 +3138,7 @@ html|*#fullscreen-exit-button {
   -moz-user-focus: ignore;
   width: 40px;
   height: 30px;
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-home.png"); }
 
 .devtools-responsiveui-sleep-button {
   -moz-user-focus: ignore;
@@ -3117,13 +3184,13 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-resizebarV {
-    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer@2x.png"); }
 
   .devtools-responsiveui-resizebarH {
-    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png"); }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer@2x.png"); }
 
   .devtools-responsiveui-resizehandle {
-    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png"); } }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer@2x.png"); } }
 /* Developer toolbar */
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
@@ -3180,7 +3247,7 @@ html|*#fullscreen-exit-button {
 
 :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image,
 :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
-  filter: url("chrome://browser/skin/devtools/filters.svg#invert"); }
+  filter: url("chrome://devtools/skin/images/filters.svg#invert"); }
 
 .developer-toolbar-button > .toolbarbutton-icon,
 #developer-toolbar-closebutton > .toolbarbutton-icon {
@@ -3188,7 +3255,7 @@ html|*#fullscreen-exit-button {
   height: 16px; }
 
 #developer-toolbar-toolbox-button {
-  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
 #developer-toolbar-toolbox-button > label {
@@ -3205,7 +3272,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-toolbox-button {
-    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px); }
 
   #developer-toolbar-toolbox-button:hover {
@@ -3217,7 +3284,7 @@ html|*#fullscreen-exit-button {
   #developer-toolbar-toolbox-button[checked=true] {
     -moz-image-region: rect(0px, 128px, 32px, 96px); } }
 #developer-toolbar-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  list-style-image: url("chrome://devtools/skin/images/close.png");
   -moz-appearance: none;
   border: none;
   margin: 0 4px;
@@ -3227,7 +3294,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-closebutton {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png"); } }
 #developer-toolbar-closebutton > .toolbarbutton-icon {
   /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
      use evil CSS to give the impression of smaller content */
@@ -3289,7 +3356,7 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
   background-position: 0 center;
   background-size: 32px 16px; }
 
@@ -3298,7 +3365,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 1.1dppx) {
   .gclitoolbar-input-node::before {
-    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } }
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png"); } }
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
@@ -3734,6 +3801,12 @@ toolbar[brighttext] #downloads-indicator-counter {
 chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   transform: none; }
 
+chatbox[src^="about:loopconversation#"] .chat-minimize-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); }
+
+chatbox[src^="about:loopconversation#"] .chat-swap-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); }
+
 .chat-loop-hangup {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white");
   background-color: #d13f1a;
@@ -3755,6 +3828,9 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   text-shadow: none;
   cursor: inherit; }
 
+chatbox[src^="about:loopconversation#"] .chat-title {
+  color: white; }
+
 .chat-titlebar {
   height: 26px;
   min-height: 26px;
@@ -3771,6 +3847,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
 .chat-titlebar[selected] {
   background-color: #f0f0f0; }
 
+chatbox[src^="about:loopconversation#"] > .chat-titlebar {
+  background-color: #00a9dc;
+  border-color: #00a9dc; }
+
 .chat-titlebar > .notification-anchor-icon {
   margin-left: 2px;
   margin-right: 2px; }
@@ -4627,5 +4707,62 @@ notification.heartbeat {
   -moz-padding-end: 0 !important;
   -moz-margin-end: 0 !important; }
 
-.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0; }
+.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  overflow: hidden; }
+
+/* User Context UI browser styles */
+#menu_newUserContextTabPersonal {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
+
+#menu_newUserContextTabWork {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
+
+#menu_newUserContextTabBanking {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+
+#menu_newUserContextTabShopping {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
+
+/* URL Bar Decoration */
+#userContext-indicator {
+  height: 16px;
+  width: 16px; }
+
+#userContext-label {
+  margin-inline-end: 3px;
+  color: #909090; }
+
+#userContext-icons:not([usercontextid]) {
+  display: none; }
+
+#userContext-icons {
+  -moz-box-align: center; }
+
+/* Personal User Context */
+#userContext-icons[usercontextid="1"] > #userContext-label {
+  color: #00a7e0; }
+
+#userContext-icons[usercontextid="1"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
+
+/* Work User Context */
+#userContext-icons[usercontextid="2"] > #userContext-label {
+  color: #f89c24; }
+
+#userContext-icons[usercontextid="2"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
+
+/* Banking User Context */
+#userContext-icons[usercontextid="3"] > #userContext-label {
+  color: #7dc14c; }
+
+#userContext-icons[usercontextid="3"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+
+/* Shopping User Context */
+#userContext-icons[usercontextid="4"] > #userContext-label {
+  color: #ee5195; }
+
+#userContext-icons[usercontextid="4"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
index 84b7369..e238cba 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
@@ -482,6 +482,15 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("chrome://global/skin/console/console.png"); }
 
 /* Primary toolbar buttons */
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px; }
+
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  max-width: 18px; }
+
 .findbar-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 {
@@ -508,14 +517,11 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px; }
 
-/* Help SDK icons fit: */
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-  width: 16px; }
-
-:-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
-  width: 32px; }
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  /* horizontal padding + border + actual icon width */
+  max-width: 32px !important; }
 
 #nav-bar #PanelUI-menu-button {
   -moz-padding-start: 5px;
@@ -580,18 +586,30 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:hover:active {
   padding: 3px; }
 
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons {
+  margin-left: 2px;
+  margin-right: 2px; }
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons > .toolbarbutton-1 {
+  padding-left: 0;
+  padding-right: 0; }
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons:not(:hover) > separator,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
   content: "";
   display: -moz-box;
   width: 1px;
   height: 18px;
   -moz-margin-end: -1px;
-  background-image: var(--toolbarbutton-combined-backgroundimage);
-  background-clip: padding-box;
+  background-image: linear-gradient(currentColor 0, currentColor 100%);
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px;
-  box-shadow: var(--toolbarbutton-combined-boxshadow); }
+  opacity: .2; }
+
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbaritem-combined-buttons > separator,
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
+  opacity: .3; }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-margin-start: -4px; }
@@ -1284,7 +1302,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   #minimize-button:active {
     list-style-image: url("chrome://browser/skin/custom_images/dark/window-controls/minimize_pressed.svg"); }
 
-/* Location bar */
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
@@ -1304,6 +1321,15 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
 .searchbar-textbox {
   border-radius: 20px; }
 
+#urlbar:-moz-lwtheme,
+.searchbar-textbox:-moz-lwtheme {
+  background-color: rgba(255, 255, 255, 0.8);
+  color: black; }
+
+#urlbar:-moz-lwtheme[focused=true],
+.searchbar-textbox:-moz-lwtheme[focused=true] {
+  background-color: white; }
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center; }
@@ -1315,7 +1341,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   -moz-appearance: toolbarbutton-dropdown;
   transition: opacity 0.15s ease; }
 
-#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#navigator-toolbox:not(:hover) .urlbar-history-dropmarker {
   opacity: 0; }
 
 #urlbar-container {
@@ -1489,6 +1515,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-secure.svg); }
 
+.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
 .mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); }
 
@@ -1518,9 +1545,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon[popupid="geolocation"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png); }
 
-.popup-notification-icon[popupid="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png); }
-
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
 .popup-notification-icon[popupid="addon-install-origin-blocked"] {
@@ -1548,7 +1572,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); }
 
 .popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png); }
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg); }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
 .popup-notification-icon[popupid*="offline-app-requested"],
@@ -1613,9 +1637,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 #geo-notification-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png); }
 
-#push-notification-icon {
-  list-style-image: url(chrome://browser/skin/Push-16.png); }
-
 #addons-notification-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); }
 
@@ -1699,7 +1720,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-16.png); }
+  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
+  -moz-image-region: rect(0, 16px, 16px, 0); }
+
+.web-notifications-notification-icon:hover,
+#web-notifications-notification-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px); }
+
+.web-notifications-notification-icon:hover:active,
+#web-notifications-notification-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px); }
 
 .pointerLock-notification-icon,
 #pointerLock-notification-icon {
@@ -2571,6 +2601,29 @@ lwtHeader;*/
   background-repeat: no-repeat;
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; }
 
+/* User Context UI - change tab decoration depending on userContextId.
+   Defaults to gray for unknown usercontextids. */
+.tabbrowser-tab[usercontextid] {
+  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
+  background-size: auto 2px;
+  background-repeat: no-repeat; }
+
+/* Personal User Context */
+.tabbrowser-tab[usercontextid="1"] {
+  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%); }
+
+/* Work User Context */
+.tabbrowser-tab[usercontextid="2"] {
+  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%); }
+
+/* Banking User Context */
+.tabbrowser-tab[usercontextid="3"] {
+  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%); }
+
+/* Shopping User Context */
+.tabbrowser-tab[usercontextid="4"] {
+  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%); }
+
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none; }
@@ -2589,12 +2642,20 @@ lwtHeader;*/
   height: 100%;
   position: absolute; }
 
-.tabbrowser-tab[pinned][titlechanged]:not([visuallyselected="true"]) > .tab-stack > .tab-content {
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
+.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
   background-image: radial-gradient(farthest-corner at center bottom, white 3%, rgba(186, 221, 251, 0.75) 20%, rgba(127, 179, 255, 0.25) 40%, transparent 70%);
   background-position: center bottom var(--tab-toolbar-navbar-overlap);
   background-repeat: no-repeat;
   background-size: 85% 100%; }
 
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([visuallyselected="true"]) {
+  background-position: left bottom var(--tab-toolbar-navbar-overlap);
+  background-size: 34px 100%; }
+
+.tab-label[attention]:not([visuallyselected="true"]) {
+  font-weight: bold; }
+
 /* Tab separators */
 /* Also show separators beside the selected tab when dragging it. */
 /* New tab button */
@@ -2729,6 +2790,12 @@ lwtHeader;*/
 .alltabs-endimage[soundplaying] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); }
 
+menuitem:hover > hbox > .alltabs-endimage[muted] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-muted-hover); }
+
+menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-hover); }
+
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
@@ -2798,7 +2865,7 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin-bottom: 5px; }
 
 #sync-start-panel-subtitle {
-  margin: 0; }
+  margin-bottom: 0; }
 
 /* Status panel */
 .statuspanel-label {
@@ -2951,7 +3018,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px; }
@@ -2973,7 +3040,7 @@ html|*#fullscreen-exit-button {
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px; }
 
@@ -2982,19 +3049,19 @@ html|*#fullscreen-exit-button {
   margin-left: 0; }
 
 .devtools-responsiveui-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png"); }
+  list-style-image: url("chrome://devtools/skin/images/close.png"); }
 
 .devtools-responsiveui-rotate {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate.png"); }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-close {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); }
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png"); }
 
   .devtools-responsiveui-rotate {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate@2x.png"); } }
 .devtools-responsiveui-touch {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
 .devtools-responsiveui-touch[checked] {
@@ -3002,24 +3069,24 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-touch {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px); }
 
   .devtools-responsiveui-touch[checked] {
     -moz-image-region: rect(0px, 64px, 32px, 32px); } }
 .devtools-responsiveui-screenshot {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot.png"); }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-screenshot {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot@2x.png"); } }
 .devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
   cursor: ew-resize;
   transform: translate(12px, -12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer.png"); }
 
 .devtools-responsiveui-resizebarH {
   width: 24px;
@@ -3027,7 +3094,7 @@ html|*#fullscreen-exit-button {
   cursor: ns-resize;
   transform: translate(-12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer.png"); }
 
 .devtools-responsiveui-resizehandle {
   width: 16px;
@@ -3035,7 +3102,7 @@ html|*#fullscreen-exit-button {
   cursor: se-resize;
   transform: translate(12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer.png"); }
 
 /* FxOS custom mode with additional buttons and phone look'n feel */
 /* Hide devtools manual resizer */
@@ -3071,7 +3138,7 @@ html|*#fullscreen-exit-button {
   -moz-user-focus: ignore;
   width: 40px;
   height: 30px;
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-home.png"); }
 
 .devtools-responsiveui-sleep-button {
   -moz-user-focus: ignore;
@@ -3117,13 +3184,13 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-resizebarV {
-    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer@2x.png"); }
 
   .devtools-responsiveui-resizebarH {
-    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png"); }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer@2x.png"); }
 
   .devtools-responsiveui-resizehandle {
-    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png"); } }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer@2x.png"); } }
 /* Developer toolbar */
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
@@ -3180,7 +3247,7 @@ html|*#fullscreen-exit-button {
 
 :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image,
 :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
-  filter: url("chrome://browser/skin/devtools/filters.svg#invert"); }
+  filter: url("chrome://devtools/skin/images/filters.svg#invert"); }
 
 .developer-toolbar-button > .toolbarbutton-icon,
 #developer-toolbar-closebutton > .toolbarbutton-icon {
@@ -3188,7 +3255,7 @@ html|*#fullscreen-exit-button {
   height: 16px; }
 
 #developer-toolbar-toolbox-button {
-  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
 #developer-toolbar-toolbox-button > label {
@@ -3205,7 +3272,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-toolbox-button {
-    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px); }
 
   #developer-toolbar-toolbox-button:hover {
@@ -3217,7 +3284,7 @@ html|*#fullscreen-exit-button {
   #developer-toolbar-toolbox-button[checked=true] {
     -moz-image-region: rect(0px, 128px, 32px, 96px); } }
 #developer-toolbar-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  list-style-image: url("chrome://devtools/skin/images/close.png");
   -moz-appearance: none;
   border: none;
   margin: 0 4px;
@@ -3227,7 +3294,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-closebutton {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png"); } }
 #developer-toolbar-closebutton > .toolbarbutton-icon {
   /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
      use evil CSS to give the impression of smaller content */
@@ -3289,7 +3356,7 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
   background-position: 0 center;
   background-size: 32px 16px; }
 
@@ -3298,7 +3365,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 1.1dppx) {
   .gclitoolbar-input-node::before {
-    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } }
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png"); } }
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
@@ -3734,6 +3801,12 @@ toolbar[brighttext] #downloads-indicator-counter {
 chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   transform: none; }
 
+chatbox[src^="about:loopconversation#"] .chat-minimize-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); }
+
+chatbox[src^="about:loopconversation#"] .chat-swap-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); }
+
 .chat-loop-hangup {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white");
   background-color: #d13f1a;
@@ -3755,6 +3828,9 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   text-shadow: none;
   cursor: inherit; }
 
+chatbox[src^="about:loopconversation#"] .chat-title {
+  color: white; }
+
 .chat-titlebar {
   height: 26px;
   min-height: 26px;
@@ -3771,6 +3847,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
 .chat-titlebar[selected] {
   background-color: #f0f0f0; }
 
+chatbox[src^="about:loopconversation#"] > .chat-titlebar {
+  background-color: #00a9dc;
+  border-color: #00a9dc; }
+
 .chat-titlebar > .notification-anchor-icon {
   margin-left: 2px;
   margin-right: 2px; }
@@ -4627,5 +4707,62 @@ notification.heartbeat {
   -moz-padding-end: 0 !important;
   -moz-margin-end: 0 !important; }
 
-.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0; }
+.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  overflow: hidden; }
+
+/* User Context UI browser styles */
+#menu_newUserContextTabPersonal {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
+
+#menu_newUserContextTabWork {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
+
+#menu_newUserContextTabBanking {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+
+#menu_newUserContextTabShopping {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
+
+/* URL Bar Decoration */
+#userContext-indicator {
+  height: 16px;
+  width: 16px; }
+
+#userContext-label {
+  margin-inline-end: 3px;
+  color: #909090; }
+
+#userContext-icons:not([usercontextid]) {
+  display: none; }
+
+#userContext-icons {
+  -moz-box-align: center; }
+
+/* Personal User Context */
+#userContext-icons[usercontextid="1"] > #userContext-label {
+  color: #00a7e0; }
+
+#userContext-icons[usercontextid="1"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
+
+/* Work User Context */
+#userContext-icons[usercontextid="2"] > #userContext-label {
+  color: #f89c24; }
+
+#userContext-icons[usercontextid="2"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
+
+/* Banking User Context */
+#userContext-icons[usercontextid="3"] > #userContext-label {
+  color: #7dc14c; }
+
+#userContext-icons[usercontextid="3"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+
+/* Shopping User Context */
+#userContext-icons[usercontextid="4"] > #userContext-label {
+  color: #ee5195; }
+
+#userContext-icons[usercontextid="4"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css
index 3752502..7229492 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-light.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css
@@ -482,6 +482,15 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
   list-style-image: url("chrome://global/skin/console/console.png"); }
 
 /* Primary toolbar buttons */
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
+  max-width: 16px; }
+
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon,
+:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  max-width: 18px; }
+
 .findbar-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 {
@@ -508,14 +517,11 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 3px 7px; }
 
-/* Help SDK icons fit: */
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon,
-toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
-  width: 16px; }
-
-:-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
-  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
-  width: 32px; }
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  /* horizontal padding + border + actual icon width */
+  max-width: 32px !important; }
 
 #nav-bar #PanelUI-menu-button {
   -moz-padding-start: 5px;
@@ -580,18 +586,30 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:hover:active {
   padding: 3px; }
 
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons {
+  margin-left: 2px;
+  margin-right: 2px; }
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons > .toolbarbutton-1 {
+  padding-left: 0;
+  padding-right: 0; }
+
+:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons:not(:hover) > separator,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
   content: "";
   display: -moz-box;
   width: 1px;
   height: 18px;
   -moz-margin-end: -1px;
-  background-image: var(--toolbarbutton-combined-backgroundimage);
-  background-clip: padding-box;
+  background-image: linear-gradient(currentColor 0, currentColor 100%);
   background-position: center;
   background-repeat: no-repeat;
   background-size: 1px 18px;
-  box-shadow: var(--toolbarbutton-combined-boxshadow); }
+  opacity: .2; }
+
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbaritem-combined-buttons > separator,
+:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
+  opacity: .3; }
 
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-margin-start: -4px; }
@@ -1284,7 +1302,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   #minimize-button:active {
     list-style-image: url("chrome://browser/skin/custom_images/light/window-controls/minimize_pressed.svg"); }
 
-/* Location bar */
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
@@ -1304,6 +1321,15 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
 .searchbar-textbox {
   border-radius: 20px; }
 
+#urlbar:-moz-lwtheme,
+.searchbar-textbox:-moz-lwtheme {
+  background-color: rgba(255, 255, 255, 0.8);
+  color: black; }
+
+#urlbar:-moz-lwtheme[focused=true],
+.searchbar-textbox:-moz-lwtheme[focused=true] {
+  background-color: white; }
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center; }
@@ -1315,7 +1341,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger {
   -moz-appearance: toolbarbutton-dropdown;
   transition: opacity 0.15s ease; }
 
-#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#navigator-toolbox:not(:hover) .urlbar-history-dropmarker {
   opacity: 0; }
 
 #urlbar-container {
@@ -1489,6 +1515,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-secure.svg); }
 
+.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
 .mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); }
 
@@ -1518,9 +1545,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 .popup-notification-icon[popupid="geolocation"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png); }
 
-.popup-notification-icon[popupid="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png); }
-
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
 .popup-notification-icon[popupid="addon-install-origin-blocked"] {
@@ -1548,7 +1572,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
   list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); }
 
 .popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png); }
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg); }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
 .popup-notification-icon[popupid*="offline-app-requested"],
@@ -1613,9 +1637,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 #geo-notification-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png); }
 
-#push-notification-icon {
-  list-style-image: url(chrome://browser/skin/Push-16.png); }
-
 #addons-notification-icon {
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); }
 
@@ -1699,7 +1720,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box
 
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-16.png); }
+  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
+  -moz-image-region: rect(0, 16px, 16px, 0); }
+
+.web-notifications-notification-icon:hover,
+#web-notifications-notification-icon:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px); }
+
+.web-notifications-notification-icon:hover:active,
+#web-notifications-notification-icon:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px); }
 
 .pointerLock-notification-icon,
 #pointerLock-notification-icon {
@@ -2571,6 +2601,29 @@ lwtHeader;*/
   background-repeat: no-repeat;
   background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; }
 
+/* User Context UI - change tab decoration depending on userContextId.
+   Defaults to gray for unknown usercontextids. */
+.tabbrowser-tab[usercontextid] {
+  background-image: linear-gradient(to right, transparent 20%, #909090 30%, #909090 70%, transparent 80%);
+  background-size: auto 2px;
+  background-repeat: no-repeat; }
+
+/* Personal User Context */
+.tabbrowser-tab[usercontextid="1"] {
+  background-image: linear-gradient(to right, transparent 20%, #00a7e0 30%, #00a7e0 70%, transparent 80%); }
+
+/* Work User Context */
+.tabbrowser-tab[usercontextid="2"] {
+  background-image: linear-gradient(to right, transparent 20%, #f89c24 30%, #f89c24 70%, transparent 80%); }
+
+/* Banking User Context */
+.tabbrowser-tab[usercontextid="3"] {
+  background-image: linear-gradient(to right, transparent 20%, #7dc14c 30%, #7dc14c 70%, transparent 80%); }
+
+/* Shopping User Context */
+.tabbrowser-tab[usercontextid="4"] {
+  background-image: linear-gradient(to right, transparent 20%, #ee5195 30%, #ee5195 70%, transparent 80%); }
+
 /* Tab pointer-events */
 .tabbrowser-tab {
   pointer-events: none; }
@@ -2589,12 +2642,20 @@ lwtHeader;*/
   height: 100%;
   position: absolute; }
 
-.tabbrowser-tab[pinned][titlechanged]:not([visuallyselected="true"]) > .tab-stack > .tab-content {
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
+.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
   background-image: radial-gradient(farthest-corner at center bottom, white 3%, rgba(186, 221, 251, 0.75) 20%, rgba(127, 179, 255, 0.25) 40%, transparent 70%);
   background-position: center bottom var(--tab-toolbar-navbar-overlap);
   background-repeat: no-repeat;
   background-size: 85% 100%; }
 
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([visuallyselected="true"]) {
+  background-position: left bottom var(--tab-toolbar-navbar-overlap);
+  background-size: 34px 100%; }
+
+.tab-label[attention]:not([visuallyselected="true"]) {
+  font-weight: bold; }
+
 /* Tab separators */
 /* Also show separators beside the selected tab when dragging it. */
 /* New tab button */
@@ -2729,6 +2790,12 @@ lwtHeader;*/
 .alltabs-endimage[soundplaying] {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); }
 
+menuitem:hover > hbox > .alltabs-endimage[muted] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-muted-hover); }
+
+menuitem:hover > hbox > .alltabs-endimage[soundplaying] {
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-menu-hover); }
+
 /* Sidebar */
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
@@ -2798,7 +2865,7 @@ toolbarbutton.chevron > .toolbarbutton-icon {
   margin-bottom: 5px; }
 
 #sync-start-panel-subtitle {
-  margin: 0; }
+  margin-bottom: 0; }
 
 /* Status panel */
 .statuspanel-label {
@@ -2951,7 +3018,7 @@ html|*#fullscreen-exit-button {
   -moz-appearance: none;
   display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px; }
@@ -2973,7 +3040,7 @@ html|*#fullscreen-exit-button {
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
   -moz-appearance: none !important;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
+  list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px; }
 
@@ -2982,19 +3049,19 @@ html|*#fullscreen-exit-button {
   margin-left: 0; }
 
 .devtools-responsiveui-close {
-  list-style-image: url("chrome://browser/skin/devtools/close.png"); }
+  list-style-image: url("chrome://devtools/skin/images/close.png"); }
 
 .devtools-responsiveui-rotate {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate.png"); }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-close {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); }
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png"); }
 
   .devtools-responsiveui-rotate {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-rotate@2x.png"); } }
 .devtools-responsiveui-touch {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
 .devtools-responsiveui-touch[checked] {
@@ -3002,24 +3069,24 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-touch {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-touch@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px); }
 
   .devtools-responsiveui-touch[checked] {
     -moz-image-region: rect(0px, 64px, 32px, 32px); } }
 .devtools-responsiveui-screenshot {
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot.png"); }
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-screenshot {
-    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-screenshot@2x.png"); } }
 .devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
   cursor: ew-resize;
   transform: translate(12px, -12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer.png"); }
 
 .devtools-responsiveui-resizebarH {
   width: 24px;
@@ -3027,7 +3094,7 @@ html|*#fullscreen-exit-button {
   cursor: ns-resize;
   transform: translate(-12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer.png"); }
 
 .devtools-responsiveui-resizehandle {
   width: 16px;
@@ -3035,7 +3102,7 @@ html|*#fullscreen-exit-button {
   cursor: se-resize;
   transform: translate(12px, 12px);
   background-size: cover;
-  background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png"); }
+  background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer.png"); }
 
 /* FxOS custom mode with additional buttons and phone look'n feel */
 /* Hide devtools manual resizer */
@@ -3071,7 +3138,7 @@ html|*#fullscreen-exit-button {
   -moz-user-focus: ignore;
   width: 40px;
   height: 30px;
-  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); }
+  list-style-image: url("chrome://devtools/skin/images/responsivemode/responsiveui-home.png"); }
 
 .devtools-responsiveui-sleep-button {
   -moz-user-focus: ignore;
@@ -3117,13 +3184,13 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   .devtools-responsiveui-resizebarV {
-    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-vertical-resizer@2x.png"); }
 
   .devtools-responsiveui-resizebarH {
-    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png"); }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-horizontal-resizer@2x.png"); }
 
   .devtools-responsiveui-resizehandle {
-    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png"); } }
+    background-image: url("chrome://devtools/skin/images/responsivemode/responsive-se-resizer@2x.png"); } }
 /* Developer toolbar */
 /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
    We are copy/pasting variables from light-theme and dark-theme,
@@ -3180,7 +3247,7 @@ html|*#fullscreen-exit-button {
 
 :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image,
 :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before {
-  filter: url("chrome://browser/skin/devtools/filters.svg#invert"); }
+  filter: url("chrome://devtools/skin/images/filters.svg#invert"); }
 
 .developer-toolbar-button > .toolbarbutton-icon,
 #developer-toolbar-closebutton > .toolbarbutton-icon {
@@ -3188,7 +3255,7 @@ html|*#fullscreen-exit-button {
   height: 16px; }
 
 #developer-toolbar-toolbox-button {
-  list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px); }
 
 #developer-toolbar-toolbox-button > label {
@@ -3205,7 +3272,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-toolbox-button {
-    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
     -moz-image-region: rect(0px, 32px, 32px, 0px); }
 
   #developer-toolbar-toolbox-button:hover {
@@ -3217,7 +3284,7 @@ html|*#fullscreen-exit-button {
   #developer-toolbar-toolbox-button[checked=true] {
     -moz-image-region: rect(0px, 128px, 32px, 96px); } }
 #developer-toolbar-closebutton {
-  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  list-style-image: url("chrome://devtools/skin/images/close.png");
   -moz-appearance: none;
   border: none;
   margin: 0 4px;
@@ -3227,7 +3294,7 @@ html|*#fullscreen-exit-button {
 
 @media (min-resolution: 1.1dppx) {
   #developer-toolbar-closebutton {
-    list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } }
+    list-style-image: url("chrome://devtools/skin/images/close@2x.png"); } }
 #developer-toolbar-closebutton > .toolbarbutton-icon {
   /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
      use evil CSS to give the impression of smaller content */
@@ -3289,7 +3356,7 @@ html|*#gcli-output-frame {
   width: 16px;
   height: 16px;
   margin: 0 2px;
-  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
   background-position: 0 center;
   background-size: 32px 16px; }
 
@@ -3298,7 +3365,7 @@ html|*#gcli-output-frame {
 
 @media (min-resolution: 1.1dppx) {
   .gclitoolbar-input-node::before {
-    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } }
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png"); } }
 .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
   background-color: var(--selection-background);
   color: var(--selection-color);
@@ -3734,6 +3801,12 @@ toolbar[brighttext] #downloads-indicator-counter {
 chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   transform: none; }
 
+chatbox[src^="about:loopconversation#"] .chat-minimize-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); }
+
+chatbox[src^="about:loopconversation#"] .chat-swap-button {
+  list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); }
+
 .chat-loop-hangup {
   list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white");
   background-color: #d13f1a;
@@ -3755,6 +3828,9 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
   text-shadow: none;
   cursor: inherit; }
 
+chatbox[src^="about:loopconversation#"] .chat-title {
+  color: white; }
+
 .chat-titlebar {
   height: 26px;
   min-height: 26px;
@@ -3771,6 +3847,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button {
 .chat-titlebar[selected] {
   background-color: #f0f0f0; }
 
+chatbox[src^="about:loopconversation#"] > .chat-titlebar {
+  background-color: #00a9dc;
+  border-color: #00a9dc; }
+
 .chat-titlebar > .notification-anchor-icon {
   margin-left: 2px;
   margin-right: 2px; }
@@ -4627,5 +4707,62 @@ notification.heartbeat {
   -moz-padding-end: 0 !important;
   -moz-margin-end: 0 !important; }
 
-.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0; }
+.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  overflow: hidden; }
+
+/* User Context UI browser styles */
+#menu_newUserContextTabPersonal {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
+
+#menu_newUserContextTabWork {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
+
+#menu_newUserContextTabBanking {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+
+#menu_newUserContextTabShopping {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
+
+/* URL Bar Decoration */
+#userContext-indicator {
+  height: 16px;
+  width: 16px; }
+
+#userContext-label {
+  margin-inline-end: 3px;
+  color: #909090; }
+
+#userContext-icons:not([usercontextid]) {
+  display: none; }
+
+#userContext-icons {
+  -moz-box-align: center; }
+
+/* Personal User Context */
+#userContext-icons[usercontextid="1"] > #userContext-label {
+  color: #00a7e0; }
+
+#userContext-icons[usercontextid="1"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); }
+
+/* Work User Context */
+#userContext-icons[usercontextid="2"] > #userContext-label {
+  color: #f89c24; }
+
+#userContext-icons[usercontextid="2"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/work.svg"); }
+
+/* Banking User Context */
+#userContext-icons[usercontextid="3"] > #userContext-label {
+  color: #7dc14c; }
+
+#userContext-icons[usercontextid="3"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); }
+
+/* Shopping User Context */
+#userContext-icons[usercontextid="4"] > #userContext-label {
+  color: #ee5195; }
+
+#userContext-icons[usercontextid="4"] > #userContext-indicator {
+  list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); }
diff --git a/arc-firefox-theme/chrome/browser/search-engine-placeholder@2x.png b/arc-firefox-theme/chrome/browser/search-engine-placeholder@2x.png
new file mode 100644
index 0000000..1565fc5
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/search-engine-placeholder@2x.png
diff --git a/arc-firefox-theme/chrome/browser/search-indicator-badge-add@2x.png b/arc-firefox-theme/chrome/browser/search-indicator-badge-add@2x.png
new file mode 100644
index 0000000..8105624
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/search-indicator-badge-add@2x.png
diff --git a/arc-firefox-theme/chrome/browser/search-indicator@2x.png b/arc-firefox-theme/chrome/browser/search-indicator@2x.png
new file mode 100644
index 0000000..2722c16
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/search-indicator@2x.png
diff --git a/arc-firefox-theme/chrome/browser/searchbar.css b/arc-firefox-theme/chrome/browser/searchbar.css
index b026cdb..67eaa5c 100644
--- a/arc-firefox-theme/chrome/browser/searchbar.css
+++ b/arc-firefox-theme/chrome/browser/searchbar.css
@@ -54,9 +54,6 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   list-style-image: url("moz-icon://stock/gtk-clear?size=menu&state=disabled");
 }
 
-
-
-
 .searchbar-search-button-container {
   -moz-box-align: center;
 }
@@ -88,19 +85,18 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .search-panel-current-engine {
-  border-bottom: 1px solid #ccc;
+  border-bottom: none;
+}
+
+.search-panel-tree {
+  border-top: 1px solid #ccc !important;
 }
 
 .search-panel-header {
   font-weight: normal;
-  background-color: rgb(245, 245, 245);
-  border-top: 1px solid #ccc;
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
   padding: 3px 5px;
-  color: #666;
-}
-
-.search-panel-tree[collapsed=true] + .search-panel-header {
-  border-top: none;
+  color: MenuText;
 }
 
 .search-panel-header > label {
@@ -113,12 +109,12 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .search-panel-input-value {
-  color: black;
+  color: Highlight;
 }
 
 .search-panel-one-offs {
   margin: 0 -1px !important;
-  border-top: 1px solid #ccc;
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
 }
 
 .searchbar-engine-one-off-item {
@@ -130,14 +126,14 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
   margin: 0 0;
   padding: 0 0;
   background: none;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gofECQNNVW2/AAAABBJREFUGFdjOHPmzH8GehEA/KpKg9YTf4AAAAAASUVORK5CYII=');
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAABmJLR0QA/wD/AP+gvaeTAAAAFElEQVQI12NgYGAwZmJgYGCgBwEAHpIAXs+dj/cAAAAASUVORK5CYII=');
   background-repeat: no-repeat;
   background-position: right center;
 }
 
 .searchbar-engine-one-off-item:not(.last-row) {
   box-sizing: content-box;
-  border-bottom: 1px solid #ccc;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
 
 .searchbar-engine-one-off-item.last-of-row {
@@ -178,7 +174,7 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .addengine-item:first-of-type {
-  border-top: 1px solid #ccc;
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
 }
 
 .addengine-item[selected] {
@@ -231,13 +227,15 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 
 .search-setting-button {
   -moz-appearance: none;
+  background-color: Menu;
   border: none;
-  border-top: 1px solid #ccc;
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
   margin: 0;
   min-height: 32px;
 }
 
 .search-setting-button[selected] {
-  background-color: #d3d3d3;
+  background-color: Highlight;
+  color: HighlightText;
   border-top-color: #bdbebe;
 }
diff --git a/arc-firefox-theme/chrome/browser/social/chat-icons.svg b/arc-firefox-theme/chrome/browser/social/chat-icons.svg
index 766b974..c9b3ebf 100644
--- a/arc-firefox-theme/chrome/browser/social/chat-icons.svg
+++ b/arc-firefox-theme/chrome/browser/social/chat-icons.svg
@@ -42,8 +42,10 @@
   <use id="expand-active" xlink:href="#expand-shape"/>
   <use id="expand-disabled" xlink:href="#expand-shape"/>
   <use id="expand-hover" xlink:href="#expand-shape"/>
+  <use id="expand-white" xlink:href="#expand-shape"/>
   <use id="minimize" xlink:href="#minimize-shape"/>
   <use id="minimize-active" xlink:href="#minimize-shape"/>
   <use id="minimize-disabled" xlink:href="#minimize-shape"/>
   <use id="minimize-hover" xlink:href="#minimize-shape"/>
+  <use id="minimize-white" xlink:href="#minimize-shape"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg
index e62a69f..aeb3e80 100644
--- a/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg
+++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg
@@ -35,6 +35,13 @@
       fill-opacity: .5;
     }
 
+    .icon.menu {
+      fill: MenuText;
+    }
+    .icon.menu.hover {
+      fill: -moz-menuhovertext;
+    }
+
     .icon.backgroundTab,
     .icon.backgroundTab.hover,
     .icon.backgroundTab.pressed {
@@ -84,4 +91,9 @@
     <path d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/>
   </g>
 
+  <path id="tab-audio-menu" class="icon menu" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/>
+  <path id="tab-audio-menu-muted" class="icon menu" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/>
+  <path id="tab-audio-menu-hover" class="icon menu hover" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/>
+  <path id="tab-audio-menu-muted-hover" class="icon menu hover" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/>
+
 </svg>
diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-end.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-end.svg
index 72c2544..5d0d0a2 100644
--- a/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-end.svg
+++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-end.svg
@@ -11,7 +11,7 @@
 
       #tab-background-fill {
         background-color: -moz-dialog;
-        background-image: linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, rgba(255,255,255,.3));
+        background-image: linear-gradient(transparent 2px, rgba(255,255,255,.4) 2px, rgba(255,255,255,.4));
         background-repeat: no-repeat;
         height: 100%;
         width: 100%;
diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-start.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-start.svg
index 2b8845e..6f2f86e 100644
--- a/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-start.svg
+++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-start.svg
@@ -11,7 +11,7 @@
 
       #tab-background-fill {
         background-color: -moz-dialog;
-        background-image: linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, rgba(255,255,255,.3));
+        background-image: linear-gradient(transparent 2px, rgba(255,255,255,.4) 2px, rgba(255,255,255,.4));
         background-repeat: no-repeat;
         height: 100%;
         width: 100%;
diff --git a/arc-firefox-theme/chrome/browser/tabview/tabview.css b/arc-firefox-theme/chrome/browser/tabview/tabview.css
index 648b36e..6ad5b43 100644
--- a/arc-firefox-theme/chrome/browser/tabview/tabview.css
+++ b/arc-firefox-theme/chrome/browser/tabview/tabview.css
@@ -564,7 +564,7 @@ html[dir=rtl] .iq-resizable-se {
 
 #search{
   width: 100%;
-  height: 100%;
+  height: calc(100% - 1.7em - 20px); /* leave room for banner */
 }
 
 #searchbox{
diff --git a/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png b/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png
new file mode 100644
index 0000000..286adfe
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png
diff --git a/arc-firefox-theme/chrome/browser/undoCloseTab@2x.png b/arc-firefox-theme/chrome/browser/undoCloseTab@2x.png
new file mode 100644
index 0000000..4854c56
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/undoCloseTab@2x.png
diff --git a/arc-firefox-theme/chrome/browser/usercontext/banking.svg b/arc-firefox-theme/chrome/browser/usercontext/banking.svg
new file mode 100644
index 0000000..a1e20d8
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/usercontext/banking.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="#7dc14c" d="M17.3857868,14.0527919 C14.2304569,13.0862944 13.4913706,12.4609137 13.4913706,11.0964467 C13.4913706,9.61827411 14.7137056,8.85076142 16.4192893,8.85076142 C17.9827411,8.85076142 19.3187817,9.33401015 20.5979695,10.4994924 L22.4456853,8.42436548 C21.1664975,7.20203046 19.3187819,6.26535905 17,6.00952148 L17,2 L15,2 L15,6.00952148 C12.3827412,6.43591742 9.76751269,8.53807107 9.76751269,11.3238579 C9.76751269,14.1664975 11.4730964,15.786802 15.4812183,17.0091371 C18.4375635,17.9187817 19.2335025,18.6294416 19.2335025,20.2213198 C19.2335025,22.0690355 17.7553299,23.035533 15.7370558,23.035533 C13.7756345,23.035533 12.2406091,22.3248731 10.9329949,21.1025381 L9,23.2345178 C10.4213198,24.6274112 12.8659899,25.8324934 15,26.0030518 L15,30 L17,30 L17,26.0030518 C20.7116753,25.4060974 22.9857868,22.893401 22.9857868,20.022335 C22.9857868,16.4690355 20.7116751,15.1045685 17.3857868,14.0527919 Z"/>
+</svg>
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/browser/usercontext/personal.svg b/arc-firefox-theme/chrome/browser/usercontext/personal.svg
new file mode 100644
index 0000000..861b40b
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/usercontext/personal.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="#00a7e0" d="M7.17741905,12 C7.10965537,12 7.041327,11.9953181 6.97243393,11.985018 C6.33263187,11.8918489 5.90515601,11.3862071 6.01809547,10.8552833 C7.41798011,4.26321358 12.2613889,2.57493207 15.0238882,2.15590491 C19.6448063,1.45690206 24.3408291,3.21541158 25.8344535,5.29743816 C26.1664955,5.76047488 25.9835336,6.35881757 25.4244832,6.63364321 C24.8654329,6.9098734 24.1437497,6.75583996 23.8122724,6.29327142 C22.8923805,5.01043967 19.1749781,3.51130562 15.4479759,4.07406612 C12.8080159,4.474834 9.43056132,6.03623689 8.33561323,11.1942506 C8.23453242,11.666651 7.73816348,12 7.17741905,12 Z M16.63127,26 C16.1452186,26 15.6509104,25.9658335 15.147795,25.8938767 C10.637921,25.257137 6.71207921,21.8114952 6.01575422,17.8807924 C5.91171832,17.2932317 6.33391695,16.7382846 6.95813239,16.6404441 C7.58454965,16.5343208 8.17298555,16.9406954 8.27757192,17.5272206 C8.80876054,20.5255916 11.9766264,23.26409 15.4885263,23.7610576 C17.3975027,24.02766 20.959494,23.8221432 23.3220449,19.3789425 C24.4625867,17.2331815 23.0049831,11.881462 19.9521622,9.34692739 C18.2380468,7.92384005 16.4573263,7.76905536 14.6628445,8.89499751 C13.26469,9.77142052 11.8070864,12.2857658 11.8665355,14.6287608 C11.9127737,16.4835887 12.8386382,17.9325598 14.6171568,18.9363308 C15.2210054,19.2764429 16.9411759,19.4933486 17.9424527,18.8296898 C18.7257495,18.3104622 18.9591422,17.2761485 18.6365758,15.7583267 C18.3822659,14.5650869 17.2219077,12.4452096 16.6664991,12.3711821 C16.6692513,12.3722175 16.4666841,12.4312324 16.1276041,12.9095636 C15.8545786,13.2936782 15.58981,14.7297074 15.9476054,15.3581643 C16.0142104,15.4761941 16.0725586,15.5465978 16.3202632,15.5465978 C16.9532859,15.5465978 17.46686,16.0290705 17.46686,16.6249139 C17.46686,17.2207573 16.9543868,17.7042653 16.3213641,17.7042653 C15.2644914,17.7042653 14.4140391,17.2336992 13.9268868,16.3774655 C13.1083609,14.9388479 13.5536787,12.6548678 14.2202791,11.7137354 C15.2540327,10.2564816 16.3631986,10.1151564 17.1123672,10.2564816 C19.7066595,10.7389543 20.8763754,15.2908666 20.8857331,15.3359043 C21.5303153,18.3648181 20.3594985,19.8665919 19.264094,20.593407 C17.4151172,21.8192603 14.6920186,21.493643 13.4380832,20.7859819 C10.3280151,19.0310652 9.62013053,16.497566 9.5744428,14.6805283 C9.49022326,11.3643051 11.4779146,8.30018945 13.391845,7.10021984 C16.0417332,5.43848454 18.9877658,5.66781436 21.4714167,7.72919442 C25.1176276,10.7565552 27.0871539,17.1229168 25.3746898,20.3433702 C23.4326862,23.9950465 20.2983981,26 16.63127,26 Z M16.0845157,30 C14.9348455,30 13.9050564,29.8557557 13.0394288,29.6610017 C10.2114238,29.0257442 7.58700058,27.4599412 6.18892823,25.5735955 C5.84440518,25.1078371 5.98426642,24.4803503 6.50105099,24.1700066 C7.01675554,23.8596629 7.71552172,23.986423 8.06112477,24.4507244 C9.89498097,26.9252176 15.9397944,29.9781448 22.2508301,26.1937972 C22.7676147,25.8844249 23.4658409,26.0087566 23.8109039,26.474515 C24.155427,26.9397877 24.0161057,27.5672745 23.4993212,27.8776182 C20.7987573,29.4963593 18.2315746,30 16.0845157,30 Z"/>
+</svg>
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/browser/usercontext/shopping.svg b/arc-firefox-theme/chrome/browser/usercontext/shopping.svg
new file mode 100644
index 0000000..e74e16d
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/usercontext/shopping.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="#ee5195" fill-rule="evenodd" d="M20.8195396,14 L15.1804604,14 L15.1804604,14 L15.8471271,18 L20.1528729,18 L20.8195396,14 Z M22.8471271,14 L27.6125741,14 L27.6125741,14 L26.2792408,18 L22.1804604,18 L22.8471271,14 Z M21.1528729,12 L14.8471271,12 L14.8471271,12 L14.1804604,8 L21.8195396,8 L21.1528729,12 Z M23.1804604,12 L28.2792408,12 L28.2792408,12 L29.6125741,8 L23.8471271,8 L23.1804604,12 Z M13.1528729,14 L8.47703296,14 L10.077033,18 L10.077033,18 L13.8195396,18 L13.1528729,14 Z M12.8195396,12 L7.67703296,12 L6.07703296,8 L12.1528729,8 L12.8195396,12 L12.8195396,12 Z M31.7207592,8 L32,8 L32,6 L31,6 L5.27703296,6 L5.27703296,6 L4,2.8074176 L4,2 L3,2 L1,2 L0,2 L0,4 L1,4 L2.32296704,4 L9.78931928,22.6658806 L9.78931928,22.6658806 C8.71085924,23.3823847 8,24.6081773 8,26 C8,28.209139 9.790861,30 12,30 C14.209139,30 16,28.209139 16,26 C16,25.2714257 15.8052114,24.5883467 15.4648712,24 L22.5351288,24 C22.1947886,24.5883467 22,25.2714257 22,26 C22,28.209139 23.790861,30 26,30 C28.209139,30 30,28.209139 30,26 C30,23.790861 28.209139,22 26,22 L11.677033,22 L10.877033,20 L27,20 L28,20 L28,19.1622777 L31.7207592,8 L31.7207592,8 Z M26,28 C27.1045695,28 28,27.1045695 28,26 C28,24.8954305 27.1045695,24 26,24 C24.8954305,24 24,24.8954305 24,26 C24,27.1045695 24.8954305,28 26,28 Z M12,28 C13.1045695,28 14,27.1045695 14,26 C14,24.8954305 13.1045695,24 12,24 C10.8954305,24 10,24.8954305 10,26 C10,27.1045695 10.8954305,28 12,28 Z"/>
+</svg>
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/browser/usercontext/work.svg b/arc-firefox-theme/chrome/browser/usercontext/work.svg
new file mode 100644
index 0000000..782ad00
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/usercontext/work.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="#f89c24" fill-rule="evenodd" d="M22,9.99887085 L21.635468,10 L29.0034652,10 C29.5538362,10 30,10.4449463 30,10.9933977 L30,27.0066023 C30,27.5552407 29.5601869,28 29.0034652,28 L2.99653482,28 C2.44616384,28 2,27.5550537 2,27.0066023 L2,10.9933977 C2,10.4447593 2.43981314,10 2.99653482,10 L8,10 L8,7.99922997 C8,5.79051625 10.0426627,4 12.5635454,4 L19.4364546,4 C21.9568311,4 24,5.79246765 24,7.99922997 L24,9.99267578 L22,9.99887085 L22,10 L10,10 L10,7.99922997 C10,6.89421235 11.0713286,6 12.3917227,6 L19.6082773,6 C20.9273761,6 22,6.89552665 22,7.99922997 L22,9.99887085 Z"/>
+</svg>
\ No newline at end of file
diff --git a/arc-firefox-theme/chrome/browser/web-notifications-icon.svg b/arc-firefox-theme/chrome/browser/web-notifications-icon.svg
new file mode 100644
index 0000000..f7186c7
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/web-notifications-icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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" preserveAspectRatio="xMidYMid" width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .icon {
+        fill: #a6a6a6;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path d="M57,48 L46,48 L46,60.016 L32.482,48 L7,48 C5.343,48 4,46.657 4,45 L4,11.031 C4,9.374 5.343,8.031 7,8.031 L57,8.031 C58.657,8.031 60,9.374 60,11.031 L60,45 C60,46.657 58.657,48 57,48 ZM36,16.031 C36,14.927 35.105,14.031 34,14.031 L30,14.031 C28.895,14.031 28,14.927 28,16.031 L28,30.031 C28,31.136 28.895,32.031 30,32.031 L34,32.031 C35.105,32.031 36,31.136 36,30.031 L36,16.031 ZM36,37.5 C36,36.672 35.328,36 34.5,36 L29.5,36 C28.672,36 28,36.672 28,37.5 L28,40.5 C28,41.328 28.672,42 29.5,42 L34.5,42 C35.328,42 36,41.328 36,40.5 L36,37.5 Z" class="icon"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/web-notifications-tray.svg b/arc-firefox-theme/chrome/browser/web-notifications-tray.svg
new file mode 100644
index 0000000..314026a
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/web-notifications-tray.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="48" height="16" viewBox="0 0 96 32">
+  <defs>
+    <style>
+      .style-icon-notification {
+        fill: #666666;
+      }
+      .style-icon-notification.hover {
+        fill: #808080;
+      }
+      .style-icon-notification.active {
+        fill: #4d4d4d;
+      }
+    </style>
+    <path id="shape-notifcations-push" d="M27,23.969 L24,23.969 L24,29.977 L17.241,23.969 L5,23.969 C3.343,23.969 2,22.626 2,20.969 L2,6.969 C2,5.312 3.343,3.969 5,3.969 L27,3.969 C28.657,3.969 30,5.312 30,6.969 L30,20.969 C30,22.626 28.657,23.969 27,23.969 ZM18,8.969 C18,7.864 17.105,6.969 16,6.969 C14.895,6.969 14,7.864 14,8.969 L14,13.969 C14,15.073 14.895,15.969 16,15.969 C17.105,15.969 18,15.073 18,13.969 L18,8.969 ZM16.5,17.969 L15.5,17.969 C14.672,17.969 14,18.640 14,19.469 C14,20.297 14.672,20.969 15.5,20.969 L16.5,20.969 C17.328,20.969 18,20.297 18,19.469 C18,18.640 17.328,17.969 16.5,17.969 Z"/>
+  </defs>
+  <use xlink:href="#shape-notifcations-push" class="style-icon-notification"/>
+  <use xlink:href="#shape-notifcations-push" transform="translate(32)" class="style-icon-notification hover"/>
+  <use xlink:href="#shape-notifcations-push" transform="translate(64)" class="style-icon-notification active"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/global/alerts/alert-common.css b/arc-firefox-theme/chrome/global/alerts/alert-common.css
new file mode 100644
index 0000000..af7fd0c
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/alerts/alert-common.css
@@ -0,0 +1,136 @@
+/* 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/. */
+
+/* ===== alert.css =====================================================
+  == Shared styles specific to the alerts dialog.
+  ======================================================================= */
+
+@import url("chrome://global/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#alertBox[hasBodyText] > #alertTextBox,
+#alertBox[hasOrigin] > #alertTitleBox {
+  border-bottom: 1px solid ThreeDShadow;
+}
+
+#alertBox[animate] {
+  animation-timing-function: cubic-bezier(.12,1.23,.48,1.09);
+}
+
+#alertBox[animate][clicked] {
+  animation-duration: .6s;
+  animation-name: alert-clicked-animation;
+}
+
+/* This is used if the close button is clicked
+   before the animation has finished. */
+#alertBox[animate][closing] {
+  animation-duration: .6s;
+  animation-name: alert-closing-animation;
+}
+
+@keyframes alert-animation {
+  from {
+    opacity: 0;
+  }
+  5% {
+    opacity: 1;
+  }
+  95% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes alert-clicked-animation {
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes alert-closing-animation {
+  to {
+    opacity: 0;
+  }
+}
+
+#alertImage {
+  width: 64px;
+}
+
+.alertTextBox {
+  padding-top: 8px;
+  padding-inline-start: 8px;
+  /* The text box width is increased to make up for the lack of image when one
+     is not provided. 319px is the text box width when a picture is present,
+     255px, plus the width of the image, 64px. */
+  width: 319px;
+}
+
+#alertBox[hasImage] > box > #alertTextBox {
+  width: 255px;
+}
+
+#alertTextLabel {
+  padding-inline-end: 8px;
+}
+
+.alertTitle {
+  -moz-box-flex: 1;
+  font-weight: bold;
+  padding: 6px 8px;
+  width: 255px;
+}
+
+#alertFooter {
+  -moz-box-align: end;
+  padding-bottom: 2px;
+}
+
+#alertSourceLabel {
+  -moz-box-flex: 1;
+  font-size: 83.334%;
+  color: GrayText;
+}
+
+#alertSettings {
+  -moz-appearance: none;
+  background-color: transparent;
+  border-width: 0;
+  border-radius: 20px;
+  min-width: 0;
+  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities");
+  margin-inline-end: 0;
+  margin-bottom: 0;
+}
+
+#alertSettings > .button-box {
+  padding: 0;
+}
+
+#alertSettings:hover,
+#alertSettings[open] {
+  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-inverted");
+}
+
+#alertSettings:hover {
+  background-color: rgb(128,128,128);
+}
+
+#alertSettings[open],
+#alertSettings:hover:active {
+  background-color: rgb(102,102,102);
+}
+
+#alertSettings[focusedViaMouse]:-moz-focusring > .button-box {
+  border-color: transparent;
+}
+
+#alertSettings > .button-box > .button-menu-dropmarker,
+#alertSettings > .button-box > .box-inherit > .button-text {
+  display: none;
+}
diff --git a/arc-firefox-theme/chrome/global/alerts/alert.css b/arc-firefox-theme/chrome/global/alerts/alert.css
index 38d504e..7d09f02 100644
--- a/arc-firefox-theme/chrome/global/alerts/alert.css
+++ b/arc-firefox-theme/chrome/global/alerts/alert.css
@@ -6,7 +6,7 @@
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
-@import url("chrome://global/skin/");
+@import url("chrome://global/skin/alerts/alert-common.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -15,48 +15,6 @@
   background-color: -moz-Dialog;
 }
 
-.alertImageBox {
-  padding: 8px 0;
-  width: 64px;
-  background-image: linear-gradient(rgba(255,255,255,0.7), rgba(255,255,255,0.6));
-  -moz-border-end: 1px solid rgba(0,0,0,.1);
-}
-
-.alertTextBox {
-  padding: 8px;
-  -moz-padding-start: 16px;
-  width: 255px;
-}
-
-.alertTextBox,
-.alertCloseBox {
-  background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1));
-}
-
-#alertNotification[clickable="true"]:hover .alertTextBox,
-#alertNotification[clickable="true"]:hover .alertCloseBox {
-  background-image: linear-gradient(rgba(255,255,255,0.4), rgba(255,255,255,0.3));
-}
-
-.alertTitle {
-  font-weight: bold;
-  font-size: 110%;
-}
-
-#alertImage {
-  max-width: 48px;
-  max-height: 48px;
-  list-style-image: url(chrome://global/skin/alerts/notification-48.png);
-}
-
-#alertNotification[clickable="true"] {
-  cursor: pointer;
-}
-
-label {
-  cursor: inherit;
-}
-
 .alertCloseButton {
   -moz-appearance: none;
   height: 16px;
diff --git a/arc-firefox-theme/chrome/global/alerts/notification-48.png b/arc-firefox-theme/chrome/global/alerts/notification-48.png
deleted file mode 100644
index 23ab5a0..0000000
--- a/arc-firefox-theme/chrome/global/alerts/notification-48.png
+++ /dev/null
diff --git a/arc-firefox-theme/chrome/global/findBar.css b/arc-firefox-theme/chrome/global/findBar.css
index cb4729a..e70d929 100644
--- a/arc-firefox-theme/chrome/global/findBar.css
+++ b/arc-firefox-theme/chrome/global/findBar.css
@@ -22,6 +22,11 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
+findbar[noanim] {
+  transition-duration: 0s !important;
+  transition-delay: 0s !important;
+}
+
 .findbar-container {
   -moz-padding-start: 8px;
   padding-top: 4px;
diff --git a/arc-firefox-theme/chrome/global/icons/loading-inverted.png b/arc-firefox-theme/chrome/global/icons/loading-inverted.png
new file mode 100644
index 0000000..8831a80
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/icons/loading-inverted.png
diff --git a/arc-firefox-theme/chrome/global/icons/loading-inverted@2x.png b/arc-firefox-theme/chrome/global/icons/loading-inverted@2x.png
new file mode 100644
index 0000000..b25b445
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/icons/loading-inverted@2x.png
diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css
index 5814b1e..575cc32 100644
--- a/arc-firefox-theme/chrome/global/in-content/common.css
+++ b/arc-firefox-theme/chrome/global/in-content/common.css
@@ -42,7 +42,7 @@
   --in-content-help-button-background-active: #eaba00;
 }
 
-html|body,
+html|html,
 xul|page,
 xul|window {
   font: message-box;
@@ -405,13 +405,11 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
 
 /* textboxes */
 
-*|textbox {
+html|input[type="text"],
+html|textarea,
+xul|textbox {
   -moz-appearance: none;
-  height: 30px;
   color: var(--in-content-text-color);
-  line-height: 20px;
-  padding-right: 10px;
-  padding-left: 10px;
   border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
@@ -421,12 +419,27 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator {
   background-color: var(--in-content-box-background);
 }
 
-html|textbox:focus,
+xul|textbox {
+  min-height: 30px;
+  padding-right: 10px;
+  padding-left: 10px;
+}
+
+html|input[type="text"],
+html|textarea {
+  font-family: inherit;
+  font-size: inherit;
+  padding: 5px 10px;
+}
+
+html|input[type="text"]:focus,
+html|textarea:focus,
 xul|textbox[focused] {
   border-color: var(--in-content-border-focus);
 }
 
-html|textbox:disabled,
+html|input[type="text"]:disabled,
+html|textarea:disabled,
 xul|textbox[disabled="true"] {
   opacity: 0.5;
 }
diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css
index f525710..ffa0607 100644
--- a/arc-firefox-theme/chrome/global/notification.css
+++ b/arc-firefox-theme/chrome/global/notification.css
@@ -6,7 +6,6 @@
 
 notification {
   color: -moz-gtk-info-bar-text;
-  background-color: InfoBackground;
   -moz-appearance: -moz-gtk-info-bar;
   text-shadow: none;
 }
diff --git a/arc-firefox-theme/chrome/global/toolbarbutton.css b/arc-firefox-theme/chrome/global/toolbarbutton.css
index a62e173..ffaf672 100644
--- a/arc-firefox-theme/chrome/global/toolbarbutton.css
+++ b/arc-firefox-theme/chrome/global/toolbarbutton.css
@@ -122,6 +122,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
   margin: -6px 0 0 !important;
   -moz-margin-end: -8px !important;
   min-width: 14px;
+  max-width: 28px;
   line-height: 10px;
   text-align: center;
   -moz-stack-sizing: ignore;
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/utilities.svg b/arc-firefox-theme/chrome/mozapps/extensions/utilities.svg
index 6792871..bc93fba 100644
--- a/arc-firefox-theme/chrome/mozapps/extensions/utilities.svg
+++ b/arc-firefox-theme/chrome/mozapps/extensions/utilities.svg
@@ -13,10 +13,14 @@
     use[id$="-native"] {
       fill: GrayText;
     }
+    use[id$="-inverted"] {
+      fill: #ddd;
+    }
   </style>
   <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"/>
   <use id="utilities-native" xlink:href="#utilities-shape"/>
+  <use id="utilities-inverted" xlink:href="#utilities-shape"/>
 </svg>
diff --git a/arc-firefox-theme/chrome/mozapps/places/defaultFavicon.png b/arc-firefox-theme/chrome/mozapps/places/defaultFavicon.png
index b559061..28ed179 100644
--- a/arc-firefox-theme/chrome/mozapps/places/defaultFavicon.png
+++ b/arc-firefox-theme/chrome/mozapps/places/defaultFavicon.png
diff --git a/arc-firefox-theme/chrome/mozapps/places/defaultFavicon@2x.png b/arc-firefox-theme/chrome/mozapps/places/defaultFavicon@2x.png
index 052bfd3..6674927 100644
--- a/arc-firefox-theme/chrome/mozapps/places/defaultFavicon@2x.png
+++ b/arc-firefox-theme/chrome/mozapps/places/defaultFavicon@2x.png