From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Sun, 9 Jun 2013 18:53:16 +0000 (+0200)
Subject: finish up sync of LCARStrek theme with windows theme changes in Firefox 22
X-Git-Tag: LCARStrek-2.19~1
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=82b4252f7e41007fc93fa3b94fd7418a07c03fd1;p=themes.git

finish up sync of LCARStrek theme with windows theme changes in Firefox 22
---

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 1eb84a38..a25e08aa 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -293,10 +293,23 @@ menubar {
   list-style-image: url("chrome://browser/skin/Privacy-16.png");
 }
 
+@media (min-resolution: 1.25dppx) {
+  #appmenu_privateBrowsing,
+  #appmenu_newPrivateWindow {
+    list-style-image: url("chrome://browser/skin/Privacy-32.png");
+  }
+}
+
 #appmenu_addons {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
 }
 
+@media (min-resolution: 1.25dppx) {
+  #appmenu_addons {
+    list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  }
+}
+
 #BMB_bookmarkThisPage,
 #appmenu_bookmarkThisPage {
   list-style-image: url("chrome://browser/skin/places/bookmark.png");
@@ -1596,6 +1609,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 #socialUserPortrait {
   width: 48px;
   height: 48px;
+  list-style-image:url("chrome://global/skin/icons/information-32.png");
 }
 
 #socialUserDisplayName,
@@ -1610,6 +1624,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   padding-top: 0;
   font-size: 130%;
   font-weight: bold;
+  list-style-image:url("chrome://global/skin/icons/information-32.png");
 }
 
 #socialUserDisplayName > .button-box {
@@ -2122,6 +2137,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   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");
+}
+
 .addon-progress-description {
   width: 350px;
   max-width: 350px;
@@ -2176,6 +2195,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
 }
 
+.popup-notification-icon[popupid="pointerLock"] {
+  list-style-image: url("chrome://browser/skin/pointerLock-64.png");
+}
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -2184,7 +2207,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   padding-left: 3px;
   padding-right: 8px;
   border-radius: 3px 0 0 3px;
-  -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
+  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
   -moz-margin-end: -8px;
   border-right-width: 8px;
 }
@@ -2279,6 +2302,17 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png");
 }
 
+#web-notifications-notification-icon {
+  list-style-image: url("chrome://browser/skin/notification-16.png");
+}
+
+#pointerLock-notification-icon {
+  list-style-image: url("chrome://browser/skin/pointerLock-16.png");
+}
+#pointerLock-cancel {
+  margin: 0px;
+}
+
 #identity-popup-container {
   min-width: 280px;
 }
@@ -2816,26 +2850,40 @@ html|*#gcli-output-frame {
   display: none;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1,
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .social-notification-container > .toolbarbutton-1 {
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar #social-toolbar-item {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar #social-toolbar-item > .toolbarbutton-1 {
   padding-left: 0;
   padding-right: 0;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item {
-  margin-left: 5px;
-  margin-right: 5px;
+.toolbarbutton-badge-container {
+  margin: 0;
+  padding: 0;
+  position: relative;
 }
 
-.social-notification-container {
-  /* position:relative on .toolbarbutton-1 does not get position:absolute
-     to work as expected on .toolbarbutton-1 generated content. Placing a
-     simple container outside of .toolbarbutton-1 and setting position:relative
-     on the simple container however will work. */
-  position: relative;
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
+  padding: 2px 5px;
+}
+
+.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
+  position: absolute;
+  top: 2px;
+  right: 2px;
+}
+
+.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
 }
 
-.social-notification-container > .toolbarbutton-1[badge]:not([badge=""])::after {
+.toolbarbutton-badge[badge=""] {
+  display: none;
+}
+.toolbarbutton-badge[badge]:not([badge=""])::after {
   /* The |content| property is set in the content stylesheet. */
   font-size: 9px;
   font-weight: bold;
@@ -2845,16 +2893,22 @@ html|*#gcli-output-frame {
   border: 1px solid #9C9CFF;
   border-radius: 2px;
   position: absolute;
-  top: 2px;
-  right: 2px;
+  top: 0;
+  right: 0;
+}
+
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
+  top: 1px;
+  right: 1px;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > *|* > .social-notification-container > .toolbarbutton-1[badge]:not([badge=""])::after {
-  top: 7px;
+.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 0;
+  right: auto;
 }
 
-.social-notification-container > .toolbarbutton-1[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 2px;
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 1px;
   right: auto;
 }
 
diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css
index 40f3976b..b226c7e2 100644
--- a/LCARStrek/browser/devtools/common.css
+++ b/LCARStrek/browser/devtools/common.css
@@ -122,6 +122,7 @@ devtools-menulist:-moz-focusring,
   padding-bottom: 0;*/
   -moz-padding-start: 18px;
   -moz-padding-end: 12px;
+  font-size: inherit;
 }
 
 .devtools-searchinput[focused] {
@@ -182,6 +183,10 @@ devtools-menulist:-moz-focusring,
 
 /* In-tools sidebar */
 
+.devtools-toolbox-side-iframe {
+  min-width: 465px;
+}
+
 .devtools-sidebar-tabs {
 }
 
@@ -253,44 +258,86 @@ devtools-menulist:-moz-focusring,
 .devtools-sidebar-tabs > tabs > tab[selected=true]:hover:active {
 }
 
-/* Theme */
+/* LCARStrek-specific adaptions */
+
+#profiler-chrome {
+  /* HACK for profiler in the dev toolbox in FF 20+. */
+  margin: -3px;
+}
+
+#profiler-chrome > box > box > .devtools-toolbar {
+  border-bottom: none;
+}
+
+
+/********************** shared/devtools/common.inc.css **********************/
 
