Fixed #1300

fix: Theme parser error

README.md

@@ -91,6 +91,9 @@ OPTIONS:
   -l, --libadwaita 
    Install theme into gtk4.0 config for libadwaita. Default is dark version
 
+  -f, --fixed 
+   Install fixed accent color version. Default is adaptive version
+
   -HD, --highdefinition 
    Set to High Definition size. Default is laptop size
 
@@ -237,7 +240,9 @@ OPTIONS:
 
       4. darker         Darker Firefox theme version    Darker Firefox theme version
 
-      5. adaptive       Adaptive color version   You need install adaptive-tab-bar-colour plugin first   https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/
+      5. nord           Nord Firefox colorscheme version    Nord Firefox colorscheme version
+
+      6. adaptive       Adaptive color version   You need install adaptive-tab-bar-colour plugin first   https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/
 
   -e, --edit-firefox [(monterey|flat)|alt|(darker|adaptive)]
    Edit 'WhiteSur' theme for Firefox settings and also connect the theme to the current Firefox profiles. 

install.sh

@@ -35,6 +35,7 @@ usage() {
   helpify "-m, --monterey"                ""                                                  "  Set to MacOS Monterey style"                     ""
   helpify "-N, --nautilus"                "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "  Set Nautilus style"                             "Default is BigSur-like style (stabled sidebar)"
   helpify "-l, --libadwaita"              ""                                                  "  Install theme into gtk4.0 config for libadwaita" "Default is dark version"
+  helpify "-f, --fixed"                   ""                                                  "  Install fixed accent color version"              "Default is adaptive version"
   helpify "-HD, --highdefinition"         ""                                                  "  Set to High Definition size"                     "Default is laptop size"
 
   helpify "--shell, --gnomeshell"         ""                                                  "  Tweaks for gnome-shell"                          "Options:"
@@ -129,6 +130,8 @@ while [[ $# -gt 0 ]]; do
       monterey="true"; shift ;;
     -l|--libadwaita)
       libadwaita="true"; shift ;;
+    -f|--fixed)
+      accent_type="fixed"; shift ;;
     -r|--remove|-u|-uninstall)
       uninstall='true'; shift ;;
     --silent-mode)
@@ -167,10 +170,11 @@ if [[ "${uninstall}" == 'true' ]]; then
   fi
 else
   if [[ "${interactive}" == 'true' ]]; then
-    show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog
+    show_panel_opacity_dialog
-    echo; prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo
+#    show_sidebar_size_dialog
-  else
+    show_nautilus_style_dialog
-    show_needed_dialogs
+#  else
+#    show_needed_dialogs
   fi
 
   prompt -w "Removing the old '${name}' themes...\n"

libs/lib-core.sh

@@ -26,7 +26,9 @@ MY_HOME=$(getent passwd "${MY_USERNAME}" | cut -d: -f6)
 
 if command -v gnome-shell &> /dev/null; then
   SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
-  if [[ "${SHELL_VERSION:-}" -ge "47" ]]; then
+  if [[ "${SHELL_VERSION:-}" -ge "48" ]]; then
+    GNOME_VERSION="48-0"
+  elif [[ "${SHELL_VERSION:-}" -ge "47" ]]; then
     GNOME_VERSION="47-0"
   elif [[ "${SHELL_VERSION:-}" -ge "46" ]]; then
     GNOME_VERSION="46-0"
@@ -40,7 +42,7 @@ if command -v gnome-shell &> /dev/null; then
     GNOME_VERSION="3-28"
   fi
 else
-  GNOME_VERSION="47-0"
+  GNOME_VERSION="48-0"
 fi
 
 #----------Program options-------------#
@@ -257,7 +259,6 @@ if [[ -d "${WHITESUR_TMP_DIR}" ]]; then
 
   if [[ -d "${WHITESUR_TMP_DIR}" ]]; then
     prompt -e "ERROR: Whitesur installer or tweaks is already running. Probably it's run by '$(ls -ld "${WHITESUR_TMP_DIR}" | awk '{print $3}')'"
-    exit 1
   fi
 fi
 

libs/lib-install.sh

@@ -77,7 +77,11 @@ prepare_deps() {
     prompt -w "DEPS: Your system clock is wrong"
     prompt -i "DEPS: Updating your system clock..."
     # Add "+ 25" here to accomodate potential time delay by sudo prompt
-    sudo date -s "@$((remote_time + 25))"; sudo hwclock --systohc
+    sudo date -s "@$((remote_time + 25))"
+
+    if has_command hwclock; then
+      sudo hwclock --systohc
+    fi
   fi
 }
 
@@ -536,6 +540,11 @@ config_gtk4() {
 install_libadwaita() {
   color="${colors[0]}"
   opacity="${opacities[0]}"
+  alt="${alts[0]}"
+  theme="${themes[0]}"
+  scheme="${schemes[0]}"
+
+  install_theme_deps
 
   gtk_base && config_gtk4 "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
 }
@@ -670,7 +679,14 @@ install_firefox_theme() {
     local TARGET_DIR="${FIREFOX_THEME_DIR}"
   fi
 
+  if [[ "${colorscheme}" == '-nord' && "${adaptive}" == '-adaptive' ]]; then
+    local theme_type="${adaptive}"
+  else
+    local theme_type="${darker}${adaptive}${colorscheme}"
+  fi
+
   remove_firefox_theme
+
   udo mkdir -p                                                                                "${TARGET_DIR}"
   udo cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css                                            "${TARGET_DIR}"
 
@@ -678,16 +694,23 @@ install_firefox_theme() {
   cp -rf "${FIREFOX_SRC_DIR}/${theme_name}"                                                   "${TARGET_DIR}"
   [[ -f "${TARGET_DIR}"/customChrome.css ]] && mv "${TARGET_DIR}"/customChrome.css            "${TARGET_DIR}"/customChrome.css.bak
   cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css                                                "${TARGET_DIR}"
-  cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,titlebuttons,pages}                               "${TARGET_DIR}/${theme_name}"
+  cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,pages}                                            "${TARGET_DIR}/${theme_name}"
+
+  if [[ "${colorscheme}" == '-nord' ]]; then
+    cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons-nord                                      "${TARGET_DIR}/${theme_name}"/titlebuttons
+  else
+    cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons                                           "${TARGET_DIR}/${theme_name}"
+  fi
+
   cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                                    "${TARGET_DIR}/${theme_name}"
   cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                              "${TARGET_DIR}/${theme_name}"/parts
   [[ -f "${TARGET_DIR}"/userChrome.css ]] && mv "${TARGET_DIR}"/userChrome.css                "${TARGET_DIR}"/userChrome.css.bak
-  cp -rf "${FIREFOX_SRC_DIR}"/userChrome-"${theme_name}${darker}${adaptive}".css              "${TARGET_DIR}"/userChrome.css
+  cp -rf "${FIREFOX_SRC_DIR}"/userChrome-"${theme_name}${theme_type}".css                     "${TARGET_DIR}"/userChrome.css
   [[ -f "${TARGET_DIR}"/userContent.css ]] && mv "${TARGET_DIR}"/userContent.css              "${TARGET_DIR}"/userContent.css.bak
-  cp -rf "${FIREFOX_SRC_DIR}"/userContent-"${theme_name}${darker}${adaptive}".css             "${TARGET_DIR}"/userContent.css
+  cp -rf "${FIREFOX_SRC_DIR}"/userContent-"${theme_name}${theme_type}".css                    "${TARGET_DIR}"/userContent.css
 
   if [[ "${firefoxtheme}" == 'Flat' && "${theme_name}" == 'Monterey' ]]; then
-    cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt"${darker}${adaptive}".css             "${TARGET_DIR}"/userChrome.css
+    cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt"${theme_type}".css                    "${TARGET_DIR}"/userChrome.css
     cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/parts/headerbar-urlbar.css                           "${TARGET_DIR}"/Monterey/parts/headerbar-urlbar-alt.css
   fi
 
@@ -759,7 +782,7 @@ remove_firefox_theme() {
   [[ -f "${TARGET_DIR}"/userChrome.css && ! -f "${TARGET_DIR}"/userChrome.css.bak ]] && cp -r "${TARGET_DIR}"/userChrome.css "${TARGET_DIR}"/userChrome.css.bak
   [[ -f "${TARGET_DIR}"/userContent.css && ! -f "${TARGET_DIR}"/userContent.css.bak ]] && cp -r "${TARGET_DIR}"/userContent.css "${TARGET_DIR}"/userContent.css.bak
 
-  rm -rf "${TARGET_DIR}/${THEME_NAME}"
+  rm -rf "${TARGET_DIR}/${theme_name}"
   rm -rf "${TARGET_DIR}"/customChrome.css
   rm -rf "${TARGET_DIR}"/userChrome.css
   rm -rf "${TARGET_DIR}"/userContent.css
@@ -890,11 +913,16 @@ gtk_base() {
 
   if [[ "${scheme}" == 'nord' ]]; then
     sed $SED_OPT "/\$scheme/s/standard/nord/"                                   "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss"
+    accent_type="fixed"
   fi
 
   if [[ "${GNOME_VERSION}" -ge '47-0' && "${libadwaita}" == 'true' ]]; then
     sed $SED_OPT "/\$gnome_version/s/old/new/"                                  "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss"
   fi
+
+  if [[ "${accent_type}" == 'fixed' ]]; then
+    sed $SED_OPT "/\$accent_type/s/default/fixed/"                              "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss"
+  fi
 }
 
 shell_base() {
@@ -916,6 +944,10 @@ shell_base() {
 customize_theme() {
   cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"}
 
+  if [[ "${GNOME_VERSION}" -ge '47-0' ]]; then
+    sed $SED_OPT "/\$shell_version/s/old/new/"                                  "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  fi
+
   # Darker dark colors
   if [[ "${darker}" == 'true' ]]; then
     prompt -s "Changing dark color style to darker one ...\n"

make-release.sh

@@ -62,8 +62,8 @@ echo "Nautilus style   : ${nautilus_style}" >> ${RELEASE_DIR}/release-info.txt
 #install && compress
 #prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
 
-GNOME_VERSION="47-0"
+GNOME_VERSION="48-0"
-RELEASE_VERSION="47.0"
+RELEASE_VERSION="48.0"
 install && compress
 prompt -i "Compress ${THEME_NAME} themes finished!\n"
 release_info

parse-sass.sh

@@ -13,11 +13,11 @@ if [ ! "$(which sassc 2> /dev/null)" ]; then
   if has_command zypper; then
     sudo zypper in sassc
   elif has_command apt; then
-    sudo apt install sassc
+    sudo apt install -y sassc
   elif has_command dnf; then
     sudo dnf install -y sassc
   elif has_command yum; then
-    sudo yum install sassc
+    sudo yum install -y sassc
   elif has_command pacman; then
     sudo pacman -S --noconfirm sassc
   fi

release/release-info.txt

@@ -1,6 +1,6 @@
-VERSION: (GNOME-SHELL) 47.0
+VERSION: (GNOME-SHELL) 48.0
 
-RELEASE TIME: 2024年 10月 30日 星期三 21:08:48 CST
+RELEASE TIME: Sun Apr  6 06:14:30 PM CST 2025
 
 --->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---
 Color variants   : Dark;Light

src/other/firefox/Monterey/colors/dark-nord.css

@@ -0,0 +1,172 @@
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Variables that start with --gnome- are added by me and are assigned
+ * to elements somewhere in this code. The rest of the variables are
+ * built-in in Firefox, so you need to add an !important if you wanna
+ * override them. */
+
+@media (prefers-color-scheme: dark) {
+  :root {
+	/* Browser area before a page starts loading */
+	--gnome-browser-before-load-background: #252932;
+	--gnome-content-page-dialog-background: #313742;
+	--gnome-content-page-background: #15181d;
+	--gnome-content-box-background: #20242b;
+	--gnome-content-page-color: #eef3fd;
+	--theme-primary-color: #5271ad;
+	--theme-primary-hover-color: #6085cc;
+	--theme-primary-active-color: #73a0f5;
+
+	/* Toolbars */
+	--gnome-toolbar-background: #2e3440;
+	--gnome-tabstoolbar-background: #191c23;
+	--gnome-findbar-background: #2b303b;
+	--gnome-toolbar-color: #fbfcfd;
+	--gnome-toolbar-icon-fill: #fbfcfd;
+	--gnome-toolbar-border-color: #0e0f0f;
+	--gnome-inactive-toolbar-color: rgba(255, 255, 255, 0.35);
+	--gnome-inactive-toolbar-background: #242931;
+	--gnome-inactive-toolbar-border-color: #0d0f12;
+
+	/* Sidebar */
+	--sidebar-background-color: #252932;
+	--gnome-sidebar-background: #2c313b;
+	--gnome-inactive-sidebar-background: #2f343f;
+	--gnome-sidebar-border-color: color-mix(in srgb, #000000 75%, var(--gnome-sidebar-background));
+
+	/* Popups */
+	--gnome-menu-background: rgba(43, 48, 59, 0.95);
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-popover-background: rgba(43, 48, 59, 0.95);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
+	--gnome-popover-button-hover-background: rgba(255, 255, 255, 0.1);
+	--gnome-popover-button-active-background: rgba(255, 255, 255, 0.15);
+	--gnome-popover-separator-color: rgba(255, 255, 255, 0.08);
+
+	/* Header bar */
+	--gnome-headerbar-background: #2e3440;
+	--gnome-headerbar-border-color: #0e0f0f;
+	--gnome-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.15);
+	--gnome-inactive-headerbar-background: #242931;
+	--gnome-inactive-headerbar-border-color: #0d0f12;
+	--gnome-inactive-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08););
+
+	/* Buttons */
+	--gnome-button-background: linear-gradient(to top, #495263 0%, #4e5769 100%);
+	--gnome-button-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-border-bottom-color: rgba(0, 0, 0, 0.25);
+	--gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+	--gnome-button-hover-color: rgba(255, 255, 255, 0.1);
+	--gnome-button-active-color: rgba(255, 255, 255, 0.2);
+	--gnome-button-hover-background: linear-gradient(to top, #535d70 0%, #555f73 100%);
+	--gnome-button-active-background: linear-gradient(to top, #5f6a80 0%, #626e85 100%);
+	--gnome-button-active-border-color: rgba(0, 0, 0, 0.25);
+	--gnome-button-active-border-bottom-color: rgba(0, 0, 0, 0.25);
+	--gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+	--gnome-button-disabled-background: linear-gradient(to top, #323743 0%, #363c49 100%);
+	--gnome-button-disabled-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03);
+	--gnome-inactive-button-background: linear-gradient(#292e38, #292e38);
+	--gnome-inactive-button-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
+	--gnome-button-suggested-action-background: linear-gradient(to top, #5271ad 2px, #5271ad);
+	--gnome-button-suggested-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-suggested-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
+	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #7090cc, #7090cc 1px);
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #3d578c, #3d578c 1px);
+	--gnome-button-suggested-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
+	--gnome-button-destructive-action-background: linear-gradient(to top, #bf5f69 2px, #bf5f69);
+	--gnome-button-destructive-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-destructive-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #cc707a, #cc707a 1px);
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #95464e, #95464e 1px);
+	--gnome-button-destructive-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+
+	--gnome-headerbar-button-combined-background: rgba(255, 255, 255, 0.05);
+	--gnome-headerbar-button-hover-background: rgba(255, 255, 255, 0.1);
+	--gnome-headerbar-button-active-background: rgba(255, 255, 255, 0.15);
+
+	/* URL bar */
+	--gnome-urlbar-background: #3b4250;
+	--gnome-urlbar-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-urlbar-box-shadow: 0 3px 6px 1px rgba(0,0,0, .2), 0 5px 16px 3px rgba(0,0,0, .15), 0 0 0 1px rgba(0, 0, 0, 0.75);
+	--gnome-urlbar-color: #f0f5ff;
+	--gnome-hover-urlbar-border-color: #414958;
+	--gnome-inactive-urlbar-background: #292e38;
+	--gnome-inactive-urlbar-border-color: #1e2128;
+	--gnome-inactive-urlbar-box-shadow: none;
+	--gnome-inactive-urlbar-color: #c9cdd6;
+	--gnome-focused-urlbar-border-color: #338CBE;
+	--gnome-focused-urlbar-highlight-color: #006EA0;
+	--gnome-private-urlbar-background: #25003e;
+
+	/* Tabs */
+	--gnome-tabbar-tab-background: rgba(255, 255, 255, 0.06);
+	--gnome-tabbar-tab-color: #828690;
+	--gnome-tabbar-tab-hover-background: rgba(255, 255, 255, 0.12);
+	--gnome-tabbar-tab-hover-color: #b4bbc8;
+	--gnome-tabbar-tab-active-background: rgba(255, 255, 255, 0.16);
+	--gnome-tabbar-tab-active-color: #fbfcfd;
+	--gnome-tabbar-tab-active-hover-background: rgba(255, 255, 255, 0.16);
+	--gnome-inactive-tabbar-tab-color: #5e6168;
+	--gnome-inactive-tabbar-tab-background: rgba(255, 255, 255, 0.03);
+	--gnome-inactive-tabbar-tab-active-background: rgba(255, 255, 255, 0.1);
+	--gnome-inactive-tabbar-tab-active-color: #7b8089;
+	--gnome-tab-attention-icon-color: #8694c4;
+
+	/* Switch */
+	--gnome-switch-background: #343a46;
+	--gnome-switch-hover-background: #3d4452;
+	--gnome-switch-active-background: #474f60;
+	--gnome-switch-border-color: transparent;
+	--gnome-switch-slider-background: #fbfcfd;
+	--gnome-switch-slider-border-color: transparent;
+	--gnome-switch-slider-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-switch-pressed-background: var(--theme-primary-color);
+	--gnome-switch-pressed-hover-background: var(--theme-primary-hover-color);
+	--gnome-switch-pressed-active-background: var(--theme-primary-active-color);
+	--gnome-switch-active-border-color: transparent;
+	--gnome-switch-active-slider-border-color: transparent;
+
+	/* Dirty hacks for replaced symbolic icons, they load from
+	 * /usr/share/icons/<theme>/ and on some systems they need to be
+	 * inverted, on others they don't, adjusts the filters below to your
+	 * needs (you may also adjust icon brightness here). */
+	--gnome-convert-icon-to-symbolic-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(85%);
+	--gnome-icons-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(200%); /* without invert: none */
+	--gnome-window-icons-hack-filter: invert(90%); /* without invert: none */
+
+	/* Private window colors */
+	--gnome-private-accent: #78aeed;
+
+	/* Toolbars */
+	--gnome-private-toolbar-background: var(--gnome-headerbar-background);
+	--gnome-private-inactive-toolbar-background: var(--gnome-inactive-headerbar-background);
+	/* Menus */
+	--gnome-private-menu-background: #292e38;
+	/* Header bar */
+	--gnome-private-headerbar-background: #252F49;
+	--gnome-private-inactive-headerbar-background: var(--gnome-private-toolbar-background);
+	/* Tabs */
+	--gnome-private-tabbar-tab-hover-background: #343e56; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-background: #343e56; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-background-contrast: #495675; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-hover-background: #414a61; /* Hardcoded color */
+	--gnome-private-inactive-tabbar-tab-hover-background: #242c3f; /* Hardcoded color */
+	--gnome-private-inactive-tabbar-tab-active-background: #272e41; /* Hardcoded color */
+
+	/* Text color for Firefox Logo in new private tab */
+	--gnome-private-wordmark: #FBFBFE;
+
+	/* New private tab background */
+	--gnome-private-in-content-page-background: #1b1e24;
+
+	/* Private browsing info box */
+	--gnome-private-text-primary-color: #FBFBFE;
+  }
+}

src/other/firefox/Monterey/colors/dark.css

@@ -9,7 +9,10 @@
   :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: #242424;
-	--gnome-browser-content-box-background: #323232;
+	--gnome-content-page-dialog-background: #424242;
+	--gnome-content-page-background: #1d1d1d;
+	--gnome-content-box-background: #2b2b2b;
+	--gnome-content-page-color: #fdfdfd;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;
@@ -102,20 +105,17 @@
 	--gnome-private-urlbar-background: #25003e;
 
 	/* Tabs */
-	--gnome-tabbar-tab-background: #404040;
+	--gnome-tabbar-tab-background: rgba(255, 255, 255, 0.06);
-	--gnome-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-tabbar-tab-color: #909090;
-	--gnome-tabbar-tab-hover-background: #464646;
+	--gnome-tabbar-tab-hover-background: rgba(255, 255, 255, 0.12);
-	--gnome-tabbar-tab-hover-border-bottom-color: #1b1b1b;
+	--gnome-tabbar-tab-hover-color: #c8c8c8;
-	--gnome-tabbar-tab-hover-color: rgb(200, 200, 200);
+	--gnome-tabbar-tab-active-background: rgba(255, 255, 255, 0.16);
-	--gnome-tabbar-tab-active-background: #505050;
-	--gnome-tabbar-tab-active-border-bottom-color: #15539e;
 	--gnome-tabbar-tab-active-color: #ffffff;
-	--gnome-tabbar-tab-active-hover-background: #525252;
+	--gnome-tabbar-tab-active-hover-background: rgba(255, 255, 255, 0.16);
-	--gnome-inactive-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-inactive-tabbar-tab-color: #686868;
-	--gnome-inactive-tabbar-tab-background: #383838;
+	--gnome-inactive-tabbar-tab-background: rgba(255, 255, 255, 0.03);
-	--gnome-inactive-tabbar-tab-active-background: #424242;
+	--gnome-inactive-tabbar-tab-active-background: rgba(255, 255, 255, 0.1);
-	--gnome-inactive-tabbar-tab-active-border-bottom-color: var(--gnome-tabbar-tab-active-border-bottom-color);
+	--gnome-inactive-tabbar-tab-active-color: #898989;
-	--gnome-inactive-tabbar-tab-active-color: var(--gnome-inactive-tabbar-tab-color);
 	--gnome-tab-attention-icon-color: #718be8;
 
 	/* Switch */

src/other/firefox/Monterey/colors/darker.css

@@ -9,7 +9,10 @@
   :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: #1f1f1f;
-	--gnome-browser-content-box-background: #323232;
+	--gnome-content-page-dialog-background: #242424;
+	--gnome-content-page-background: #101010;
+	--gnome-content-box-background: #1b1b1b;
+	--gnome-content-page-color: #dddddd;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;

src/other/firefox/Monterey/colors/light-adaptive.css

@@ -9,6 +9,10 @@
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: var(--lwt-accent-color, #ffffff);
 	--gnome-browser-content-box-background: var(--lwt-accent-color, #ffffff);
+	--gnome-content-page-dialog-background: #ffffff;
+	--gnome-content-page-background: #f2f2f2;
+	--gnome-content-box-background: #ffffff;
+	--gnome-content-page-color: #242424;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;

src/other/firefox/Monterey/colors/light-nord.css

@@ -0,0 +1,169 @@
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Variables that start with --gnome- are added by me and are assigned
+ * to elements somewhere in this code. The rest of the variables are
+ * built-in in Firefox, so you need to add an !important if you wanna
+ * override them. */
+
+:root {
+	/* Browser area before a page starts loading */
+	--gnome-browser-before-load-background: #f3f4f6;
+	--gnome-content-page-dialog-background: #fbfcfd;
+	--gnome-content-page-background: #e3e8f2;
+	--gnome-content-box-background: #fbfcfd;
+	--gnome-content-page-color: #1b1e24;
+	--theme-primary-color: #5271ad;
+	--theme-primary-hover-color: #6085cc;
+	--theme-primary-active-color: #73a0f5;
+
+	/* Toolbars */
+	--gnome-toolbar-background: #fbfcfd;
+	--gnome-tabstoolbar-background: #d7dce5;
+	--gnome-findbar-background: #f3f4f6;
+	--gnome-toolbar-color: #22262e;
+	--gnome-toolbar-icon-fill: #22262e;
+	--gnome-toolbar-border-color: #c3c7cf;
+	--gnome-inactive-toolbar-color: rgba(34, 38, 46, 0.45);
+	--gnome-inactive-toolbar-background: #f6f5f4;
+	--gnome-inactive-toolbar-border-color: #cdd1da;
+
+	/* Sidebar */
+	--gnome-sidebar-background: #f3f4f6;
+	--gnome-inactive-sidebar-background: #f2f4f9;
+	--gnome-sidebar-border-color: color-mix(in srgb, #000000 12%, var(--gnome-sidebar-background));
+
+	/* Popups */
+	--gnome-menu-background: rgba(255, 255, 255, 0.95);
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-popover-background: rgba(255, 255, 255, 0.95);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
+	--gnome-popover-button-hover-background: rgba(0, 0, 0, 0.1);
+	--gnome-popover-button-active-background: rgba(0, 0, 0, 0.2);
+	--gnome-popover-separator-color: rgba(0, 0, 0, 0.1);
+
+	/* Header bar */
+	--gnome-headerbar-background: #fbfcfd;
+	--gnome-headerbar-border-color: #c3c7cf;
+	--gnome-headerbar-box-shadow: 0 1px rgba(255, 255, 255, 0.65) inset;
+	--gnome-inactive-headerbar-background: #f3f4f6;
+	--gnome-inactive-headerbar-border-color: #cdd1da;
+	--gnome-inactive-headerbar-box-shadow: 0 1px #fff inset;
+
+	/* Buttons */
+	--gnome-button-background: linear-gradient(to top, #eaecf1 0%, #f5f8fd 95%, #f6f9fe 100%);
+	--gnome-button-border-color: #c3c7cf;
+	--gnome-button-border-bottom-color: #c3c7cf;
+	--gnome-button-box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.03);
+	--gnome-button-hover-color: rgba(0, 0, 0, 0.1);
+	--gnome-button-active-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-hover-background: linear-gradient(to top, #f5f8fd 0%, #eef3fd 100%);
+	--gnome-button-active-background: #c3c7cf;
+	--gnome-button-active-border-color: #a7abb2;
+	--gnome-button-active-border-bottom-color: #a7abb2;
+	--gnome-button-active-box-shadow: 0 1px rgba(255, 255, 255, 0) inset;
+	--gnome-button-disabled-background: #faf9f8;
+	--gnome-button-disabled-border-color: #c3c7cf;
+	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+	--gnome-inactive-button-background: #f6f5f4;
+	--gnome-inactive-button-border-color: #cdd1da;
+	--gnome-inactive-button-box-shadow: 0 1px rgba(255, 255, 255, 0) inset, 0 1px rgba(255, 255, 255, 0);
+	--gnome-button-suggested-action-background: linear-gradient(to top, #2379e2 2px, #3584e4);
+	--gnome-button-suggested-action-border-color: #1b6acb;
+	--gnome-button-suggested-action-border-bottom-color: #15539e;
+	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #3584e4, #3987e5 1px);
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #1961b9, #1961b9 1px);
+	--gnome-button-suggested-action-active-border-color: #1b6acb;
+	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+	--gnome-button-destructive-action-background: linear-gradient(to top, #ce1921 2px, #e01b24);
+	--gnome-button-destructive-action-border-color: #b2161d;
+	--gnome-button-destructive-action-border-bottom-color: #851015;
+	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #e01b24, #e41c26 1px);
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #a0131a, #a0131a 1px);
+	--gnome-button-destructive-action-active-border-color: #b2161d;
+	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+
+	--gnome-headerbar-button-combined-background: rgba(0, 0, 0, 0.05);
+	--gnome-headerbar-button-hover-background: rgba(0, 0, 0, 0.1);
+	--gnome-headerbar-button-active-background: rgba(0, 0, 0, 0.15);
+
+	/* URL bar */
+	--gnome-urlbar-background: #f3f4f6;
+	--gnome-urlbar-border-color: #abafb6;
+	--gnome-urlbar-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.08), 0 5px 8px rgba(0, 0, 0, 0.05), 0 8px 16px rgba(0, 0, 0, 0.03), 0 0 0 1px rgba(0,0,0, 0.12);
+	--gnome-urlbar-color: #020202;
+	--gnome-hover-urlbar-border-color: #d7dce5;
+	--gnome-inactive-urlbar-background: #e9ebf0;
+	--gnome-inactive-urlbar-border-color: #cdd1da;
+	--gnome-inactive-urlbar-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.05);
+	--gnome-inactive-urlbar-color: #252932;
+	--gnome-focused-urlbar-border-color: #5683DA;
+	--gnome-focused-urlbar-highlight-color: #6592E9;
+	--gnome-private-urlbar-background: #e6c2ff;
+
+	/* Tabs */
+	--gnome-tabbar-tab-background: #e6ebf5;
+	--gnome-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-tabbar-tab-hover-background: #f0f0f0;
+	--gnome-tabbar-tab-hover-color: rgb(93, 98, 99);
+	--gnome-tabbar-tab-active-background: #e8e8e8;
+	--gnome-tabbar-tab-active-color: rgb(46, 52, 54);
+	--gnome-tabbar-tab-active-hover-background: #f0f0f0;
+	--gnome-inactive-tabbar-tab-color: #8b8e8f;
+	--gnome-inactive-tabbar-tab-background: #f0f0f0;
+	--gnome-inactive-tabbar-tab-active-background: #eeeeee;
+	--gnome-inactive-tabbar-tab-active-color: var(--gnome-inactive-tabbar-tab-color);
+	--gnome-tab-attention-icon-color: #718be8;
+
+	/* Switch */
+	--gnome-switch-background: #a7abb2;
+	--gnome-switch-hover-background: #969aa0;
+	--gnome-switch-active-background: #7b8292;
+	--gnome-switch-border-color: transparent;
+	--gnome-switch-slider-background: #fbfcfd;
+	--gnome-switch-slider-border-color: transparent;
+	--gnome-switch-slider-box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-switch-active-border-color: transparent;
+	--gnome-switch-active-slider-border-color: transparent;
+	--gnome-switch-pressed-background: #315bef;
+	--gnome-switch-pressed-hover-background: #5073f1;
+	--gnome-switch-pressed-active-background: #6584f3;
+
+	/* Dirty hacks for replaced symbolic icons, they load from
+	 * /usr/share/icons/<theme>/ and on some systems they need to be
+	 * inverted, on others they don't, adjusts the filters below to your
+	 * needs (you may also adjust icon brightness here). */
+	--gnome-convert-icon-to-symbolic-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(85%) invert(100%);
+	--gnome-icons-hack-filter: none;
+	--gnome-window-icons-hack-filter: invert(30%);
+
+	/* Private window colors */
+	--gnome-private-accent: #1c71d8;
+
+	/* Toolbars */
+	--gnome-private-toolbar-background: var(--gnome-headerbar-background);
+	--gnome-private-inactive-toolbar-background: var(--gnome-inactive-headerbar-background);
+	/* Menus */
+	--gnome-private-menu-background: #fbfcfd;
+	/* Header bar */
+	--gnome-private-headerbar-background: #D7E3F0;
+	--gnome-private-inactive-headerbar-background: var(--gnome-private-toolbar-background);
+	/* Tabs */
+	--gnome-private-tabbar-tab-hover-background: #cbd7e3; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-background: #c6d1dd; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-background-contrast: #a9b6c4; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-hover-background: #c0cbd7; /* Hardcoded color */
+	--gnome-private-inactive-tabbar-tab-hover-background: #e4e9f0; /* Hardcoded color */
+	--gnome-private-inactive-tabbar-tab-active-background: #e1e7ed; /* Hardcoded color */
+
+	/* Text color for Firefox Logo in new private tab */
+	--gnome-private-wordmark: #20123A;
+
+	/* New private tab background */
+	--gnome-private-in-content-page-background: #ebf0fa;
+
+	/* Private browsing info box */
+	--gnome-private-text-primary-color: #15141A;
+}

src/other/firefox/Monterey/colors/light.css

@@ -8,7 +8,10 @@
 :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: #f5f5f5;
-	--gnome-browser-content-box-background: #ffffff;
+	--gnome-content-page-dialog-background: #ffffff;
+	--gnome-content-page-background: #f2f2f2;
+	--gnome-content-box-background: #ffffff;
+	--gnome-content-page-color: #242424;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;

src/other/firefox/Monterey/parts/headerbar-urlbar.css

@@ -45,8 +45,6 @@ toolbarspring {
 }
 
 #urlbar[breakout][breakout-extend] {
-	left: 0 !important;
-	top: 0 !important;
 	width: 360px !important;
 	z-index: 5 !important;
 	padding: 0 !important;

src/other/firefox/Monterey/parts/tabsbar-alt.css

@@ -12,12 +12,8 @@
 	min-height: 32px !important;
 }
 
-#TabsToolbar-customization-target {
+#TabsToolbar #tabbrowser-tabs,
-	padding-bottom: 6px !important;
+#TabsToolbar #tabbrowser-tabs arrowscrollbox {
-}
-
-#tabbrowser-tabs,
-#tabbrowser-tabs arrowscrollbox {
 	min-height: 32px !important;
 	--tab-min-height: 32px !important;
 }
@@ -26,13 +22,14 @@
 	max-height: 32px !important;
 }
 
-.tab-background, .tab-stack {
+#TabsToolbar .tab-background,
+#TabsToolbar .tab-stack {
 	height: 32px !important;
 	min-height: 32px !important;
 }
 
-tab > stack {
+#TabsToolbar tab > stack {
-	margin: 0 3px !important;
+	margin: 6px 3px !important;
 }
 
 :root:not([sizemode="normal"]) .titlebar-spacer[type="pre-tabs"], :root[gtktiledwindow="true"] .titlebar-spacer[type="pre-tabs"] { /* reset */
@@ -43,10 +40,15 @@ tab > stack {
 	width: 8px !important;
 }
 
-.tabbrowser-tab,
 .tab-background {
 	border: none !important;
 	box-shadow: none !important;
+	outline: none !important;
+	transition: background-color 200ms !important;
+}
+
+#TabsToolbar .tabbrowser-tab,
+#TabsToolbar .tab-background {
 	border-radius: 8px !important;
 	padding: 0 !important;
 	background-image: none !important;
@@ -56,31 +58,25 @@ tab > stack {
 	color: var(--gnome-tabbar-tab-color) !important;
 }
 
+#TabsToolbar .tab-background {
+	margin: 0 !important;
+	margin-block: 0 !important;
+}
+
 .tabbrowser-tab .tab-background:not([selected=true]) {
 	color: var(--gnome-tabbar-tab-active-color) !important;
 }
 
-.tab-background {
+.tabbrowser-tab:not([selected=true]) .tab-background {
-	margin: 0 !important;
-	transition: none;
-	margin-block: 0 !important;
-}
-
-.tab-background:hover,
-.tab-background:is([selected]) {
-	transition: background 200ms;
-}
-
-#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background {
 	background: var(--gnome-tabbar-tab-background) !important;
 }
 
-#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
+.tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
 	background: var(--gnome-inactive-tabbar-tab-background) !important;
 }
 
 /* Tab hover */
-#TabsToolbar .tabbrowser-tab:not([selected=true]):hover > .tab-stack > .tab-background {
+.tabbrowser-tab:not([selected=true]):hover > .tab-stack > .tab-background {
 	background: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -113,6 +109,7 @@ tab[selected]:-moz-window-inactive .tab-label {
 }
 
 /* Center all inside tab */
+#TabsToolbar {
 .tab-content {
 	display: flex;
 	flex-direction: row;
@@ -126,41 +123,6 @@ tab[selected]:-moz-window-inactive .tab-label {
 	margin-inline: 0 !important;
 }
 
-/* Prevent tab icons size breaking */
-.tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
-	min-width: 16px;
-}
-
-.tabbrowser-tab[soundplaying="true"] .tab-icon-image,
-.tabbrowser-tab[muted="true"] .tab-icon-image {
-	margin-top: 3px !important;
-	margin-left: 2px !important;
-}
-
-.tab-icon-overlay {
-	height: 24px !important;
-	width: 24px !important;
-	padding: 4px !important;
-	border-radius: 100px !important;
-}
-
-.tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
-	top: 0 !important;
-	inset-inline-end: 0 !important;
-}
-
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
-	background-color: var(--gnome-tabbar-tab-background) !important;
-}
-
-.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
-	background-color: var(--gnome-tabbar-tab-active-background) !important;
-}
-
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):hover {
-	background-color: var(--gnome-tabbar-tab-hover-background) !important;
-}
-
 /* Adjust tab label width */
 .tab-label-container {
 	min-width: 0 !important;
@@ -210,6 +172,29 @@ tab[selected]:-moz-window-inactive .tab-label {
 	margin-left: 0 !important
 }
 
+/* Prevent tab icons size breaking */
+.tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
+	min-width: 16px;
+}
+
+.tabbrowser-tab[soundplaying="true"] .tab-icon-image,
+.tabbrowser-tab[muted="true"] .tab-icon-image {
+	margin-top: 3px !important;
+	margin-left: 2px !important;
+}
+
+.tab-icon-overlay {
+	height: 24px !important;
+	width: 24px !important;
+	padding: 4px !important;
+	border-radius: 100px !important;
+}
+
+.tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+	top: 0 !important;
+	inset-inline-end: 0 !important;
+}
+
 /*Align personal bookmarks v89 */
 #personal-bookmarks {
 	-moz-box-align: center !important;
@@ -219,6 +204,19 @@ tab[selected]:-moz-window-inactive .tab-label {
 .tabbrowser-tab {
 	padding-inline: 0px !important;
 }
+}
+
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+	background-color: transparent !important;
+}
+
+.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+	background-color: transparent !important;
+}
+
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]):hover {
+	background-color: var(--gnome-tabbar-tab-hover-background) !important;
+}
 
 .close-icon {
 	height: 16px !important;
@@ -274,6 +272,18 @@ tab[selected]:-moz-window-inactive .tab-label {
 	display: none;
 }
 
+/* tab-context-line above tabs */
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+	height: 2px;
+	border-radius: 2px;
+	margin: 0 12px !important;
+}
+
+/* Remove alt colours references for multi tabs*/
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
+	display: none;
+}
+
 /* Remove tab separators */
 .tabbrowser-tab::after,
 .tabbrowser-tab::before {
@@ -300,11 +310,6 @@ tab[selected]:-moz-window-inactive .tab-label {
 	max-width: .1px !important;
 }
 
-/* Remove alt colours references for multi tabs*/
-.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
-	display: none;
-}
-
 .tabbrowser-tab[class*="identity-color-"][pinned] {
 	display: flex;
 }
@@ -315,15 +320,16 @@ tab[selected]:-moz-window-inactive .tab-label {
 }
 
 #TabsToolbar .toolbarbutton-1,
-#tabs-newtab-button, #TabsToolbar #new-tab-button {
+#TabsToolbar #tabs-newtab-button,
+#TabsToolbar #new-tab-button {
 	min-height: 32px !important;
-	margin: 0 2px !important;
+	margin: 6px 2px !important;
 	padding: 0 10px !important;
 	border-radius: 8px !important;
 }
 
 #TabsToolbar .toolbarbutton-1 image,
-#tabs-newtab-button image,
+#TabsToolbar #tabs-newtab-button image,
 #TabsToolbar #new-tab-button image {
 	margin: 0 !important;
 	padding: 0 !important;
@@ -350,9 +356,9 @@ tab[selected]:-moz-window-inactive .tab-label {
   toolbarbutton:not(#firefox-view-button),
   toolbarpaletteitem:not(#wrapper-firefox-view-button)
 ) + #tabbrowser-tabs {
-  border-inline-start: none !important;
+	border-inline-start: none !important;
-  padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
+	padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
-  margin-inline-start: 0 !important;
+	margin-inline-start: 0 !important;
 }
 
 #firefox-view-button {
@@ -370,4 +376,5 @@ tab[selected]:-moz-window-inactive .tab-label {
 
 #firefox-view-button > .toolbarbutton-icon {
 	box-shadow: none !important;
+	outline: none !important;
 }

src/other/firefox/Monterey/parts/tabsbar.css

@@ -11,27 +11,31 @@
 	margin-inline-start: 6px !important;
 }
 
-tab > stack {
+#TabsToolbar tab > stack {
 	margin: 0 3px !important;
 }
 
+/* Tabs bar height */
+#TabsToolbar #tabbrowser-tabs {
+	--tab-min-height: 32px !important;
+	--tabstrip-min-height: 32px !important;
+}
+
+#TabsToolbar .tab-background,
+#TabsToolbar .tab-stack {
+	height: 32px !important;
+	min-height: 32px !important;
+}
+
 .tabbrowser-tab,
 .tab-background {
 	border: none !important;
 	box-shadow: none !important;
 	border-radius: 8px !important;
-	height: 32px !important;
-	min-height: 32px !important;
-	max-height: 32px !important;
 	padding: 0 !important;
 	background-image: none !important;
 }
 
-.tab-content {
-	height: 32px !important;
-	min-height: 32px !important;
-}
-
 .tabbrowser-tab:not([visuallyselected="true"], [multiselected]), .tabbrowser-tab:-moz-lwtheme {
 	color: var(--gnome-tabbar-tab-color) !important;
 }
@@ -41,21 +45,25 @@ tab > stack {
 }
 
 .tab-background {
-	margin: 0 !important;
+	background: transparent !important;
-	background-color: transparent !important;
+	transition: background-color 200ms !important;
-	transition: background 200ms !important;
+	outline: none !important;
 }
 