-.devtools-theme-background {
+/* Autocomplete Popup */
+/* Dark and light theme */
+
+.devtools-autocomplete-popup {
+  border: 1px solid #FF9F00;
   background-color: #000000;
-  color: #FF9F00;
+  border-radius: 3px;
+  max-height: 40rem;
+}
+
+.devtools-autocomplete-listbox {
+  background-color: transparent;
+  border-width: 0px !important;
 }
 
-.devtools-theme-comment {
-  color: #A09090; /* original: grey */
+.devtools-autocomplete-listbox > richlistitem,
+.devtools-autocomplete-listbox > richlistitem[selected] {
+  width: 100%;
+  background-color: transparent;
+  border-radius: 4px;
 }
 
-.devtools-theme-keyword {
-  color: #8050B0; /* original: purple */
+.devtools-autocomplete-listbox.dark-theme > richlistitem[selected],
+.devtools-autocomplete-listbox.dark-theme > richlistitem:hover {
+/*  background-color: rgba(0,0,0,0.5); */
 }
 
-.devtools-theme-string {
-  color: #E7ADE7; /* original: green */
+.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-theme-tagname {
-  color: #FFCF00; /* original: dark blue */
+.devtools-autocomplete-listbox.dark-theme > richlistitem[selected] > label {
+/*  color: #eee;*/
 }
 
-.devtools-theme-attrname {
-  color: #9C9CFF; /* original: blue */
+.devtools-autocomplete-listbox.dark-theme > richlistitem > label {
+/*  color: #ccc;*/
 }
 
-.devtools-theme-attrvalue {
-  color: #C09070; /* original: orange */
+.devtools-autocomplete-listbox > richlistitem > .initial-value,
+.devtools-autocomplete-listbox > richlistitem > .autocomplete-value {
+  margin: 0;
+  padding: 1px 0;
 }
 
-/* LCARStrek-specific adaptions */
+.devtools-autocomplete-listbox > richlistitem > .autocomplete-count {
+  text-align: right;
+}
 
-#profiler-chrome {
-  /* HACK for profiler in the dev toolbox in FF 20+. */
-  margin: -3px;
+/* Rest of the light theme */
+
+.devtools-autocomplete-popup.light-theme {
 }
 
-#profiler-chrome > box > box > .devtools-toolbar {
-  border-bottom: none;
+.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;*/
 }
+
diff --git a/LCARStrek/browser/devtools/csshtmltree.css b/LCARStrek/browser/devtools/csshtmltree.css
deleted file mode 100644
index bdf9f831..00000000
--- a/LCARStrek/browser/devtools/csshtmltree.css
+++ /dev/null
@@ -1,293 +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/. */
-
-:root {
-  background: #000000;
-  color: #FF9F00;
-  font: 12px "Liberation Mono", Consolas, "Courier New", monospace;
-}
-
-/* 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;
-}
-
-.helplink {
-  height: 14px;
-  width: 0;
-  overflow: hidden;
-  -moz-padding-start: 14px;
-  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
-  -moz-margin-end: 2px;
-  cursor: pointer;
-}
-
-.property-view:not(:hover) > .helplink-container {
-  visibility: hidden;
-}
-
-.rulelink {
-  color: -moz-dialogtext;
-  padding: 0;
-  cursor: pointer;
-}
-
-.expander {
-  width: 9px;
-  height: 9px;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 5px;
-  background: url("chrome://global/skin/tree/twisty-closed.gif") center center no-repeat;
-  vertical-align: middle;
-}
-
-.expander[open] {
-  background-image: url("chrome://global/skin/tree/twisty-open.gif");
-}
-
-.match {
-  visibility: hidden;
-}
-
-.expandable {
-  cursor: pointer;
-  visibility: visible;
-}
-
-.expander-container {
-  vertical-align: text-top;
-}
-
-.property-name {
-  padding: 2px 0;
-  color: #FF9F00;
-  width: 220px;
-}
-
-.property-value {
-  padding: 0;
-  -moz-padding-end: 6px;
-  color: #8050B0;
-  width: 100%;
-}
-
-.rule-link {
-  text-align: end;
-  -moz-padding-start: 10px;
-}
-
-/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */
-.rule-text {
-  direction: ltr;
-  padding: 0;
-  -moz-padding-start: 20px;
-  vertical-align: text-bottom;
-}
-
-.bestmatch {
-  color: #FFCF00;
-}
-.matched {
-  text-decoration: line-through;
-}
-.parentmatch {
-  color: #E7ADE7;
-}
-
-#propertyContainer {
-  border-collapse: collapse;
-}
-
-.darkrow {
-  background-color: #404000;
-}
-
-#noResults {
-  font-size: 18px;
-  margin-top: 5px;
-  text-align: center;
-}
-
-.headerControls {
-  color: #9C9CFF;
-  background-color: #000000;
-}
-
-.includebrowserstyles {
-  cursor: pointer;
-  font-size: 11px;
-}
-
-#footer {
-  border-top: 1px solid #9C9CFF;
-}
-
-.legendKey {
-  margin: 0 5px;
-}
-
-/**
- * CSS Rule View
- */
-
-.ruleview {
-  background-color: #000000;
-}
-
-.ruleview-rule-source {
-  color: #9C9CFF; /* original: green */
-  -moz-padding-start: 5px;
-  cursor: pointer;
-  text-align: right;
-  float: right;
-  -moz-user-select: none;
-}
-
-.ruleview-rule-inheritance {
-  background-color: #000000;
-  color: #8050B0;
-  border-top: 1px solid #9C9CFF;
-  border-bottom: 1px solid #9C9CFF;
-  padding: 1px 4px;
-  margin-top: 4px;
-  -moz-user-select: none;
-}
-
-.ruleview-rule-source:hover {
-  text-decoration: underline;
-}
-
-.ruleview-rule {
-  padding: 2px 4px;
-}
-
-.ruleview-rule + .ruleview-rule {
-  border-top: 1px dotted #008484;
-}
-
-.ruleview-warning {
-  background: url("chrome://browser/skin/devtools/alerticon-warning.png");
-  -moz-margin-start: 5px;
-  vertical-align: middle;
-  width: 13px;
-  height: 12px;
-}
-
-.ruleview-ruleopen {
-  -moz-padding-end: 5px;
-}
-
-.ruleview-ruleclose {
-  cursor: text;
-  padding-right: 20px;
-}
-
-.ruleview-propertylist {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.ruleview-enableproperty {
-  height: 10px;
-  width: 10px;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 0;
-  transition: opacity 100ms;
-  transition-delay: 200ms;
-}
-
-.ruleview-property:not(:hover) > .ruleview-enableproperty[checked] {
-  opacity: 0;
-  transition: none;
-}
-
-.ruleview-expander {
-  width: 8px;
-  height: 8px;
-  background: url("chrome://browser/skin/devtools/arrows.png") 24px 0;
-  cursor: pointer;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 5px;
-}
-
-.ruleview-expander.styleinspector-open {
-  background-position: 8px 0;
-}
-
-.ruleview-newproperty {
-  /* (enable checkbox width: 12px) + (expander width: 15px) */
-  -moz-margin-start: 27px;
-}
-
-.ruleview-propertyname {
-  padding: 1px 0;
-  color: #9C9CFF; /* original: blue */
-}
-
-.ruleview-propertyvalue {
-  padding: 1px 0;
-}
-
-.ruleview-namecontainer,
-.ruleview-propertycontainer,
-.ruleview-propertyname,
-.ruleview-propertyvalue {
-  text-decoration: inherit;
-}
-
-.ruleview-computedlist {
-  list-style: none;
-  padding: 0;
-}
-
-.ruleview-computed {
-  -moz-margin-start: 4em;
-}
-
-.ruleview-overridden {
-  text-decoration: line-through;
-}
-
-.styleinspector-propertyeditor {
-  border: 1px solid #9C9CFF;
-  padding: 0;
-}
-
-.ruleview-property {
-  border-left: 2px solid transparent;
-}
-
-.ruleview-property  > * {
-  vertical-align: middle;
-}
-
-.ruleview-property[dirty] {
-  border-left-color: #008484;
-}
-
-.ruleview-namecontainer > .ruleview-propertyname,
-.ruleview-propertycontainer > .ruleview-propertyvalue {
-  border-bottom: 1px dashed transparent;
-}
-
-.ruleview-namecontainer:hover > .ruleview-propertyname,
-.ruleview-propertycontainer:hover > .ruleview-propertyvalue {
-  border-bottom-color: #9C9CFF;
-}
-
-.ruleview-selector-separator, .ruleview-selector-unmatched {
-  color: #8050B0;
-}
diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css
index 911d1a5f..20079ae2 100644
--- a/LCARStrek/browser/devtools/debugger.css
+++ b/LCARStrek/browser/devtools/debugger.css
@@ -1,5 +1,3 @@
-/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* 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/. */
@@ -12,256 +10,88 @@ window {
   background-color: #000000;
 }
 
-/**
- * Debugger content
- */
+/* Sources and breakpoints pane */
 
-#chrome-globals, #sources {
-  width: 200px;
-}
-
-/**
- * This hardcoded width likely due to a toolkit Windows specific bug.
- * See http://hg.mozilla.org/mozilla-central/annotate/f38d6df93cad/toolkit/themes/winstripe/global/textbox-aero.css#l7
- */
-#searchbox {
-  width: 200px;
+#sources-pane {
+  min-width: 50px;
 }
 
-/**
- * Lists and headers
- */
-
-.list-item {
-  padding: 2px;
+#sources-pane + .devtools-side-splitter {
+  -moz-border-start-color: transparent;
 }
 
-.list-item:not(.selected):not(.empty):hover {
-  /* background: #cddae5; */
-}
+/* Watch expressions, variables and other instruments pane */
 
-.list-item.selected {
-  background: #008484;
-  color: #FFCF00;
+#instruments-pane {
+  min-width: 50px;
+  -moz-margin-start: 0px !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. */
 }
 
-.list-item.empty {
-  color: #8050B0;
-  /* padding: 4px; */
+#instruments-pane[animated] {
+  transition: margin 0.25s ease-in-out;
 }
 
-/**
- * Sources searching
- */
-
-#globalsearch {
-  background-color: #000000;
-  min-height: 10px;
-}
+/* ListWidget items */
 
-#globalsearch > vbox:not(:empty) {
-  min-height: 10px;
-  max-height: 150px;
+.list-widget-item {
+  padding: 2px;
 }
 
-.dbg-source-results:not(:last-child) {
-  border-bottom: 1px dotted #9C9CFF;
+.list-widget-item:not(.selected):not(.empty):hover {
+/*  background: linear-gradient(rgba(255,255,255,0.9), rgba(255,255,255,0.85)), Highlight;*/
 }
 
-.dbg-results-header {
-  -moz-padding-start: 6px;
+.list-widget-item.selected.light {
+/*  background: linear-gradient(rgba(255,255,255,0.85), rgba(255,255,255,0.8)), Highlight;
+  color: #000;*/
 }
 
-.dbg-results-header .location {
-  font-weight: 600;
+.list-widget-item.selected {
+  background: #008484;
+  color: #FFCF00;
 }
 
-.dbg-results-header .match-count {
-  -moz-padding-start: 6px;
+.list-widget-item.empty {
   color: #8050B0;
+  /* padding: 4px; */
 }
 
-.dbg-results-container .line-number {
-  background: #000000;
-  min-width: 40px;
-  -moz-padding-end: 4px;
-  -moz-border-end: 1px dotted #9C9CFF;
-  text-align: end;
-  font: 8pt monospace;
-  color: #FF9F00;
-}
-
-.dbg-results-container .line-contents {
-  -moz-padding-start: 4px;
-  font: 8pt monospace;
-}
-
-.dbg-results-container .line-contents:hover {
-  background: #000000;
-}
-
-.dbg-results-container .line-contents > .string {
-  padding: 1px;
-}
-
-.dbg-results-container .line-contents > .string[match=true] {
-  background: #E7ADE7;
-  color: #000000;
-  padding: 0;
-  border: 1px solid #9C9CFF;
-  border-radius: 4px;
-  cursor: pointer;
-  transition: transform 0.25s ease-in-out;
-}
-
-.dbg-results-container .line-contents > .string[match=true][focused] {
-  transition-duration: 0.1s;
-  transform: scale(1.75, 1.75);
-}
-
-/**
- * Searchbox panel
- */
-
-#searchbox-panel .description {
-  margin: -6px 0 8px;
-}
-
-#searchbox-panel button.operator {
-  min-width: 0;
-  margin: 0;
-  padding: 0;
-  font: 9pt "Liberation Mono", Consolas, "Courier New", monospace;
-}
-
-#searchbox-panel label.operator {
-  -moz-padding-start: 6px;
-  padding-bottom: 1px;
-}
-
-/**
- * Filtered sources panel
- */
-
-#filtered-sources-panel {
-  padding: 4px;
-}
-
-.dbg-source-item {
-  border: 1px solid #A09090;
-  border-top-color: #8050B0;
-}
-
-.dbg-source-item.selected {
-}
-
-.dbg-source-item:first-of-type {
-  border-top-color: #9C9CFF;
-  border-radius: 4px 4px 0 0;
-}
-
-.dbg-source-item:last-of-type {
-  border-radius: 0 0 4px 4px;
-}
-
-.dbg-source-item:only-of-type {
-  border-radius: 4px 4px 4px 4px;
-}
-
-.dbg-source-item:not(:hover) {
-/*  text-shadow: 0 1px #fff;*/
-}
-
-.dbg-source-item-name {
-  color: #9C9CFF;
-  font-weight: 600;
-}
-
-.dbg-source-item-details {
-  color: #FF9F00;
-}
-
-/**
- * Stack frames and breakpoints pane
- */
-
-#stackframes\+breakpoints {
-  min-width: 50px;
-}
-
-#stackframes\+breakpoints[animated] {
-  transition: margin 0.25s ease-in-out;
-}
-
-/**
- * Variables and watch expressions pane
- */
-
-#variables\+expressions {
-  min-width: 50px;
-}
-
-#variables\+expressions[animated] {
-  transition: margin 0.25s ease-in-out;
-}
-
-/**
- * Stack frames view
- */
+/* Stack frames view */
 