-#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background {
+#TabsToolbar .tab-background {
+	margin: 0 !important;
+}
+
+.tabbrowser-tab:not([selected=true]) .tab-background {
 	background: var(--gnome-tabbar-tab-background) !important;
 }
 
-#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
+.tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
 	background: var(--gnome-inactive-tabbar-tab-background) !important;
 }
 
 /* Tab hover */
-#TabsToolbar .tabbrowser-tab:not([selected=true]):hover .tab-background {
+.tabbrowser-tab:not([selected=true]):hover .tab-background {
 	background: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -151,15 +159,15 @@ tab[selected]:-moz-window-inactive .tab-label {
 	inset-inline-end: 0 !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
-	background-color: var(--gnome-tabbar-tab-background) !important;
+	background-color: transparent !important;
 }
 
-.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
-	background-color: var(--gnome-tabbar-tab-active-background) !important;
+	background-color: transparent !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):hover {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -168,6 +176,18 @@ tab[selected]:-moz-window-inactive .tab-label {
 	display: none;
 }
 
+/* tab-context-line above tabs */
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+	height: 2px;
+	border-radius: 2px;
+	margin: 0 12px !important;
+}
+
+/* Remove alt colours references for multi tabs*/
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
+	display: none;
+}
+
 /* Tab attention dot */
 .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]), #firefox-view-button[attention] {
 	background-image: radial-gradient(circle, var(--gnome-tab-attention-icon-color), var(--gnome-tab-attention-icon-color) 2px, transparent 2px) !important;
@@ -230,6 +250,7 @@ tab[selected]:-moz-window-inactive .tab-label {
 #firefox-view-button > .toolbarbutton-icon {
 	filter: none !important;
 	box-shadow: none !important;
+	outline: none !important;
 }
 
 /* Remove shadow next to tab scroll buttons */

src/other/firefox/Monterey/parts/toolbox-alt.css

@@ -14,13 +14,12 @@
 #TabsToolbar,
 #navigator-toolbox,
 .notificationbox-stack {
-	border: none !important;
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
 	transition: none !important;
 }
 
-#TabsToolbar {
+#navigator-toolbox {
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }
 
@@ -33,12 +32,6 @@
 	background: var(--gnome-inactive-toolbar-background) !important;
 }
 
-/* Toolbox colors */
-#navigator-toolbox {
-	border: 0 !important;
-	background: none !important;
-}
-
 .toolbarbutton-icon {
 	color: var(--gnome-toolbar-color);
 	fill: var(--gnome-toolbar-color);
@@ -57,7 +50,7 @@
 }
 
 /* allow to drag headerbar empty space */
-:root[tabsintitlebar] #nav-bar .chromeclass-location {
+#nav-bar .chromeclass-location {
 	-moz-window-dragging: drag !important;
 }
 

src/other/firefox/Monterey/parts/toolbox.css

@@ -10,10 +10,9 @@
 #nav-bar, #PersonalToolbar, #toolbar-menubar, #titlebar {
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
-	border: none !important;
 }
 
-#PersonalToolbar {
+#navigator-toolbox {
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }
 
@@ -24,12 +23,6 @@
 	background: var(--gnome-inactive-toolbar-background) !important;
 }
 
-/* Toolbox colors */
-#navigator-toolbox {
-	border: none !important;
-	background: none !important;
-}
-
 .toolbarbutton-icon {
 	color: var(--gnome-toolbar-color);
 	fill: var(--gnome-toolbar-color);
@@ -58,7 +51,7 @@
 }
 
 /* allow to drag headerbar empty space */
-:root[tabsintitlebar] #nav-bar .chromeclass-location {
+#nav-bar .chromeclass-location {
 	-moz-window-dragging: drag !important;
 }
 

src/other/firefox/Monterey/right_header_button_3.css

@@ -1,10 +1,10 @@
 #TabsToolbar, #urlbar-container {
-	margin-right: 14vw !important;
+	margin-right: 16vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar, #urlbar-container {
-		margin-right: 10vw !important;
+		margin-right: 12vw !important;
 	}
 }

src/other/firefox/Monterey/right_header_button_4.css

@@ -1,10 +1,10 @@
 #TabsToolbar, #urlbar-container {
-	margin-right: 16vw !important;
+	margin-right: 18vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar, #urlbar-container {
-		margin-right: 12vw !important;
+		margin-right: 14vw !important;
 	}
 }

src/other/firefox/Monterey/right_header_button_5.css

@@ -1,10 +1,10 @@
 #TabsToolbar, #urlbar-container {
-	margin-right: 18vw !important;
+	margin-right: 20vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar, #urlbar-container {
-		margin-right: 14vw !important;
+		margin-right: 16vw !important;
 	}
 }

src/other/firefox/Monterey/theme-adaptive.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/Monterey/theme-alt-adaptive.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/Monterey/theme-alt-darker.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/Monterey/theme-alt.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/Monterey/theme-darker.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/Monterey/theme.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/WhiteSur/colors/dark-adaptive.css

@@ -9,6 +9,10 @@
   :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: var(--lwt-accent-color, #282828);
+	--gnome-content-page-dialog-background: #424242;
+	--gnome-content-page-background: #1d1d1d;
+	--gnome-content-box-background: #2b2b2b;
+	--gnome-content-page-color: #fdfdfd;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;

src/other/firefox/WhiteSur/colors/dark-nord.css

@@ -0,0 +1,176 @@
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Variables that start with --gnome- are added by me and are assigned
+ * to elements somewhere in this code. The rest of the variables are
+ * built-in in Firefox, so you need to add an !important if you wanna
+ * override them. */
+
+@media (prefers-color-scheme: dark) {
+  :root {
+	/* Browser area before a page starts loading */
+	--gnome-browser-before-load-background: #252932;
+	--gnome-content-page-dialog-background: #313742;
+	--gnome-content-page-background: #15181d;
+	--gnome-content-box-background: #20242b;
+	--gnome-content-page-color: #eef3fd;
+	--theme-primary-color: #5271ad;
+	--theme-primary-hover-color: #6085cc;
+	--theme-primary-active-color: #73a0f5;
+
+	/* Toolbars */
+	--gnome-toolbar-background: #2e3440;
+	--gnome-tabstoolbar-background: #191c23;
+	--gnome-findbar-background: #2b303b;
+	--gnome-toolbar-color: #fbfcfd;
+	--gnome-toolbar-icon-fill: #fbfcfd;
+	--gnome-toolbar-border-color: #0e0f0f;
+	--gnome-inactive-toolbar-color: rgba(255, 255, 255, 0.35);
+	--gnome-inactive-toolbar-background: #242931;
+	--gnome-inactive-toolbar-border-color: #0d0f12;
+
+	/* Sidebar */
+	--sidebar-background-color: #252932;
+	--gnome-sidebar-background: #2c313b;
+	--gnome-inactive-sidebar-background: #2f343f;
+	--gnome-sidebar-border-color: color-mix(in srgb, #000000 75%, var(--gnome-sidebar-background));
+
+	/* Popups */
+	--gnome-menu-background: rgba(43, 48, 59, 0.95);
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-popover-background: rgba(43, 48, 59, 0.95);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
+	--gnome-popover-button-hover-background: rgba(255, 255, 255, 0.1);
+	--gnome-popover-button-active-background: rgba(255, 255, 255, 0.15);
+	--gnome-popover-separator-color: rgba(255, 255, 255, 0.08);
+
+	/* Header bar */
+	--gnome-headerbar-background: #2e3440;
+	--gnome-headerbar-border-color: #0e0f0f;
+	--gnome-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.15);
+	--gnome-inactive-headerbar-background: #242931;
+	--gnome-inactive-headerbar-border-color: #0d0f12;
+	--gnome-inactive-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
+
+	/* Buttons */
+	--gnome-button-background: linear-gradient(to top, #495263 0%, #4e5769 100%);
+	--gnome-button-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-border-bottom-color: rgba(0, 0, 0, 0.25);
+	--gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+	--gnome-button-hover-color: rgba(255, 255, 255, 0.1);
+	--gnome-button-active-color: rgba(255, 255, 255, 0.2);
+	--gnome-button-hover-background: linear-gradient(to top, #535d70 0%, #555f73 100%);
+	--gnome-button-active-background: linear-gradient(to top, #5f6a80 0%, #626e85 100%);
+	--gnome-button-active-border-color: rgba(0, 0, 0, 0.25);
+	--gnome-button-active-border-bottom-color: rgba(0, 0, 0, 0.25);
+	--gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+	--gnome-button-disabled-background: linear-gradient(to top, #323743 0%, #363c49 100%);
+	--gnome-button-disabled-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03);
+	--gnome-inactive-button-background: linear-gradient(#292e38, #292e38);
+	--gnome-inactive-button-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
+	--gnome-button-suggested-action-background: linear-gradient(to top, #5271ad 2px, #5271ad);
+	--gnome-button-suggested-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-suggested-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
+	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #7090cc, #7090cc 1px);
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #3d578c, #3d578c 1px);
+	--gnome-button-suggested-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.05);
+	--gnome-button-destructive-action-background: linear-gradient(to top, #bf5f69 2px, #bf5f69);
+	--gnome-button-destructive-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-destructive-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #cc707a, #cc707a 1px);
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #95464e, #95464e 1px);
+	--gnome-button-destructive-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+
+	--gnome-headerbar-button-combined-background: rgba(255, 255, 255, 0.05);
+	--gnome-headerbar-button-hover-background: rgba(255, 255, 255, 0.1);
+	--gnome-headerbar-button-active-background: rgba(255, 255, 255, 0.15);
+
+	/* URL bar */
+	--gnome-urlbar-background: #3b4250;
+	--gnome-urlbar-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-urlbar-box-shadow: 0 3px 6px 1px rgba(0,0,0, .2), 0 5px 16px 3px rgba(0,0,0, .15), 0 0 0 1px rgba(0, 0, 0, 0.75);
+	--gnome-urlbar-color: #f0f5ff;
+	--gnome-hover-urlbar-border-color: #414958;
+	--gnome-inactive-urlbar-background: #292e38;
+	--gnome-inactive-urlbar-border-color: #1e2128;
+	--gnome-inactive-urlbar-box-shadow: none;
+	--gnome-inactive-urlbar-color: #c9cdd6;
+	--gnome-focused-urlbar-border-color: #338CBE;
+	--gnome-focused-urlbar-highlight-color: #006EA0;
+	--gnome-private-urlbar-background: #25003e;
+
+	/* Tabs */
+	--gnome-tabbar-tab-background: #1c1f26;
+	--gnome-tabbar-tab-color: #828690;
+	--gnome-tabbar-tab-border-color: #0b0c0f;
+	--gnome-tabbar-tab-hover-background: #20242b;
+	--gnome-tabbar-tab-hover-border-color: #0b0c0f;
+	--gnome-tabbar-tab-hover-color: #b4bbc8;
+	--gnome-tabbar-tab-active-background: #2e3440;
+	--gnome-tabbar-tab-active-border-color: #0e0f0f;
+	--gnome-tabbar-tab-active-color: #fbfcfd;
+	--gnome-tabbar-tab-active-hover-background: #242931;
+	--gnome-inactive-tabbar-tab-color: #5e6168;
+	--gnome-inactive-tabbar-tab-background: #181a20;
+	--gnome-inactive-tabbar-tab-active-background: #242931;
+	--gnome-inactive-tabbar-tab-active-border-color: var(--gnome-tabbar-tab-active-border-bottom-color);
+	--gnome-inactive-tabbar-tab-active-color: #657189;
+	--gnome-tab-attention-icon-color: #8694c4;
+
+	/* Switch */
+	--gnome-switch-background: #343a46;
+	--gnome-switch-hover-background: #3d4452;
+	--gnome-switch-active-background: #474f60;
+	--gnome-switch-border-color: transparent;
+	--gnome-switch-slider-background: #fbfcfd;
+	--gnome-switch-slider-border-color: transparent;
+	--gnome-switch-slider-box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-switch-pressed-background: var(--theme-primary-color);
+	--gnome-switch-pressed-hover-background: var(--theme-primary-hover-color);
+	--gnome-switch-pressed-active-background: var(--theme-primary-active-color);
+	--gnome-switch-active-border-color: transparent;
+	--gnome-switch-active-slider-border-color: transparent;
+
+	/* Dirty hacks for replaced symbolic icons, they load from
+	 * /usr/share/icons/<theme>/ and on some systems they need to be
+	 * inverted, on others they don't, adjusts the filters below to your
+	 * needs (you may also adjust icon brightness here). */
+	--gnome-convert-icon-to-symbolic-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(85%);
+	--gnome-icons-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(200%); /* without invert: none */
+	--gnome-window-icons-hack-filter: invert(90%); /* without invert: none */
+
+	/* Private window colors */
+	--gnome-private-accent: #78aeed;
+
+	/* Toolbars */
+	--gnome-private-toolbar-background: var(--gnome-headerbar-background);
+	--gnome-private-inactive-toolbar-background: var(--gnome-inactive-headerbar-background);
+	/* Menus */
+	--gnome-private-menu-background: #292e38;
+	/* Header bar */
+	--gnome-private-headerbar-background: #252F49;
+	--gnome-private-inactive-headerbar-background: var(--gnome-private-toolbar-background);
+	/* Tabs */
+	--gnome-private-tabbar-tab-hover-background: #343e56; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-background: #343e56; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-background-contrast: #495675; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-hover-background: #414a61; /* Hardcoded color */
+	--gnome-private-inactive-tabbar-tab-hover-background: #242c3f; /* Hardcoded color */
+	--gnome-private-inactive-tabbar-tab-active-background: #272e41; /* Hardcoded color */
+
+	/* Text color for Firefox Logo in new private tab */
+	--gnome-private-wordmark: #FBFBFE;
+
+	/* New private tab background */
+	--gnome-private-in-content-page-background: #1b1e24;
+
+	/* Private browsing info box */
+	--gnome-private-text-primary-color: #FBFBFE;
+  }
+}

src/other/firefox/WhiteSur/colors/dark.css

@@ -9,6 +9,10 @@
   :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: #242424;
+	--gnome-content-page-dialog-background: #424242;
+	--gnome-content-page-background: #1d1d1d;
+	--gnome-content-box-background: #2b2b2b;
+	--gnome-content-page-color: #fdfdfd;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;
@@ -103,20 +107,20 @@
 
 	/* Tabs */
 	--gnome-tabbar-tab-background: #262626;
-	--gnome-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-tabbar-tab-color: #909090;
 	--gnome-tabbar-tab-border-color: #070707;
 	--gnome-tabbar-tab-hover-background: #2b2b2b;
-	--gnome-tabbar-tab-hover-border-color: #1b1b1b;
+	--gnome-tabbar-tab-hover-border-color: #070707;
-	--gnome-tabbar-tab-hover-color: rgb(200, 200, 200);
+	--gnome-tabbar-tab-hover-color: #c8c8c8;
 	--gnome-tabbar-tab-active-background: #373737;
 	--gnome-tabbar-tab-active-border-color: #070707;
 	--gnome-tabbar-tab-active-color: #ffffff;
 	--gnome-tabbar-tab-active-hover-background: #313131;
-	--gnome-inactive-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-inactive-tabbar-tab-color: #686868;
 	--gnome-inactive-tabbar-tab-background: #202020;
 	--gnome-inactive-tabbar-tab-active-background: #313131;
 	--gnome-inactive-tabbar-tab-active-border-color: var(--gnome-tabbar-tab-active-border-bottom-color);
-	--gnome-inactive-tabbar-tab-active-color: var(--gnome-inactive-tabbar-tab-color);
+	--gnome-inactive-tabbar-tab-active-color: #898989;
 	--gnome-tab-attention-icon-color: #718be8;
 
 	/* Switch */

src/other/firefox/WhiteSur/colors/darker.css

@@ -9,6 +9,10 @@
   :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: #1f1f1f;
+	--gnome-content-page-dialog-background: #242424;
+	--gnome-content-page-background: #101010;
+	--gnome-content-box-background: #1b1b1b;
+	--gnome-content-page-color: #dddddd;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;

src/other/firefox/WhiteSur/colors/light-adaptive.css

@@ -8,6 +8,10 @@
 :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: var(--lwt-accent-color, #ffffff);
+	--gnome-content-page-dialog-background: #ffffff;
+	--gnome-content-page-background: #f2f2f2;
+	--gnome-content-box-background: #ffffff;
+	--gnome-content-page-color: #242424;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;

src/other/firefox/WhiteSur/colors/light-nord.css

@@ -0,0 +1,173 @@
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Variables that start with --gnome- are added by me and are assigned
+ * to elements somewhere in this code. The rest of the variables are
+ * built-in in Firefox, so you need to add an !important if you wanna
+ * override them. */
+
+:root {
+	/* Browser area before a page starts loading */
+	--gnome-browser-before-load-background: #f3f4f6;
+	--gnome-content-page-dialog-background: #fbfcfd;
+	--gnome-content-page-background: #e3e8f2;
+	--gnome-content-box-background: #fbfcfd;
+	--gnome-content-page-color: #1b1e24;
+	--theme-primary-color: #5271ad;
+	--theme-primary-hover-color: #6085cc;
+	--theme-primary-active-color: #73a0f5;
+
+	/* Toolbars */
+	--gnome-toolbar-background: #fbfcfd;
+	--gnome-tabstoolbar-background: #d7dce5;
+	--gnome-findbar-background: #f3f4f6;
+	--gnome-toolbar-color: #22262e;
+	--gnome-toolbar-icon-fill: #22262e;
+	--gnome-toolbar-border-color: #c3c7cf;
+	--gnome-inactive-toolbar-color: rgba(34, 38, 46, 0.45);
+	--gnome-inactive-toolbar-background: #f6f5f4;
+	--gnome-inactive-toolbar-border-color: #cdd1da;
+
+	/* Sidebar */
+	--gnome-sidebar-background: #f3f4f6;
+	--gnome-inactive-sidebar-background: #f2f4f9;
+	--gnome-sidebar-border-color: color-mix(in srgb, #000000 12%, var(--gnome-sidebar-background));
+
+	/* Popups */
+	--gnome-menu-background: rgba(255, 255, 255, 0.95);
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-popover-background: rgba(255, 255, 255, 0.95);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
+	--gnome-popover-button-hover-background: rgba(0, 0, 0, 0.1);
+	--gnome-popover-button-active-background: rgba(0, 0, 0, 0.2);
+	--gnome-popover-separator-color: rgba(0, 0, 0, 0.1);
+
+	/* Header bar */
+	--gnome-headerbar-background: #fbfcfd;
+	--gnome-headerbar-border-color: #c3c7cf;
+	--gnome-headerbar-box-shadow: 0 1px rgba(255, 255, 255, 0.65) inset;
+	--gnome-inactive-headerbar-background: #f3f4f6;
+	--gnome-inactive-headerbar-border-color: #cdd1da;
+	--gnome-inactive-headerbar-box-shadow: 0 1px #fff inset;
+
+	/* Buttons */
+	--gnome-button-background: linear-gradient(to top, #eaecf1 0%, #f5f8fd 95%, #f6f9fe 100%);
+	--gnome-button-border-color: #c3c7cf;
+	--gnome-button-border-bottom-color: #c3c7cf;
+	--gnome-button-box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.03);
+	--gnome-button-hover-color: rgba(0, 0, 0, 0.1);
+	--gnome-button-active-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-hover-background: linear-gradient(to top, #f5f8fd 0%, #eef3fd 100%);
+	--gnome-button-active-background: #c3c7cf;
+	--gnome-button-active-border-color: #a7abb2;
+	--gnome-button-active-border-bottom-color: #a7abb2;
+	--gnome-button-active-box-shadow: 0 1px rgba(255, 255, 255, 0) inset;
+	--gnome-button-disabled-background: #faf9f8;
+	--gnome-button-disabled-border-color: #c3c7cf;
+	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+	--gnome-inactive-button-background: #f6f5f4;
+	--gnome-inactive-button-border-color: #cdd1da;
+	--gnome-inactive-button-box-shadow: 0 1px rgba(255, 255, 255, 0) inset, 0 1px rgba(255, 255, 255, 0);
+	--gnome-button-suggested-action-background: linear-gradient(to top, #2379e2 2px, #3584e4);
+	--gnome-button-suggested-action-border-color: #1b6acb;
+	--gnome-button-suggested-action-border-bottom-color: #15539e;
+	--gnome-button-suggested-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-button-suggested-action-hover-background: linear-gradient(to top, #3584e4, #3987e5 1px);
+	--gnome-button-suggested-action-active-background: linear-gradient(to top, #1961b9, #1961b9 1px);
+	--gnome-button-suggested-action-active-border-color: #1b6acb;
+	--gnome-button-suggested-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+	--gnome-button-destructive-action-background: linear-gradient(to top, #ce1921 2px, #e01b24);
+	--gnome-button-destructive-action-border-color: #b2161d;
+	--gnome-button-destructive-action-border-bottom-color: #851015;
+	--gnome-button-destructive-action-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-button-destructive-action-hover-background: linear-gradient(to top, #e01b24, #e41c26 1px);
+	--gnome-button-destructive-action-active-background: linear-gradient(to top, #a0131a, #a0131a 1px);
+	--gnome-button-destructive-action-active-border-color: #b2161d;
+	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+
+	--gnome-headerbar-button-combined-background: rgba(0, 0, 0, 0.05);
+	--gnome-headerbar-button-hover-background: rgba(0, 0, 0, 0.1);
+	--gnome-headerbar-button-active-background: rgba(0, 0, 0, 0.15);
+
+	/* URL bar */
+	--gnome-urlbar-background: #f3f4f6;
+	--gnome-urlbar-border-color: #abafb6;
+	--gnome-urlbar-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.08), 0 5px 8px rgba(0, 0, 0, 0.05), 0 8px 16px rgba(0, 0, 0, 0.03), 0 0 0 1px rgba(0,0,0, 0.12);
+	--gnome-urlbar-color: #020202;
+	--gnome-hover-urlbar-border-color: #d7dce5;
+	--gnome-inactive-urlbar-background: #e9ebf0;
+	--gnome-inactive-urlbar-border-color: #cdd1da;
+	--gnome-inactive-urlbar-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.05);
+	--gnome-inactive-urlbar-color: #252932;
+	--gnome-focused-urlbar-border-color: #5683DA;
+	--gnome-focused-urlbar-highlight-color: #6592E9;
+	--gnome-private-urlbar-background: #e6c2ff;
+
+	/* Tabs */
+	--gnome-tabbar-tab-background: #d7dce5;
+	--gnome-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-tabbar-tab-border-color: #c3c7cf;
+	--gnome-tabbar-tab-hover-background: #c8ccd5;
+	--gnome-tabbar-tab-hover-border-color: #c3c7cf;
+	--gnome-tabbar-tab-hover-color: rgb(93, 98, 99);
+	--gnome-tabbar-tab-active-background: #fbfcfd;
+	--gnome-tabbar-tab-active-border-color: #c3c7cf;
+	--gnome-tabbar-tab-active-color: rgb(46, 52, 54);
+	--gnome-tabbar-tab-active-hover-background: #f3f4f6;
+	--gnome-inactive-tabbar-tab-color: #8b8c8f;
+	--gnome-inactive-tabbar-tab-background: #dfdfdf;
+	--gnome-inactive-tabbar-tab-active-background: #f3f4f6;
+	--gnome-inactive-tabbar-tab-active-border-color: var(--gnome-tabbar-tab-active-border-bottom-color);
+	--gnome-inactive-tabbar-tab-active-color: var(--gnome-inactive-tabbar-tab-color);
+	--gnome-tab-attention-icon-color: #718be8;
+
+	/* Switch */
+	--gnome-switch-background: #a7abb2;
+	--gnome-switch-hover-background: #969aa0;
+	--gnome-switch-active-background: #7b8292;
+	--gnome-switch-border-color: transparent;
+	--gnome-switch-slider-background: #fbfcfd;
+	--gnome-switch-slider-border-color: transparent;
+	--gnome-switch-slider-box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
+	--gnome-switch-active-border-color: transparent;
+	--gnome-switch-active-slider-border-color: transparent;
+	--gnome-switch-pressed-background: #315bef;
+	--gnome-switch-pressed-hover-background: #5073f1;
+	--gnome-switch-pressed-active-background: #6584f3;
+
+	/* Dirty hacks for replaced symbolic icons, they load from
+	 * /usr/share/icons/<theme>/ and on some systems they need to be
+	 * inverted, on others they don't, adjusts the filters below to your
+	 * needs (you may also adjust icon brightness here). */
+	--gnome-convert-icon-to-symbolic-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(85%) invert(100%);
+	--gnome-icons-hack-filter: none;
+	--gnome-window-icons-hack-filter: invert(30%);
+
+	/* Private window colors */
+	--gnome-private-accent: #1c71d8;
+	
+	/* Toolbars */
+	--gnome-private-toolbar-background: var(--gnome-headerbar-background);
+	--gnome-private-inactive-toolbar-background: var(--gnome-inactive-headerbar-background);
+	/* Menus */
+	--gnome-private-menu-background: #fbfcfd;
+	/* Header bar */
+	--gnome-private-headerbar-background: #D7E3F0;
+	--gnome-private-inactive-headerbar-background: var(--gnome-private-toolbar-background);
+	/* Tabs */
+	--gnome-private-tabbar-tab-hover-background: #cbd7e3; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-background: #c6d1dd; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-background-contrast: #a9b6c4; /* Hardcoded color */
+	--gnome-private-tabbar-tab-active-hover-background: #c0cbd7; /* Hardcoded color */
+	--gnome-private-inactive-tabbar-tab-hover-background: #e4e9f0; /* Hardcoded color */
+	--gnome-private-inactive-tabbar-tab-active-background: #e1e7ed; /* Hardcoded color */
+
+	/* Text color for Firefox Logo in new private tab */
+	--gnome-private-wordmark: #20123A;
+
+	/* New private tab background */
+	--gnome-private-in-content-page-background: #ebf0fa;
+
+	/* Private browsing info box */
+	--gnome-private-text-primary-color: #15141A;
+}

src/other/firefox/WhiteSur/colors/light.css

@@ -8,6 +8,10 @@
 :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: #f5f5f5;
+	--gnome-content-page-dialog-background: #ffffff;
+	--gnome-content-page-background: #f2f2f2;
+	--gnome-content-box-background: #ffffff;
+	--gnome-content-page-color: #242424;
 	--theme-primary-color: #315bef;
 	--theme-primary-hover-color: #5073f1;
 	--theme-primary-active-color: #6584f3;

src/other/firefox/WhiteSur/parts/headerbar-urlbar.css

@@ -40,9 +40,7 @@ toolbarspring {
 }
 
 #urlbar[breakout][breakout-extend] {
-	left: 0 !important;
+	width: var(--urlbar-width) !important;
-	top: 0 !important;
-	width: 100% !important;
 	z-index: 5 !important;
 	padding: 0 !important;
 	border-radius: 8px !important;
@@ -211,7 +209,7 @@ toolbarspring {
 	border-radius: 5px !important;
 }
 
-#star-button-box.urlbar-page-action {
+.urlbar-page-action {
 	padding: 5px 6px !important;
 }
 

src/other/firefox/WhiteSur/parts/tabsbar-adaptive.css

@@ -6,6 +6,12 @@
 	--space-above-tabbar: 0 !important;
 }
 
+#TabsToolbar {
+/* Remove hover effects on tab bar buttons */
+	--toolbarbutton-active-background: transparent !important;
+	--toolbarbutton-hover-background: transparent !important;
+	padding: 0 !important;
+	box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 1px 3px rgba(0, 0, 0, 0.08) !important;
 
 /* Tabs bar height */
 #tabbrowser-tabs {
@@ -16,28 +22,20 @@
 	max-height: 32px !important;
 }
 
-#TabsToolbar .toolbar-items {
+.tab-background, .tab-stack {
+	min-height: 32px !important;
+}
+
+.toolbar-items {
 	margin-bottom: -1px !important;
 }
 
-:root[tabsintitlebar][inFullscreen] #TabsToolbar .toolbar-items {
-	margin-bottom: 0 !important;
-}
-
-/* Remove hover effects on tab bar buttons */
-#TabsToolbar {
-	--toolbarbutton-active-background: transparent !important;
-	--toolbarbutton-hover-background: transparent !important;
-	padding: 0 !important;
-	box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 1px 3px rgba(0, 0, 0, 0.08) !important;
-}
-
 /* New hover effect */
-#TabsToolbar toolbarbutton {
+toolbarbutton {
 	fill-opacity: .6 !important;
 }
-#TabsToolbar toolbarbutton:not([disabled]):hover,
+toolbarbutton:not([disabled]):hover,
-#TabsToolbar toolbarbutton[open=true] {
+toolbarbutton[open=true] {
 	fill-opacity: 1 !important;
 }
 
@@ -77,23 +75,6 @@
 	margin: 0 !important;
 }
 
-/* Tab labels */
-tab {
-	color: var(--gnome-tabbar-tab-color) !important;
-}
-tab:hover {
-	color: var(--gnome-tabbar-tab-hover-color) !important;
-}
-tab[selected] {
-	color: var(--gnome-tabbar-tab-active-color) !important;
-}
-tab:-moz-window-inactive {
-	color: var(--gnome-inactive-tabbar-tab-color) !important;
-}
-tab[selected]:-moz-window-inactive {
-	color: var(--gnome-inactive-tabbar-tab-active-color) !important;
-}
-
 /* Center all inside tab */
 .tab-content {
 	display: flex;
@@ -192,11 +173,6 @@ tab[selected]:-moz-window-inactive {
 	margin-left: 0 !important
 }
 
-.tab-background {
-	border-radius: 0 !important;
-	margin-block: 0 !important;
-}
-
 /*Align personal bookmarks v89 */
 #personal-bookmarks {
 	-moz-box-align: center !important;
@@ -208,6 +184,15 @@ tab[selected]:-moz-window-inactive {
 	padding: 0 !important;
 }
 
+/* Tabs */
+.tab-background {
+	background-color: transparent !important;
+	transition: background-color 200ms;
+	border-radius: 0 !important;
+	margin-block: 0 !important;
+	outline: none !important;
+}
+
 .tabbrowser-tab[selected="true"] > .tab-stack > .tab-background {
 	margin-left: 0px !important;
 	margin-right: 0px !important;
@@ -219,6 +204,102 @@ tab[selected]:-moz-window-inactive {
 	margin-right: auto !important
 }
 
+/* Tab hover */
+.tabbrowser-tab:not([selected=true]):hover .tab-background {
+	background-color: var(--gnome-tabbar-tab-active-hover-background) !important;
+	border-image: none !important;
+	box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 -1px var(--gnome-toolbar-border-color) !important;
+}
+
+/* Active tab */
+.tab-background:is([selected]) {
+	background-color: var(--gnome-tabbar-tab-active-background) !important;
+	background-image: none !important;
+	border: none !important;
+	border-image: none !important;
+	transition: none !important;
+	margin-left: -1px !important;
+	margin-right: -1px !important;
+	border-radius: 0 !important;
+	box-shadow: 1px 0 var(--gnome-toolbar-border-color), 1px 0 3px rgba(0, 0, 0, 0.08),
+	            -1px 0 var(--gnome-toolbar-border-color), -1px 0 3px rgba(0, 0, 0, 0.08),
+	            inset 0 -1px var(--gnome-toolbar-border-color) !important;
+}
+
+.tab-background:is([selected]):-moz-window-inactive {
+	background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
+	border-image: none !important;
+}
+
+/* Tabs scroll buttons */
+#scrollbutton-up:not([disabled]):hover,
+#scrollbutton-down:not([disabled]):hover {
+	background: var(--gnome-tabbar-tab-active-hover-background) !important;
+}
+
+/* Full width tabs */
+.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
+.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
+	max-width: 100% !important;
+}
+
+.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]),
+.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) {
+	max-width: .1px !important;
+}
+
+/* Remove blank spaces on tabs start and end */
+.titlebar-spacer {
+	display: none !important;
+}
+
+/* TabsToolbar buttons */
+.toolbarbutton-1 {
+	margin: 0 !important;
+	border-radius: 0 !important;
+	min-width: 32px !important;
+	min-height: 32px !important;
+	padding: 0 !important;
+	border: none !important;
+}
+
+.toolbarbutton-1 > .toolbarbutton-icon,
+.toolbarbutton-1 > .toolbarbutton-text,
+.toolbarbutton-1 > .toolbarbutton-badge-stack {
+	padding: 8px !important;
+}
+
+.toolbarbutton-1 > .toolbarbutton-icon {
+	width: 32px !important;
+	height: 32px !important;
+}
+
+#alltabs-button {
+	display: none !important;
+}
+}
+
+:root[tabsintitlebar][inFullscreen] #TabsToolbar .toolbar-items {
+	margin-bottom: 0 !important;
+}
+
+/* Tab labels */
+tab {
+	color: var(--gnome-tabbar-tab-color) !important;
+}
+tab:hover {
+	color: var(--gnome-tabbar-tab-hover-color) !important;
+}
+tab[selected] {
+	color: var(--gnome-tabbar-tab-active-color) !important;
+}
+tab:-moz-window-inactive {
+	color: var(--gnome-inactive-tabbar-tab-color) !important;
+}
+tab[selected]:-moz-window-inactive {
+	color: var(--gnome-inactive-tabbar-tab-active-color) !important;
+}
+
 /* Close tab button */
 .close-icon {
 	height: 16px !important;
@@ -297,15 +378,15 @@ tab[selected]:-moz-window-inactive {
 	display: none !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
 	background-color: var(--gnome-tabbar-tab-background) !important;
 }
 
-.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
 	background-color: var(--gnome-tabbar-tab-active-background) !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):hover {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -314,6 +395,18 @@ tab[selected]:-moz-window-inactive {
 	display: none;
 }
 
+/* tab-context-line above tabs */
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+	height: 2px;
+	border-radius: 0 !important;
+	margin: 0 !important;
+}
+
+/* Remove alt colours references for multi tabs*/
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
+	display: none;
+}
+
 /* Tab attention dot */
 .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]), #firefox-view-button[attention] {
 	background-image: radial-gradient(circle, var(--gnome-tab-attention-icon-color), var(--gnome-tab-attention-icon-color) 2px, transparent 2px) !important;
@@ -322,107 +415,19 @@ tab[selected]:-moz-window-inactive {
 	background-repeat: no-repeat;
 }
 
-/* Remove alt colours references for multi tabs*/
-.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
-	display: none;
-}
-
 .tabbrowser-tab[class*="identity-color-"][pinned] {
 	display: flex;
 }
 
-.tab-background {
-	background-color: transparent !important;
-	transition: background-color 200ms;
-}
-
-.tab-background, .tab-stack {
-	min-height: 32px !important;
-}
-
-/* Tab hover */
-#TabsToolbar .tabbrowser-tab:not([selected=true]):hover .tab-background {
-	background-color: var(--gnome-tabbar-tab-active-hover-background) !important;
-	border-image: none !important;
-	box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 -1px var(--gnome-toolbar-border-color) !important;
-}
-
-/* Active tab */
-.tab-background:is([selected]) {
-	background-color: var(--gnome-tabbar-tab-active-background) !important;
-	background-image: none !important;
-	border: none !important;
-	border-image: none !important;
-	transition: none !important;
-	margin-left: -1px !important;
-	margin-right: -1px !important;
-	border-radius: 0 !important;
-	box-shadow: 1px 0 var(--gnome-toolbar-border-color), 1px 0 3px rgba(0, 0, 0, 0.08),
-	            -1px 0 var(--gnome-toolbar-border-color), -1px 0 3px rgba(0, 0, 0, 0.08),
-	            inset 0 -1px var(--gnome-toolbar-border-color) !important;
-}
-
-.tab-background:is([selected]):-moz-window-inactive {
-	background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
-	border-image: none !important;
-}
-
-/* Tabs scroll buttons */
-#TabsToolbar #scrollbutton-up:not([disabled]):hover,
-#TabsToolbar #scrollbutton-down:not([disabled]):hover {
-	background: var(--gnome-tabbar-tab-active-hover-background) !important;
-}
-
-/* Full width tabs */
-.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
-.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
-	max-width: 100% !important;
-}
-
-.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]),
-.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) {
-	max-width: .1px !important;
-}
-
-/* Remove blank spaces on tabs start and end */
-#TabsToolbar .titlebar-spacer {
-	display: none !important;
-}
-
-/* TabsToolbar buttons */
-#TabsToolbar .toolbarbutton-1 {
-	margin: 0 !important;
-	border-radius: 0 !important;
-	min-width: 32px !important;
-	min-height: 32px !important;
-	padding: 0 !important;
-	border: none !important;
-}
-
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon,
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-text,
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-badge-stack {
-	padding: 8px !important;
-}
-
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon {
-	width: 32px !important;
-	height: 32px !important;
-}
-
-#TabsToolbar #alltabs-button {
-	display: none !important;
-}
-
 /* firefox-view-button */
 :root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
 :root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
   toolbarbutton:not(#firefox-view-button),
   toolbarpaletteitem:not(#wrapper-firefox-view-button)
 ) + #tabbrowser-tabs {
-  border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important;
+	border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important;
-  padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
+	padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
-  margin-inline-start: 0 !important;
+	margin-inline-start: 0 !important;
 }
 
 #TabsToolbar #firefox-view-button {
@@ -432,6 +437,7 @@ tab[selected]:-moz-window-inactive {
 
 #firefox-view-button > .toolbarbutton-icon {
 	box-shadow: none !important;
+	outline: none !important;
 }
 
 #TabsToolbar #firefox-view-button[open] {
@@ -443,34 +449,6 @@ tab[selected]:-moz-window-inactive {
 	background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
 }
 
-/* Create new container tab indicator */
-.tabbrowser-tab[class*="identity-color-"] .tab-content::before {
-	content: "";
-	display: block;
-	background-image: var(#userContext-icons:--identity-icon);
-	background: var( --identity-tab-color);
-	-moz-context-properties: fill;
-	fill: var(--identity-icon-color);
-	background-size: contain;
-	background-repeat: no-repeat;
-	background-position: center center;
-	min-width: 10px;
-	height: 10px;
-	margin-right: 5px;
-	margin-left: auto !important;
-	border-radius: 100%;
-}
-
-.tabbrowser-tab[class*="identity-color-"][pinned] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][image] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][busy] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][progress] .tab-content::before {
-	right: -10px;
-	top: -8px;
-	position: relative;
-	margin-right: -10px;
-}
-
 /* fix pip on small displays */
 .tab-icon-overlay[pictureinpicture] {
 	top: 3px !important;

src/other/firefox/WhiteSur/parts/tabsbar.css

@@ -6,74 +6,280 @@
 	--space-above-tabbar: 0 !important;
 }
 
-/* Tabs bar height */
-#tabbrowser-tabs {
-	--tab-min-height: 32px !important;
-}
-
-#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
-	max-height: 32px !important;
-}
-
-#TabsToolbar .toolbar-items {
-	margin-bottom: -1px !important;
-}
-
-:root[tabsintitlebar][inFullscreen] #TabsToolbar .toolbar-items {
-	margin-bottom: 0 !important;
-}
-
-/* Remove hover effects on tab bar buttons */
 #TabsToolbar {
+	/* Remove hover effects on tab bar buttons */
 	--toolbarbutton-active-background: transparent !important;
 	--toolbarbutton-hover-background: transparent !important;
 	padding: 0 !important;
 	box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 1px 3px rgba(0, 0, 0, 0.08) !important;