-#stackframes {
-  min-height: 10px;
-}
-
-.dbg-stackframe {
+.dbg-stackframe-details {
   -moz-padding-start: 4px;
-  -moz-padding-end: 4px;
 }
 
-.dbg-stackframe-name {
+.dbg-stackframe-menuitem[checked] {
+  margin-top: 3px;
+  margin-bottom: 3px;
+  outline: 1px solid #008484;
   font-weight: 600;
 }
 
-.dbg-stackframe-details {
-  -moz-padding-start: 4px;
+.dbg-stackframe-menuitem-details {
+  -moz-padding-start: 16px;
 }
 
-/**
- * Breakpoints view
- */
+/* Sources and breakpoints view */
 
-#breakpoints {
-  min-height: 10px;
+.dbg-breakpoint {
+  font-family: "Liberation Mono", Consolas, "Courier New", monospace;
 }
 
-#breakpoints > vbox:not(:empty) {
-  min-height: 10px;
-  max-height: 200px;
-}
-
-.dbg-breakpoint:not(:last-child) {
-  border-bottom: 1px solid #008484;
-}
-
-.dbg-breakpoint-info {
+.dbg-breakpoint-line {
   font-weight: 600;
 }
 
 .dbg-breakpoint-text {
-  font: 12px "Liberation Mono", Consolas, "Courier New", monospace;
-}
-
-#conditional-breakpoint-panel .description {
-  margin: -6px 0 8px 0;
-}
-
-#conditional-breakpoint-panel textbox {
-  margin: 0 0 -2px 0;
+  -moz-margin-start: 10px !important;
+  font-style: italic;
 }
 
-/**
- * Watch expressions view
- */
+/* Watch expressions view */
 
 #expressions {
   min-height: 10px;
@@ -280,323 +110,158 @@ window {
 }
 
 .dbg-expression-input {
-  font: 9pt monospace;
+  -moz-padding-start: 2px !important;
+  font-family: "Liberation Mono", Consolas, "Courier New", monospace;
 }
 
-.dbg-expression-delete {
-  opacity: 0;
-}
-
-.dbg-expression-delete:not(:hover) {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.dbg-expression-delete:hover {
-  opacity: 1;
-}
+/* Searchbox and the search operations help panel */
 
-.dbg-expression:hover > .dbg-expression-delete:not(:hover) {
-  opacity: 0.5;
-  transition: opacity 0.2s ease-in-out;
+.devtools-searchinput {
+  min-width: 220px;
+  -moz-margin-start: 1px;
 }
 
-/**
- * Variables view
- */
-
-#variables {
-  min-height: 10px;
+#searchbox-panel-description {
+  margin-top: 0;
+  margin-bottom: 8px;
+  -moz-margin-start: 2px;
 }
 
-.dbg-variable-delete {
-  opacity: 0;
+.searchbox-panel-operator-button {
+  min-width: 26px;
+  margin-top: 0;
+  margin-bottom: 0;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 6px;
+  text-align: center;
+  font-family: "Liberation Mono", Consolas, "Courier New", monospace;
 }
 
-.dbg-variable-delete:not(:hover) {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+.searchbox-panel-operator-label {
+  padding-bottom: 2px;
 }
 
-.dbg-variable-delete:hover {
-  opacity: 1;
-}
+/* Searchbox results panel */
 
-.variable-or-property:hover > .title > .dbg-variable-delete:not(:hover),
-.variable-or-property:focus > .title > .dbg-variable-delete:not(:hover) {
-  opacity: 0.5;
-  transition: opacity 0.2s ease-in-out;
+.results-panel {
+  padding: 4px;
 }
 
-.dbg-variable-edit {
-  background: url("chrome://browser/skin/tabview/edit-light.png") center no-repeat;
-  width: 20px;
-  height: 16px;
+.results-panel-item {
+  border: 1px solid #A09090;
+  border-top-color: #8050B0;
+  padding: 5px;
   cursor: pointer;
 }
-.dbg-variable-throbber {
-  background: url("chrome://global/skin/icons/loading.gif") center no-repeat;
-  width: 16px;
-  height: 16px;
-}
-
-/**
- * Scope element
- */
 
-.scope:focus > .title {
-  background: #008484;
-  color: #000000;
-}
-
-.scope > .title {
-  background: #E7ADE7;
-  border-radius: 5px;
-  color: #000000;
-}
-
-.scope > .details {
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
+.results-panel-item:first-of-type {
+  border-top-color: #9C9CFF;
+  border-radius: 4px 4px 0 0;
 }
 
-.scope > .details.nonenum:not(:empty) {
-  border-top: 1px solid #9C9CFF;
+.results-panel-item:last-of-type {
+  border-radius: 0 0 4px 4px;
 }
 
-/**
- * Variable element
- */
-
-.variable {
-  -moz-margin-start: 1px;
-  -moz-margin-end: 1px;
-  border-bottom: 1px solid #008484;
-  transition: background 1s ease-in-out;
+.results-panel-item:only-of-type {
+  border-radius: 4px;
 }
 
-.variable[changed] {
-  background: #FFCF00;
-  transition-duration: 0.4s;
+.results-panel-item:not(.selected):not(:hover) {
+/*  text-shadow: 0 1px #fff;*/
 }
 
-.scope:focus > .title {
-  background: #008484;
-  color: #000000;
-  border-radius: 4px;
+.results-panel-item-pre {
+  -moz-margin-end: 5px !important;
+  color: #A09090;
+  cursor: inherit;
 }
 
-.variable > .title > .name {
+.results-panel-item-name {
+  color: #9C9CFF;
   font-weight: 600;
+  cursor: inherit;
 }
 
-.variable:not(:focus) > .title > .name {
+.results-panel-item-details {
   color: #FF9F00;
+  cursor: inherit;
 }
 
-.variable > .title > .value {
-  -moz-padding-start: 6px;
-  -moz-padding-end: 4px;
-}
-
-.variable[editable] > .title > .value {
-  cursor: text;
-}
-
-.variable:not([non-header]) > .details {
-  -moz-margin-start: 10px;
-}
-
-/**
- * Property element
- */
+/* Sources search view */
 
-.property {
-  transition: background 1s ease-in-out;
-  border-radius: 8px;
+#globalsearch {
+  min-height: 10px;
 }
 
-.property[changed] {
-  transition-duration: 0.4s;
-  background: rgba(255, 207, 0, 0.8);
+#globalsearch > vbox:not(:empty) {
+  min-height: 10px;
+  max-height: 125px;
 }
 
-.property:focus > .title {
-  background: #008484;
-  color: #000000;
-  border-radius: 4px;
+#globalsearch + .devtools-horizontal-splitter {
+  -moz-border-top-colors: #9C9CFF;
 }
 
-.property:not(:focus) > .title > .name {
-  color: #E7ADE7;
+.dbg-source-results {
+  padding: 0;
+  background: none !important;
 }
 
-.property > .title > .value {
+.dbg-results-header {
   -moz-padding-start: 6px;
-  -moz-padding-end: 4px;
-}
-
-.property[editable] > .title > .value {
-  cursor: text;
-}
-
-.property:not([non-header]) > .details {
-  -moz-margin-start: 10px;
-}
-
-/**
- * Non enumerable, configurable and writable variables and properties
- */
-
-.variable[proto] > .title > .name,
-.property[proto] > .title > .name,
-.variable[non-enumerable]:not([self]):not([exception]) > .title > .name,
-.property[non-enumerable]:not([self]):not([exception]) > .title > .name {
-  opacity: 0.5;
 }
 
-.variable[non-configurable] > .title > .name,
-.property[non-configurable] > .title > .name {
-  border-bottom: 1px dashed #9C9CFF;
-}
-
-.variable[non-configurable][non-writable] > .title > .name,
-.property[non-configurable][non-writable] > .title > .name {
-  border-bottom: 1px dashed #FF0000;
-}
-
-.variable[non-writable] > .title:after,
-.property[non-writable] > .title:after {
-  content: " ";
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background: url("chrome://browser/skin/identity-icons-https.png") no-repeat;
-  opacity: 0.5;
-}
-
-/*
-@media (min-resolution: 2dppx) {
-  .variable[non-writable] > .title:after,
-  .property[non-writable] > .title:after {
-    background-image: url("chrome://browser/skin/identity-icons-https@2x.png");
-    background-size: 32px;
-  }
-}
-*/
-
-.variable[exception]:not(:focus) > .title > .name,
-.property[exception]:not(:focus) > .title > .name {
-  color: #FF0000;
-}
-
-.variable > tooltip > label,
-.property > tooltip > label {
-  margin: 0 2px 0 2px;
-}
-
-.variable[non-enumerable] > tooltip > label[value="enumerable"],
-.property[non-enumerable] > tooltip > label[value="enumerable"],
-.variable[non-configurable] > tooltip > label[value="configurable"],
-.property[non-configurable] > tooltip > label[value="configurable"],
-.variable[non-writable] > tooltip > label[value="writable"],
-.property[non-writable] > tooltip > label[value="writable"] {
-  text-decoration: line-through;
-}
-
-/**
- * Variables and properties editing
- */
-
-.element-value-input {
-  -moz-margin-start: 4px !important;
-}
-
-.element-name-input {
-  -moz-margin-start: -2px !important;
-  color: #E7ADE7;
+.dbg-results-header-location {
   font-weight: 600;
 }
 
-.element-value-input,
-.element-name-input {
-  max-width: 30em;
-  border: 1px solid #9C9CFF !important;
-}
-
-/**
- * Variables and properties searching
- */
-
-.variables-searchinput.devtools-searchinput {
-  min-height: 24px;
-}
-
-.variable[non-match],
-.property[non-match] {
-  border: none;
-  margin: 0;
-}
-
-/**
- * Token value colors
- */
-
-.variable-or-property:not(:focus) > .title > .token-undefined {
+.dbg-results-header-match-count {
+  -moz-padding-start: 6px;
   color: #8050B0;
 }
 
-.variable-or-property:not(:focus) > .title > .token-null {
-  color: #008484;
-}
-
-.variable-or-property:not(:focus) > .title > .token-boolean {
-  color: #FFCF00;
-}
-
-.variable-or-property:not(:focus) > .title > .token-number {
-  color: #E7ADE7;
-}
-
-.variable-or-property:not(:focus) > .title > .token-string {
-  max-width: 30em;
-  color: #9C9CFF;
-}
-
-.variable-or-property:not(:focus) > .title > .token-other {
+.dbg-results-line-number {
+  background: #000000;
+  min-width: 40px;
+  -moz-border-end: 1px solid #9C9CFF;
+  -moz-padding-end: 4px;
+  padding-top: 2px;
+  text-align: end;
+  font-family: "Liberation Mono", Consolas, "Courier New", monospace;
   color: #FF9F00;
 }
 
-/**
- * Expand/collapse arrow
- */
-
-.arrow {
-  width: 9px;
-  height: 9px;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 5px;
-  margin-top: -2px;
-  background: url("chrome://global/skin/tree/twisty-closed.gif") center center no-repeat;
+.dbg-results-line-contents {
+  -moz-padding-start: 4px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  font-family: "Liberation Mono", Consolas, "Courier New", monospace;
 }
 
-.arrow[open] {
-  background-image: url("chrome://global/skin/tree/twisty-open.gif");
+.dbg-results-line-contents-string {
+  padding: 1px;
 }
 
-.scope > .title > .arrow {
-  background-image: url("chrome://global/skin/tree/twisty-closed-selected.gif");
+.dbg-results-line-contents-string[match=true] {
+  background: #E7ADE7;
+  color: #000000;
+  padding: 0;
+  border: 1px solid #9C9CFF;
+  border-radius: 4px;
+  cursor: pointer;
 }
 
-.scope > .title > .arrow[open] {
-  background-image: url("chrome://global/skin/tree/twisty-open-selected.gif");
+.dbg-results-line-contents-string[match=true][focusing] {
+  transition: transform 0.3s ease-in-out;
 }
 
-.arrow[invisible] {
-  visibility: hidden;
+.dbg-results-line-contents-string[match=true][focused] {
+  transition-duration: 0.1s;
+  transform: scale(1.75, 1.75);
 }
 
-/**
- * Toolbar Controls
- */
+/* Toolbar Controls */
 
 #toggle-panes {
   list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
@@ -654,3 +319,20 @@ window {
 
 #debugger-controls {
 }
+
+#instruments-pane-toggle {
+  background: none;
+  box-shadow: none;
+  border: none;
+  list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
+  -moz-image-region: rect(0px,16px,16px,0px);
+}
+
+#instruments-pane-toggle:not([toggled]) {
+  list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");
+}
+
+#instruments-pane-toggle:hover,
+#instruments-pane-toggle:hover:active {
+  -moz-image-region: rect(0px,32px,16px,16px);
+}
diff --git a/LCARStrek/browser/devtools/floating-scrollbars.css b/LCARStrek/browser/devtools/floating-scrollbars.css
index e27de04d..4d11597e 100644
--- a/LCARStrek/browser/devtools/floating-scrollbars.css
+++ b/LCARStrek/browser/devtools/floating-scrollbars.css
@@ -10,15 +10,15 @@ scrollbar {
 }
 
 scrollbar[orient="vertical"] {
-  -moz-margin-start: -8px;
-  min-width: 8px;
-  max-width: 8px;
+  -moz-margin-start: -10px;
+  min-width: 10px;
+  max-width: 10px;
 }
 
 scrollbar[orient="horizontal"] {
-  margin-top: -8px;
-  min-height: 8px;
-  max-height: 8px;
+  margin-top: -10px;
+  min-height: 10px;
+  max-height: 10px;
 }
 
 scrollbar thumb {
diff --git a/LCARStrek/browser/devtools/inspector.css b/LCARStrek/browser/devtools/inspector.css
index 75ff683f..301f0f07 100644
--- a/LCARStrek/browser/devtools/inspector.css
+++ b/LCARStrek/browser/devtools/inspector.css
@@ -161,57 +161,57 @@ window {
 }
 
 .inspector-breadcrumbs-button {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
 .inspector-breadcrumbs-button:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[checked][siblings-menu-open],
 .inspector-breadcrumbs-button[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button:first-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
 .inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button:first-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
 .inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button:last-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
 .inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button:last-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
 .inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
 }
 
 /* Highlighter toolbar - breadcrumbs - RTL */
@@ -220,43 +220,43 @@ window {
 }
 
 .inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
 .inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
 .inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
 .inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
 .inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
 }
 
 #inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
@@ -264,16 +264,16 @@ window {
 
 .inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
 .inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
 }
 
 .inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
 .inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
+  border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
 }
 
 #inspector-searchbox {
diff --git a/LCARStrek/browser/devtools/layoutview.css b/LCARStrek/browser/devtools/layoutview.css
index 531c64b4..1528eb3a 100644
--- a/LCARStrek/browser/devtools/layoutview.css
+++ b/LCARStrek/browser/devtools/layoutview.css
@@ -2,14 +2,17 @@
  * 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/. */
 
-body {
+.theme-dark .theme-body {
+  background: url("layout-background-grid.png"), -moz-radial-gradient(50% 70%, circle cover, #000000 0%, #000000 100%);
+}
+
+.theme-light .theme-body {
   background: url("layout-background-grid.png"), -moz-radial-gradient(50% 70%, circle cover, #000000 0%, #000000 100%);
-  color: #FF9F00;
-  -moz-box-sizing: border-box;
 }
 
-#element-size {
+.theme-body {
   color: #FF9F00;
+  -moz-box-sizing: border-box;
 }
 
 #main {
diff --git a/LCARStrek/browser/devtools/markup-view.css b/LCARStrek/browser/devtools/markup-view.css
index 8e7c1551..d902c38d 100644
--- a/LCARStrek/browser/devtools/markup-view.css
+++ b/LCARStrek/browser/devtools/markup-view.css
@@ -7,11 +7,6 @@
   margin: 0;
 }
 
-body {
-  background-color: #000000;
-  color: #FF9F00;
-}
-
 .tagname {
   color: #FFCF00;
 }
@@ -54,17 +49,6 @@ li.container {
 
 .expander {
   position: absolute;
-  top: 5px;
-  left: 0;
-  width: 14px;
-  height: 14px;
-  background-repeat: no-repeat;
-  background-position: center;
-  background-image: url("chrome://global/skin/tree/twisty-closed.gif");
-}
-
-.expander[expanded] {
-  background-image: url("chrome://global/skin/tree/twisty-open.gif");
 }
 
 .more-nodes {
diff --git a/LCARStrek/browser/devtools/styleeditor.css b/LCARStrek/browser/devtools/styleeditor.css
index b3cc37a4..0076d50e 100644
--- a/LCARStrek/browser/devtools/styleeditor.css
+++ b/LCARStrek/browser/devtools/styleeditor.css
@@ -56,6 +56,10 @@ window:not([windowtype]) {
   font-style: italic;
 }
 
+.splitview-nav.empty > p {
+  padding: 0 10px;
+}
+
 .stylesheet-enabled {
   padding: 8px 0;
   margin: 0 8px;
diff --git a/LCARStrek/browser/devtools/toolbox.css b/LCARStrek/browser/devtools/toolbox.css
index 2fbf6a64..ffb857ed 100644
--- a/LCARStrek/browser/devtools/toolbox.css
+++ b/LCARStrek/browser/devtools/toolbox.css
@@ -137,8 +137,8 @@ window {
 }
 
 .devtools-tab {
-  min-width: 88px;
-  /* min-height: 22px; */
+  min-width: 32px;
+  max-width: 110px;
   color: #000000;
   margin: 0;
   -moz-margin-end: 3px;
@@ -148,20 +148,16 @@ window {
   border-radius: 8px 8px 0 0;
 }
 
-.devtools-tab > .radio-label-center-box > .radio-label-box {
-  padding: 0 6px;
-  border-radius: 8px 8px 0 0;
-}
-
-.devtools-tab > .radio-label-center-box > .radio-label-box > .radio-icon {
-  -moz-margin-end: 6px;
+.devtools-tab > image {
+  -moz-margin-end: 0px;
+/*  -moz-margin-start: 8px; */
 }
 
-.devtools-tab:hover > .radio-label-center-box > .radio-label-box > .radio-icon {
+.devtools-tab:hover > image {
 }
 
-.devtools-tab:active > .radio-label-center-box > .radio-label-box > .radio-icon,
-.devtools-tab[selected=true] > .radio-label-center-box > .radio-label-box > .radio-icon {
+.devtools-tab:active > image,
+.devtools-tab[selected=true] > image {
 }
 
 .devtools-tab:hover,
@@ -170,11 +166,6 @@ window {
   color: #000000;
 }
 
-.devtools-tab:hover > .radio-label-center-box > .radio-label-box,
-.devtools-tab:hover:active > .radio-label-center-box > .radio-label-box {
-  color: #000000;
-}
-
 .devtools-tab[selected=true] {
   background-color: #008484;
   color: #000000;
diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css
index 57ad3dd6..a7192d9f 100644
--- a/LCARStrek/browser/devtools/widgets.css
+++ b/LCARStrek/browser/devtools/widgets.css
@@ -622,7 +622,7 @@
 /* Expand/collapse arrow */
 
 .arrow {
-  background: url("chrome://global/skin/tree/twisty-clsd.png") center center no-repeat;
+  background: url("chrome://global/skin/tree/twisty-closed.gif") center center no-repeat;
   width: 9px;
   height: 20px;
   -moz-margin-start: 5px;
diff --git a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
index 94c370ba..f4fb871c 100644
--- a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
+++ b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
@@ -17,9 +17,9 @@
 .downloadTypeIcon {
   -moz-margin-end: 8px;
   -moz-margin-start: 8px;
-  /* Prevent flickering when changing states. */
-  min-height: 32px;
-  min-width: 32px;
+  /* explicitly size the icon, so size doesn't vary on hidpi systems */
+  height: 32px;
+  width: 32px;
 }
 
 .blockedIcon {
diff --git a/LCARStrek/browser/notification-16.png b/LCARStrek/browser/notification-16.png
new file mode 100644
index 00000000..5cbf3a19
Binary files /dev/null and b/LCARStrek/browser/notification-16.png differ
diff --git a/LCARStrek/browser/notification-64.png b/LCARStrek/browser/notification-64.png
new file mode 100644
index 00000000..d23cb4b8
Binary files /dev/null and b/LCARStrek/browser/notification-64.png differ
diff --git a/LCARStrek/browser/pointerLock-16.png b/LCARStrek/browser/pointerLock-16.png
new file mode 100644
index 00000000..dc9408f4
Binary files /dev/null and b/LCARStrek/browser/pointerLock-16.png differ
diff --git a/LCARStrek/browser/pointerLock-64.png b/LCARStrek/browser/pointerLock-64.png
new file mode 100644
index 00000000..66426e64
Binary files /dev/null and b/LCARStrek/browser/pointerLock-64.png differ
diff --git a/LCARStrek/browser/syncSetup.css b/LCARStrek/browser/syncSetup.css
index 0c909408..35ea5c81 100644
--- a/LCARStrek/browser/syncSetup.css
+++ b/LCARStrek/browser/syncSetup.css
@@ -117,3 +117,8 @@ wizardpage {
   /* TODO replace this with a 128px version (bug 591122) */
   list-style-image: url("chrome://browser/skin/sync-32.png");
 }
+
+#tosDesc {
+  margin-left: -7px;
+  margin-bottom: 3px;
+}