+
+	/* New hover effect */
+	toolbarbutton {
+		fill-opacity: .6 !important;
+	}
+	toolbarbutton:not([disabled]):hover,
+	toolbarbutton[open=true] {
+		fill-opacity: 1 !important;
+	}
+	/* Tabs bar height */
+	#tabbrowser-tabs {
+		--tab-min-height: 32px !important;
+		--tabstrip-min-height: 32px !important;
+	}
+
+	.tab-background, .tab-stack {
+		min-height: 32px !important;
+	}
+
+	#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
+		max-height: 32px !important;
+	}
+
+	.toolbar-items {
+		margin-bottom: -1px !important;
+	}
+
+	/* Remove shadow next to tab scroll buttons */
+	.arrowscrollbox-overflow-start-indicator,
+	.arrowscrollbox-overflow-end-indicator {
+		display: none;
+	}
+
+	/* Remove tab separators */
+	.tabbrowser-tab::after,
+	.tabbrowser-tab::before {
+		border-color: transparent !important;
+		border-image: none !important;
+	}
+
+	/* Tabs separators */
+	.tabbrowser-tab {
+		border-left: 1px solid transparent !important;
+	}
+
+	.tabbrowser-tab + .tabbrowser-tab:not([selected], :hover) {
+		border-color: var(--gnome-tabbar-tab-border-color) !important;
+	}
+
+	.tabbrowser-tab[selected] + .tabbrowser-tab,
+	.tabbrowser-tab:hover + .tabbrowser-tab {
+		border-color: transparent !important;
+	}
+
+	.tabbrowser-tab:first-of-type {
+		border-left: none !important;
+	}
+
+	/* Space between tabs */
+	.tabbrowser-tab:not([pinned]) {
+		margin: 0 !important;
+	}
+
+	/* Center all inside tab */
+	.tab-content {
+		display: flex;
+		flex-direction: row;
+		justify-content: center !important;
+		align-items: center !important;
+		min-width: 44px !important;
+		min-height: 32px !important;
+		padding: 0 8px !important;
+	}
+
+	/* Fix custom info tab icon */
+	.tabbrowser-tab[image="chrome://global/skin/icons/info.svg"]:not([pinned]):not([busy]):not([progress]) .tab-icon-stack::before {
+		margin-inline-end: 5.5px;
+	}
+
+	/* Prevent tab icons size breaking */
+	.tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
+		min-width: 16px;
+	}
+
+	/* Center tab text */
+	.tab-label {
+		margin-inline: 0 !important;
+	}
+
+	/* Adjust tab label width */
+	.tab-label-container {
+		min-width: 0 !important;
+	}
+
+	.tabbrowser-tab:not([pinned]) .tab-label-container {
+		max-width: min-content !important;
+	}
+
+	.tabbrowser-tab[pinned] .tab-label-container {
+		display: none !important;
+	}
+
+	.tab-throbber:not([pinned]), .tab-icon-pending:not([pinned]), .tab-icon-image:not([pinned]), .tab-sharing-icon-overlay:not([pinned]), .tab-icon-overlay:not([pinned]) {
+		margin-inline-end: 0 !important;
+	}
+
+	.tabbrowser-tab:not([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-icon-stack {
+		padding: 6px;
+	}
+
+	/* Hide secondary label about muting */
+	.tabbrowser-tab:is([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-secondary-label {
+		display: none;
+	}
+
+	/* Put tab close button and icon sound to the right */
+	.tab-icon-sound[soundplaying="true"], .tab-icon-sound[muted="true"],
+	.tab-icon-sound[activemedia-blocked="true"] {
+		margin-left: auto !important;
+	}
+	/*.tabbrowser-tab:not([soundplaying]):not([muted]):not([activemedia-blocked]) .tab-close-button {*/
+	/*	margin-left: auto !important;*/
+	/*}*/
+	.tab-icon-sound {
+		margin-right: 6px;
+	}
+
+	/* Force tab favicon to the center */
+	.tab-throbber, .tab-throbber-fallback,
+	.tabbrowser-tab:not([busy]):not([muted="true"]) .tab-icon-image,
+	.tabbrowser-tab .tab-icon-stack {
+		margin-left: auto !important;
+	}
+
+	.tabbrowser-tab:is([pinned]) .tab-icon-stack {
+		margin-left: 0 !important;
+	}
+
+	.tabbrowser-tab:not([busy]):not([muted="true"]) .tab-icon-stack .tab-icon-image {
+		margin: auto !important;
+	}
+
+	/* If tab favicon is not present, force tab label to the center */
+	.tabbrowser-tab .tab-label-container {
+		margin-left: 0 !important;
+		margin-right: auto !important;
+	}
+
+	.tabbrowser-tab:not([image]):not([busy]):not([progress]) .tab-label-container {
+		margin-left: auto !important;
+	}
+
+	/* Fix website with no favicon centred text */
+	.tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) .tab-icon-stack {
+		margin-left: 0 !important
+	}
+
+	.tabbrowser-tab:not([image], [busy]) .tab-icon-stack {
+		margin-left: 0 !important
+	}
+
+	/*Align personal bookmarks v89 */
+	#personal-bookmarks {
+		-moz-box-align: center !important;
+	}
+
+	/* fix misc spacing between tabs */
+	.tabbrowser-tab {
+		padding-inline: 0 !important;
+		padding: 0 !important;
+	}
+
+	.tabbrowser-tab[selected="true"] > .tab-stack > .tab-background {
+		margin-left: 0px !important;
+		margin-right: 0px !important;
+	}
+
+	/* centre text when audio is playing */
+	.tabbrowser-tab:is([soundplaying]) .tab-label-container {
+		margin-left: 0 !important;
+		margin-right: auto !important
+	}
+
+	/* Tabs */
+	.tab-background {
+		transition: background-color 200ms;
+		border-radius: 0 !important;
+		margin-block: 0 !important;
+		outline: none !important;
+	}
+
+	/* Tab hover */
+	.tabbrowser-tab:not([selected=true]):hover .tab-background {
+		background-color: var(--gnome-tabbar-tab-hover-background) !important;
+		border-image: none !important;
+		box-shadow: inset 0 1px var(--gnome-tabbar-tab-hover-border-color), inset 0 -1px var(--gnome-tabbar-tab-hover-border-color) !important;
+	}
+
+	/* Active tab */
+	.tab-background:is([selected]) {
+		background-color: var(--gnome-tabbar-tab-active-background) !important;
+		background-image: none !important;
+		border: none !important;
+		border-image: none !important;
+		transition: none !important;
+		margin-left: -1px !important;
+		margin-right: -1px !important;
+		border-radius: 0 !important;
+		box-shadow: 1px 0 var(--gnome-tabbar-tab-active-border-color), 1px 0 3px rgba(0, 0, 0, 0.08),
+		            -1px 0 var(--gnome-tabbar-tab-active-border-color), -1px 0 3px rgba(0, 0, 0, 0.08),
+		            inset 0 -1px var(--gnome-tabbar-tab-active-border-color) !important;
+	}
+
+	.tab-background:is([selected]):-moz-window-inactive {
+		background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
+		border-image: none !important;
+	}
+
+	/* Tabs scroll buttons */
+	#scrollbutton-up:not([disabled]):hover,
+	#scrollbutton-down:not([disabled]):hover {
+		background: var(--gnome-tabbar-tab-active-hover-background) !important;
+	}
+
+	/* Full width tabs */
+	.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
+	.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
+		max-width: 100% !important;
+	}
+
+	.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]),
+	.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) {
+		max-width: .1px !important;
+	}
+
+	/* Remove blank spaces on tabs start and end */
+	.titlebar-spacer {
+		display: none !important;
+	}
+
+	/* TabsToolbar buttons */
+	.toolbarbutton-1 {
+		margin: 0 !important;
+		border-radius: 0 !important;
+		min-width: 32px !important;
+		min-height: 32px !important;
+		padding: 0 !important;
+		border: none !important;
+	}
+
+	.toolbarbutton-1 > .toolbarbutton-icon,
+	.toolbarbutton-1 > .toolbarbutton-text,
+	.toolbarbutton-1 > .toolbarbutton-badge-stack {
+		padding: 8px !important;
+	}
+
+	.toolbarbutton-1 > .toolbarbutton-icon {
+		width: 32px !important;
+		height: 32px !important;
+	}
+
+	#alltabs-button {
+		display: none !important;
+	}
 }
 
-/* New hover effect */
+:root[tabsintitlebar][inFullscreen] #TabsToolbar .toolbar-items {
-#TabsToolbar toolbarbutton {
+	margin-bottom: 0 !important;
-	fill-opacity: .6 !important;
-}
-#TabsToolbar toolbarbutton:not([disabled]):hover,
-#TabsToolbar toolbarbutton[open=true] {
-	fill-opacity: 1 !important;
-}
-
-/* Remove shadow next to tab scroll buttons */
-.arrowscrollbox-overflow-start-indicator,
-.arrowscrollbox-overflow-end-indicator {
-	display: none;
-}
-
-/* Remove tab separators */
-.tabbrowser-tab::after,
-.tabbrowser-tab::before {
-	border-color: transparent !important;
-	border-image: none !important;
-}
-
-/* Tabs separators */
-.tabbrowser-tab {
-	border-left: 1px solid transparent !important;
-}
-
-.tabbrowser-tab + .tabbrowser-tab:not([selected], :hover) {
-	border-color: var(--gnome-tabbar-tab-border-color) !important;
-}
-
-.tabbrowser-tab[selected] + .tabbrowser-tab,
-.tabbrowser-tab:hover + .tabbrowser-tab {
-	border-color: transparent !important;
-}
-
-.tabbrowser-tab:first-of-type {
-	border-left: none !important;
-}
-
-/* Space between tabs */
-.tabbrowser-tab:not([pinned]) {
-	margin: 0 !important;
 }
 
 /* Tab labels */
@@ -93,131 +299,6 @@ tab[selected]:-moz-window-inactive {
 	color: var(--gnome-inactive-tabbar-tab-active-color) !important;
 }
 
-/* Center all inside tab */
-.tab-content {
-	display: flex;
-	flex-direction: row;
-	justify-content: center !important;
-	align-items: center !important;
-	min-width: 44px !important;
-	min-height: 32px !important;
-	padding: 0 8px !important;
-}
-
-/* Fix custom info tab icon */
-.tabbrowser-tab[image="chrome://global/skin/icons/info.svg"]:not([pinned]):not([busy]):not([progress]) .tab-icon-stack::before {
-	margin-inline-end: 5.5px;
-}
-
-/* Prevent tab icons size breaking */
-.tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
-	min-width: 16px;
-}
-
-/* Center tab text */
-.tab-label {
-	margin-inline: 0 !important;
-}
-
-/* Adjust tab label width */
-.tab-label-container {
-	min-width: 0 !important;
-}
-
-.tabbrowser-tab:not([pinned]) .tab-label-container {
-	max-width: min-content !important;
-}
-
-.tabbrowser-tab[pinned] .tab-label-container {
-	display: none !important;
-}
-
-.tab-throbber:not([pinned]), .tab-icon-pending:not([pinned]), .tab-icon-image:not([pinned]), .tab-sharing-icon-overlay:not([pinned]), .tab-icon-overlay:not([pinned]) {
-	margin-inline-end: 0 !important;
-}
-
-.tabbrowser-tab:not([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-icon-stack {
-	padding: 6px;
-}
-
-/* Hide secondary label about muting */
-.tabbrowser-tab:is([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-secondary-label {
-	display: none;
-}
-
-/* Put tab close button and icon sound to the right */
-.tab-icon-sound[soundplaying="true"], .tab-icon-sound[muted="true"],
-.tab-icon-sound[activemedia-blocked="true"] {
-	margin-left: auto !important;
-}
-/*.tabbrowser-tab:not([soundplaying]):not([muted]):not([activemedia-blocked]) .tab-close-button {*/
-/*	margin-left: auto !important;*/
-/*}*/
-.tab-icon-sound {
-	margin-right: 6px;
-}
-
-/* Force tab favicon to the center */
-.tab-throbber, .tab-throbber-fallback,
-.tabbrowser-tab:not([busy]):not([muted="true"]) .tab-icon-image,
-.tabbrowser-tab .tab-icon-stack {
-	margin-left: auto !important;
-}
-
-.tabbrowser-tab:is([pinned]) .tab-icon-stack {
-	margin-left: 0 !important;
-}
-
-.tabbrowser-tab:not([busy]):not([muted="true"]) .tab-icon-stack .tab-icon-image {
-	margin: auto !important;
-}
-
-/* If tab favicon is not present, force tab label to the center */
-.tabbrowser-tab .tab-label-container {
-	margin-left: 0 !important;
-	margin-right: auto !important;
-}
-
-.tabbrowser-tab:not([image]):not([busy]):not([progress]) .tab-label-container {
-	margin-left: auto !important;
-}
-
-/* Fix website with no favicon centred text */
-.tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) .tab-icon-stack {
-	margin-left: 0 !important
-}
-
-.tabbrowser-tab:not([image], [busy]) .tab-icon-stack {
-	margin-left: 0 !important
-}
-
-.tab-background {
-	border-radius: 0 !important;
-	margin-block: 0 !important;
-}
-
-/*Align personal bookmarks v89 */
-#personal-bookmarks {
-	-moz-box-align: center !important;
-}
-
-/* fix misc spacing between tabs */
-.tabbrowser-tab {
-	padding-inline: 0 !important;
-	padding: 0 !important;
-}
-
-.tabbrowser-tab[selected="true"] > .tab-stack > .tab-background {
-	margin-left: 0px !important;
-	margin-right: 0px !important;
-}
-
-/* centre text when audio is playing */
-.tabbrowser-tab:is([soundplaying]) .tab-label-container {
-	margin-left: 0 !important;
-	margin-right: auto !important
-}
-
 /* Close tab button */
 .close-icon {
 	height: 16px !important;
@@ -281,6 +362,30 @@ tab[selected]:-moz-window-inactive {
 	border-radius: 100px !important;
 }
 
+.tab-audio-button {
+  --icon-size-default: 12px;
+  --button-size-icon-small: 24px;
+  --button-min-height-small: 24px;
+  --button-border-radius: 100px !important;
+  margin: -3px 3px 0 !important;
+}
+
+/*.tab-content*/
+/*	/* Rearrange content */
+/*	.tab-audio-button {*/
+/*		order: 0;*/
+/*	}*/
+/*	.tab-icon-stack {*/
+/*		order: 1;*/
+/*	}*/
+/*	.tab-label-container {*/
+/*		order: 2;*/
+/*	}*/
+/*	.tab-close-button {*/
+/*		order: 3;*/
+/*	}*/
+/*}*/
+
 .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
 	top: 0 !important;
 	inset-inline-end: 0 !important;
@@ -290,15 +395,15 @@ tab[selected]:-moz-window-inactive {
 	display: none !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
 	background-color: var(--gnome-tabbar-tab-background) !important;
 }
 
-.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
 	background-color: var(--gnome-tabbar-tab-active-background) !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):hover {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -307,6 +412,18 @@ tab[selected]:-moz-window-inactive {
 	display: none;
 }
 
+/* tab-context-line above tabs */
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+	height: 2px;
+	border-radius: 0 !important;
+	margin: 0 !important;
+}
+
+/* Remove alt colours references for multi tabs*/
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
+	display: none;
+}
+
 /* Tab attention dot */
 .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]), #firefox-view-button[attention] {
 	background-image: radial-gradient(circle, var(--gnome-tab-attention-icon-color), var(--gnome-tab-attention-icon-color) 2px, transparent 2px) !important;
@@ -315,107 +432,19 @@ tab[selected]:-moz-window-inactive {
 	background-repeat: no-repeat;
 }
 
-/* Remove alt colours references for multi tabs*/
-.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
-	display: none;
-}
-
 .tabbrowser-tab[class*="identity-color-"][pinned] {
 	display: flex;
 }
 
-.tab-background {
-	background-color: transparent !important;
-	transition: background-color 200ms;
-}
-
-.tab-background, .tab-stack {
-	min-height: 32px !important;
-}
-
-/* Tab hover */
-#TabsToolbar .tabbrowser-tab:not([selected=true]):hover .tab-background {
-	background-color: var(--gnome-tabbar-tab-hover-background) !important;
-	border-image: none !important;
-	box-shadow: inset 0 1px var(--gnome-tabbar-tab-hover-border-color), inset 0 -1px var(--gnome-tabbar-tab-hover-border-color) !important;
-}
-
-/* Active tab */
-.tab-background:is([selected]) {
-	background-color: var(--gnome-tabbar-tab-active-background) !important;
-	background-image: none !important;
-	border: none !important;
-	border-image: none !important;
-	transition: none !important;
-	margin-left: -1px !important;
-	margin-right: -1px !important;
-	border-radius: 0 !important;
-	box-shadow: 1px 0 var(--gnome-tabbar-tab-active-border-color), 1px 0 3px rgba(0, 0, 0, 0.08),
-	            -1px 0 var(--gnome-tabbar-tab-active-border-color), -1px 0 3px rgba(0, 0, 0, 0.08),
-	            inset 0 -1px var(--gnome-tabbar-tab-active-border-color) !important;
-}
-
-.tab-background:is([selected]):-moz-window-inactive {
-	background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
-	border-image: none !important;
-}
-
-/* Tabs scroll buttons */
-#TabsToolbar #scrollbutton-up:not([disabled]):hover,
-#TabsToolbar #scrollbutton-down:not([disabled]):hover {
-	background: var(--gnome-tabbar-tab-active-hover-background) !important;
-}
-
-/* Full width tabs */
-.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
-.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
-	max-width: 100% !important;
-}
-
-.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]),
-.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) {
-	max-width: .1px !important;
-}
-
-/* Remove blank spaces on tabs start and end */
-#TabsToolbar .titlebar-spacer {
-	display: none !important;
-}
-
-/* TabsToolbar buttons */
-#TabsToolbar .toolbarbutton-1 {
-	margin: 0 !important;
-	border-radius: 0 !important;
-	min-width: 32px !important;
-	min-height: 32px !important;
-	padding: 0 !important;
-	border: none !important;
-}
-
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon,
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-text,
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-badge-stack {
-	padding: 8px !important;
-}
-
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon {
-	width: 32px !important;
-	height: 32px !important;
-}
-
-#TabsToolbar #alltabs-button {
-	display: none !important;
-}
-
 /* firefox-view-button */
 :root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
 :root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
   toolbarbutton:not(#firefox-view-button),
   toolbarpaletteitem:not(#wrapper-firefox-view-button)
 ) + #tabbrowser-tabs {
-  border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important;
+	border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important;
-  padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
+	padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
-  margin-inline-start: 0 !important;
+	margin-inline-start: 0 !important;
 }
 
 #TabsToolbar #firefox-view-button {
@@ -425,6 +454,7 @@ tab[selected]:-moz-window-inactive {
 
 #firefox-view-button > .toolbarbutton-icon {
 	box-shadow: none !important;
+	outline: none !important;
 }
 
 #TabsToolbar #firefox-view-button[open] {
@@ -436,34 +466,6 @@ tab[selected]:-moz-window-inactive {
 	background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
 }
 
-/* Create new container tab indicator */
-.tabbrowser-tab[class*="identity-color-"] .tab-content::before {
-	content: "";
-	display: block;
-	background-image: var(#userContext-icons:--identity-icon);
-	background: var( --identity-tab-color);
-	-moz-context-properties: fill;
-	fill: var(--identity-icon-color);
-	background-size: contain;
-	background-repeat: no-repeat;
-	background-position: center center;
-	min-width: 10px;
-	height: 10px;
-	margin-right: 5px;
-	margin-left: auto !important;
-	border-radius: 100%;
-}
-
-.tabbrowser-tab[class*="identity-color-"][pinned] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][image] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][busy] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][progress] .tab-content::before {
-	right: -10px;
-	top: -8px;
-	position: relative;
-	margin-right: -10px;
-}
-
 /* fix pip on small displays */
 .tab-icon-overlay[pictureinpicture] {
 	top: 3px !important;

src/other/firefox/WhiteSur/parts/toolbox.css

@@ -14,6 +14,10 @@
 	background: var(--gnome-toolbar-background) !important;
 }
 
+#navigator-toolbox {
+	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
+}
+
 #nav-bar {
 	border: none !important;
 	color: var(--gnome-toolbar-color);
@@ -41,7 +45,6 @@ findbar:-moz-window-inactive label,
 #TabsToolbar {
 	border: none !important;
 	background: var(--gnome-tabstoolbar-background) !important;
-	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 	box-shadow: inset 0 1px var(--gnome-toolbar-border-color) !important;
 }
 

src/other/firefox/WhiteSur/theme-adaptive.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/WhiteSur/theme-darker.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/WhiteSur/theme-nord.css

@@ -0,0 +1,36 @@
+@import "parts/toolbox.css";
+@import "parts/buttons.css";
+@import "parts/entries.css";
+@import "parts/controls.css";
+@import "parts/headerbar-urlbar.css";
+@import "parts/headerbar-private-urlbar.css";
+@import "parts/headerbar.css";
+@import "parts/csd.css";
+@import "parts/titlebutton-light.css";
+@import "parts/titlebutton-dark.css";
+@import "parts/popups.css";
+@import "parts/tabsbar.css";
+@import "parts/findbar.css";
+@import "parts/sidebar.css";
+@import "parts/dialogs.css";
+@import "parts/notification.css";
+@import "parts/video-player.css";
+@import "parts/remove-white-flash.css";
+@import "parts/icons.css";
+@import "colors/light-nord.css";
+@import "colors/dark-nord.css";
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+/* Set theme version text in customization panel */
+#customization-footer::before {
+	background: url("icons/icon.svg") no-repeat;
+	background-size: contain;
+	content: "Firefox WhiteSur theme";
+	padding: 10px 10px 10px 50px;
+}
+
+#customization-container {
+	background-color: var(--gnome-browser-before-load-background) !important;
+	color: var(--gnome-toolbar-color) !important;
+	background-image: none !important;
+}

src/other/firefox/WhiteSur/theme.css

@@ -14,6 +14,7 @@
 @import "parts/sidebar.css";
 @import "parts/dialogs.css";
 @import "parts/notification.css";
+@import "parts/infobar.css";
 @import "parts/video-player.css";
 @import "parts/remove-white-flash.css";
 @import "parts/icons.css";

src/other/firefox/common/hide-single-tab.css

@@ -1,20 +1,21 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#tabbrowser-tabs tab:only-of-type,
-#TabsToolbar #alltabs-button {
-	display: none !important;
-}
-
-.tab-background, .tab-stack {
-	min-height: 0 !important;
-}
-
 #TabsToolbar {
 	min-height: 0 !important;
-}
 
-#tabbrowser-tabs,
+	#tabbrowser-tabs tab:only-of-type,
-#tabbrowser-tabs arrowscrollbox {
+	#alltabs-button {
-	min-height: 0 !important;
+		display: none !important;
-	--tab-min-height: 0 !important;
+	}
+
+	.tab-background,
+	.tab-stack {
+		min-height: 0 !important;
+	}
+
+	#tabbrowser-tabs,
+	#tabbrowser-tabs arrowscrollbox {
+		min-height: 0 !important;
+		--tab-min-height: 0 !important;
+	}
 }

src/other/firefox/common/hide-window-buttons.css

@@ -1,9 +1,18 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox-container {
+:root[tabsintitlebar], :root[customtitlebar] {
-    display: none !important;
+	&[sizemode="maximized"] {
-}
+		#nav-bar, #titlebar {
+			.titlebar-buttonbox-container {
+				display: none !important;
+				padding: 0 !important;
+				right: 0 !important;
+			}
+		}
 
-:root[tabsintitlebar][sizemode="maximized"] #nav-bar {
+		&:not([inFullscreen]) #nav-bar {
-    padding-left: 3px !important;
+			padding-left: 8px !important;
+			padding-right: 8px !important;
+		}
+	}
 }

src/other/firefox/common/icons/briefcase.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m6 1c-1.108 0-2 0.892-2 2v2h-2c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2h-2v-2c0-1.108-0.892-2-2-2h-4zm0 1h4c0.554 0 1 0.446 1 1v2h-6v-2c0-0.554 0.446-1 1-1zm-4 4h1v8h-1c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1zm2 0h1 6 1v8h-8v-8zm9 0h1c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-1v-8z"/>
+</svg>

src/other/firefox/common/icons/cart.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m0.5 1a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h1.6152l1.9023 7.1289a0.50005 0.50005 0 0 0 0.48242 0.37109h9a0.50005 0.50005 0 0 0 0.47461-0.3418l1.5-4.5a0.50005 0.50005 0 0 0-0.47461-0.6582h-11.316l-0.70117-2.6289a0.50005 0.50005 0 0 0-0.48242-0.37109h-2zm3.4512 4h10.355l-1.168 3.5h-8.2539l-0.93359-3.5zm0.54883 6c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h9c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-9zm1.75 1.5a1.25 1.25 0 0 0-1.25 1.25 1.25 1.25 0 0 0 1.25 1.25 1.25 1.25 0 0 0 1.25-1.25 1.25 1.25 0 0 0-1.25-1.25zm5.5 0a1.25 1.25 0 0 0-1.25 1.25 1.25 1.25 0 0 0 1.25 1.25 1.25 1.25 0 0 0 1.25-1.25 1.25 1.25 0 0 0-1.25-1.25zm-5.5 1a0.25 0.25 0 0 1 0.25 0.25 0.25 0.25 0 0 1-0.25 0.25 0.25 0.25 0 0 1-0.25-0.25 0.25 0.25 0 0 1 0.25-0.25zm5.5 0a0.25 0.25 0 0 1 0.25 0.25 0.25 0.25 0 0 1-0.25 0.25 0.25 0.25 0 0 1-0.25-0.25 0.25 0.25 0 0 1 0.25-0.25z"/>
+</svg>

src/other/firefox/common/icons/container-openin.svg

@@ -0,0 +1,3 @@
+<svg data-name="icon" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m2 1c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm7.5 0c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h3.791l-4.1445 4.1465c-0.19587 0.19587-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l4.1465-4.1445v3.791c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-5c0-0.277-0.223-0.5-0.5-0.5h-5zm-7.5 1h4v4h-4v-4zm0 7c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm8 0c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm-8 1h4v4h-4v-4zm8 0h4v4h-4v-4z"/>
+</svg>

src/other/firefox/common/icons/dollar.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7zm0 1c-0.277 0-0.5 0.223-0.5 0.5v0.92188c-1.2706 0.16126-2.4004 0.9536-2.4004 2.3789 0 1.3329 0.77308 2.0292 2.4004 2.2656v3.4141c-0.91099-0.10544-1.2653-0.55323-1.4492-1.3809-0.1-0.25-0.30078-0.34961-0.55078-0.34961h-0.19922c-0.25 0-0.45117 0.19922-0.45117 0.44922v0.20117c0.24465 1.2232 1.1139 2.0136 2.6504 2.1406v0.95898c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-0.95703c1.4181-0.068444 2.6504-0.871 2.6504-2.543 0-1.6641-1.1031-2.2249-2.6504-2.5762v-3.0098c0.82889 0.12188 1.2081 0.56323 1.4004 1.2363 0.1 0.25 0.24922 0.34961 0.44922 0.34961h0.20117c0.15-0.1 0.34961-0.19922 0.34961-0.44922v-0.20117c-0.29241-1.0234-1.1092-1.7121-2.4004-1.9316v-0.91797c0-0.277-0.223-0.5-0.5-0.5zm-0.5 2.3555v2.9336c-1.2073-0.25207-1.5508-0.6996-1.5508-1.4883-1e-7 -0.78559 0.62862-1.3313 1.5508-1.4453zm1 4.1289c0.93622 0.16145 1.5529 0.49238 1.5996 1.5664 0 0.94045-0.5746 1.4389-1.5996 1.5781v-3.1445z"/>
+</svg>

src/other/firefox/common/icons/fingerprint.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path transform="matrix(-.46973 .46973 -.46973 -.46973 21.705 6.5082)" d="m6.8081 20.663c2.6543 2.6482 6.3446 3.8716 9.9604 3.4324a0.75267 0.75267 0 0 0 0.65696-0.83991 0.75267 0.75267 0 0 0-0.83991-0.65696c-3.1617 0.38403-6.3866-0.68021-8.7109-2.9979-2.1069-2.1192-3.2141-5.0329-3.0478-8.0165a0.75267 0.75267 0 0 0-0.71101-0.79417 0.75267 0.75267 0 0 0-0.79417 0.71101c-0.19 3.409 1.0771 6.7387 3.4844 9.16a0.75274 0.75274 0 0 0 0.002079 0.002079zm2.1684-2.1018c2.8534 2.693 7.4695 3.0316 10.522 0.33887 2.8395-2.5051 3.3354-7.0148 0.72764-9.9042-2.2328-2.474-6.2159-2.8926-8.7379-0.54677-2.1078 1.9605-2.4478 5.4209-0.35966 7.5737 1.6885 1.7408 4.6315 2.0041 6.4116 0.16632 1.3725-1.417 1.5583-3.8579-0.043659-5.2577-0.5738-0.50142-1.3132-0.76106-2.0644-0.74635-0.7512 0.0147-1.5447 0.34549-2.0436 1.0457-0.31848 0.44694-0.45717 0.98131-0.39501 1.5384s0.42442 1.1915 1.0748 1.4366c0.48444 0.18256 0.78262 0.095159 1.1601-0.099791 0.18872-0.09747 0.42044-0.25774 0.54053-0.58627 0.12009-0.32853 0.008268-0.73533-0.1684-0.97088-0.24939-0.33187-0.71962-0.39845-1.052-0.14969 0 0-0.008203-0.19035 0.066527-0.29521 0.20438-0.28681 0.48511-0.41081 0.84614-0.41787 0.36103-0.0071 0.76765 0.14109 1.0416 0.38045 0.88618 0.7744 0.77507 2.2296-0.043659 3.0748-1.1405 1.1774-3.12 1.0023-4.2515-0.16424-1.4606-1.5058-1.2155-4.0133 0.30353-5.4261 1.8706-1.7398 4.905-1.4232 6.5966 0.45114 2.017 2.2349 1.6244 5.7984-0.60706 7.7671-2.5989 2.2928-6.6866 1.829-8.9313-0.7609-2.5679-2.9628-2.0303-7.5838 0.91891-10.104 3.3265-2.8423 8.4754-2.2261 11.27 1.0831 3.1164 3.6901 2.4286 9.3652-1.2411 12.434-0.31945 0.26635-0.36224 0.74104-0.095633 1.0603 0.26635 0.31945 0.74104 0.36224 1.0603 0.095633 4.2979-3.5945 5.1007-10.214 1.4262-14.565-1.6611-1.9668-4.0132-3.1289-6.449-3.3763-2.4358-0.24736-4.9548 0.42167-6.9479 2.1247-3.5692 3.0498-4.2175 8.6094-1.079 12.231 0.17359 0.20028 0.35446 0.39011 0.54469 0.56964zm17.769-2.4553a0.75267 0.75267 0 0 0 0.26819 0.1185 0.75267 0.75267 0 0 0 0.90228-0.56964c0.91298-4.0285-0.30614-8.247-3.2245-11.17a0.75274 0.75274 0 0 0-0.002079-0.002079c-2.4214-2.4087-5.7519-3.6765-9.162-3.4864a0.75267 0.75267 0 0 0-0.71101 0.79417 0.75267 0.75267 0 0 0 0.79417 0.71101c2.9836-0.16629 5.8975 0.94101 8.0165 3.0478 2.5549 2.5592 3.6163 6.2465 2.817 9.7733a0.75267 0.75267 0 0 0 0.30145 0.78377z"/>
+</svg>

src/other/firefox/common/icons/multi-account-container.svg

@@ -0,0 +1,3 @@
+<svg fill="context-fill" fill-opacity="context-fill-opacity" data-name="icon" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2 1c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm10 0c-0.277 0-0.5 0.223-0.5 0.5v2h-2c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h2v2c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-2h2c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-2v-2c0-0.277-0.223-0.5-0.5-0.5zm-10 1h4v4h-4v-4zm0 7c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm8 0c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm-8 1h4v4h-4v-4zm8 0h4v4h-4v-4z"/>
+</svg>

src/other/firefox/common/icons/side-view.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.662 0-3 1.338-3 3v8c0 1.662 1.338 3 3 3h10c1.662 0 3-1.338 3-3v-8c0-1.662-1.338-3-3-3h-10zm0 1h4.5v5h1v-5h4.5c1.108 0 2 0.892 2 2v8c0 1.108-0.892 2-2 2h-4.5v-4h-1v4h-4.5c-1.108 0-2-0.892-2-2v-8c0-1.108 0.892-2 2-2zm2.4004 3.9492c-0.15 0-0.30039 0.050391-0.40039 0.15039l-1.9004 2c-0.2 0.2-0.2 0.60078 0 0.80078l1.9004 1.9004c0.2 0.2 0.60078 0.2 0.80078 0 0.2-0.2 0.2-0.60078 0-0.80078l-1-1h6.3984l-1 1.0996c-0.2 0.2-0.2 0.60078 0 0.80078 0.2 0.2 0.60078 0.2 0.80078 0l1.9004-1.9004c0.2-0.2 0.2-0.60078 0-0.80078l-1.9004-2.0996c-0.2-0.2-0.60078-0.2-0.80078 0-0.2 0.2-0.2 0.60078 0 0.80078l1 1.0996h-6.3984l1-1.0996c0.2-0.2 0.2-0.60078 0-0.80078-0.1-0.1-0.25039-0.15039-0.40039-0.15039z"/>
+</svg>

src/other/firefox/common/icons/system-users-symbolic.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8 4e-6a8 8 0 0 0-8 8 8 8 0 0 0 6.6621 7.8848 8 8 0 0 0 0.79297 0.0957 8 8 0 0 0 0.54492 0.01953 8 8 0 0 0 1.5898-0.16016 8 8 0 0 0 0.77344-0.19727 8 8 0 0 0 2.8574-1.584 8 8 0 0 0 0.33789-0.30664 6 6 0 0 0-0.0039-0.0078 8 8 0 0 0 2.4453-5.7441 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-1.9277 4.8105 6 6 0 0 0-5.0723-2.8105 6 6 0 0 0-5.0762 2.8145 7 7 0 0 1-1.9238-4.8145 7 7 0 0 1 7-7zm0 3a2 2 0 0 0-2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-2-2z"/>
+</svg>

src/other/firefox/common/icons/universal-notepad.svg

@@ -0,0 +1,3 @@
+<svg fill="context-fill" fill-opacity="context-fill-opacity" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5.4746 0c-0.26491 0.013342-0.47461 0.23166-0.47461 0.5v0.5h-2c-1.108 0-2 0.892-2 2v11c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-11c0-1.108-0.892-2-2-2h-2v-0.5c0-0.277-0.223-0.5-0.5-0.5s-0.5 0.223-0.5 0.5v0.5h-4v-0.5c0-0.277-0.223-0.5-0.5-0.5-0.0086562 0-0.016845-4.3039e-4 -0.02539 0zm-2.4746 2h9.9999c0.554 0 1 0.446 1 1v11c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-11c0-0.554 0.446-1 1-1zm1.4982 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h7.0017c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm0 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h7.0017c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm0 3c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h7.0017c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5z"/>
+</svg>

src/other/firefox/common/pages/common.css

@@ -1,24 +1,26 @@
 @media (prefers-color-scheme: dark) {
   :host,
+  :host(.anonymous-content-host),
   :root {
-    --in-content-page-background: rgb(29,29,29) !important;
+    --color-accent-primary: var(--theme-primary-active-color) !important;
-    --in-content-page-color: rgb(253,253,253) !important;
+    --in-content-page-color: var(--gnome-content-page-color) !important;
+    --in-content-page-background: var(--gnome-content-page-background) !important;
 
-    --in-content-box-background: rgb(36, 36, 36) !important;
+    --in-content-box-background: var(--gnome-browser-before-load-background) !important;
     --in-content-box-background-odd: rgba(250,250,250,0.05) !important;
-    --in-content-box-info-background: rgba(250,250,250,0.15) !important;
+    --in-content-box-info-background: var(--gnome-content-box-background) !important;
 
     --in-content-border-color: rgba(250,250,250,0.2) !important;
     --in-content-border-hover: rgba(250,250,250,0.3) !important;
 
-    --in-content-icon-color: rgb(252,252,252) !important;
+    --in-content-icon-color: var(--gnome-content-page-color) !important;
 
-    --in-content-primary-button-text-color: rgb(255,255,255) !important;
+    --in-content-primary-button-text-color: var(--gnome-toolbar-color) !important;
     --in-content-primary-button-background: var(--theme-primary-color) !important;
     --in-content-primary-button-background-hover: var(--theme-primary-hover-color) !important;
     --in-content-primary-button-background-active: var(--theme-primary-active-color) !important;
 
-    --in-content-table-background: rgb(35, 35, 35) !important;
+    --in-content-table-background: var(--gnome-browser-before-load-background) !important;
 
     --newtab-background-color: var(--gnome-browser-before-load-background) !important;
     --newtab-background-color-secondary: var(--gnome-menu-background) !important;
@@ -26,12 +28,13 @@
     --fxview-background-color: var(--gnome-browser-before-load-background) !important;
     --fxview-background-color-secondary: var(--gnome-menu-background) !important;
     scrollbar-color: rgba(250,250,250,.4) rgba(22,22,22,.3) !important;
+    --background-color-box: var(--gnome-content-box-background) !important;
   }
 
   @media not (prefers-contrast) {
     :root[dialogroot],
     :host(dialog) {
-      --in-content-page-background: #424242 !important;
+      --in-content-page-background: var(--gnome-content-page-dialog-background) !important;
     }
   }
 }

src/other/firefox/common/pages/newtab.css

@@ -19,14 +19,14 @@ body {
 .context-menu {
 	background: var(--gnome-menu-background) !important;
 	border-radius: 12px !important;
-	box-shadow: var(--gnome-popover-shadow) !important;
+	box-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important;
 	padding: 6px !important;
 }
 
 @media (prefers-color-scheme: dark) {
-.context-menu {
+	.context-menu {
-	border: 1px solid rgba(255, 255, 255, 0.06) !important;
+		border: 1px solid rgba(255, 255, 255, 0.06) !important;
-}
+	}
 }
 
 .context-menu > ul {

src/other/firefox/common/parts/buttons.css

@@ -225,13 +225,13 @@ button.customizationmode-button[disabled] {
 	opacity: 1 !important;
 }
 
-#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] image,
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled] image,*/
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled] image,
 #context-navigation menuitem[disabled] image {
 	opacity: .4 !important;
 }
 
-#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled]:hover,
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled]:hover,*/
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled]:hover {
 	background: none !important;
 }
@@ -259,6 +259,7 @@ button.close:not(.ghost-button),
 	border-color: transparent !important;
 	border-radius: 8px !important;
 	border: none !important;
+	outline: none !important;
 }
 
 .subviewbutton-back:not(#hack):not(:active):hover,

src/other/firefox/common/parts/csd.css

@@ -1,12 +1,13 @@
-/* GNOME CSD styles for headerbar on Firefox [tabsintitlebar] */
+/* GNOME CSD styles for headerbar on Firefox  */
 
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+:root[tabsintitlebar], :root[customtitlebar] {
 /* Headerbar top border corners rounded */
-:root[tabsintitlebar][sizemode="normal"]:not([gtktiledwindow="true"]) {
+&:root[sizemode="normal"]:not([gtktiledwindow="true"]) {
   #nav-bar {
-    border-top-left-radius: 12px !important;
+    border-top-left-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
-    border-top-right-radius: 12px !important;
+    border-top-right-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
     box-shadow: var(--gnome-headerbar-box-shadow) !important;
   }
 
@@ -21,149 +22,190 @@
     body::backdrop,
     dialog::backdrop {
       /* Use an uniform clip to allow WebRender to optimize it better */
-      border-radius: 12px !important;
+      border-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
     }
 
     window[role="dialog"] {
-      border-bottom-left-radius: 12px !important;
+      border-bottom-left-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
-      border-bottom-right-radius: 12px !important;
+      border-bottom-right-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
     }
   }
 }
 
+/* Always show nav bar window buttons*/
+#nav-bar > .titlebar-buttonbox-container {
+	display: flex !important;
+}
+
+#toolbar-menubar, #TabsToolbar {
+	/* Always hide menu bar window buttons*/
+	& > .titlebar-buttonbox-container {
+		display: none !important;
+	}
+}
+
+#nav-bar, #titlebar {
+	/* Window buttons box */
+	.titlebar-buttonbox-container,
+	#titlebar-buttonbox-container {
+		-moz-appearance: none !important;
+		padding: 0 3px 0 4px;
+		position: absolute !important;
+		right: 8px;
+		top: 0;
+		display: block !important;
+	}
+
+	.titlebar-buttonbox {
+		-moz-appearance: none !important;
+	}
+
+	/* Window buttons style */
+	.titlebar-button {
+		-moz-appearance: none !important;
+		border: none !important;
+		border-radius: 100px !important;
+		height: 16px;
+		width: 16px;
+		margin: 16px 4px !important;
+		padding: 2px 0 !important;
+		--inactive-titlebar-opacity: 1 !important;
+	}
+
+	&, &:-moz-window-inactive {
+		.titlebar-button .toolbarbutton-icon {
+			opacity: 0 !important;
+			appearance: none !important;
+		}
+
+		.titlebar-button[disabled="true"] {
+			opacity: 0.35 !important;
+		}
+	}
+}
+
+
+/* Fullscreen headerbar */
+&:root[inFullscreen] {
+	/* Fullscreen headerbar padding for 1 button */
+	#nav-bar {
+		padding-right: 50px !important;
+	}
+
+	#nav-bar .titlebar-button,
+	#titlebar .titlebar-button {
+		height: 24px;
+		width: 24px;
+		margin: 12px 4px !important;
+		padding: 0 !important;
+	}
+
+	/* Remove close and minimize buttons from fullscreen buttons */
+	#window-controls #close-button,
+	#window-controls #minimize-button,
+	#titlebar .titlebar-buttonbox .titlebar-close,
+	#titlebar .titlebar-buttonbox .titlebar-min,
+	#nav-bar .titlebar-buttonbox .titlebar-close,
+	#nav-bar .titlebar-buttonbox .titlebar-min {
+		display: none !important;
+	}
+}
+}
+
+
 /* Window buttons: at least 1 button */
 @media (-moz-gtk-csd-minimize-button), (-moz-gtk-csd-maximize-button), (-moz-gtk-csd-close-button) {
-	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+:root[tabsintitlebar], :root[customtitlebar] {
-		padding-right: 60px !important;
+	&:root:not([inFullscreen]) #nav-bar {
+		padding-right: 50px !important;
 	}
 }
+}
 /* Window buttons: at least 2 buttons */
 @media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
        (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
        (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
-	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+       :root[tabsintitlebar], :root[customtitlebar] {
+	&:root:not([inFullscreen]) #nav-bar {
 		padding-right: 70px !important;
 	}
+	}
 }
 /* Window buttons: 3 buttons */
 @media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
-	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+:root[tabsintitlebar], :root[customtitlebar] {
-		padding-right: 90px !important;
+	&:root:not([inFullscreen]) #nav-bar {
+		padding-right: 96px !important;
 	}
 }
-
-/* Fullscreen headerbar padding for 1 button */
-:root[tabsintitlebar][inFullscreen] #nav-bar {
-	padding-right: 50px !important;
-}
-
-/* Window buttons box */
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox-container,
-:root[tabsintitlebar] #titlebar-buttonbox-container,
-:root[tabsintitlebar][inFullscreen] #window-controls {
-	-moz-appearance: none !important;
-	padding: 0 3px 0 4px;
-	position: absolute !important;
-	right: 8px;
-	top: 0;
-	display: block !important;
-}
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox {
-	-moz-appearance: none !important;
-}
-
-/* Window buttons style */
-:root[tabsintitlebar] #titlebar .titlebar-button,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
-	-moz-appearance: none !important;
-	border: none !important;
-	border-radius: 100px !important;
-	height: 16px;
-	margin: 16px 4px !important;
-	padding: 2px 0 !important;
-	width: 16px;
-}
-:root[tabsintitlebar][inFullscreen] #titlebar .titlebar-button,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
-	height: 24px !important;
-	width: 24px !important;
-	margin: 12px 4px !important;
-	padding: 0 !important;
-}
-:root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
-	opacity: 0 !important;
-}
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive toolbarbutton .toolbarbutton-icon {
-	opacity: 0 !important;
-}
-
-/* Remove close and minimize buttons from fullscreen buttons */
-:root[tabsintitlebar][inFullscreen] #window-controls #close-button,
-:root[tabsintitlebar][inFullscreen] #window-controls #minimize-button,
-:root[tabsintitlebar][inFullscreen] #titlebar .titlebar-buttonbox .titlebar-close,
-:root[tabsintitlebar][inFullscreen] #titlebar .titlebar-buttonbox .titlebar-min {
-	display: none !important;
 }
 
 /* Left window buttons */
 @media (-moz-gtk-csd-reversed-placement) {
-	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+	:root[tabsintitlebar], :root[customtitlebar] {
+	&:root:not([inFullscreen]) #nav-bar {
 		padding-right: 6px !important;
 	}
 
 	/* Window buttons box */
-	:root[tabsintitlebar] #titlebar .titlebar-buttonbox-container {
+	#nav-bar .titlebar-buttonbox-container,
+	#titlebar .titlebar-buttonbox-container {
 		padding: 0 3px 0 4px;
 		left: 8px;
 		right: auto;
 	}
 
 	/* Fullscreen headerbar padding for 1 button */
-	:root[tabsintitlebar][inFullscreen] #nav-bar {
+	&:root[inFullscreen] #nav-bar {
 		padding-left: 50px !important;
 	}
+	}
 
 	/* Window controls: at least 1 button */
 	@media (-moz-gtk-csd-minimize-button), (-moz-gtk-csd-maximize-button), (-moz-gtk-csd-close-button) {
-		:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+	:root[tabsintitlebar], :root[customtitlebar] {
-			padding-left: 60px !important;
+		&:root:not([inFullscreen]) #nav-bar {
+			padding-left: 50px !important;
 		}
 	}
+	}
 	/* Window controls: at least 2 buttons */
 	@media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
-				 (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
+		(-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
-				 (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
+		(-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
-		:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+		:root[tabsintitlebar], :root[customtitlebar] {
+		&:root:not([inFullscreen]) #nav-bar {
 			padding-left: 70px !important;
 		}
+		}
 	}
 	/* Window controls: 3 buttons */
 	@media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
-		:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+		:root[tabsintitlebar], :root[customtitlebar] {
-			padding-left: 90px !important;
+		&:root:not([inFullscreen]) #nav-bar {
+			padding-left: 96px !important;
+		}
 		}
 	}
 }
 
 /* Remove tabsbar titlebar blank spaces */
-:root[tabsintitlebar] #TabsToolbar .titlebar-placeholder {
+#TabsToolbar .titlebar-placeholder {
 	display: none !important;
 }
 
 /* Prevent menubar from breaking */
-:root[tabsintitlebar] #toolbar-menubar:not([inactive=true]) {
+#toolbar-menubar:not([inactive=true]) {
 	height: 30px !important;
 	margin-bottom: 8px;
 }
 
 /* Remove default style of titlebar */
-:root[tabsintitlebar] #titlebar {
+#titlebar {
 	-moz-appearance: none !important;
 }
 
 /* Fix the issue when dragging tabs */
-:root[tabsintitlebar] #navigator-toolbox[movingtab] #TabsToolbar {
+#navigator-toolbox[movingtab] #TabsToolbar {
 	padding-bottom: 0 !important;
 }

src/other/firefox/common/parts/headerbar.css

@@ -4,15 +4,15 @@
 /* Headerbar */
 #nav-bar {
 	padding: 8px !important;
-}
-
-/* Headerbar CSD colors */
-:root[tabsintitlebar] #nav-bar {
 	border: none !important;
 }
 
+.titlebar-spacer[type="pre-tabs"], .titlebar-spacer[type="post-tabs"] {
+	width: 0 !important;
+}
+
 /* Headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton),
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.titlebar-button),
 toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	border: none !important;
 	box-shadow: none !important;
@@ -27,7 +27,7 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	transition: background 200ms;
 }
 
-:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button) {
+:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button) {
 	background: none !important;
 }
 
@@ -43,7 +43,7 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 }
 
 /* Hover headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled]):not([checked]):hover,
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([open]):not([disabled]):not([checked]):hover,
 #TabsToolbar .toolbarbutton-1:hover,
 #tabs-newtab-button:hover, #TabsToolbar #new-tab-button:hover {
 	outline: 0 !important;
@@ -51,24 +51,28 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 }
 
 /* Active headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active,
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled]):not(#hack):active,
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open],
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled])[open],
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[checked],
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled])[checked],
 #TabsToolbar .toolbarbutton-1:active, #TabsToolbar .toolbarbutton-1[open],
 #tabs-newtab-button:active, #TabsToolbar #new-tab-button:active {
 	background: var(--gnome-headerbar-button-active-background) !important;
 }
 
 /* Disabled headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] {
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled] {
 	background: transparent !important;
 	border-color: var(--gnome-button-disabled-border-color) !important;
 	box-shadow: none !important;
 	opacity: 1 !important;
 }
 
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled] image {
+	opacity: .4 !important;
+}
+
 /* Inactive window buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive {
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):-moz-window-inactive {
 	background: var(--gnome-inactive-button-background) !important;
 	box-shadow: var(--gnome-inactive-button-box-shadow) !important;
 	border-color: var(--gnome-inactive-button-border-color) !important;
@@ -103,6 +107,10 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	transition-duration: 100ms;
 }
 
+#urlbar[breakout] {
+	position: static !important; 
+}
+
 #urlbar[breakout][breakout-extend] #urlbar-input-container,
 #urlbar[breakout][breakout-extend] #urlbar-input-container:hover,
 #urlbar[breakout][breakout-extend] .urlbar-input-container,
@@ -112,6 +120,12 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	padding: 0 3px !important;
 }
 
+/* New tab url bar focusing */
+#urlbar[focused]:not([suppress-focus-border]) > #urlbar-background, 
+#searchbar:focus-within {
+	outline: none !important;
+}
+
 #nav-bar #searchbar:focus-within {
 	border: none !important;
 	background: var(--gnome-urlbar-background) !important;

src/other/firefox/common/parts/icons.css

@@ -266,16 +266,19 @@ menu[disabled] > .menu-right {
 }
 
 /* Sound icons */
-.tab-icon-overlay[soundplaying] {
+.tab-icon-overlay:not([crashed])[soundplaying] {
 	list-style-image: url("../icons/audio-playing-symbolic.svg") !important;
+	background-image: none !important;
 }
 
-.tab-icon-overlay[muted] {
+.tab-icon-overlay:not([crashed])[muted] {
 	list-style-image: url("../icons/audio-muted-symbolic.svg") !important;
+	background-image: none !important;
 }
 
 .tab-icon-overlay[activemedia-blocked] {
 	list-style-image: url("../icons/tab-audio-blocked-small.svg") !important;
+	background-image: none !important;
 }
 
 .tab-icon-stack[activemedia-blocked="true"] .tab-icon-image {
@@ -357,7 +360,8 @@ menu[disabled] > .menu-right {
 #add-ons-button,
 #unified-extensions-button,
 #addons-notification-icon,
-.install-icon {
+.install-icon,
+#identity-box[pageproxystate="valid"].extensionPage #identity-icon {
 	list-style-image: url("../icons/application-x-addon-symbolic.svg") !important;
 }
 /* Find button */
@@ -665,6 +669,75 @@ toolbar:not([brighttext]) .webextension-browser-action:-moz-lwtheme {
 	list-style-image: url("../icons/tool-profiler.svg") !important;
 }
 
+/* empty user button */
+#fxa-toolbar-menu-button .toolbarbutton-icon {
+	fill: var(--gnome-toolbar-icon-fill) !important;
+	-moz-context-properties: fill;
+}
+:root[fxastatus="not_configured"] {
+	--avatar-image-url: url("../icons/system-users-symbolic.svg") !important;
+}
+:root[fxastatus="not_configured"] #fxa-toolbar-menu-button .toolbarbutton-icon {
+	list-style-image: url("../icons/system-users-symbolic.svg") !important;
+}
+
+/* containers extension */
+.urlbar-page-action > .urlbar-icon {
+	filter: none !important;
+}
+
+#pageAction-urlbar-_testpilot-containers {
+	list-style-image: url("../icons/container-openin.svg") !important;
+}
+
+#_testpilot-containers-BAP .toolbarbutton-icon {
+	list-style-image: url("../icons/multi-account-container.svg") !important;
+}
+
+.userContext-icon, .subviewbutton[usercontextid] > .toolbarbutton-icon, #userContext-indicator {
+	background-image: var(--identity-icon) !important;
+	-moz-context-properties: fill;
+	fill: var(--identity-icon-color) !important;
+	background-size: contain;
+	background-repeat: no-repeat;
+	background-position: center center;
+}
+
+.identity-icon-briefcase {
+	--identity-icon: url("../icons/briefcase.svg") !important;
+}
+
+.identity-icon-fingerprint {
+	--identity-icon: url("../icons/fingerprint.svg") !important;
+}
+
+.identity-icon-cart {
+	--identity-icon: url("../icons/cart.svg") !important;
+}
+
+.identity-icon-dollar {
+	--identity-icon: url("../icons/dollar.svg") !important;
+}
+
+/* side view extension */
+#pageAction-urlbar-side-view_mozilla_org,
+#sidebarswitcher_menu_side-view_mozilla_org-sidebar-action,
+#side-view_mozilla_org-BAP .toolbarbutton-icon,
+#sidebar-box[sidebarcommand="side-view_mozilla_org-sidebar-action"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
+	list-style-image: url("../icons/side-view.svg") !important;
+}
+
+#side-view_mozilla_org-menuitem-_open-in-sidebar .menu-iconic-icon {
+	background-image: url("../icons/side-view.svg") !important;
+}
+
+/* Firefox note extension */
+#notes_mozilla_com-BAP .toolbarbutton-icon,
+#sidebarswitcher_menu_notes_mozilla_com-sidebar-action,
+#sidebar-box[sidebarcommand="notes_mozilla_com-sidebar-action"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
+	list-style-image: url("../icons/universal-notepad.svg") !important;
+}
+
 /* Fix flat buttons icons aproach */
 button.close::before {
 	content: "";

src/other/firefox/common/parts/infobar.css

@@ -0,0 +1,97 @@
+/* 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/. */
+
+:host(.infobar) {
+  --info-bar-background-color: light-dark(var(--color-white), var(--gnome-tabbar-tab-active-background)) !important;
+  --info-bar-text-color: light-dark(var(--color-gray-100), var(--color-gray-05)) !important;
+  position: relative;
+
+  &::before {
+    content: "";
+    display: block;
+    width: 2px;
+    position: absolute;
+    top: 0;
+    inset-inline-start: 0;
+    height: 100%;
+    border-start-start-radius: 4px;
+    border-end-start-radius: 4px;
+  }
+
+  .container {
+    /* Don't let lwthemes set a text-shadow. */
+    text-shadow: none;
+    padding-block: 3px;
+    align-items: center;
+  }
+
+  .content {
+    gap: 0 12px;
+    height: fit-content;
+  }
+
+  .close {
+    margin-block: 2px;
+    margin-inline-start: 8px;
+    align-self: flex-start;
+  }
+}
+
+@media (prefers-contrast) {
+  :host(.infobar)::before {
+    background-color: CanvasText;
+  }
+}
+
+@media not (prefers-contrast) {
+  :host(.infobar) {
+    box-shadow: 0 1px 2px rgba(48, 48, 48, 0.1);
+    background-color: var(--gnome-tabbar-tab-active-background) !important;
+    color: var(--info-bar-text-color) !important;
+
+    &::before {
+      background-image: linear-gradient(0deg, #9059ff 0%, #ff4aa2 52.08%, #ffbd4f 100%);
+    }
+  }
+}
+
+:host([message-bar-type=infobar]:first-of-type) {
+  margin-top: 4px;
+}
+
+:host([message-bar-type=infobar]) {
+  margin: 0 4px 4px;
+}
+
+::slotted(.notification-button-container) {
+  gap: 8px;
+  display: inline-flex;
+}
+
+::slotted(.text-link) {
+  margin: 0 !important;
+}
+
+img.inline-icon {
+  /* Align inline icon images in the message content */
+  vertical-align: middle;
+  /* Ensure they get the right fill color. */
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+strong {
+  font-weight: var(--font-weight-bold);
+}
+
+/* type="system" infobar styles */
+
+:host([type=system]) .icon {
+  display: none;
+}
+
+:host([type=system]) .content {
+  margin-inline-start: 0;
+}
+

src/other/firefox/common/parts/popups.css

@@ -183,7 +183,6 @@ panelview {
 
 /* Style popovers menu buttons */
 menuitem, menupopup menu,
-.toolbarbutton-1,
 .protections-popup-footer-button,
 .protections-popup-category,
 .identity-popup-content-blocking-category,

src/other/firefox/common/parts/sidebar.css

@@ -1,10 +1,52 @@
 /* Sidebar */
+#sidebar-main,
 #sidebar-box, #sidebar,
 .sidebar-panel[lwt-sidebar] {
 	color: var(--gnome-toolbar-color) !important;
 	background: var(--gnome-sidebar-background) !important;
 }
 
+#sidebar-main {
+	padding: 8px 0;
+}
+
+@media (-moz-bool-pref: "sidebar.revamp") {
+	#tabbrowser-tabbox {
+		outline: none !important;
+		box-shadow: none !important;
+	}
+	
+	#sidebar {
+		border-radius: 12px !important;
+		box-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important;
+		border: 1px solid rgba(255, 255, 255, 0.06) !important;
+		color: var(--gnome-toolbar-color) !important;
+		background: var(--gnome-menu-background) !important;
+		margin: 6px 6px 0 0 !important;
+	}
+}
+
+.search-container {
+	border-radius: 1000px;
+	background-color: var(--gnome-urlbar-background) !important;
+	border: 1px solid var(--gnome-urlbar-border-color) !important;
+	outline: 2px solid transparent !important;
+	box-shadow: none !important;
+}
+
+.search-container:focus-within {
+	border: 1px solid transparent !important;
+	outline: 2px solid var(--gnome-focused-urlbar-border-color) !important;
+	outline-offset: -2px;
+	transition: outline 100ms ease-out;
+}
+
+fxview-search-textbox {
+  &::part(input) {
+    border: var(--sidebar-box-border) !important;
+  }
+}
+
 #sidebar-header {
 	padding: 8px;
 	border-bottom: 1px solid var(--gnome-sidebar-border-color) !important;
@@ -13,7 +55,7 @@
 
 .sidebar-splitter {
 	width: 1px !important;
-	background-color: var(--gnome-sidebar-border-color, var(--gnome-toolbar-background)) !important;
+	background-color: var(--gnome-toolbar-border-color, var(--gnome-toolbar-background)) !important;
 	background-image: linear-gradient(to top, var(--sidebar-background-color) 0%, var(--sidebar-background-color) 100%);
 	border: none !important;
 }

src/other/firefox/common/parts/titlebutton-dark-alt.css

@@ -1,128 +1,137 @@
 @media (prefers-color-scheme: dark) {
-:root[tabsintitlebar] #titlebar .titlebar-close,
+#nav-bar .titlebar-close,
-:root[tabsintitlebar] #titlebar #titlebar-close {
+#titlebar .titlebar-close,
+#titlebar #titlebar-close {
 	background: url("../titlebuttons/titlebutton-close-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max,
+#nav-bar .titlebar-max,
-:root[tabsintitlebar] #titlebar #titlebar-max {
+#titlebar .titlebar-max,
+#titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min,
+#nav-bar .titlebar-min,
-:root[tabsintitlebar] #titlebar #titlebar-min {
+#titlebar .titlebar-min,
+#titlebar #titlebar-min {
 	background: url("../titlebuttons/titlebutton-minimize-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore,
+#nav-bar .titlebar-restore,
-:root[tabsintitlebar] #titlebar #titlebar-restore,
+#titlebar .titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
+#titlebar #titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
+:root[sizemode="maximized"] #nav-bar .titlebar-max,
+:root[sizemode="maximized"] #titlebar .titlebar-max,
+:root[sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-close:hover,
+#nav-bar .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar #titlebar-close:hover {
+#titlebar .titlebar-close:hover,
+#titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:hover,
+#nav-bar .titlebar-max:hover,
-:root[tabsintitlebar] #titlebar #titlebar-max:hover {
+#titlebar .titlebar-max:hover,
+#titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:hover,
+#nav-bar .titlebar-min:hover,
-:root[tabsintitlebar] #titlebar #titlebar-min:hover {
+#titlebar .titlebar-min:hover,
+#titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:hover,
+#nav-bar .titlebar-restore:hover,
-:root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+#titlebar .titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
+#titlebar #titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
+:root[sizemode="maximized"] #nav-bar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-close:active,
+#nav-bar .titlebar-close:active,
-:root[tabsintitlebar] #titlebar #titlebar-close:active {
+#titlebar .titlebar-close:active,
+#titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:active,
+#nav-bar .titlebar-max:active,
-:root[tabsintitlebar] #titlebar #titlebar-max:active {
+#titlebar .titlebar-max:active,
+#titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:active,
+#nav-bar .titlebar-min:active,
-:root[tabsintitlebar] #titlebar #titlebar-min:active {
+#titlebar .titlebar-min:active,
-	background: url("../titlebuttons/titlebutton-minimize-active-dark.svg") no-repeat;
+#titlebar #titlebar-min:active {
+	background: url("../titlebuttons/titlebutton-minimize-active-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:active,
+#nav-bar .titlebar-restore:active,
-:root[tabsintitlebar] #titlebar #titlebar-restore:active,
+#titlebar .titlebar-restore:active,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
+#titlebar #titlebar-restore:active,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
+:root[sizemode="maximized"] #nav-bar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
+#nav-bar:-moz-window-inactive .titlebar-close,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
+#titlebar:-moz-window-inactive .titlebar-close,
+#titlebar:-moz-window-inactive #titlebar-close {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
+#nav-bar:-moz-window-inactive .titlebar-max,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
+#titlebar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
+#nav-bar:-moz-window-inactive .titlebar-min,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
+#titlebar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive #titlebar-min {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
+#nav-bar:-moz-window-inactive .titlebar-restore,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+#titlebar:-moz-window-inactive .titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive #titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
+#nav-bar:-moz-window-inactive .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
+#titlebar:-moz-window-inactive .titlebar-close:hover,
+#titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
+#nav-bar:-moz-window-inactive .titlebar-max:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
+#titlebar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
+#nav-bar:-moz-window-inactive .titlebar-min:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
+#titlebar:-moz-window-inactive .titlebar-min:hover,
+#titlebar:-moz-window-inactive #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
+#nav-bar:-moz-window-inactive .titlebar-restore:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+#titlebar:-moz-window-inactive .titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive #titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-unmaximize-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
-	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
-	background: url("../titlebuttons/titlebutton-unmaximize-active-dark-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
-	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
-	background-size: contain;
-}
 }

src/other/firefox/common/parts/titlebutton-dark.css

@@ -1,128 +1,128 @@
 @media (prefers-color-scheme: dark) {
-:root[tabsintitlebar] #titlebar .titlebar-close,
+#nav-bar .titlebar-close,
-:root[tabsintitlebar] #titlebar #titlebar-close {
+#titlebar .titlebar-close,
+#titlebar #titlebar-close {
 	background: url("../titlebuttons/titlebutton-close-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max,
+#nav-bar .titlebar-max,
-:root[tabsintitlebar] #titlebar #titlebar-max {
+#titlebar .titlebar-max,
+#titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min,
+#nav-bar .titlebar-min,
-:root[tabsintitlebar] #titlebar #titlebar-min {
+#titlebar .titlebar-min,
+#titlebar #titlebar-min {
 	background: url("../titlebuttons/titlebutton-minimize-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore,
+#nav-bar .titlebar-restore,
-:root[tabsintitlebar] #titlebar #titlebar-restore,
+#titlebar .titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
+#titlebar #titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
+:root[sizemode="maximized"] #nav-bar .titlebar-max,
+:root[sizemode="maximized"] #titlebar .titlebar-max,
+:root[sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-close:hover,
+#nav-bar .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar #titlebar-close:hover {
+#titlebar .titlebar-close:hover,
+#titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:hover,
+#nav-bar .titlebar-max:hover,
-:root[tabsintitlebar] #titlebar #titlebar-max:hover {
+#titlebar .titlebar-max:hover,
+#titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:hover,
+#nav-bar .titlebar-min:hover,
-:root[tabsintitlebar] #titlebar #titlebar-min:hover {
+#titlebar .titlebar-min:hover,
+#titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:hover,
+#nav-bar .titlebar-restore:hover,
-:root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+#titlebar .titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
+#titlebar #titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
+:root[sizemode="maximized"] #nav-bar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-close:active,
+#nav-bar .titlebar-close:active,
-:root[tabsintitlebar] #titlebar #titlebar-close:active {
+#titlebar .titlebar-close:active,
+#titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:active,
+#nav-bar .titlebar-max:active,
-:root[tabsintitlebar] #titlebar #titlebar-max:active {
+#titlebar .titlebar-max:active,
+#titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:active,
+#nav-bar .titlebar-min:active,
-:root[tabsintitlebar] #titlebar #titlebar-min:active {
+#titlebar .titlebar-min:active,
+#titlebar #titlebar-min:active {
 	background: url("../titlebuttons/titlebutton-minimize-active-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:active,
+#nav-bar .titlebar-restore:active,
-:root[tabsintitlebar] #titlebar #titlebar-restore:active,
+#titlebar .titlebar-restore:active,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
+#titlebar #titlebar-restore:active,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
+:root[sizemode="maximized"] #nav-bar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
+#nav-bar:-moz-window-inactive .titlebar-close,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
+#titlebar:-moz-window-inactive .titlebar-close,
+#titlebar:-moz-window-inactive #titlebar-close,
+#nav-bar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive #titlebar-max,
+#nav-bar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive #titlebar-min,
+#nav-bar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
+#nav-bar:-moz-window-inactive .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
+#titlebar:-moz-window-inactive .titlebar-close:hover,
-	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
+#titlebar:-moz-window-inactive #titlebar-close:hover {
-	background-size: contain;
-}
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
-	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
-	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
+#nav-bar:-moz-window-inactive .titlebar-max:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
+#titlebar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
+#nav-bar:-moz-window-inactive .titlebar-min:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
+#titlebar:-moz-window-inactive .titlebar-min:hover,
+#titlebar:-moz-window-inactive #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
+#nav-bar:-moz-window-inactive .titlebar-restore:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+#titlebar:-moz-window-inactive .titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive #titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-unmaximize-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
-	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
-	background: url("../titlebuttons/titlebutton-unmaximize-active-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
-	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
-	background-size: contain;
-}
 }

src/other/firefox/common/parts/titlebutton-light-alt.css

@@ -1,129 +1,135 @@
-:root[tabsintitlebar] #titlebar .titlebar-close,
+#nav-bar .titlebar-close,
-:root[tabsintitlebar] #titlebar #titlebar-close {
+#titlebar .titlebar-close,
+#titlebar #titlebar-close {
 	background: url("../titlebuttons/titlebutton-close.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max,
+#nav-bar .titlebar-max,
-:root[tabsintitlebar] #titlebar #titlebar-max {
+#titlebar .titlebar-max,
+#titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min,
+#nav-bar .titlebar-min,
-:root[tabsintitlebar] #titlebar #titlebar-min {
+#titlebar .titlebar-min,
+#titlebar #titlebar-min {
 	background: url("../titlebuttons/titlebutton-minimize.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore,
+#nav-bar .titlebar-restore,
-:root[tabsintitlebar] #titlebar #titlebar-restore,
+#titlebar .titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
+#titlebar #titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
+:root[sizemode="maximized"] #nav-bar .titlebar-max,
+:root[sizemode="maximized"] #titlebar .titlebar-max,
+:root[sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-close:hover,
+#nav-bar .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar #titlebar-close:hover {
+#titlebar .titlebar-close:hover,
+#titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover-alt.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:hover,
+#nav-bar .titlebar-max:hover,
-:root[tabsintitlebar] #titlebar #titlebar-max:hover {
+#titlebar .titlebar-max:hover,
+#titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover-alt.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:hover,
+#nav-bar .titlebar-min:hover,
-:root[tabsintitlebar] #titlebar #titlebar-min:hover {
+#titlebar .titlebar-min:hover,
+#titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:hover,
+#nav-bar .titlebar-restore:hover,
-:root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+#titlebar .titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
+#titlebar #titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
+:root[sizemode="maximized"] #nav-bar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-close:active,
+#nav-bar .titlebar-close:active,
-:root[tabsintitlebar] #titlebar #titlebar-close:active {
+#titlebar .titlebar-close:active,
+#titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:active,
+#nav-bar .titlebar-max:active,
-:root[tabsintitlebar] #titlebar #titlebar-max:active {
+#titlebar .titlebar-max:active,
+#titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:active,
+#nav-bar .titlebar-min:active,
-:root[tabsintitlebar] #titlebar #titlebar-min:active {
+#titlebar .titlebar-min:active,
+#titlebar #titlebar-min:active {
 	background: url("../titlebuttons/titlebutton-minimize-active.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:active,
+#nav-bar .titlebar-restore:active,
-:root[tabsintitlebar] #titlebar #titlebar-restore:active,
+#titlebar .titlebar-restore:active,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
+#titlebar #titlebar-restore:active,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
+:root[sizemode="maximized"] #nav-bar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
+#nav-bar:-moz-window-inactive .titlebar-close,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
+#titlebar:-moz-window-inactive .titlebar-close,
+#titlebar:-moz-window-inactive #titlebar-close {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
+#nav-bar:-moz-window-inactive .titlebar-max,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
+#titlebar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
+#nav-bar:-moz-window-inactive .titlebar-min,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
+#titlebar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive #titlebar-min {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
+#nav-bar:-moz-window-inactive .titlebar-restore,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+#titlebar:-moz-window-inactive .titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive #titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive  .titlebar-close:hover,
+#nav-bar:-moz-window-inactive .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
+#titlebar:-moz-window-inactive .titlebar-close:hover,
+#titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
+#nav-bar:-moz-window-inactive .titlebar-max:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
+#titlebar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
+#nav-bar:-moz-window-inactive .titlebar-min:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
+#titlebar:-moz-window-inactive .titlebar-min:hover,
+#titlebar:-moz-window-inactive #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
+#nav-bar:-moz-window-inactive .titlebar-restore:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+#titlebar:-moz-window-inactive .titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive #titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-alt.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
-	background: url("../titlebuttons/titlebutton-unmaximize-hover-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
-	background: url("../titlebuttons/titlebutton-unmaximize-active-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
-	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
-	background-size: contain;
-}

src/other/firefox/common/parts/titlebutton-light.css

@@ -1,129 +1,135 @@
-:root[tabsintitlebar] #titlebar .titlebar-close,
+#nav-bar .titlebar-close,
-:root[tabsintitlebar] #titlebar #titlebar-close {
+#titlebar .titlebar-close,
+#titlebar #titlebar-close {
 	background: url("../titlebuttons/titlebutton-close.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max,
+#nav-bar .titlebar-max,
-:root[tabsintitlebar] #titlebar #titlebar-max {
+#titlebar .titlebar-max,
+#titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min,
+#nav-bar .titlebar-min,
-:root[tabsintitlebar] #titlebar #titlebar-min {
+#titlebar .titlebar-min,
+#titlebar #titlebar-min {
 	background: url("../titlebuttons/titlebutton-minimize.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore,
+#nav-bar .titlebar-restore,
-:root[tabsintitlebar] #titlebar #titlebar-restore,
+#titlebar .titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
+#titlebar #titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
+:root[sizemode="maximized"] #nav-bar .titlebar-max,
+:root[sizemode="maximized"] #titlebar .titlebar-max,
+:root[sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-close:hover,
+#nav-bar .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar #titlebar-close:hover {
+#titlebar .titlebar-close:hover,
+#titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:hover,
+#nav-bar .titlebar-max:hover,
-:root[tabsintitlebar] #titlebar #titlebar-max:hover {
+#titlebar .titlebar-max:hover,
+#titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:hover,
+#nav-bar .titlebar-min:hover,
-:root[tabsintitlebar] #titlebar #titlebar-min:hover {
+#titlebar .titlebar-min:hover,
+#titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:hover,
+#nav-bar .titlebar-restore:hover,
-:root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+#titlebar .titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
+#titlebar #titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
+:root[sizemode="maximized"] #nav-bar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-close:active,
+#nav-bar .titlebar-close:active,
-:root[tabsintitlebar] #titlebar #titlebar-close:active {
+#titlebar .titlebar-close:active,
+#titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-max:active,
+#nav-bar .titlebar-max:active,
-:root[tabsintitlebar] #titlebar #titlebar-max:active {
+#titlebar .titlebar-max:active,
+#titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-min:active,
+#nav-bar .titlebar-min:active,
-:root[tabsintitlebar] #titlebar #titlebar-min:active {
+#titlebar .titlebar-min:active,
+#titlebar #titlebar-min:active {
 	background: url("../titlebuttons/titlebutton-minimize-active.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar .titlebar-restore:active,
+#nav-bar .titlebar-restore:active,
-:root[tabsintitlebar] #titlebar #titlebar-restore:active,
+#titlebar .titlebar-restore:active,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
+#titlebar #titlebar-restore:active,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
+:root[sizemode="maximized"] #nav-bar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
+#nav-bar:-moz-window-inactive .titlebar-close,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
+#titlebar:-moz-window-inactive .titlebar-close,
+#titlebar:-moz-window-inactive #titlebar-close {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
+#nav-bar:-moz-window-inactive .titlebar-max,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
+#titlebar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
+#nav-bar:-moz-window-inactive .titlebar-min,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
+#titlebar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive #titlebar-min {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
+#nav-bar:-moz-window-inactive .titlebar-restore,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+#titlebar:-moz-window-inactive .titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive #titlebar-restore,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive  .titlebar-close:hover,
+#nav-bar:-moz-window-inactive .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
+#titlebar:-moz-window-inactive .titlebar-close:hover,
+#titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
+#nav-bar:-moz-window-inactive .titlebar-max:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
+#titlebar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
+#nav-bar:-moz-window-inactive .titlebar-min:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
+#titlebar:-moz-window-inactive .titlebar-min:hover,
+#titlebar:-moz-window-inactive #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
+#nav-bar:-moz-window-inactive .titlebar-restore:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+#titlebar:-moz-window-inactive .titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive #titlebar-restore:hover,
-:root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-unmaximize.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
-	background: url("../titlebuttons/titlebutton-unmaximize-hover.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
-	background: url("../titlebuttons/titlebutton-unmaximize-active.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
-	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
-	background-size: contain;
-}

src/other/firefox/common/titlebuttons-nord/titlebutton-backdrop-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g style="display:inline"><path d="M12 1047.362a7 7 0 1 0 0-14 7 7 0 0 0 0 14" style="fill:#4d576b;fill-opacity:1;fill-rule:evenodd;stroke:none" transform="translate(-4 -1032.362)"/></g></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-backdrop.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g style="display:inline"><path d="M12 1047.362a7 7 0 1 0 0-14 7 7 0 0 0 0 14" style="fill:#afb6c5;fill-opacity:1;fill-rule:evenodd;stroke:none" transform="translate(-4 -1032.362)"/><path d="M12 1046.862a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13" style="opacity:1;fill:#c7ccd6;fill-opacity:1;fill-rule:evenodd;stroke:none" transform="translate(-4 -1032.362)"/></g></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-active-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill-rule="evenodd"><path fill="#9d585e" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="M8 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6" opacity=".5"/></g></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-active-dark-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill-rule="evenodd"><path fill="#bf5f69" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="M8 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6" opacity=".5"/><path d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14" opacity=".2"/></g></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-active-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#bf5f69" fill-rule="evenodd" d="M8 15.002a7 7 0 1 0 0-14 7 7 0 0 0 0 14"/><path d="M5.169 5.091a1 1 0 0 0 0 1.415L6.583 7.92 5.169 9.334a1 1 0 0 0 0 1.414 1 1 0 0 0 1.414 0l1.414-1.414 1.414 1.414a1 1 0 0 0 1.414 0 1 1 0 0 0 0-1.414L9.411 7.92l1.414-1.414a1 1 0 0 0 0-1.415 1 1 0 0 0-1.414 0L7.997 6.505 6.583 5.092a1 1 0 0 0-1.414 0" opacity=".5"/><path d="M8 15.002a7 7 0 1 0 0-14 7 7 0 0 0 0 14" style="fill:#000;opacity:.15"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-active.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#9d585e" d="M8 15.002a7 7 0 1 0 0-14 7 7 0 0 0 0 14" style="fill-rule:evenodd"/><path fill="#c46e76" d="M8 14.488a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13" style="fill:#9d585e;fill-opacity:1;fill-rule:evenodd"/><path d="M5.169 5.091a1 1 0 0 0 0 1.414L6.583 7.92 5.169 9.334a1 1 0 0 0 0 1.414 1 1 0 0 0 1.414 0l1.414-1.414 1.414 1.414a1 1 0 0 0 1.414 0 1 1 0 0 0 0-1.414L9.411 7.92l1.414-1.415a1 1 0 0 0 0-1.414 1 1 0 0 0-1.414 0L7.997 6.505 6.583 5.091a1 1 0 0 0-1.414 0" opacity=".5" style="stroke-width:3.7795"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-backdrop-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill-rule="evenodd"><path fill="#afb6c5" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path fill="#c7ccd6" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13"/><path d="M8 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6" opacity=".5"/></g></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-backdrop-dark-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill-rule="evenodd"><path fill="#4d576b" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="M8 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6" opacity=".5"/></g></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-backdrop-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#4d576b" fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="M5.169 5.091a1 1 0 0 0 0 1.415L6.583 7.92 5.169 9.334a1 1 0 0 0 0 1.414 1 1 0 0 0 1.414 0l1.414-1.414 1.414 1.414a1 1 0 0 0 1.414 0 1 1 0 0 0 0-1.414L9.411 7.92l1.414-1.414a1 1 0 0 0 0-1.415 1 1 0 0 0-1.414 0L7.997 6.505 6.583 5.092a1 1 0 0 0-1.414 0" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-backdrop.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill-rule="evenodd"><path fill="#afb6c5" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path fill="#c7ccd6" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13"/></g><path d="M5.169 5.091a1 1 0 0 0 0 1.415L6.583 7.92 5.169 9.334a1 1 0 0 0 0 1.414 1 1 0 0 0 1.414 0l1.414-1.414 1.414 1.414a1 1 0 0 0 1.414 0 1 1 0 0 0 0-1.414L9.411 7.92l1.414-1.414a1 1 0 0 0 0-1.415 1 1 0 0 0-1.414 0L7.997 6.505 6.583 5.092a1 1 0 0 0-1.414 0" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#bf5f69" fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-hover-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill-rule="evenodd"><path fill="#9d585e" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path fill="#c46e76" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13"/><path d="M8 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6" opacity=".5"/></g></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-hover-dark-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill-rule="evenodd"><path fill="#bf5f69" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="M8 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6" opacity=".5"/></g></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-hover-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#bf5f69" d="M8 15.002a7 7 0 1 0 0-14 7 7 0 0 0 0 14"/><path d="M5.169 5.091a1 1 0 0 0 0 1.415L6.583 7.92 5.169 9.334a1 1 0 0 0 0 1.414 1 1 0 0 0 1.414 0l1.414-1.414 1.414 1.414a1 1 0 0 0 1.414 0 1 1 0 0 0 0-1.414L9.411 7.92l1.414-1.414a1 1 0 0 0 0-1.415 1 1 0 0 0-1.414 0L7.997 6.505 6.583 5.092a1 1 0 0 0-1.414 0" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close-hover.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#9d585e" d="M8 15.002a7 7 0 1 0 0-14 7 7 0 0 0 0 14"/><path fill="#c46e76" d="M8 14.488a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13"/><path d="M5.169 5.091a1 1 0 0 0 0 1.414L6.583 7.92 5.169 9.334a1 1 0 0 0 0 1.414 1 1 0 0 0 1.414 0l1.414-1.414 1.414 1.414a1 1 0 0 0 1.414 0 1 1 0 0 0 0-1.414L9.411 7.92l1.414-1.415a1 1 0 0 0 0-1.414 1 1 0 0 0-1.414 0L7.997 6.505 6.583 5.091a1 1 0 0 0-1.414 0" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-close.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#9d585e" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path fill="#c46e76" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-active-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#829870" fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="M8 3.958c-.554 0-1 .446-1 1v2H5c-.554 0-1 .446-1 1s.446 1 1 1h2v2c0 .554.446 1 1 1s1-.446 1-1v-2h2c.554 0 1-.446 1-1s-.446-1-1-1H9v-2c0-.554-.446-1-1-1" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-active-dark-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#9cb983" fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="M8 3.958c-.554 0-1 .446-1 1v2H5c-.554 0-1 .446-1 1s.446 1 1 1h2v2c0 .554.446 1 1 1s1-.446 1-1v-2h2c.554 0 1-.446 1-1s-.446-1-1-1H9v-2c0-.554-.446-1-1-1" opacity=".5"/><path fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14" opacity=".2"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-active-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#9cb983" fill-rule="evenodd" d="M8.002 14.999a7 7 0 1 0 0-14 7 7 0 0 0 0 14"/><path d="m6.41 4.98 4.587 4.585V5.98c0-.415-.585-1-1-1zM4.998 6.392V9.98c0 .416.584 1 1 1h3.586z" opacity=".5"/><path d="M8.002 14.999a7 7 0 1 0 0-14 7 7 0 0 0 0 14" style="fill:#000;opacity:.15"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-active.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#829870" fill-rule="evenodd" d="M8.002 14.999a7 7 0 1 0 0-14 7 7 0 0 0 0 14"/><path d="m6.41 4.98 4.587 4.585V5.98c0-.415-.585-1-1-1zM4.998 6.392V9.98c0 .416.584 1 1 1h3.586z" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-backdrop-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#4d576b" fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="m6.413 4.995 4.586 4.586V5.995c0-.415-.585-1-1-1zM4.999 6.41v3.586c0 .416.584 1 1 1h3.586z" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-backdrop.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill-rule="evenodd"><path fill="#afb6c5" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path fill="#c7ccd6" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13"/></g><path d="m6.413 4.995 4.586 4.586V5.995c0-.415-.585-1-1-1zM4.999 6.41v3.586c0 .416.584 1 1 1h3.586z" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#9cb983" fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-hover-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#829870" fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path fill="#a3be8c" fill-rule="evenodd" d="M8 14.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13"/><path d="M8 3.958c-.554 0-1 .446-1 1v2H5c-.554 0-1 .446-1 1s.446 1 1 1h2v2c0 .554.446 1 1 1s1-.446 1-1v-2h2c.554 0 1-.446 1-1s-.446-1-1-1H9v-2c0-.554-.446-1-1-1" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-hover-dark-alt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#9cb983" fill-rule="evenodd" d="M8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14"/><path d="M8 3.958c-.554 0-1 .446-1 1v2H5c-.554 0-1 .446-1 1s.446 1 1 1h2v2c0 .554.446 1 1 1s1-.446 1-1v-2h2c.554 0 1-.446 1-1s-.446-1-1-1H9v-2c0-.554-.446-1-1-1" opacity=".5"/></svg>

src/other/firefox/common/titlebuttons-nord/titlebutton-maximize-hover-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#9cb983" fill-rule="evenodd" d="M8.002 14.999a7 7 0 1 0 0-14 7 7 0 0 0 0 14"/><path d="m6.41 4.98 4.587 4.585V5.98c0-.415-.585-1-1-1zM4.998 6.392V9.98c0 .416.584 1 1 1h3.586z" opacity=".5"/></svg>