.gitignore

@@ -5,7 +5,6 @@
 src/main/gtk-3.0/gtk*.css
 src/main/gtk-4.0/gtk*.css
 src/main/cinnamon/cinnamon*.css
-src/main/gnome-shell/gnome-shell-Dark.css
+src/main/gnome-shell/*/*.css
-src/main/gnome-shell/gnome-shell-Light.css
 src/other/dash-to-dock/stylesheet.css
 src/other/dash-to-dock/stylesheet-dark.css

README.md

@@ -7,7 +7,7 @@
 
 ## Donate
 
-If you like my project, you can buy me a coffee, many thanks ❤️ !
+If you like my project, you can buy me a coffee:
 
 <span class="paypal"><a href="https://www.paypal.me/vinceliuice" title="Donate to this project using Paypal"><img src="https://www.paypalobjects.com/webstatic/mktg/Logo/pp-logo-100px.png" alt="PayPal donate button" /></a></span>
 
@@ -48,11 +48,15 @@ Don't worry, WhiteSur installer already provides all of those dependencies.
 
 ### Uninstall
 
+<details> <summary> For example: <b>(click to open)</b> </summary>
+
 - uninstall Gtk themes: `./install.sh -r`
 - uninstall GDM theme: `sudo ./tweaks.sh -g -r`
 - uninstall Firefox theme: `./tweaks.sh -f -r`
 - uninstall Flatpak Gtk themes: `./tweaks.sh -F -r`
 
+</details>
+
 ## There's so many customizations you can do!
 Usage:  `./install.sh [OPTIONS...]`
 
@@ -60,9 +64,8 @@ Usage:  `./install.sh [OPTIONS...]`
 
 ```bash
 
-OPTIONS:
   -d, --dest DIR
-   Set destination directory. Default is '/home/[USER_NAME]/.themes'
+   Set destination directory. Default is '/home/USER/.themes'
 
   -n, --name NAME
    Set theme name. Default is 'WhiteSur'
@@ -70,7 +73,7 @@ OPTIONS:
   -o, --opacity [normal|solid]
    Set theme opacity variants. Repeatable. Default is all variants
 
-  -c, --color [light|dark]
+  -c, --color [Light|Dark]
    Set theme color variants. Repeatable. Default is all variants
 
   -a, --alt [normal|alt|all]
@@ -79,25 +82,19 @@ OPTIONS:
   -t, --theme [default|blue|purple|pink|red|orange|yellow|green|grey|all]
    Set theme accent color. Repeatable. Default is BigSur-like theme
 
-  -s, --scheme [standard|nord]
-   Set theme colorscheme style. Repeatable. Default is 'standard'
-
   -m, --monterey 
    Set to MacOS Monterey style. 
 
-  -N, --nautilus [stable|normal|mojave|glassy|right]
+  -N, --nautilus [stable|normal|mojave|glassy]
    Set Nautilus style. Default is BigSur-like style (stabled sidebar)
 
   -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
 
-  --shell, --gnomeshell 
+  --shell, --gnome-shell 
    Tweaks for gnome-shell. Options:
 
      1. -i, -icon [apple|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin|budgie|gentoo]
@@ -109,24 +106,30 @@ OPTIONS:
      3. -p, -panelopacity [default|30|45|60|75]
      Set gnome-shell panel transparency. Default is 15%
 
-     4. -h, -panelheight [default|smaller|bigger]
+     4. -h, -height [default|smaller|bigger]
      Set gnome-shell panel height size. Default is 32px
 
-     5. -sf, -smallerfont 
+     5. -g, -general, -normal 
-     Set gnome-shell font size to smaller (10pt). Default is 11pt
+     Set gnome-shell show apps button style to general/normal. Default is BigSur
 
-     6. normal, -normal 
+     6. -s, -smaller 
-     Set gnome-shell show apps button style to normal. Default is BigSur
+     Set gnome-shell font size to smaller (10pt). Default is 11pt
 
   --round, --roundedmaxwindow 
    Set maximized window to rounded. Default is square
 
+  --right, --rightplacement 
+   Set Nautilus title button placement to right. Default is left
+
   --black, --blackfont 
    Set panel font color to black. Default is white
 
   --darker, --darkercolor 
    Install darker 'WhiteSur' dark themes. 
 
+  --nord, --nordcolor 
+   Install 'WhiteSur' Nord ColorScheme themes. 
+
   --dialog, --interactive 
    Run this installer interactively, with dialogs. 
 
@@ -143,7 +146,7 @@ OPTIONS:
 
 </details>
 
-## Fix for libadwaita (not perfect)
+### Fix for libadwaita (not perfect)
 
 <details> <summary> Details <b>(click to open)</b> </summary>
 
@@ -159,13 +162,34 @@ Run this command to install `WhiteSur` into `gtk-4.0 configuration folder` ($HOM
 
 ```bash
 ./install.sh -l                # Default is the normal dark theme
-./install.sh -l -c light       # install light theme for libadwaita
+./install.sh -l -c Light       # install light theme for libadwaita
 ```
 
-## <p align="center"> <b> Change theme color and accent </b> </p>
+### Connect WhiteSur theme to Flatpak (Snap not support)
+Parameter: `--flatpak` `-F`
+
+Example: `./tweaks.sh -F`
+
+Fix for Flatpak gtk-4.0 app:
+
+```bash
+sudo flatpak override --filesystem=xdg-config/gtk-4.0
+```
+
+### <p align="center"> <b> Change theme color and accent </b> </p>
 <p align="center"> <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/colors-themes.png"/> </p>
 
-#### - Install theme accent
+#### Install theme color
+Parameter: `--color` `-c` (repeatable)
+
+Example:
+
+```bash
+./install.sh -c Light          # install light theme color only
+./install.sh -c Dark -c Light  # install dark and light theme colors
+```
+
+#### Install theme accent
 Parameter: `--theme` `-t` (repeatable)
 
 Example:
@@ -176,89 +200,74 @@ Example:
 ./install.sh -t all            # install all available theme accents
 ```
 
-## <p align="center"> <b> Change Nautilus style </b> </p>
+### <p align="center"> <b> Change Nautilus style </b> </p>
 <p align="center"> <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/nautilus.png"/> </p>
 
-Parameter: `--nautilus` `-N`
+Parameter: `--nautilus-style` `-N`
 
 Example: `./install.sh -N mojave`
 
-## <p align="center"> <b> Explore more customization features! </b> </p>
+### <p align="center"> <b> Explore more customization features! </b> </p>
 You can run `./install.sh -h` to explore more customization features we have
 like changing panel opacity, theme opacity (normal and solid variant), window
 control button variant, etc.
 
-# <p align="center"> <b> Let's tweak! </b> </p>
+# Let's tweak!
 Usage:  `./tweaks.sh [OPTIONS...]`
 
 <details> <summary> Options <b>(click to open)</b> </summary>
 
 ```bash
+ [GDM theme]... options
+
+  -g, --gdm [default|x2]
+   Install 'WhiteSur' theme for GDM (scaling: 100%/200%, default is 100%). Requires to run this shell as root
 
-OPTIONS:
   -o, --opacity [normal|solid]
-   Set 'WhiteSur' GDM/Flatpak theme opacity variants. Default is 'normal'
+   Set 'WhiteSur' GDM theme opacity variants. Default is 'normal'
 
-  -c, --color [light|dark]
+  -c, --color [Light|Dark]
-   Set 'WhiteSur' GDM/Flatpak theme color variants. Default is 'light'
+   Set 'WhiteSur' GDM and Dash to Dock theme color variants. Default is 'light'
 
   -t, --theme [default|blue|purple|pink|red|orange|yellow|green|grey]
-   Set 'WhiteSur' GDM/Flatpak theme accent color. Default is BigSur-like theme
+   Set 'WhiteSur' GDM theme accent color. Default is BigSur-like theme
 
-  -s, --scheme [standard|nord]
+  -N, --no-darken 
-   Set 'WhiteSur' GDM/Flatpak theme colorscheme style. Default is 'standard'
+   Don't darken 'WhiteSur' GDM theme background image. 
 
+  -n, --no-blur 
+   Don't blur 'WhiteSur' GDM theme background image. 
 
- Tweaks for GDM theme. options
+  -b, --background [default|blank|IMAGE_PATH]
+   Set 'WhiteSur' GDM theme background image. Default is BigSur-like wallpaper
 
-  -g, --gdm    Without options default GDM theme will install... 
+  -p, --panel-opacity [default|30|45|60|75]
+   Set 'WhiteSur' GDM (GNOME Shell) theme panel transparency. Default is 15%
 
-      1. -i, -icon [apple|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin|budgie|gentoo]   Set GDM panel 'Activities' icon Default is 'standard'
+  -P, --panel-size [default|smaller|bigger]
+   Set 'WhiteSur' Gnome shell panel height size. Default is 32px
 
-      2. -b, -background [default|blank|IMAGE_PATH]   Set GDM background image Default is BigSur-like wallpaper
+  -i, --icon [apple|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin|budgie|gentoo]
+   Set 'WhiteSur' GDM (GNOME Shell) 'Activities' icon. Default is 'standard'
 
-      3. -p, -panelopacity [default|30|45|60|75]   Set GDM panel transparency Default is 15%
+  --nord, --nordcolor 
+   Install 'WhiteSur' Nord ColorScheme themes. 
 
-      4. -h, -panelheight [default|smaller|bigger]   Set GDM panel height size Default is 32px
+ [Others]... options
 
-      5. -sf, -smallerfont    Set GDM font size to smaller (10pt) Default is 11pt
+  -f, --firefox         [monterey|alt|adaptive]   Options:
 
-      6. -nd, -nodarken    Don't darken 'WhiteSur' GDM theme background image 
+      1. monterey       [3+3,3+4,3+5,4+3,4+4,4+5,5+3,5+4,5+5]   Topbar buttons number: 'a+b'   a: left side buttons number, b: right side buttons number
 
-      7. -nb, -noblur    Don't blur 'WhiteSur' GDM theme background image 
+      2. alt            Monterey alt version
 
+      3. adaptive       Adaptive color version   You need install adaptive-tab-bar-colour plugin first   https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/
 
- Tweaks for firefox. options
+  -e, --edit-firefox [default|monterey|alt|adaptive]
-
-  -f, --firefox         [(monterey|flat)|alt|(darker|adaptive)]   Without options default WhiteSur theme will install...   Options:
-
-      1. monterey       [3+3|3+4|3+5|4+3|4+4|4+5|5+3|5+4|5+5]   Topbar buttons number: 'a+b'   a: left side buttons number, b: right side buttons number
-
-      2. flat           Monterey alt version    Flat round tabs...
-
-      3. alt            Alt windows button version    Alt windows button style like gtk theme
-
-      4. darker         Darker Firefox theme version    Darker Firefox theme version
-
-      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. 
 
-   
+  -F, --flatpak Support options: [-o, -c, -t...]
- Others. options
+   Connect 'WhiteSur' theme to Flatpak. Without options will only install default themes
-
-  -F, --flatpak Support options: [-o, -c, -t...]   Connect 'WhiteSur' theme to Flatpak Without options will only install default themes
-
-      1.  -o, --opacity [normal|solid]   Set 'WhiteSur' flatpak theme opacity variants Default is 'normal'
-
-      2.  -c, --color [Light|Dark]   Set 'WhiteSur' flatpak theme color variants Default is 'light'
-
-      3.  -t, --theme [default|blue|purple|pink|red|orange|yellow|green|grey]   Set 'WhiteSur' flatpak theme accent color Default is BigSur-like theme
-
-      4.  -s, --scheme [standard|nord]   Set 'WhiteSur' flatpak theme colorscheme style Default is 'standard'
 
   -d, --dash-to-dock 
    Fixed Dash to Dock theme issue. 
@@ -271,7 +280,6 @@ OPTIONS:
 
   -h, --help 
    Show this help. 
-
 ```
 
 </details>
@@ -283,12 +291,12 @@ OPTIONS:
 <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/firefox.svg"/>
 </a> </p>
 
-#### - [Install Firefox theme](src/other/firefox)
+#### [Install Firefox theme](src/other/firefox)
 Parameter: `--firefox` `-f`
 
 Example: `./tweaks.sh -f`
 
-#### - Edit Firefox theme
+#### Edit Firefox theme
 Parameter: `--edit-firefox` `-e`
 
 Example:
@@ -299,17 +307,15 @@ Example:
 ./tweaks.sh -f monterey  # install Monterey Firefox theme
 ```
 
-##
-
 ### <p align="center"> <b> Install and customize GDM theme </b> </p>
 <p align="center"> <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/gdm.png"/> </p>
 
-#### - Install GDM theme
+#### Install GDM theme
 Parameter: `--gdm` `-g` (requires to be run as root)
 
 Example: `sudo ./tweaks.sh -g`
 
-#### - Change the background
+#### Change the background
 Parameter: `--background` `-b`
 
 Example:
@@ -320,51 +326,33 @@ sudo ./tweaks.sh -g -b default          # use the default background
 sudo ./tweaks.sh -g -b blank            # make it blank
 ```
 
-#### - Don't darken the background
+#### Don't darken the background
-Parameter: `--nodarken` `-nd`
+Parameter: `--no-darken` `-N`
 
 Example:
 
 ```bash
-sudo ./tweaks.sh -g -nd                          # darken the default background
+sudo ./tweaks.sh -g -N                          # darken the default background
-sudo ./tweaks.sh -g -nd -b "wallpapers/snow.jpg" # darken the custom background
+sudo ./tweaks.sh -g -N -b "wallpapers/snow.jpg" # darken the custom background
 ```
 
-#### - Don't blur the background
+#### Don't blur the background
-Parameter: `--noblur` `-nb`
+Parameter: `--no-blur` `-n`
 
 Example:
 
 ```bash
-sudo ./tweaks.sh -g -nb                           # don't blur the default background
+sudo ./tweaks.sh -g -n                           # don't blur the default background
-sudo ./tweaks.sh -g -nb -b "wallpapers/rocks.jpg" # don't blur the custom background
+sudo ./tweaks.sh -g -n -b "wallpapers/rocks.jpg" # don't blur the custom background
 ```
 
-#### - Do more GDM customizations
+#### Do more GDM customizations
 You can do [the similar customization features in `./install.sh`](#theres-so-many-customizations-you-can-do)
 like changing theme color (dark and light variant) and accent, GNOME Shell
 'Activities' icon, etc. related to GDM. Run `./tweaks.sh -h` to explore!
 
-##
+## Other recommended stuff
-
+### WhiteSur Icon Theme
-### <p align="center"> <b> Fix for Flatpak </b> </p>
-
-#### 1. Run command to fix it
-
-```sh
-sudo flatpak override --filesystem=xdg-config/gtk-3.0 && sudo flatpak override --filesystem=xdg-config/gtk-4.0
-```
-
-If you use flatpak apps, you can run this to fix theme issue
-
-#### 2. Connect WhiteSur theme to Flatpak (gtk 3.0) (Snap not support)
-
-Parameter: `--flatpak` `-F`
-
-Example: `./tweaks.sh -F`
-
-## <p align="center"> <b> Other recommended stuff </b> </p>
-### <p align="center"> <b> WhiteSur Icon Theme </b> </p>
 <p align="center"> <a href="https://github.com/vinceliuice/WhiteSur-icon-theme">
   <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/icon-theme.png"/>
 </a> </p>
@@ -374,7 +362,7 @@ Example: `./tweaks.sh -F`
 </a> </p>
 <br>
 
-### <p align="center"> <b> WhiteSur Wallpapers </b> </p>
+### WhiteSur Wallpapers
 <p align="center"> <a href="https://github.com/vinceliuice/WhiteSur-wallpapers">
   <img class="image" src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/wallpaper.gif"/>
 </a> </p>

install.sh

@@ -13,7 +13,7 @@
 ###############################################################################
 
 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
-source "${REPO_DIR}/libs/lib-install.sh"
+source "${REPO_DIR}/shell/lib-install.sh"
 
 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")
@@ -26,29 +26,29 @@ usage() {
   helpify "-d, --dest"                    "DIR"                                               "  Set destination directory"                     "Default is '${THEME_DIR}'"
   helpify "-n, --name"                    "NAME"                                              "  Set theme name"                                 "Default is '${THEME_NAME}'"
   helpify "-o, --opacity"                 "[$(IFS='|'; echo "${OPACITY_VARIANTS[*]}")]"       "  Set theme opacity variants"                     "Repeatable. Default is all variants"
-  helpify "-c, --color"                   "[$(IFS='|'; echo "${COMMAND_COLOR_VARIANTS[*]}")]" "  Set theme color variants"                       "Repeatable. Default is all variants"
+  helpify "-c, --color"                   "[$(IFS='|'; echo "${COLOR_VARIANTS[*]}")]"         "  Set theme color variants"                       "Repeatable. Default is all variants"
   helpify "-a, --alt"                     "[$(IFS='|'; echo "${ALT_VARIANTS[*]}")|all]"       "  Set window control buttons variant"             "Repeatable. Default is 'normal'"
   helpify "-t, --theme"                   "[$(IFS='|'; echo "${THEME_VARIANTS[*]}")|all]"     "  Set theme accent color"                         "Repeatable. Default is BigSur-like theme"
-  helpify "-s, --scheme"                  "[$(IFS='|'; echo "${SCHEME_VARIANTS[*]}")]"        "  Set theme colorscheme style"                    "Repeatable. Default is 'standard'"
+  # helpify "-s, --size"                    "[$(IFS='|'; echo "${SIDEBAR_SIZE_VARIANTS[*]}")]"  "Set Nautilus sidebar minimum width"               "Default is 200px"
-#  helpify "-s, --size"                    "[$(IFS='|'; echo "${SIDEBAR_SIZE_VARIANTS[*]}")]"  "  Set Nautilus (version < 40.0) sidebar minimum width" "Default is 200px"
 
   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:"
+  helpify "--shell, --gnome-shell"        ""                                                  "  Tweaks for gnome-shell"                          "Options:"
   helpify "   1. -i, -icon"               "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]"          "    Set gnome-shell panel 'Activities' icon"       "Default is 'standard'"
   helpify "   2. -b, -background"         "[default|blank|IMAGE_PATH]"                        "    Set gnome-shell background image"              "Default is BigSur-like wallpaper"
-  helpify "   3. -p, -panelopacity"       "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]" "    Set gnome-shell panel transparency"            "Default is 15%"
+  helpify "   3. -o, -opacity"            "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]" "    Set gnome-shell panel transparency"            "Default is 15%"
-  helpify "   4. -h, -panelheight"        "[$(IFS='|'; echo "${PANEL_SIZE_VARIANTS[*]}")]"    "    Set gnome-shell panel height size"             "Default is 32px"
+  helpify "   4. -h, -height"             "[$(IFS='|'; echo "${PANEL_SIZE_VARIANTS[*]}")]"    "    Set gnome-shell panel height size"             "Default is 32px"
-  helpify "   5. -sf, -smallerfont"       ""                                                  "    Set gnome-shell font size to smaller (10pt)"   "Default is 11pt"
+  helpify "   5. -n, -normal"            ""                                                  "    Set gnome-shell show apps button style to normal" "Default is BigSur"
-  helpify "   6. normal, -normal"         ""                                                  "    Set gnome-shell show apps button style to normal" "Default is BigSur"
+  helpify "   6. -s, -smaller"           ""                                                  "    Set gnome-shell font size to smaller (10pt)"   "Default is 11pt"
 
   helpify "--round, --roundedmaxwindow"   ""                                                  "  Set maximized window to rounded"                 "Default is square"
+  helpify "--right, --rightplacement"     ""                                                  "  Set Nautilus title button placement to right"    "Default is left"
   helpify "--black, --blackfont"          ""                                                  "  Set panel font color to black"                   "Default is white"
   helpify "--darker, --darkercolor"       ""                                                  "  Install darker '${THEME_NAME}' dark themes"      ""
+  helpify "--nord, --nordcolor"           ""                                                  "  Install '${THEME_NAME}' Nord ColorScheme themes" ""
   helpify "--dialog, --interactive"       ""                                                  "  Run this installer interactively, with dialogs"  ""
   helpify "--silent-mode"                 ""                                                  "  Meant for developers: ignore any confirm prompt and params become more strict" ""
   helpify "-r, --remove, -u, --uninstall" ""                                                  "  Remove all installed ${THEME_NAME} themes"       ""
@@ -81,8 +81,6 @@ while [[ $# -gt 0 ]]; do
       check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
     -t|--theme)
       check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
-    -s|--scheme)
-      check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
     -a|--alt)
       check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
     # Parameters that require a value, single use
@@ -90,8 +88,8 @@ while [[ $# -gt 0 ]]; do
       check_param "${1}" "${1}" "${2}" "must" "must" "not-at-all" && shift 2 || shift ;;
     -n|--name)
       check_param "${1}" "${1}" "${2}" "must" "must" "not-at-all" && shift 2 || shift ;;
-#    -s|--size) # only works on gnome < 40.0
+    -s|--size) # only works on gnome < 40.0
-#      check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
+      check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
     -N|--nautilus)
       check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
     # Parameters that require a second value
@@ -106,12 +104,12 @@ while [[ $# -gt 0 ]]; do
             check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
           -p|-panelopacity)
             check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
-          -h|-panelheight)
+          -h|-height)
             check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
-          -sf|-smallerfont)
+          -g|-general|-normal)
-            smaller_font="true"; shift ;;
-          normal|-normal)
             showapps_normal="true"; shift ;;
+          -s|-smaller)
+            smaller_font="true"; shift ;;
         esac
       done
       ;;
@@ -124,14 +122,14 @@ while [[ $# -gt 0 ]]; do
       black_font="true"; shift ;;
     --darker|--darkercolor)
       darker="true"; shift ;;
+    --nord|--nordcolor)
+      colorscheme="-nord"; shift ;;
     -HD|--highdefinition)
       compact="false"; shift ;;
     -m|--monterey)
       monterey="true"; shift ;;
     -l|--libadwaita)
       libadwaita="true"; shift ;;
-    -f|--fixed)
-      accent_type="fixed"; shift ;;
     -r|--remove|-u|-uninstall)
       uninstall='true'; shift ;;
     --silent-mode)
@@ -170,33 +168,32 @@ if [[ "${uninstall}" == 'true' ]]; then
   fi
 else
   if [[ "${interactive}" == 'true' ]]; then
-    show_panel_opacity_dialog
+    show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog
-#    show_sidebar_size_dialog
+    echo; prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo
-    show_nautilus_style_dialog
+  else
-#  else
+    show_needed_dialogs
-#    show_needed_dialogs
   fi
 
-  prompt -w "Removing the old '${name}' themes...\n"
+  prompt -w "Removing the old '${name}${colorscheme}' themes...\n"
 
   remove_themes; customize_theme; avoid_variant_duplicates;
 
-  prompt -w "Installing '${name}' themes in '${dest}'...\n";
+  prompt -w "Installing '${name}${colorscheme}' '${themes[*]}' themes in '${dest}'...\n";
 
   prompt -t "--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---"
   prompt -i "Color variants   : $( IFS=';'; echo "${colors[*]}" )"
   prompt -i "Theme variants   : $( IFS=';'; echo "${themes[*]}" )"
   prompt -i "Opacity variants : $( IFS=';'; echo "${opacities[*]}" )"
   prompt -i "Alt variants     : $( IFS=';'; echo "${alts[*]}" )"
-  prompt -i "Scheme variants  : $( IFS=';'; echo "${schemes[*]}" )"
+  prompt -i "Icon variant     : ${icon}"
-  prompt -i "Start icon style : ${icon}"
+  prompt -i "Nautilus variant : ${nautilus_style}"
-  prompt -i "Nautilus style   : ${nautilus_style}"
 
   echo; install_themes; echo; prompt -s "Done!"
 
   if [[ "${libadwaita}" == 'true' ]]; then
     if [[ "$UID" != '0' ]]; then
       install_libadwaita
+      echo; prompt -s "Installed ${name} ${opacities} ${colors} gtk-4.0 theme in '${HOME}/.config/gtk-4.0' for libadwaita!"
       echo; prompt -w "Some colorsheme extension will re-writes config files in '${HOME}/.config/gtk-4.0' like: 'custom-accent-colors' you need disable it!"
     else
       echo; prompt -e "Do not run '--libadwaita' option with sudo!"

make-release.sh

@@ -2,7 +2,7 @@
 
 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
 readonly RELEASE_DIR="${REPO_DIR}/release"
-source "${REPO_DIR}/libs/lib-install.sh"
+source "${REPO_DIR}/shell/lib-install.sh"
 
 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")
@@ -14,9 +14,9 @@ N_VARIANTS=('' '-nord')
 
 install() {
   remove_themes; customize_theme; avoid_variant_duplicates
-  local schemes=("${SCHEME_VARIANTS[@]}")
+  install_themes; echo; prompt -s "Install Gnome${RELEASE_VERSION} version finished!"; echo
-  install_themes
+  local colorscheme="-nord"
-  echo; prompt -s "Install GNOME ${RELEASE_VERSION} version finished!\n"
+  install_themes; echo; prompt -s "Install Gnome${RELEASE_VERSION} nord version finished!"; echo
 }
 
 compress() {
@@ -39,34 +39,15 @@ compress() {
   done
 }
 
-release_info() {
-rm -rf ${RELEASE_DIR}/release-info.txt
-
-echo >> release-info.txt
-echo "VERSION: (GNOME-SHELL) ${RELEASE_VERSION}" >> ${RELEASE_DIR}/release-info.txt
-echo >> ${RELEASE_DIR}/release-info.txt
-echo "RELEASE TIME: $(date)" >> ${RELEASE_DIR}/release-info.txt
-echo >> ${RELEASE_DIR}/release-info.txt
-echo "--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---" >> ${RELEASE_DIR}/release-info.txt
-echo "Color variants   : $( IFS=';'; echo "${colors[*]}" )" >> ${RELEASE_DIR}/release-info.txt
-echo "Theme variants   : $( IFS=';'; echo "${themes[*]}" )" >> ${RELEASE_DIR}/release-info.txt
-echo "Opacity variants : $( IFS=';'; echo "${opacities[*]}" )" >> ${RELEASE_DIR}/release-info.txt
-echo "Alt variants     : $( IFS=';'; echo "${alts[*]}" )" >> ${RELEASE_DIR}/release-info.txt
-echo "Scheme variants  : $( IFS=';'; echo "${SCHEME_VARIANTS[*]}" )" >> ${RELEASE_DIR}/release-info.txt
-echo "Start icon style : ${icon}" >> ${RELEASE_DIR}/release-info.txt
-echo "Nautilus style   : ${nautilus_style}" >> ${RELEASE_DIR}/release-info.txt
-}
-
 #GNOME_VERSION="3-28"
 #RELEASE_VERSION="-3-38"
 #install && compress
 #prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
 
-GNOME_VERSION="48-0"
+GNOME_VERSION="46-0"
-RELEASE_VERSION="48.0"
+RELEASE_VERSION="-last"
 install && compress
-prompt -i "Compress ${THEME_NAME} themes finished!\n"
+prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
-release_info
-prompt -s "Done!"; echo
 
+prompt -s "Done!"; echo
 exit 0

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 -y sassc
+    sudo apt install sassc
   elif has_command dnf; then
     sudo dnf install -y sassc
   elif has_command yum; then
-    sudo yum install -y sassc
+    sudo yum install sassc
   elif has_command pacman; then
     sudo pacman -S --noconfirm sassc
   fi
@@ -26,7 +26,6 @@ fi
 SASSC_OPT="-M -t expanded"
 
 _COLOR_VARIANTS=('-Light' '-Dark')
-
 if [ ! -z "${COLOR_VARIANTS:-}" ]; then
   IFS=', ' read -r -a _COLOR_VARIANTS <<< "${COLOR_VARIANTS:-}"
 fi
@@ -36,8 +35,16 @@ for color in "${_COLOR_VARIANTS[@]}"; do
   echo "==> Generating the 3.0 gtk${color}.css..."
   sassc $SASSC_OPT src/main/gtk-4.0/gtk${color}.{scss,css}
   echo "==> Generating the 4.0 gtk${color}.css..."
-  sassc $SASSC_OPT src/main/gnome-shell/gnome-shell${color}.{scss,css}
+  sassc $SASSC_OPT src/main/gnome-shell/shell-3-28/gnome-shell${color}.{scss,css}
-  echo "==> Generating gnome-shell${color}.css..."
+  echo "==> Generating the 3.28 gnome-shell${color}.css..."
+  sassc $SASSC_OPT src/main/gnome-shell/shell-40-0/gnome-shell${color}.{scss,css}
+  echo "==> Generating the 40.0 gnome-shell${color}.css..."
+  sassc $SASSC_OPT src/main/gnome-shell/shell-42-0/gnome-shell${color}.{scss,css}
+  echo "==> Generating the 42.0 gnome-shell${color}.css..."
+  sassc $SASSC_OPT src/main/gnome-shell/shell-44-0/gnome-shell${color}.{scss,css}
+  echo "==> Generating the 44.0 gnome-shell${color}.css..."
+  sassc $SASSC_OPT src/main/gnome-shell/shell-46-0/gnome-shell${color}.{scss,css}
+  echo "==> Generating the 46.0 gnome-shell${color}.css..."
   sassc $SASSC_OPT src/main/cinnamon/cinnamon${color}.{scss,css}
   echo "==> Generating the cinnamon${color}.css..."
 done

release/release-info.txt

@@ -1,12 +0,0 @@
-VERSION: (GNOME-SHELL) 48.0
-
-RELEASE TIME: Sun Apr  6 06:14:30 PM CST 2025
-
---->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---
-Color variants   : Dark;Light
-Theme variants   : default
-Opacity variants : normal;solid
-Alt variants     : normal
-Scheme variants  : standard;nord
-Start icon style : apple
-Nautilus style   : stable

shell/lib-core.sh

@@ -26,11 +26,7 @@ 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 "48" ]]; then
+  if [[ "${SHELL_VERSION:-}" -ge "46" ]]; 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"
   elif [[ "${SHELL_VERSION:-}" -ge "44" ]]; then
     GNOME_VERSION="44-0"
@@ -42,7 +38,7 @@ if command -v gnome-shell &> /dev/null; then
     GNOME_VERSION="3-28"
   fi
 else
-  GNOME_VERSION="48-0"
+  GNOME_VERSION="46-0"
 fi
 
 #----------Program options-------------#
@@ -92,17 +88,15 @@ GS_GR_XML_FILE="${THEME_SRC_DIR}/main/gnome-shell/gnome-shell-theme.gresource.xm
 
 #-------------Theme---------------#
 THEME_NAME="WhiteSur"
-COMMAND_COLOR_VARIANTS=('light' 'dark')
 COLOR_VARIANTS=('Light' 'Dark')
 OPACITY_VARIANTS=('normal' 'solid')
 ALT_VARIANTS=('normal' 'alt')
 THEME_VARIANTS=('default' 'blue' 'purple' 'pink' 'red' 'orange' 'yellow' 'green' 'grey')
-SCHEME_VARIANTS=('standard' 'nord')
 ICON_VARIANTS=('apple' 'simple' 'gnome' 'ubuntu' 'tux' 'arch' 'manjaro' 'fedora' 'debian' 'void' 'opensuse' 'popos' 'mxlinux' 'zorin' 'budgie' 'gentoo')
 SIDEBAR_SIZE_VARIANTS=('default' '180' '220' '240' '260' '280')
 PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75')
 PANEL_SIZE_VARIANTS=('default' 'smaller' 'bigger')
-NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy' 'right')
+NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy')
 
 #--------Customization, default values----------#
 dest="${THEME_DIR}"
@@ -111,7 +105,6 @@ colors=("${COLOR_VARIANTS}")
 opacities=("${OPACITY_VARIANTS}")
 alts=("${ALT_VARIANTS[0]}")
 themes=("${THEME_VARIANTS[0]}")
-schemes=("${SCHEME_VARIANTS[0]}")
 icon="${ICON_VARIANTS[0]}"
 sidebar_size="${SIDEBAR_SIZE_VARIANTS[0]}"
 panel_opacity="${PANEL_OPACITY_VARIANTS[0]}"
@@ -119,10 +112,14 @@ panel_size="${PANEL_SIZE_VARIANTS[0]}"
 nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}"
 background="blank"
 compact="true"
+colorscheme=""
+firefoxtheme="$THEME_NAME"
+left_button="3"
+right_button="3"
 
 #--Ambigous arguments checking and overriding default values--#
-declare -A has_set=([-b]="false" [-s]="false" [-p]="false" [-h]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false")
+declare -A has_set=([-b]="false" [-s]="false" [-p]="false" [-P]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false")
-declare -A need_dialog=([-b]="false" [-s]="false" [-p]="false" [-h]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false")
+declare -A need_dialog=([-b]="false" [-s]="false" [-p]="false" [-P]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false")
 
 #------------Tweaks---------------#
 need_help="false"
@@ -259,6 +256,7 @@ 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
 
@@ -400,7 +398,7 @@ helpify() {
 }
 
 sec_title() {
-  printf "  ${c_blue}%s ${c_green}%s ${c_magenta}%s ${c_cyan}%s\n\n${c_default}" "${1}" "${2}" "${3}" "${4}"
+  printf "  ${c_blue}%s ${c_green}%s ${c_magenta}%s\n\n" "${1}" "${2}" "${3}"
 }
 
 sec_helpify() {
@@ -427,6 +425,8 @@ parsimplify() {
       echo "~-n" | cut -c 2- ;;
     --dest)
       echo "-d" ;;
+    --size)
+      echo "-s" ;;
     --alt)
       echo "-a" ;;
     --opacity)
@@ -437,16 +437,20 @@ parsimplify() {
       echo "-i" ;;
     --theme)
       echo "-t" ;;
-    --scheme)
+    -height)
-      echo "-s" ;;
-    --nautilus)
-      echo "-N" ;;
-    -background)
-      echo "-b" ;;
-    -panelheight)
       echo "-h" ;;
     -panelopacity)
       echo "-p" ;;
+    --panel-opacity)
+      echo "-p" ;;
+    --panel-size)
+      echo "-P" ;;
+    --nautilus)
+      echo "-N" ;;
+    --nautilus-style)
+      echo "-N" ;;
+    --background)
+      echo "-b" ;;
     *)
       echo "${1}" ;;
   esac
@@ -503,17 +507,15 @@ check_param() {
           colors=() ;;
         -t)
           themes=() ;;
-        -s)
-          schemes=() ;;
       esac
     fi
 
     case "${global_param}" in
       -d)
-        if [[ "$(readlink -m ${value})" =~ "${REPO_DIR}" ]]; then
+        if [[ "$(readlink -m "${value}")" =~ "${REPO_DIR}" ]]; then
           prompt -e "'${display_param}' ERROR: Can't install in the source directory."
           has_any_error="true"
-        elif [[ ! -w "${value}" && ! -w "$(dirname ${value})" ]]; then
+        elif [[ ! -w "${value}" && ! -w "$(dirname "${value}")" ]]; then
           prompt -e "'${display_param}' ERROR: You have no permission to access that directory."
           has_any_error="true"
         else
@@ -525,7 +527,7 @@ check_param() {
           dest="${value}"
         fi
 
-        remind_relative_path "${display_param}" "${value}"; variant_found="skip";;
+        remind_relative_path "${display_param}" "${value}"; variant_found="skip" ;;
       -b)
         if [[ "${value}" == "blank" || "${value}" == "default" ]]; then
           background="${value}"
@@ -542,18 +544,24 @@ check_param() {
         remind_relative_path "${display_param}" "${value}"; variant_found="skip" ;;
       -n)
         name="${value}"; variant_found="skip" ;;
-#      -s)
+      -s)
-#        for i in {0..5}; do
+        for i in {0..5}; do
-#          if [[ "${value}" == "${SIDEBAR_SIZE_VARIANTS[i]}" ]]; then
+          if [[ "${value}" == "${SIDEBAR_SIZE_VARIANTS[i]}" ]]; then
-#            sidebar_size="${value}"; variant_found="true"; break
+            sidebar_size="${value}"; variant_found="true"; break
-#          fi
+          fi
-#        done ;;
+        done ;;
       -p)
         for i in {0..4}; do
           if [[ "${value}" == "${PANEL_OPACITY_VARIANTS[i]}" ]]; then
             panel_opacity="${value}"; variant_found="true"; break
           fi
         done ;;
+      -P)
+        for i in {0..2}; do
+          if [[ "${value}" == "${PANEL_SIZE_VARIANTS[i]}" ]]; then
+            panel_size="${value}"; variant_found="true"; break
+          fi
+        done ;;
       -h)
         for i in {0..2}; do
           if [[ "${value}" == "${PANEL_SIZE_VARIANTS[i]}" ]]; then
@@ -582,7 +590,7 @@ check_param() {
         done ;;
       -c)
         for i in {0..1}; do
-          if [[ "${value}" == "${COLOR_VARIANTS[i]}" || "${value}" == "${COMMAND_COLOR_VARIANTS[i]}" ]]; then
+          if [[ "${value}" == "${COLOR_VARIANTS[i]}" ]]; then
             colors+=("${COLOR_VARIANTS[i]}"); variant_found="true"; break
           fi
         done ;;
@@ -597,24 +605,19 @@ check_param() {
           for i in {0..8}; do
             themes+=("${THEME_VARIANTS[i]}")
           done
+
           variant_found="true"
         else
           for i in {0..8}; do
             if [[ "${value}" == "${THEME_VARIANTS[i]}" ]]; then
               themes+=("${THEME_VARIANTS[i]}")
-              variant_found="true"; break
+              variant_found="true"
+              break
             fi
           done
         fi ;;
-      -s)
-        for i in {0..1}; do
-          if [[ "${value}" == "${SCHEME_VARIANTS[i]}" ]]; then
-            schemes+=("${SCHEME_VARIANTS[i]}")
-            variant_found="true"; break
-          fi
-        done ;;
       -N)
-        for i in {0..4}; do
+        for i in {0..3}; do
           if [[ "${value}" == "${NAUTILUS_STYLE_VARIANTS[i]}" ]]; then
             nautilus_style="${NAUTILUS_STYLE_VARIANTS[i]}"; variant_found="true"; break
           fi
@@ -642,7 +645,6 @@ avoid_variant_duplicates() {
   opacities=($(printf "%s\n" "${opacities[@]}" | sort -u))
   alts=($(printf "%s\n" "${alts[@]}" | sort -u))
   themes=($(printf "%s\n" "${themes[@]}" | sort -u))
-  schemes=($(printf "%s\n" "${schemes[@]}" | sort -u))
 }
 
 # 'finalize_argument_parsing' is in the 'MISC' section

shell/lib-flatpak.sh

@@ -7,9 +7,8 @@ pakitheme_gtk3() {
   local opacity="$(destify ${2})"
   local alt="$(destify ${3})"
   local theme="$(destify ${4})"
-  local scheme="$(destify ${5})"
 
-  local FLATPAK_THEME="${name}${color}${opacity}${alt}${theme}${scheme}"
+  local FLATPAK_THEME="${name}${color}${opacity}${alt}${theme}${colorscheme}"
 
   local GTK_3_THEME_VER=3.22
   local cache_home="${XDG_CACHE_HOME:-$HOME/.cache}"
@@ -33,13 +32,11 @@ pakitheme_gtk3() {
     prompt -i "Converting theme: $FLATPAK_THEME... \n"
   elif [[ "${theme}" == '' ]]; then
     prompt -e "Find other variant themes but could not locate deafult theme! \n"
-    prompt -s "You can run './install.sh' install theme first! \n"
     prompt -s "Run this with right options! >>> \n"
     prompt -i "-o, --opacity [$(IFS='|'; echo "${OPACITY_VARIANTS[*]}")]"
     prompt -i "-c, --color   [$(IFS='|'; echo "${COLOR_VARIANTS[*]}")]"
     prompt -i "-a, --alt     [$(IFS='|'; echo "${ALT_VARIANTS[*]}")|all]"
     prompt -i "-t, --theme   [$(IFS='|'; echo "${THEME_VARIANTS[*]}")|all]"
-    prompt -i "-s, --scheme  [$(IFS='|'; echo "${SCHEME_VARIANTS[*]}")]"
     prompt -i "..."
     echo
     exit 0
@@ -115,16 +112,10 @@ flatpak_remove() {
   local opacity="$(destify ${2})"
   local alt="$(destify ${3})"
   local theme="$(destify ${4})"
-  local scheme="$(destify ${5})"
 
-  local system_theme_dir="/var/lib/flatpak/runtime/org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${scheme}"
+  if [[ -w "/root" ]]; then
-  local user_theme_dir="$HOME/.local/share/flatpak/runtime/org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${scheme}"
+    sudo flatpak remove -y --system org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${colorscheme}
-
+  else
-  if [[ -d "$system_theme_dir" ]]; then
+    flatpak remove -y --user org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${colorscheme}
-    sudo flatpak remove -y --system org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${scheme}
-  fi
-
-  if [[ -d "$user_theme_dir" ]]; then
-    flatpak remove -y --user org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${scheme}
   fi
 }

shell/lib-install.sh

@@ -8,8 +8,8 @@
 #                                VARIABLES                                    #
 ###############################################################################
 
-source "${REPO_DIR}/libs/lib-core.sh"
+source "${REPO_DIR}/shell/lib-core.sh"
-source "${REPO_DIR}/libs/lib-flatpak.sh"
+source "${REPO_DIR}/shell/lib-flatpak.sh"
 WHITESUR_SOURCE+=("lib-install.sh")
 
 ###############################################################################
@@ -77,11 +77,7 @@ 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 date -s "@$((remote_time + 25))"; sudo hwclock --systohc
-
-    if has_command hwclock; then
-      sudo hwclock --systohc
-    fi
   fi
 }
 
@@ -119,7 +115,7 @@ prepare_swupd() {
 
 install_swupd_packages() {
   if [[ ! "${swupd_packages}" ]]; then
-    swupd_packages=$(curl -s -o - "${swupd_url}" | awk -F '"' '/-bin-|-lib-/{print $2}')
+    swupd_packages="$(curl -s -o - "${swupd_url}" | awk -F '"' '/-bin-|-lib-/{print $2}')"
   fi
 
   for key in "${@}"; do
@@ -356,25 +352,24 @@ install_shelly() {
   local opacity="$(destify ${2})"
   local alt="$(destify ${3})"
   local theme="$(destify ${4})"
-  local scheme="$(destify ${5})"
+  local icon="$(destify ${5})"
-  local icon="$(destify ${6})"
   local TARGET_DIR=
 
-  if [[ -z "${7}" ]]; then
+  if [[ -z "${6}" ]]; then
-    TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${scheme}/gnome-shell"
+    TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${colorscheme}/gnome-shell"
   else
-    TARGET_DIR="${7}"
+    TARGET_DIR="${6}"
   fi
 
   mkdir -p                                                                                    "${TARGET_DIR}"
   mkdir -p                                                                                    "${TARGET_DIR}/assets"
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/icons"                                           "${TARGET_DIR}"
   cp -r "${THEME_SRC_DIR}/main/gnome-shell/pad-osd.css"                                       "${TARGET_DIR}"
-  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/gnome-shell${color}.scss"             "${TARGET_DIR}/gnome-shell.css"
+  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/shell-${GNOME_VERSION}/gnome-shell${color}.scss" "${TARGET_DIR}/gnome-shell.css"
 
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/"*".svg"                           "${TARGET_DIR}/assets"
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/assets${color}/"*".svg"                          "${TARGET_DIR}/assets"
-  cp -r "${THEME_SRC_DIR}/assets/gnome-shell/theme${theme}${scheme}/"*".svg"                  "${TARGET_DIR}/assets"
+  cp -r "${THEME_SRC_DIR}/assets/gnome-shell/theme${theme}${colorscheme}/"*".svg"             "${TARGET_DIR}/assets"
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/activities/activities${icon}.svg"                "${TARGET_DIR}/assets/activities.svg"
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/activities/activities${icon}.svg"                "${TARGET_DIR}/assets/activities-white.svg"
   cp -r "${WHITESUR_TMP_DIR}/beggy.png"                                                       "${TARGET_DIR}/assets/background.png"
@@ -396,7 +391,6 @@ install_theemy() {
   local opacity="$(destify ${2})"
   local alt="$(destify ${3})"
   local theme="$(destify ${4})"
-  local scheme="$(destify ${5})"
 
   if [[ "${color}" == '-Light' ]]; then
     local iconcolor=''
@@ -404,21 +398,21 @@ install_theemy() {
     local iconcolor='-Dark'
   fi
 
-  local TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${scheme}"
+  local TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${colorscheme}"
-  local TMP_DIR_T="${WHITESUR_TMP_DIR}/gtk-3.0${color}${opacity}${alt}${theme}${scheme}"
+  local TMP_DIR_T="${WHITESUR_TMP_DIR}/gtk-3.0${color}${opacity}${alt}${theme}${colorscheme}"
-  local TMP_DIR_F="${WHITESUR_TMP_DIR}/gtk-4.0${color}${opacity}${alt}${theme}${scheme}"
+  local TMP_DIR_F="${WHITESUR_TMP_DIR}/gtk-4.0${color}${opacity}${alt}${theme}${colorscheme}"
 
   mkdir -p                                                                                    "${TARGET_DIR}"
 
   local desktop_entry="[Desktop Entry]\n"
   desktop_entry+="Type=X-GNOME-Metatheme\n"
-  desktop_entry+="Name=${name}${color}${opacity}${alt}${theme}${scheme}\n"
+  desktop_entry+="Name=${name}${color}${opacity}${alt}${theme}${colorscheme}\n"
   desktop_entry+="Comment=A MacOS BigSur like Gtk+ theme based on Elegant Design\n"
   desktop_entry+="Encoding=UTF-8\n\n"
 
   desktop_entry+="[X-GNOME-Metatheme]\n"
-  desktop_entry+="GtkTheme=${name}${color}${opacity}${alt}${theme}${scheme}\n"
+  desktop_entry+="GtkTheme=${name}${color}${opacity}${alt}${theme}${colorscheme}\n"
-  desktop_entry+="MetacityTheme=${name}${color}${opacity}${alt}${theme}${scheme}\n"
+  desktop_entry+="MetacityTheme=${name}${color}${opacity}${alt}${theme}${colorscheme}\n"
   desktop_entry+="IconTheme=${name}${iconcolor}\n"
   desktop_entry+="CursorTheme=WhiteSur-cursors\n"
   desktop_entry+="ButtonLayout=close,minimize,maximize:menu\n"
@@ -431,13 +425,13 @@ install_theemy() {
   cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/assets"                                    "${TMP_DIR_T}"
   cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/sidebar-assets/"*".png"                    "${TMP_DIR_T}/assets"
   cp -r "${THEME_SRC_DIR}/assets/gtk/scalable"                                                "${TMP_DIR_T}/assets"
-  cp -r "${THEME_SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${scheme}"               "${TMP_DIR_T}/windows-assets"
+  cp -r "${THEME_SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${colorscheme}"          "${TMP_DIR_T}/windows-assets"
 
   sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk${color}.scss"                         "${TMP_DIR_T}/gtk.css"
   sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-Dark.scss"                            "${TMP_DIR_T}/gtk-dark.css"
 
   mkdir -p                                                                                    "${TARGET_DIR}/gtk-3.0"
-  cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}${scheme}.png"       "${TARGET_DIR}/gtk-3.0/thumbnail.png"
+  cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}${colorscheme}.png"  "${TARGET_DIR}/gtk-3.0/thumbnail.png"
   echo '@import url("resource:///org/gnome/theme/gtk.css");' >                                "${TARGET_DIR}/gtk-3.0/gtk.css"
   echo '@import url("resource:///org/gnome/theme/gtk-dark.css");' >                           "${TARGET_DIR}/gtk-3.0/gtk-dark.css"
   glib-compile-resources --sourcedir="${TMP_DIR_T}" --target="${TARGET_DIR}/gtk-3.0/gtk.gresource" "${THEME_SRC_DIR}/main/gtk-3.0/gtk.gresource.xml"
@@ -452,7 +446,7 @@ install_theemy() {
   sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Dark.scss"                            "${TMP_DIR_F}/gtk-dark.css"
 
   mkdir -p                                                                                    "${TARGET_DIR}/gtk-4.0"
-  cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}${scheme}.png"       "${TARGET_DIR}/gtk-4.0/thumbnail.png"
+  cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}${colorscheme}.png"  "${TARGET_DIR}/gtk-4.0/thumbnail.png"
   echo '@import url("resource:///org/gnome/theme/gtk.css");' >                                "${TARGET_DIR}/gtk-4.0/gtk.css"
   echo '@import url("resource:///org/gnome/theme/gtk-dark.css");' >                           "${TARGET_DIR}/gtk-4.0/gtk-dark.css"
   glib-compile-resources --sourcedir="${TMP_DIR_F}" --target="${TARGET_DIR}/gtk-4.0/gtk.gresource" "${THEME_SRC_DIR}/main/gtk-4.0/gtk.gresource.xml"
@@ -462,39 +456,39 @@ install_theemy() {
   mkdir -p                                                                                    "${TARGET_DIR}/cinnamon"
   sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/cinnamon/cinnamon${color}.scss"                   "${TARGET_DIR}/cinnamon/cinnamon.css"
   cp -r "${THEME_SRC_DIR}/assets/cinnamon/common-assets"                                      "${TARGET_DIR}/cinnamon/assets"
-  cp -r "${THEME_SRC_DIR}/assets/cinnamon/assets${color}${scheme}/"*".svg"                    "${TARGET_DIR}/cinnamon/assets"
+  cp -r "${THEME_SRC_DIR}/assets/cinnamon/assets${color}${colorscheme}/"*".svg"               "${TARGET_DIR}/cinnamon/assets"
-  cp -r "${THEME_SRC_DIR}/assets/cinnamon/theme${theme}${scheme}/"*".svg"                     "${TARGET_DIR}/cinnamon/assets"
+  cp -r "${THEME_SRC_DIR}/assets/cinnamon/theme${theme}${colorscheme}/"*".svg"                "${TARGET_DIR}/cinnamon/assets"
-  cp -r "${THEME_SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${color}${theme}${scheme}.png"  "${TARGET_DIR}/cinnamon/thumbnail.png"
+  cp -r "${THEME_SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${color}${theme}${colorscheme}.png" "${TARGET_DIR}/cinnamon/thumbnail.png"
 
   #----------------Misc------------------#
 
   mkdir -p                                                                                    "${TARGET_DIR}/gtk-2.0"
-  cp -r "${THEME_SRC_DIR}/main/gtk-2.0/gtkrc${color}${theme}${scheme}"                        "${TARGET_DIR}/gtk-2.0/gtkrc"
+  cp -r "${THEME_SRC_DIR}/main/gtk-2.0/gtkrc${color}${theme}${colorscheme}"                   "${TARGET_DIR}/gtk-2.0/gtkrc"
   cp -r "${THEME_SRC_DIR}/main/gtk-2.0/menubar-toolbar${color}.rc"                            "${TARGET_DIR}/gtk-2.0/menubar-toolbar.rc"
   cp -r "${THEME_SRC_DIR}/main/gtk-2.0/common/"*".rc"                                         "${TARGET_DIR}/gtk-2.0"
-  cp -r "${THEME_SRC_DIR}/assets/gtk-2.0/assets-common${color}${scheme}"                      "${TARGET_DIR}/gtk-2.0/assets"
+  cp -r "${THEME_SRC_DIR}/assets/gtk-2.0/assets-common${color}${colorscheme}"                 "${TARGET_DIR}/gtk-2.0/assets"
-  cp -r "${THEME_SRC_DIR}/assets/gtk-2.0/assets${color}${theme}${scheme}/"*".png"             "${TARGET_DIR}/gtk-2.0/assets"
+  cp -r "${THEME_SRC_DIR}/assets/gtk-2.0/assets${color}${theme}${colorscheme}/"*".png"        "${TARGET_DIR}/gtk-2.0/assets"
 
   local HDPI_TARGET_DIR="${TARGET_DIR}-hdpi"
   local XHDPI_TARGET_DIR="${TARGET_DIR}-xhdpi"
 
   mkdir -p                                                                                    "${TARGET_DIR}/xfwm4"
-  cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${scheme}/"*".png"                       "${TARGET_DIR}/xfwm4"
+  cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}/"*".png"                  "${TARGET_DIR}/xfwm4"
   cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}"                                         "${TARGET_DIR}/xfwm4/themerc"
 
   mkdir -p                                                                                    "${HDPI_TARGET_DIR}/xfwm4"
-  cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${scheme}-hdpi/"*".png"                  "${HDPI_TARGET_DIR}/xfwm4"
+  cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}-hdpi/"*".png"             "${HDPI_TARGET_DIR}/xfwm4"
   cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}"                                         "${HDPI_TARGET_DIR}/xfwm4/themerc"
 
   mkdir -p                                                                                    "${XHDPI_TARGET_DIR}/xfwm4"
-  cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${scheme}-xhdpi/"*".png"                 "${XHDPI_TARGET_DIR}/xfwm4"
+  cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}${colorscheme}-xhdpi/"*".png"            "${XHDPI_TARGET_DIR}/xfwm4"
   cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}"                                         "${XHDPI_TARGET_DIR}/xfwm4/themerc"
 
   mkdir -p                                                                                    "${TARGET_DIR}/metacity-1"
   cp -r "${THEME_SRC_DIR}/main/metacity-1/metacity-theme${color}.xml"                         "${TARGET_DIR}/metacity-1/metacity-theme-1.xml"
   cp -r "${THEME_SRC_DIR}/main/metacity-1/metacity-theme-3.xml"                               "${TARGET_DIR}/metacity-1"
-  cp -r "${THEME_SRC_DIR}/assets/metacity-1/titlebuttons${color}${scheme}"                    "${TARGET_DIR}/metacity-1/titlebuttons"
+  cp -r "${THEME_SRC_DIR}/assets/metacity-1/titlebuttons${color}${colorscheme}"               "${TARGET_DIR}/metacity-1/titlebuttons"
-  cp -r "${THEME_SRC_DIR}/assets/metacity-1/thumbnail${color}${scheme}.png"                   "${TARGET_DIR}/metacity-1/thumbnail.png"
+  cp -r "${THEME_SRC_DIR}/assets/metacity-1/thumbnail${color}${colorscheme}.png"              "${TARGET_DIR}/metacity-1/thumbnail.png"
   ( cd "${TARGET_DIR}/metacity-1" && ln -s "metacity-theme-1.xml" "metacity-theme-2.xml" )
 
   mkdir -p                                                                                    "${TARGET_DIR}/plank"
@@ -504,7 +498,15 @@ install_theemy() {
 }
 
 remove_packy() {
-  rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})$(destify ${5})"{'','-hdpi','-xhdpi'}
+  rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})${colorscheme}"
+  rm -rf "${dest}/${name}$(destify ${1})${colorscheme}-hdpi"
+  rm -rf "${dest}/${name}$(destify ${1})${colorscheme}-xhdpi"
+}
+
+remove_old_packy() {
+  rm -rf "${dest}/${name}${1}$(destify ${2})$(destify ${3})$(destify ${4})${5}"
+  rm -rf "${dest}/${name}${1}${5}-hdpi"
+  rm -rf "${dest}/${name}${1}${5}-xhdpi"
 }
 
 ###############################################################################
@@ -513,45 +515,33 @@ remove_packy() {
 
 config_gtk4() {
   local color="$(destify ${1})"
-  local opacity="$(destify ${2})"
+  local alt="$(destify ${2})"
-  local alt="$(destify ${3})"
-  local theme="$(destify ${4})"
-  local scheme="$(destify ${5})"
 
   local TARGET_DIR="${HOME}/.config/gtk-4.0"
 
   # Install gtk4.0 into config for libadwaita
-
   mkdir -p                                                                                    "${TARGET_DIR}"
   # backup_file "${TARGET_DIR}/gtk.css" "udo"
-  rm -rf                                                                                      "${TARGET_DIR}/"{gtk.css,gtk-dark.css,gtk-Light.css,gtk-Dark.css,assets,windows-assets}
+  rm -rf                                                                                      "${TARGET_DIR}/"{gtk.css,gtk-Light.css,gtk-Dark.css,assets,windows-assets}
   sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Light.scss"                           "${TARGET_DIR}/gtk-Light.css"
   sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Dark.scss"                            "${TARGET_DIR}/gtk-Dark.css"
-  ln -sf "${TARGET_DIR}/gtk${color}.css"                                                      "${TARGET_DIR}/gtk.css"
+  ln -sf "${TARGET_DIR}/gtk-${colors}.css"                                                    "${TARGET_DIR}/gtk.css"
-  ln -sf "${TARGET_DIR}/gtk-Dark.css"                                                         "${TARGET_DIR}/gtk-dark.css"
   cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/assets"                                    "${TARGET_DIR}"
   cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/sidebar-assets/"*".png"                    "${TARGET_DIR}/assets"
   cp -r "${THEME_SRC_DIR}/assets/gtk/scalable"                                                "${TARGET_DIR}/assets"
-  cp -r "${THEME_SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${scheme}"               "${TARGET_DIR}/windows-assets"
+  cp -r "${THEME_SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${colorscheme}"          "${TARGET_DIR}/windows-assets"
-
-  prompt -s "\n  Installed ${name}${color}${opacity}${alt}${theme}${scheme} gtk-4.0 theme in '${HOME}/.config/gtk-4.0' for libadwaita!"
 }
 
 install_libadwaita() {
-  color="${colors[0]}"
   opacity="${opacities[0]}"
-  alt="${alts[0]}"
+  color="${colors[1]}"
-  theme="${themes[0]}"
-  scheme="${schemes[0]}"
 
-  install_theme_deps
+  gtk_base && config_gtk4 "${colors}" "${alts}"
-
-  gtk_base && config_gtk4 "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
 }
 
 remove_libadwaita() {
   # restore_file "${TARGET_DIR}/gtk.css"
-  rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-dark.css,gtk-Light.css,gtk-Dark.css,assets,windows-assets}
+  rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-Light.css,gtk-Dark.css,assets,windows-assets}
 }
 
 ###############################################################################
@@ -574,16 +564,13 @@ install_themes() {
 
   install_theme_deps; start_animation; install_beggy
 
-  for color in "${colors[@]}"; do
   for opacity in "${opacities[@]}"; do
     for alt in "${alts[@]}"; do
       for theme in "${themes[@]}"; do
-          for scheme in "${schemes[@]}"; do
+        for color in "${colors[@]}"; do
           gtk_base
-            install_theemy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
+          install_theemy "${color}" "${opacity}" "${alt}" "${theme}"
-            shell_base
+          install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${icon}"
-            install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}" "${icon}"
-          done
         done
       done
     done
@@ -599,13 +586,23 @@ remove_themes() {
     for opacity in "${OPACITY_VARIANTS[@]}"; do
       for alt in "${ALT_VARIANTS[@]}"; do
         for theme in "${THEME_VARIANTS[@]}"; do
-          for scheme in "${SCHEME_VARIANTS[@]}"; do
+          remove_packy "${color}" "${opacity}" "${alt}" "${theme}" &
-            remove_packy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}" &
           process_ids+=("${!}")
         done
       done
     done
   done
+
+  for color in '-light' '-dark'; do
+    for opacity in "${OPACITY_VARIANTS[@]}"; do
+      for alt in "${ALT_VARIANTS[@]}"; do
+        for theme in "${THEME_VARIANTS[@]}"; do
+          for scheme in '' '-nord'; do
+            remove_old_packy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
+          done
+        done
+      done
+    done
   done
 
   wait ${process_ids[*]} &> /dev/null
@@ -617,10 +614,10 @@ install_gdm_theme() {
   # Let's go!
   install_theme_deps
   rm -rf "${WHITESUR_GS_DIR}"; install_beggy
-  gtk_base && shell_base
+  gtk_base
 
   if check_theme_file "${COMMON_CSS_FILE}"; then # CSS-based theme
-    install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${schemes[0]}" "${icon}" "${WHITESUR_GS_DIR}"
+    install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${icon}" "${WHITESUR_GS_DIR}"
     sed $SED_OPT "s|assets|${WHITESUR_GS_DIR}/assets|" "${WHITESUR_GS_DIR}/gnome-shell.css"
 
     if check_theme_file "${UBUNTU_CSS_FILE}"; then
@@ -636,7 +633,7 @@ install_gdm_theme() {
     # Fix previously installed WhiteSur
     restore_file "${ETC_CSS_FILE}"
   else # GR-based theme
-    install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${schemes[0]}" "${icon}" "${WHITESUR_TMP_DIR}/shelly"
+    install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${icon}" "${WHITESUR_TMP_DIR}/shelly"
     sed $SED_OPT "s|assets|resource:///org/gnome/shell/theme/assets|" "${WHITESUR_TMP_DIR}/shelly/gnome-shell.css"
 
     if check_theme_file "$POP_OS_GR_FILE"; then
@@ -679,44 +676,52 @@ 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}"
 
-  mkdir -p                                                                                    "${TARGET_DIR}"
+  if [[ "${theme_name}" == 'Monterey' ]]; then
-  cp -rf "${FIREFOX_SRC_DIR}/${theme_name}"                                                   "${TARGET_DIR}"
+    udo cp -rf "${FIREFOX_SRC_DIR}"/Monterey                                                  "${TARGET_DIR}"
-  [[ -f "${TARGET_DIR}"/customChrome.css ]] && mv "${TARGET_DIR}"/customChrome.css            "${TARGET_DIR}"/customChrome.css.bak
+    udo cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,titlebuttons,pages}                         "${TARGET_DIR}"/Monterey
-  cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css                                                "${TARGET_DIR}"
+    udo cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                              "${TARGET_DIR}"/Monterey
-  cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,pages}                                            "${TARGET_DIR}/${theme_name}"
+    udo cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                        "${TARGET_DIR}"/Monterey/parts
 
-  if [[ "${colorscheme}" == '-nord' ]]; then
+    if [[ "${adaptive}" == 'true' ]]; then
-    cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons-nord                                      "${TARGET_DIR}/${theme_name}"/titlebuttons
+      udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-Monterey-adaptive.css                       "${TARGET_DIR}"/userContent.css
     else
-    cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons                                           "${TARGET_DIR}/${theme_name}"
+      udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-Monterey.css                                "${TARGET_DIR}"/userContent.css
     fi
 
-  cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                                    "${TARGET_DIR}/${theme_name}"
+    if [[ "${firefoxtheme}" == 'Alt' ]]; then
-  cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                              "${TARGET_DIR}/${theme_name}"/parts
+      if [[ "${adaptive}" == 'true' ]]; then
-  [[ -f "${TARGET_DIR}"/userChrome.css ]] && mv "${TARGET_DIR}"/userChrome.css                "${TARGET_DIR}"/userChrome.css.bak
+        udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt-adaptive.css                  "${TARGET_DIR}"/userChrome.css
-  cp -rf "${FIREFOX_SRC_DIR}"/userChrome-"${theme_name}${theme_type}".css                     "${TARGET_DIR}"/userChrome.css
+      else
-  [[ -f "${TARGET_DIR}"/userContent.css ]] && mv "${TARGET_DIR}"/userContent.css              "${TARGET_DIR}"/userContent.css.bak
+        udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt.css                           "${TARGET_DIR}"/userChrome.css
-  cp -rf "${FIREFOX_SRC_DIR}"/userContent-"${theme_name}${theme_type}".css                    "${TARGET_DIR}"/userContent.css
+      fi
-
+      udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/parts/headerbar-urlbar.css                     "${TARGET_DIR}"/Monterey/parts/headerbar-urlbar-alt.css
-  if [[ "${firefoxtheme}" == 'Flat' && "${theme_name}" == 'Monterey' ]]; then
+    else
-    cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt"${theme_type}".css                    "${TARGET_DIR}"/userChrome.css
+      if [[ "${adaptive}" == 'true' ]]; then
-    cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/parts/headerbar-urlbar.css                           "${TARGET_DIR}"/Monterey/parts/headerbar-urlbar-alt.css
+        udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-adaptive.css                      "${TARGET_DIR}"/userChrome.css
+      else
+        udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey.css                               "${TARGET_DIR}"/userChrome.css
       fi
 
-  if [[ "${window}" == "alt" ]]; then
+      sed -i "s/left_header_button_3/left_header_button_${left_button}/g"                     "${TARGET_DIR}"/userChrome.css
-    sed -i "s|titlebutton-light|titlebutton-light-alt|" "${TARGET_DIR}/${theme_name}"/theme*.css
+      sed -i "s/right_header_button_3/right_header_button_${right_button}/g"                  "${TARGET_DIR}"/userChrome.css
-    sed -i "s|titlebutton-dark|titlebutton-dark-alt|" "${TARGET_DIR}/${theme_name}"/theme*.css
+    fi
+  else
+    udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur                                                  "${TARGET_DIR}"
+    udo cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,titlebuttons,pages}                         "${TARGET_DIR}"/WhiteSur
+    udo cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                              "${TARGET_DIR}"/WhiteSur
+    udo cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                        "${TARGET_DIR}"/WhiteSur/parts
+
+    if [[ "${adaptive}" == 'true' ]]; then
+      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-WhiteSur-adaptive.css                        "${TARGET_DIR}"/userChrome.css
+      udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-WhiteSur-adaptive.css                       "${TARGET_DIR}"/userContent.css
+    else
+      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-WhiteSur.css                                 "${TARGET_DIR}"/userChrome.css
+      udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-WhiteSur.css                                "${TARGET_DIR}"/userContent.css
+    fi
   fi
 
   config_firefox
@@ -737,21 +742,17 @@ config_firefox() {
   killall "firefox" "firefox-bin" &> /dev/null || true
 
   for d in "${FIREFOX_DIR}/"*"default"*; do
+    if [[ -f "${d}/prefs.js" ]]; then
       rm -rf                                                                                  "${d}/chrome"
       udo ln -sf "${TARGET_DIR}"                                                              "${d}/chrome"
-    rm -rf                                                                                  "${d}/user.js"
+      udoify_file                                                                             "${d}/prefs.js"
-    udoify_file                                                                             "${d}/user.js"
+      echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >>     "${d}/prefs.js"
-    #  Enable customChrome.css
+      echo "user_pref(\"browser.tabs.drawInTitlebar\", true);" >>                             "${d}/prefs.js"
-    echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >>     "${d}/user.js"
+      echo "user_pref(\"browser.uidensity\", 0);" >>                                          "${d}/prefs.js"
-    echo "user_pref(\"browser.tabs.drawInTitlebar\", true);"                         >>     "${d}/user.js"
+      echo "user_pref(\"layers.acceleration.force-enabled\", true);" >>                       "${d}/prefs.js"
-    # Set UI density to normal
+      echo "user_pref(\"mozilla.widget.use-argb-visuals\", true);" >>                         "${d}/prefs.js"
-    echo "user_pref(\"browser.uidensity\", 0);"                                      >>     "${d}/user.js"
+      echo "user_pref(\"widget.gtk.rounded-bottom-corners.enabled\", true);" >>               "${d}/prefs.js"
-    echo "user_pref(\"layers.acceleration.force-enabled\", true);"                   >>     "${d}/user.js"
+    fi
-    echo "user_pref(\"mozilla.widget.use-argb-visuals\", true);"                     >>     "${d}/user.js"
-    # Enable rounded bottom window corners
-    echo "user_pref(\"widget.gtk.rounded-bottom-corners.enabled\", true);"           >>     "${d}/user.js"
-    # Enable SVG context-propertes
-    echo "user_pref(\"svg.context-properties.content.enabled\", true);"              >>     "${d}/user.js"
   done
 }
 
@@ -782,7 +783,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
@@ -848,13 +849,11 @@ revert_dash_to_dock_theme() {
 connect_flatpak() {
   install_flatpak_deps
 
-  for color in "${colors[@]}"; do
   for opacity in "${opacities[@]}"; do
     for alt in "${alts[@]}"; do
       for theme in "${themes[@]}"; do
-          for scheme in "${schemes[@]}"; do
+        for color in "${colors[@]}"; do
-            pakitheme_gtk3 "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
+          pakitheme_gtk3 "${color}" "${opacity}" "${alt}" "${theme}"
-          done
         done
       done
     done
@@ -862,13 +861,11 @@ connect_flatpak() {
 }
 
 disconnect_flatpak() {
-  for color in "${COLOR_VARIANTS[@]}"; do
+  for opacity in "${opacities[@]}"; do
-    for opacity in "${OPACITY_VARIANTS[@]}"; do
+    for alt in "${alts[@]}"; do
-      for alt in "${ALT_VARIANTS[@]}"; do
+      for theme in "${themes[@]}"; do
-        for theme in "${THEME_VARIANTS[@]}"; do
+        for color in "${colors[@]}"; do
-          for scheme in "${SCHEME_VARIANTS[@]}"; do
+          flatpak_remove "${color}" "${opacity}" "${alt}" "${theme}"
-            flatpak_remove "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
-          done
         done
       done
     done
@@ -910,31 +907,6 @@ gtk_base() {
   if [[ "${theme}" != '' ]]; then
     sed $SED_OPT "/\$theme/s/default/${theme}/"                                 "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss"
   fi
-
-  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() {
-  cp -rf "${THEME_SRC_DIR}/main/gnome-shell/_shell-base"{".scss","-temp.scss"}
-
-  sed $SED_OPT "/\widgets/s/46-0/$GNOME_VERSION/"                               "${THEME_SRC_DIR}/main/gnome-shell/_shell-base-temp.scss"
-
-  if [[ "${GNOME_VERSION}" == '3-28' ]]; then
-    sed $SED_OPT "/\extensions/s/46-0/3-28/"                                    "${THEME_SRC_DIR}/main/gnome-shell/_shell-base-temp.scss"
-  elif [[ "${GNOME_VERSION}" -gt '3-28' && "${GNOME_VERSION}" -lt '46-0' ]]; then
-    sed $SED_OPT "/\extensions/s/46-0/40-0/"                                    "${THEME_SRC_DIR}/main/gnome-shell/_shell-base-temp.scss"
-  fi
 }
 
 ###############################################################################
@@ -944,8 +916,10 @@ shell_base() {
 customize_theme() {
   cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"}
 
-  if [[ "${GNOME_VERSION}" -ge '47-0' ]]; then
+  # Nord dark colors
-    sed $SED_OPT "/\$shell_version/s/old/new/"                                  "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  if [[ "${colorscheme}" == '-nord' ]]; then
+    prompt -s "Changing ColorScheme style to nord version ...\n"
+    sed $SED_OPT "/\$colorscheme/s/default/nord/"                               "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
   # Darker dark colors
@@ -967,7 +941,7 @@ customize_theme() {
   fi
 
   # Change Nautilus titlebutton placement style
-  if [[ "${nautilus_style}" == 'right' ]]; then
+  if [[ "${right_placement}" == 'true' ]]; then
     prompt -s "Changing Nautilus titlebutton placement style ...\n"
     sed $SED_OPT "/\$placement/s/left/right/"                                   "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi

src/assets/gtk/windows-assets/windows-assets.svg

@@ -2,21 +2,25 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="240"
    height="270"
    id="svg9892"
    version="1.1"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="windows-assets.svg"
+   sodipodi:docname="windows-assets.svg">
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="mojave_theme">
     <linearGradient
        id="header_button_img_dark"
-       inkscape:swatch="gradient">
+       osb:paint="gradient">
       <stop
          id="stop1959"
          offset="0"
@@ -28,7 +32,7 @@
     </linearGradient>
     <linearGradient
        id="header_button_img"
-       inkscape:swatch="gradient">
+       osb:paint="gradient">
       <stop
          style="stop-color:#f1f1f1;stop-opacity:1"
          offset="0"
@@ -40,7 +44,7 @@
     </linearGradient>
     <linearGradient
        id="theme_darker_color"
-       inkscape:swatch="solid">
+       osb:paint="solid">
       <stop
          style="stop-color:#4d4d4d;stop-opacity:1;"
          offset="0"
@@ -48,7 +52,7 @@
     </linearGradient>
     <linearGradient
        id="button_active"
-       inkscape:swatch="gradient">
+       osb:paint="gradient">
       <stop
          style="stop-color:#3d6ffc;stop-opacity:1"
          offset="0"
@@ -60,7 +64,7 @@
     </linearGradient>
     <linearGradient
        id="unchecked_highlight"
-       inkscape:swatch="solid">
+       osb:paint="solid">
       <stop
          style="stop-color:#5f5f5f;stop-opacity:1;"
          offset="0"
@@ -68,7 +72,7 @@
     </linearGradient>
     <linearGradient
        id="dark_unchecked_bg"
-       inkscape:swatch="gradient">
+       osb:paint="gradient">
       <stop
          id="stop1615"
          offset="0"
@@ -80,7 +84,7 @@
     </linearGradient>
     <linearGradient
        id="hightlight"
-       inkscape:swatch="solid">
+       osb:paint="solid">
       <stop
          style="stop-color:#5887fc;stop-opacity:1;"
          offset="0"
@@ -88,7 +92,7 @@
     </linearGradient>
     <linearGradient
        id="dark_checked_bg"
-       inkscape:swatch="gradient">
+       osb:paint="gradient">
       <stop
          style="stop-color:#3458c0;stop-opacity:1"
          offset="0"
@@ -100,7 +104,7 @@
     </linearGradient>
     <linearGradient
        id="selected_fg_color"
-       inkscape:swatch="solid">
+       osb:paint="solid">
       <stop
          style="stop-color:#ffffffgit;stop-opacity:1;"
          offset="0"
@@ -108,7 +112,7 @@
     </linearGradient>
     <linearGradient
        id="selected_bg_color"
-       inkscape:swatch="solid">
+       osb:paint="solid">
       <stop
          style="stop-color:#5683fa;stop-opacity:1;"
          offset="0"
@@ -122,17 +126,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.0175781"
+     inkscape:zoom="1.4390728"
-     inkscape:cx="278.11132"
+     inkscape:cx="174.05714"
-     inkscape:cy="133.65067"
+     inkscape:cy="115.84359"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showborder="true"
-     inkscape:window-width="1920"
+     inkscape:window-width="1366"
-     inkscape:window-height="1016"
+     inkscape:window-height="702"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="36"
      inkscape:window-maximized="1"
      inkscape:snap-nodes="false"
      inkscape:snap-bbox="true"
@@ -151,8 +155,7 @@
      inkscape:pagecheckerboard="true"
      inkscape:showpageshadow="false"
      inkscape:snap-others="false"
-     inkscape:object-paths="false"
+     inkscape:object-paths="false">
-     inkscape:deskcolor="#d1d1d1">
     <inkscape:grid
        type="xygrid"
        id="grid10919"
@@ -161,11 +164,20 @@
        enabled="true"
        snapvisiblegridlinesonly="true"
        originx="8.000005"
-       originy="-1062"
+       originy="-1062" />
-       spacingy="1"
-       spacingx="1"
-       units="px" />
   </sodipodi:namedview>
+  <metadata
+     id="metadata9897">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <g
      inkscape:groupmode="layer"
      id="layer3"
@@ -199,6 +211,20 @@
      id="layer1"
      style="display:inline"
      transform="translate(8.000005,279.63782)">
+    <g
+       inkscape:label="#g10801"
+       transform="matrix(1.9947791,0,0,1.9939719,354.38167,165.09433)"
+       id="sjhgfjsgf" />
+    <g
+       id="g4816-7"
+       transform="translate(-888.87744,-514.39281)" />
+    <g
+       id="g4816-6-6"
+       transform="translate(-829.87744,-514.39281)" />
+    <g
+       id="g3981-6-4-9-3"
+       transform="rotate(45,1540.4502,361.70955)"
+       style="opacity:0.85;fill:#1a1a1a;fill-opacity:1" />
     <g
        id="titlebutton-close-small-dark"
        inkscape:label="#g1637"

src/main/gnome-shell/_shell-base.scss

@@ -1,5 +0,0 @@
-@import '../../sass/variables';
-@import '../../sass/colors';
-@import '../../sass/gnome-shell/drawing';
-@import '../../sass/gnome-shell/widgets-46-0';
-@import '../../sass/gnome-shell/extensions-46-0';

src/main/gnome-shell/gnome-shell-Dark.scss

@@ -1,3 +0,0 @@
-$variant: 'dark';
-
-@import 'shell-base-temp';

src/main/gnome-shell/gnome-shell-Light.scss

@@ -1,3 +0,0 @@
-$variant: 'light';
-
-@import 'shell-base-temp';

src/main/gnome-shell/shell-3-28/gnome-shell-Dark.scss

@@ -0,0 +1,11 @@
+$variant: 'dark';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions-3-28';

src/main/gnome-shell/shell-3-28/gnome-shell-Light.scss

@@ -0,0 +1,11 @@
+$variant: 'light';
+$laptop: 'true';
+$trans: 'true';
+$black: 'false';
+$theme: 'default';
+
+@import '../../../sass/colors';
+@import '../../../sass/variables';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-3-28';
+@import '../../../sass/gnome-shell/extensions-3-28';

src/main/gnome-shell/shell-40-0/gnome-shell-Dark.scss

@@ -0,0 +1,7 @@
+$variant: 'dark';
+
+@import '../../../sass/variables';
+@import '../../../sass/colors';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions-40-0';

src/main/gnome-shell/shell-40-0/gnome-shell-Light.scss

@@ -0,0 +1,7 @@
+$variant: 'light';
+
+@import '../../../sass/variables';
+@import '../../../sass/colors';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-40-0';
+@import '../../../sass/gnome-shell/extensions-40-0';

src/main/gnome-shell/shell-42-0/gnome-shell-Dark.scss

@@ -0,0 +1,7 @@
+$variant: 'dark';
+
+@import '../../../sass/variables';
+@import '../../../sass/colors';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-42-0';
+@import '../../../sass/gnome-shell/extensions-40-0';

src/main/gnome-shell/shell-42-0/gnome-shell-Light.scss

@@ -0,0 +1,7 @@
+$variant: 'light';
+
+@import '../../../sass/variables';
+@import '../../../sass/colors';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-42-0';
+@import '../../../sass/gnome-shell/extensions-40-0';

src/main/gnome-shell/shell-44-0/gnome-shell-Dark.scss

@@ -0,0 +1,7 @@
+$variant: 'dark';
+
+@import '../../../sass/variables';
+@import '../../../sass/colors';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-44-0';
+@import '../../../sass/gnome-shell/extensions-40-0';

src/main/gnome-shell/shell-44-0/gnome-shell-Light.scss

@@ -0,0 +1,7 @@
+$variant: 'light';
+
+@import '../../../sass/variables';
+@import '../../../sass/colors';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-44-0';
+@import '../../../sass/gnome-shell/extensions-40-0';

src/main/gnome-shell/shell-46-0/gnome-shell-Dark.scss

@@ -0,0 +1,7 @@
+$variant: 'dark';
+
+@import '../../../sass/variables';
+@import '../../../sass/colors';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-46-0';
+@import '../../../sass/gnome-shell/extensions-46-0';

src/main/gnome-shell/shell-46-0/gnome-shell-Light.scss

@@ -0,0 +1,7 @@
+$variant: 'light';
+
+@import '../../../sass/variables';
+@import '../../../sass/colors';
+@import '../../../sass/gnome-shell/drawing';
+@import '../../../sass/gnome-shell/widgets-46-0';
+@import '../../../sass/gnome-shell/extensions-46-0';

src/main/gtk-3.0/gtk-Dark.scss

@@ -2,8 +2,7 @@ $variant: 'dark';
 
 @import '../../sass/variables';
 @import '../../sass/colors';
-@import '../../sass/gtk/drawing-3.0';
+@import '../../sass/gtk/drawing';
 @import '../../sass/gtk/common-3.0';
 @import '../../sass/gtk/apps-3.0';
 @import '../../sass/gtk/colors-public';
-@import '../../sass/gtk/colors-other';

src/main/gtk-3.0/gtk-Light.scss

@@ -2,8 +2,7 @@ $variant: 'light';
 
 @import '../../sass/variables';
 @import '../../sass/colors';
-@import '../../sass/gtk/drawing-3.0';
+@import '../../sass/gtk/drawing';
 @import '../../sass/gtk/common-3.0';
 @import '../../sass/gtk/apps-3.0';
 @import '../../sass/gtk/colors-public';
-@import '../../sass/gtk/colors-other';

src/main/gtk-4.0/gtk-Dark.scss

@@ -2,8 +2,8 @@ $variant: 'dark';
 
 @import '../../sass/variables';
 @import '../../sass/colors';
-@import '../../sass/gtk/colors-libadwaita';
+@import '../../sass/gtk/drawing';
-@import '../../sass/gtk/drawing-4.0';
 @import '../../sass/gtk/common-4.0';
 @import '../../sass/gtk/apps-4.0';
 @import '../../sass/gtk/colors-public';
+@import '../../sass/gtk/colors-libadwaita';

src/main/gtk-4.0/gtk-Light.scss

@@ -2,8 +2,8 @@ $variant: 'light';
 
 @import '../../sass/variables';
 @import '../../sass/colors';
-@import '../../sass/gtk/colors-libadwaita';
+@import '../../sass/gtk/drawing';
-@import '../../sass/gtk/drawing-4.0';
 @import '../../sass/gtk/common-4.0';
 @import '../../sass/gtk/apps-4.0';
 @import '../../sass/gtk/colors-public';
+@import '../../sass/gtk/colors-libadwaita';

src/main/gtk-4.0/make_gresource_xml.sh

@@ -33,7 +33,6 @@ do
 done
 
 echo "    <file>assets/scalable/checkbox-checked-symbolic.svg</file>" >> gtk.gresource.xml
-echo "    <file>assets/scalable/checkbox-checked-big-symbolic.svg</file>" >> gtk.gresource.xml
 echo "    <file>assets/scalable/checkbox-mixed-symbolic.svg</file>" >> gtk.gresource.xml
 echo "    <file>assets/scalable/radio-checked-symbolic.svg</file>" >> gtk.gresource.xml
 echo "    <file>assets/scalable/combobox-arrow-symbolic.svg</file>" >> gtk.gresource.xml

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

@@ -30,16 +30,16 @@
 	--gnome-inactive-toolbar-border-color: color-mix(in srgb, currentColor 10%, transparent);
 
 	/* Sidebar */
-	--gnome-sidebar-background: var(--lwt-sidebar-background-color, #282828);
+	--gnome-sidebar-background: var(--lwt-accent-color, #282828);
-	--gnome-inactive-sidebar-background: var(--lwt-sidebar-background-color, #282828);
+	--gnome-inactive-sidebar-background: var(--lwt-accent-color, #282828);
-	--gnome-sidebar-border-color: color-mix(in srgb, var(--lwt-text-color) 12%, var(--lwt-sidebar-background-color));
+	--gnome-sidebar-border-color: color-mix(in srgb, var(--toolbar-color) 10%, var(--gnome-sidebar-background));
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-menu-border-color: rgba(0,0,0,.15);
+	--gnome-menu-border-color: light-dark(rgba(0,0,0,.15), #000000);
 	--gnome-popover-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
 	--gnome-popover-border-color: light-dark(rgba(0,0,0,.15), #000000);
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px light-dark(rgba(0,0,0,.15), #000000);
 	--gnome-popover-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-popover-button-active-background: color-mix(in srgb, currentColor 15%, transparent);
 	--gnome-popover-separator-color: color-mix(in srgb, currentColor 8%, transparent);
@@ -53,45 +53,40 @@
 	--gnome-inactive-headerbar-box-shadow: color-mix(in srgb, currentColor 8%, transparent);
 
 	/* Buttons */
-	--button-background-color: color-mix(in srgb, #ffffff 15%, var(--toolbar-field-background-color));
+	--gnome-button-background: color-mix(in srgb, #ffffff 15%, var(--toolbar-field-background-color));
-	--button-background-hover-color: color-mix(in srgb, #ffffff 25%, var(--toolbar-field-background-color));
-	--button-background-active-color: color-mix(in srgb, #ffffff 35%, var(--toolbar-field-background-color));
-	--button-background-disabled-color: color-mix(in srgb, #ffffff 8%, var(--toolbar-field-background-color));
-
-	--gnome-button-background: linear-gradient(to top, var(--button-background-color) 0%, var(--button-background-color) 100%);
 	--gnome-button-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-border-bottom-color: color-mix(in srgb, #000000 45%, var(--toolbar-field-background-color));
 	--gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-	--gnome-button-hover-background: linear-gradient(to top, var(--button-background-hover-color) 0%, var(--button-background-hover-color) 100%);
+	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-active-background: linear-gradient(to top, var(--button-background-active-color) 0%, var(--button-background-active-color) 100%);
+	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
+	--gnome-button-hover-background: color-mix(in srgb, #ffffff 25%, var(--toolbar-field-background-color));
+	--gnome-button-active-background: color-mix(in srgb, #ffffff 35%, var(--toolbar-field-background-color));
 	--gnome-button-active-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-active-bottom-border-color: color-mix(in srgb, #000000 45%, var(--toolbar-field-background-color));
 	--gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-	--gnome-button-disabled-background: linear-gradient(to top, var(--button-background-disabled-color) 0%, var(--button-background-disabled-color) 100%);
+	--gnome-button-disabled-background: color-mix(in srgb, #ffffff 5%, var(--toolbar-field-background-color));
 	--gnome-button-disabled-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03);
 	--gnome-inactive-button-background: color-mix(in srgb, #ffffff 5%, var(--toolbar-field-background-color));
 	--gnome-inactive-button-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
 	--gnome-button-suggested-action-background: linear-gradient(to top, #155099 2px, #15539e);
-	--gnome-button-suggested-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-suggested-action-border-color: #0f3b71;
-	--gnome-button-suggested-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-border-accent-color: #092444;
 	--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, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 1px);
+	--gnome-button-suggested-action-active-background: #103e75;
-	--gnome-button-suggested-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-active-border-color: #0f3b71;
 	--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, #ae151c 2px, #b2161d);
-	--gnome-button-destructive-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-destructive-action-border-color: #851015;
-	--gnome-button-destructive-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-border-accent-color: #570b0e;
 	--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, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 1px);
+	--gnome-button-destructive-action-active-background: #8a1116;
-	--gnome-button-destructive-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-active-border-color: #851015;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
-	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
 	--gnome-headerbar-button-combined-background: color-mix(in srgb, currentColor 6%, transparent);
 	--gnome-headerbar-button-hover-background: color-mix(in srgb, currentColor 12%, transparent);
 	--gnome-headerbar-button-active-background: color-mix(in srgb, currentColor 18%, transparent);

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

@@ -1,172 +0,0 @@
-@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,10 +9,7 @@
   :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: #242424;
-	--gnome-content-page-dialog-background: #424242;
+	--gnome-browser-content-box-background: #323232;
-	--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;
@@ -35,10 +32,10 @@
 
 	/* Popups */
 	--gnome-menu-background: rgba(51, 51, 51, 0.95);
-	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-menu-border-color: #070707;
 	--gnome-popover-background: rgba(51, 51, 51, 0.95);
-	--gnome-popover-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-popover-border-color: #070707;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
 	--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);
@@ -70,20 +67,20 @@
 	--gnome-inactive-button-border-color: #323232;
 	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
 	--gnome-button-suggested-action-background: linear-gradient(to top, #155099 2px, #15539e);
-	--gnome-button-suggested-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-suggested-action-border-color: #0f3b71;
-	--gnome-button-suggested-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-border-accent-color: #092444;;
 	--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, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 1px);
+	--gnome-button-suggested-action-active-background: #103e75;
-	--gnome-button-suggested-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-active-border-color: #0f3b71;
 	--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, #ae151c 2px, #b2161d);
-	--gnome-button-destructive-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-destructive-action-border-color: #851015;
-	--gnome-button-destructive-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-border-accent-color: #570b0e;
 	--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, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 1px);
+	--gnome-button-destructive-action-active-background: #8a1116;
-	--gnome-button-destructive-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-active-border-color: #851015;
 	--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);
@@ -105,17 +102,20 @@
 	--gnome-private-urlbar-background: #25003e;
 
 	/* Tabs */
-	--gnome-tabbar-tab-background: rgba(255, 255, 255, 0.06);
+	--gnome-tabbar-tab-background: #404040;
-	--gnome-tabbar-tab-color: #909090;
+	--gnome-tabbar-tab-color: rgb(141, 144, 145);
-	--gnome-tabbar-tab-hover-background: rgba(255, 255, 255, 0.12);
+	--gnome-tabbar-tab-hover-background: #464646;
-	--gnome-tabbar-tab-hover-color: #c8c8c8;
+	--gnome-tabbar-tab-hover-border-bottom-color: #1b1b1b;
-	--gnome-tabbar-tab-active-background: rgba(255, 255, 255, 0.16);
+	--gnome-tabbar-tab-hover-color: rgb(200, 200, 200);
+	--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: rgba(255, 255, 255, 0.16);
+	--gnome-tabbar-tab-active-hover-background: #525252;
-	--gnome-inactive-tabbar-tab-color: #686868;
+	--gnome-inactive-tabbar-tab-color: rgb(141, 144, 145);
-	--gnome-inactive-tabbar-tab-background: rgba(255, 255, 255, 0.03);
+	--gnome-inactive-tabbar-tab-background: #383838;
-	--gnome-inactive-tabbar-tab-active-background: rgba(255, 255, 255, 0.1);
+	--gnome-inactive-tabbar-tab-active-background: #424242;
-	--gnome-inactive-tabbar-tab-active-color: #898989;
+	--gnome-inactive-tabbar-tab-active-border-bottom-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 */

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

@@ -1,174 +0,0 @@
-@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: #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;
-
-	/* Toolbars */
-	--gnome-toolbar-background: #1e1e1e;
-	--gnome-tabstoolbar-background: #1e1e1e;
-	--gnome-findbar-background: #282828;
-	--gnome-toolbar-color: #ffffff;
-	--gnome-toolbar-icon-fill: #ffffff;
-	--gnome-toolbar-border-color: #070707;
-	--gnome-inactive-toolbar-color: rgba(255, 255, 255, 0.35);
-	--gnome-inactive-toolbar-background: #1e1e1e;
-	--gnome-inactive-toolbar-border-color: #121212;
-
-	/* Sidebar */
-	--gnome-sidebar-background: #1e1e1e;
-	--gnome-inactive-sidebar-background: #3f3f3f;
-	--gnome-sidebar-border-color: color-mix(in srgb, #ffffff 12%, var(--gnome-sidebar-background));
-
-	/* Popups */
-	--gnome-menu-background: rgba(40, 40, 40, 0.95);
-	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
-	--gnome-popover-background: rgba(40, 40, 40, 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: #1e1e1e;
-	--gnome-headerbar-border-color: #070707;
-	--gnome-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.15);
-	--gnome-inactive-headerbar-background: #1e1e1e;
-	--gnome-inactive-headerbar-border-color: #202020;
-	--gnome-inactive-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
-
-	/* Buttons */
-	--gnome-button-background: #2a2a2a;
-	--gnome-button-border-color: #282828;
-	--gnome-button-border-bottom-color: #282828;
-	--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, #242424 0%, #282828 100%);
-	--gnome-button-active-background: #282828;
-	--gnome-button-active-border-color: #1b1b1b;
-	--gnome-button-active-border-bottom-color: #1b1b1b;
-	--gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-	--gnome-button-disabled-background: linear-gradient(to top, #242424 0%, #494949 100%);
-	--gnome-button-disabled-border-color: #282828;
-	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03);
-	--gnome-inactive-button-background: #2a2a2a;
-	--gnome-inactive-button-border-color: #282828;
-	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
-	--gnome-button-suggested-action-background: linear-gradient(to top, #155099 2px, #15539e);
-	--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, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 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, #ae151c 2px, #b2161d);
-	--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, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 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: #2a2a2a;
-	--gnome-urlbar-border-color: #282828;
-	--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: #ffffff;
-	--gnome-hover-urlbar-border-color: #585858;
-	--gnome-inactive-urlbar-background: #2a2a2a;
-	--gnome-inactive-urlbar-border-color: #282828;
-	--gnome-inactive-urlbar-box-shadow: none;
-	--gnome-inactive-urlbar-color: #d6d6d6;
-	--gnome-focused-urlbar-border-color: #338CBE;
-	--gnome-focused-urlbar-highlight-color: #006EA0;
-	--gnome-private-urlbar-background: #25003e;
-
-	/* Tabs */
-	--gnome-tabbar-tab-background: rgba(42, 42, 42, .25);
-	--gnome-tabbar-tab-color: rgb(141, 144, 145);
-	--gnome-tabbar-tab-hover-background: #282828;
-	--gnome-tabbar-tab-hover-border-bottom-color: #1b1b1b;
-	--gnome-tabbar-tab-hover-color: rgb(200, 200, 200);
-	--gnome-tabbar-tab-active-background: #2a2a2a;
-	--gnome-tabbar-tab-active-border-bottom-color: #15539e;
-	--gnome-tabbar-tab-active-color: #ffffff;
-	--gnome-tabbar-tab-active-hover-background: #525252;
-	--gnome-inactive-tabbar-tab-color: rgb(141, 144, 145);
-	--gnome-inactive-tabbar-tab-background: var(--gnome-tabbar-tab-background);
-	--gnome-inactive-tabbar-tab-active-background: rgb(50, 50, 50);
-	--gnome-inactive-tabbar-tab-active-border-bottom-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: #464646;
-	--gnome-switch-hover-background: #525252;
-	--gnome-switch-active-background: #606060;
-	--gnome-switch-border-color: transparent;
-	--gnome-switch-slider-background: #ffffff;
-	--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: #315bef;
-	--gnome-switch-pressed-hover-background: #5073f1;
-	--gnome-switch-pressed-active-background: #6584f3;
-	--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: #1e1e1e;
-	/* 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: #1f1f1f;
-
-	/* Private browsing info box */
-	--gnome-private-text-primary-color: #FBFBFE;
-  }
-}

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

@@ -9,10 +9,6 @@
 	/* 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;
@@ -39,10 +35,10 @@
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-menu-border-color: rgba(0,0,0,.15);
+	--gnome-menu-border-color: color-mix(in srgb, currentColor 12%, transparent);
 	--gnome-popover-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-popover-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-popover-border-color: color-mix(in srgb, currentColor 12%, transparent);
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12);
 	--gnome-popover-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-popover-button-active-background: color-mix(in srgb, currentColor 20%, transparent);
 	--gnome-popover-separator-color: color-mix(in srgb, currentColor 10%, transparent);
@@ -56,45 +52,40 @@
 	--gnome-inactive-headerbar-box-shadow: 0 1px rgba(var(--lwt-accent-color), 0.35) inset;
 
 	/* Buttons */
-	--button-background-color: color-mix(in srgb, var(--lwt-accent-color, #ffffff) 35%, transparent);
+	--gnome-button-background: color-mix(in srgb, var(--lwt-accent-color, #ffffff) 35%, transparent);
-	--button-background-hover-color: color-mix(in srgb, var(--lwt-accent-color, #ffffff) 75%, transparent);
+	--gnome-button-border-color: color-mix(in srgb, currentColor 15%, transparent);
-	--button-background-active-color: color-mix(in srgb, currentColor 10%, transparent);
+	--gnome-button-border-bottom-color: color-mix(in srgb, currentColor 20%, transparent);
-	--button-background-disabled-color: color-mix(in srgb, var(--lwt-accent-color, #ffffff) 15%, transparent);
+	--gnome-button-box-shadow: inset 0 1px color-mix(in srgb, var(--lwt-accent-color, #ffffff) 50%, transparent), 0 1px 2px rgba(0, 0, 0, 0.03);
-
+	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-background: linear-gradient(to top, var(--button-background-color) 0%, var(--button-background-color) 100%);
+	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
-	--gnome-button-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-button-hover-background: var(--lwt-accent-color, #ffffff);
-	--gnome-button-border-bottom-color: light-dark(rgba(0,0,0,.20), #000000);
+	--gnome-button-active-background: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.03);
+	--gnome-button-active-border-color: color-mix(in srgb, currentColor 15%, transparent);
-	--gnome-button-hover-background: linear-gradient(to top, var(--button-background-hover-color) 0%, var(--button-background-hover-color) 100%);
+	--gnome-button-active-bottom-border-color: color-mix(in srgb, currentColor 20%, transparent);
-	--gnome-button-active-background: linear-gradient(to top, var(--button-background-active-color) 0%, var(--button-background-active-color) 100%);
-	--gnome-button-active-border-color: light-dark(rgba(0,0,0,.15), #000000);
-	--gnome-button-active-bottom-border-color: light-dark(rgba(0,0,0,.20), #000000);
 	--gnome-button-active-box-shadow: 0 1px rgba(255, 255, 255, 0) inset;
-	--gnome-button-disabled-background: linear-gradient(to top, var(--button-background-disabled-color) 0%, var(--button-background-disabled-color) 100%);
+	--gnome-button-disabled-background: color-mix(in srgb, currentColor 5%, transparent);
-	--gnome-button-disabled-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-button-disabled-border-color: color-mix(in srgb, currentColor 15%, transparent);
 	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 	--gnome-inactive-button-background: color-mix(in srgb, currentColor 5%, transparent);
-	--gnome-inactive-button-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-inactive-button-border-color: color-mix(in srgb, currentColor 15%, transparent);
 	--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-border-accent-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-background: #1961b9;
 	--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-border-accent-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-background: #a0131a;
 	--gnome-button-destructive-action-active-border-color: #b2161d;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
-	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
 	--gnome-headerbar-button-combined-background: color-mix(in srgb, currentColor 5%, transparent);
 	--gnome-headerbar-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-headerbar-button-active-background: color-mix(in srgb, currentColor 15%, transparent);

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

@@ -1,169 +0,0 @@
-@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,10 +8,7 @@
 :root {
 	/* Browser area before a page starts loading */
 	--gnome-browser-before-load-background: #f5f5f5;
-	--gnome-content-page-dialog-background: #ffffff;
+	--gnome-browser-content-box-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;
@@ -34,10 +31,10 @@
 
 	/* Popups */
 	--gnome-menu-background: rgba(255, 255, 255, 0.95);
-	--gnome-menu-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-menu-border-color: #cdc7c2;
 	--gnome-popover-background: rgba(255, 255, 255, 0.95);
-	--gnome-popover-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-popover-border-color: #cdc7c2;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12);
 	--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);
@@ -70,18 +67,18 @@
 	--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-border-accent-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-background: #1961b9;
 	--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-border-accent-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-background: #a0131a;
 	--gnome-button-destructive-action-active-border-color: #b2161d;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 

src/other/firefox/Monterey/left_header_button_3.css

@@ -1,10 +1,10 @@
 #TabsToolbar {
-	margin-left: 510px !important;
+	margin-left: 491px !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar {
-		margin-left: 590px !important;
+		margin-left: 534px !important;
 	}
 }

src/other/firefox/Monterey/left_header_button_4.css

@@ -1,10 +1,10 @@
 #TabsToolbar {
-	margin-left: 552px !important;
+	margin-left: 531px !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar {
-		margin-left: 632px !important;
+		margin-left: 574px !important;
 	}
 }

src/other/firefox/Monterey/left_header_button_5.css

@@ -1,10 +1,10 @@
 #TabsToolbar {
-	margin-left: 596px !important;
+	margin-left: 571px !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar {
-		margin-left: 686px !important;
+		margin-left: 614px !important;
 	}
 }

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

@@ -17,6 +17,23 @@ toolbarspring {
 	min-width: 360px !important;
 }
 
+#urlbar[breakout][breakout-extend] {
+	left: 0 !important;
+	top: 0 !important;
+	width: 100% !important;
+	z-index: 5 !important;
+	padding: 0 !important;
+	border-radius: 8px !important;
+	outline: 2px solid var(--gnome-focused-urlbar-border-color) !important;
+	outline-offset: -2px;
+	-moz-outline-radius: 8px;
+	transition: outline 100ms ease-out;
+}
+
+#urlbar:-moz-window-inactive {
+	border-color: var(--gnome-inactive-headerbar-background) !important;
+}
+
 #urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background {
 	outline-color: transparent !important;
 }
@@ -37,29 +54,18 @@ toolbarspring {
 	min-width: 360px !important;
 }
 
-#urlbar-background {
-	box-shadow: none !important;
-	border: none !important;
-	background: none !important;
-	border-radius: 8px !important;
-}
-
 #urlbar[breakout][breakout-extend] {
+	left: 0 !important;
+	top: 0 !important;
 	width: 360px !important;
 	z-index: 5 !important;
 	padding: 0 !important;
 	border-radius: 8px !important;
-	outline: 2px solid var(--gnome-focused-urlbar-border-color) !important;
-	outline-offset: -2px;
-	-moz-outline-radius: 8px;
-	transition: outline 100ms ease-out;
 }
-
 #urlbar[breakout][breakout-extend][open] {
 	height: auto !important;
 	max-height: unset !important;
 }
-
 #urlbar[breakout][breakout-extend] #urlbar-input-container,
 #urlbar[breakout][breakout-extend] .urlbar-input-container {
 	height: 32px !important;
@@ -67,10 +73,6 @@ toolbarspring {
 	padding: 0 !important;
 }
 
-#urlbar:-moz-window-inactive {
-	border-color: var(--gnome-inactive-headerbar-background) !important;
-}
-
 #urlbar-input {
 	text-align: center !important;
 	padding: 0 28px 0 0 !important;

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

@@ -12,8 +12,12 @@
 	min-height: 32px !important;
 }
 
-#TabsToolbar #tabbrowser-tabs,
+#TabsToolbar-customization-target {
-#TabsToolbar #tabbrowser-tabs arrowscrollbox {
+	padding-bottom: 6px !important;
+}
+
+#tabbrowser-tabs,
+#tabbrowser-tabs arrowscrollbox {
 	min-height: 32px !important;
 	--tab-min-height: 32px !important;
 }
@@ -22,14 +26,13 @@
 	max-height: 32px !important;
 }
 
-#TabsToolbar .tab-background,
+.tab-background, .tab-stack {
-#TabsToolbar .tab-stack {
 	height: 32px !important;
 	min-height: 32px !important;
 }
 
-#TabsToolbar tab > stack {
+tab > stack {
-	margin: 6px 3px !important;
+	margin: 0 3px !important;
 }
 
 :root:not([sizemode="normal"]) .titlebar-spacer[type="pre-tabs"], :root[gtktiledwindow="true"] .titlebar-spacer[type="pre-tabs"] { /* reset */
@@ -40,15 +43,10 @@
 	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;
@@ -58,25 +56,31 @@
 	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;
 }
 
-.tabbrowser-tab:not([selected=true]) .tab-background {
+.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;
 }
 
-.tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
+#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
 	background: var(--gnome-inactive-tabbar-tab-background) !important;
 }
 
 /* Tab hover */
-.tabbrowser-tab:not([selected=true]):hover > .tab-stack > .tab-background {
+#TabsToolbar .tabbrowser-tab:not([selected=true]):hover > .tab-stack > .tab-background {
 	background: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -109,20 +113,54 @@ tab[selected]:-moz-window-inactive .tab-label {
 }
 
 /* Center all inside tab */
-#TabsToolbar {
 .tab-content {
 	display: flex;
 	flex-direction: row;
 	justify-content: center !important;
 	align-items: center !important;
 	min-width: 100% !important;
-	padding: 0 8px !important;
+	padding: 0 10px !important;
 }
 
 .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;
@@ -172,29 +210,6 @@ 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;
@@ -204,19 +219,6 @@ 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;
@@ -272,18 +274,6 @@ 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 {
@@ -310,6 +300,11 @@ 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;
 }
@@ -320,16 +315,15 @@ tab[selected]:-moz-window-inactive .tab-label {
 }
 
 #TabsToolbar .toolbarbutton-1,
-#TabsToolbar #tabs-newtab-button,
+#tabs-newtab-button, #TabsToolbar #new-tab-button {
-#TabsToolbar #new-tab-button {
 	min-height: 32px !important;
-	margin: 6px 2px !important;
+	margin: 0 2px !important;
 	padding: 0 10px !important;
 	border-radius: 8px !important;
 }
 
 #TabsToolbar .toolbarbutton-1 image,
-#TabsToolbar #tabs-newtab-button image,
+#tabs-newtab-button image,
 #TabsToolbar #new-tab-button image {
 	margin: 0 !important;
 	padding: 0 !important;
@@ -376,5 +370,4 @@ 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

@@ -2,40 +2,27 @@
 
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-:root[tabsintitlebar] #nav-bar toolbaritem,
+tab > stack {
-#nav-bar-customization-target {
-	-moz-window-dragging: drag;
-}
-
-#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]):not([orient="vertical"]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) {
-	margin-inline-start: 6px !important;
-}
-
-#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;
 }
@@ -45,25 +32,21 @@
 }
 
 .tab-background {
-	background: transparent !important;
-	transition: background-color 200ms !important;
-	outline: none !important;
-}
-
-#TabsToolbar .tab-background {
 	margin: 0 !important;
+	background-color: transparent !important;
+	transition: background 200ms !important;
 }
 
-.tabbrowser-tab:not([selected=true]) .tab-background {
+#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background {
 	background: var(--gnome-tabbar-tab-background) !important;
 }
 
-.tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
+#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
 	background: var(--gnome-inactive-tabbar-tab-background) !important;
 }
 
 /* Tab hover */
-.tabbrowser-tab:not([selected=true]):hover .tab-background {
+#TabsToolbar .tabbrowser-tab:not([selected=true]):hover .tab-background {
 	background: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -119,6 +102,12 @@ tab[selected]:-moz-window-inactive .tab-label {
 .tabbrowser-tab:hover > .tab-stack > .tab-content > .tab-close-button {
 	visibility: visible;
 }
+
+@media (prefers-color-scheme: dark) {
+	.tab-close-button {
+		list-style-image: url("../icons/window-close-symbolic-light.svg") !important;
+	}
+}
 :root:-moz-window-inactive .tab-close-button:not(#hack) {
 	opacity: .18 !important;
 }
@@ -159,15 +148,15 @@ tab[selected]:-moz-window-inactive .tab-label {
 	inset-inline-end: 0 !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
-	background-color: transparent !important;
+	background-color: var(--gnome-tabbar-tab-background) !important;
 }
 
-.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
-	background-color: transparent !important;
+	background-color: var(--gnome-tabbar-tab-active-background) !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]):hover {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -176,18 +165,6 @@ 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;
@@ -250,7 +227,6 @@ 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,12 +14,13 @@
 #TabsToolbar,
 #navigator-toolbox,
 .notificationbox-stack {
+	border: none !important;
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
 	transition: none !important;
 }
 
-#navigator-toolbox {
+#TabsToolbar {
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }
 
@@ -32,6 +33,12 @@
 	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);
@@ -50,7 +57,7 @@
 }
 
 /* allow to drag headerbar empty space */
-#nav-bar .chromeclass-location {
+:root[tabsintitlebar] #nav-bar .chromeclass-location {
 	-moz-window-dragging: drag !important;
 }
 

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

@@ -10,9 +10,10 @@
 #nav-bar, #PersonalToolbar, #toolbar-menubar, #titlebar {
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
+	border: none !important;
 }
 
-#navigator-toolbox {
+#PersonalToolbar {
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }
 
@@ -23,6 +24,12 @@
 	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);
@@ -51,7 +58,7 @@
 }
 
 /* allow to drag headerbar empty space */
-#nav-bar .chromeclass-location {
+:root[tabsintitlebar] #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: 16vw !important;
+	margin-right: 14vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar, #urlbar-container {
-		margin-right: 12vw !important;
+		margin-right: 10vw !important;
 	}
 }

src/other/firefox/Monterey/right_header_button_4.css

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

src/other/firefox/Monterey/right_header_button_5.css

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

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

@@ -14,7 +14,6 @@
 @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,7 +14,6 @@
 @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

@@ -1,37 +0,0 @@
-@import "parts/toolbox-alt.css";
-@import "parts/buttons.css";
-@import "parts/entries.css";
-@import "parts/controls.css";
-@import "parts/headerbar-urlbar-alt.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-alt.css";
-@import "parts/findbar.css";
-@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";
-@import "colors/light.css";
-@import "colors/darker.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 Monterey 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/Monterey/theme-alt.css

@@ -14,7 +14,6 @@
 @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

@@ -1,37 +0,0 @@
-@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/infobar.css";
-@import "parts/video-player.css";
-@import "parts/remove-white-flash.css";
-@import "parts/icons.css";
-@import "colors/light.css";
-@import "colors/darker.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 Monterey 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/Monterey/theme.css

@@ -14,7 +14,6 @@
 @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,10 +9,6 @@
   :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;
@@ -39,10 +35,10 @@
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-menu-border-color: rgba(0,0,0,.15);
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
 	--gnome-popover-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-popover-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-popover-border-color: rgba(0, 0, 0, 0.75);
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
 	--gnome-popover-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-popover-button-active-background: color-mix(in srgb, currentColor 15%, transparent);
 	--gnome-popover-separator-color: color-mix(in srgb, currentColor 8%, transparent);
@@ -56,48 +52,43 @@
 	--gnome-inactive-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 
 	/* Buttons */
-	--button-background-color: color-mix(in srgb, #ffffff 15%, var(--toolbar-field-background-color));
+	--gnome-button-background: color-mix(in srgb, #ffffff 15%, var(--toolbar-field-background-color));
-	--button-background-hover-color: color-mix(in srgb, #ffffff 25%, var(--toolbar-field-background-color));
-	--button-background-active-color: color-mix(in srgb, #ffffff 35%, var(--toolbar-field-background-color));
-	--button-background-disabled-color: color-mix(in srgb, #ffffff 8%, var(--toolbar-field-background-color));
-
-	--gnome-button-background: linear-gradient(to top, var(--button-background-color) 0%, var(--button-background-color) 100%);
 	--gnome-button-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-border-bottom-color: color-mix(in srgb, #000000 45%, var(--toolbar-field-background-color));
 	--gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-	--gnome-button-hover-background: linear-gradient(to top, var(--button-background-hover-color) 0%, var(--button-background-hover-color) 100%);
+	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-active-background: linear-gradient(to top, var(--button-background-active-color) 0%, var(--button-background-active-color) 100%);
+	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
+	--gnome-button-hover-background: color-mix(in srgb, #ffffff 25%, var(--toolbar-field-background-color));
+	--gnome-button-active-background: color-mix(in srgb, #ffffff 35%, var(--toolbar-field-background-color));
 	--gnome-button-active-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-active-bottom-border-color: color-mix(in srgb, #000000 45%, var(--toolbar-field-background-color));
 	--gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-	--gnome-button-disabled-background: linear-gradient(to top, var(--button-background-disabled-color) 0%, var(--button-background-disabled-color) 100%);
+	--gnome-button-disabled-background: color-mix(in srgb, #ffffff 5%, var(--toolbar-field-background-color));
 	--gnome-button-disabled-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0.03);
 	--gnome-inactive-button-background: color-mix(in srgb, #ffffff 5%, var(--toolbar-field-background-color));
 	--gnome-inactive-button-border-color: color-mix(in srgb, #000000 35%, var(--toolbar-field-background-color));
 	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
 	--gnome-button-suggested-action-background: linear-gradient(to top, #155099 2px, #15539e);
-	--gnome-button-suggested-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-suggested-action-border-color: #0f3b71;
-	--gnome-button-suggested-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-border-accent-color: #092444;
 	--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, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 1px);
+	--gnome-button-suggested-action-active-background: #103e75;
-	--gnome-button-suggested-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-active-border-color: #0f3b71;
 	--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, #ae151c 2px, #b2161d);
-	--gnome-button-destructive-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-destructive-action-border-color: #851015;
-	--gnome-button-destructive-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-border-accent-color: #570b0e;
 	--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, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 1px);
+	--gnome-button-destructive-action-active-background: #8a1116;
-	--gnome-button-destructive-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-active-border-color: #851015;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
-	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
+	--gnome-headerbar-button-combined-background: color-mix(in srgb, currentColor 5%, transparent);
-	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
+	--gnome-headerbar-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-headerbar-button-combined-background: color-mix(in srgb, currentColor 6%, transparent);
+	--gnome-headerbar-button-active-background: color-mix(in srgb, currentColor 15%, transparent);
-	--gnome-headerbar-button-hover-background: color-mix(in srgb, currentColor 12%, transparent);
-	--gnome-headerbar-button-active-background: color-mix(in srgb, currentColor 18%, transparent);
 
 	/* URL bar */
 	--gnome-urlbar-color: var(--toolbar-color, #ffffff);

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

@@ -1,176 +0,0 @@
-@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,10 +9,6 @@
   :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;
@@ -36,10 +32,10 @@
 
 	/* Popups */
 	--gnome-menu-background: rgba(51, 51, 51, 0.95);
-	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-menu-border-color: #070707;
 	--gnome-popover-background: rgba(51, 51, 51, 0.95);
-	--gnome-popover-border-color: rgba(0, 0, 0, 0.75);
+	--gnome-popover-border-color: #070707;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
 	--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);
@@ -71,20 +67,20 @@
 	--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, #155099 2px, #15539e);
-	--gnome-button-suggested-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-suggested-action-border-color: #0f3b71;
-	--gnome-button-suggested-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-border-accent-color: #092444;;
 	--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, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 1px);
+	--gnome-button-suggested-action-active-background: #103e75;
-	--gnome-button-suggested-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-suggested-action-active-border-color: #0f3b71;
 	--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, #ae151c 2px, #b2161d);
-	--gnome-button-destructive-action-border-color: rgba(0, 0, 0, 0.2);
+	--gnome-button-destructive-action-border-color: #851015;
-	--gnome-button-destructive-action-border-bottom-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-border-accent-color: #570b0e;
 	--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, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 1px);
+	--gnome-button-destructive-action-active-background: #8a1116;
-	--gnome-button-destructive-action-active-border-color: rgba(0, 0, 0, 0.3);
+	--gnome-button-destructive-action-active-border-color: #851015;
 	--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);
@@ -107,20 +103,20 @@
 
 	/* Tabs */
 	--gnome-tabbar-tab-background: #262626;
-	--gnome-tabbar-tab-color: #909090;
+	--gnome-tabbar-tab-color: rgb(141, 144, 145);
 	--gnome-tabbar-tab-border-color: #070707;
 	--gnome-tabbar-tab-hover-background: #2b2b2b;
-	--gnome-tabbar-tab-hover-border-color: #070707;
+	--gnome-tabbar-tab-hover-border-color: #1b1b1b;
-	--gnome-tabbar-tab-hover-color: #c8c8c8;
+	--gnome-tabbar-tab-hover-color: rgb(200, 200, 200);
 	--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: #686868;
+	--gnome-inactive-tabbar-tab-color: rgb(141, 144, 145);
 	--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: #898989;
+	--gnome-inactive-tabbar-tab-active-color: var(--gnome-inactive-tabbar-tab-color);
 	--gnome-tab-attention-icon-color: #718be8;
 
 	/* Switch */

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

@@ -1,176 +0,0 @@
-@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: #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;
-
-	/* Toolbars */
-	--gnome-toolbar-background: #1e1e1e;
-	--gnome-tabstoolbar-background: #1e1e1e;
-	--gnome-findbar-background: #282828;
-	--gnome-toolbar-color: #ffffff;
-	--gnome-toolbar-icon-fill: #ffffff;
-	--gnome-toolbar-border-color: #070707;
-	--gnome-inactive-toolbar-color: rgba(255, 255, 255, 0.35);
-	--gnome-inactive-toolbar-background: #1e1e1e;
-	--gnome-inactive-toolbar-border-color: #121212;
-
-	/* Sidebar */
-	--sidebar-background-color: #323232 !important;
-	--gnome-sidebar-background: #1e1e1e;
-	--gnome-inactive-sidebar-background: #3f3f3f;
-	--gnome-sidebar-border-color: color-mix(in srgb, #000000 75%, var(--gnome-sidebar-background));
-
-	/* Popups */
-	--gnome-menu-background: rgba(40, 40, 40, 0.95);
-	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
-	--gnome-popover-background: rgba(40, 40, 40, 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: #1e1e1e;
-	--gnome-headerbar-border-color: #070707;
-	--gnome-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.15);
-	--gnome-inactive-headerbar-background: #1e1e1e;
-	--gnome-inactive-headerbar-border-color: #202020;
-	--gnome-inactive-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
-
-	/* Buttons */
-	--gnome-button-background: #2a2a2a;
-	--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, #242424 0%, #282828 100%);
-	--gnome-button-active-background: #282828;
-	--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, #242424 0%, #494949 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: #2a2a2a;
-	--gnome-inactive-button-border-color: #282828;
-	--gnome-inactive-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.0);
-	--gnome-button-suggested-action-background: linear-gradient(to top, #155099 2px, #15539e);
-	--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, #155099, #1655a2 1px);
-	--gnome-button-suggested-action-active-background: linear-gradient(to top, #103e75, #103e75 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, #ae151c 2px, #b2161d);
-	--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, #ae151c, #b7161d 1px);
-	--gnome-button-destructive-action-active-background: linear-gradient(to top, #8a1116, #8a1116 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: #2a2a2a;
-	--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: #ffffff;
-	--gnome-hover-urlbar-border-color: #585858;
-	--gnome-inactive-urlbar-background: #2a2a2a;
-	--gnome-inactive-urlbar-border-color: #282828;
-	--gnome-inactive-urlbar-box-shadow: none;
-	--gnome-inactive-urlbar-color: #d6d6d6;
-	--gnome-focused-urlbar-border-color: #338CBE;
-	--gnome-focused-urlbar-highlight-color: #006EA0;
-	--gnome-private-urlbar-background: #25003e;
-
-	/* Tabs */
-	--gnome-tabbar-tab-background: #2a2a2a;
-	--gnome-tabbar-tab-color: rgb(141, 144, 145);
-	--gnome-tabbar-tab-border-color: #1e1e1e;
-	--gnome-tabbar-tab-hover-background: #282828;
-	--gnome-tabbar-tab-hover-border-color: #1e1e1e;
-	--gnome-tabbar-tab-hover-color: rgb(200, 200, 200);
-	--gnome-tabbar-tab-active-background: #1e1e1e;
-	--gnome-tabbar-tab-active-border-color: #070707;
-	--gnome-tabbar-tab-active-color: #ffffff;
-	--gnome-tabbar-tab-active-hover-background: #1e1e1e;
-	--gnome-inactive-tabbar-tab-color: var(--gnome-tabbar-tab-color);
-	--gnome-inactive-tabbar-tab-background: var(--gnome-tabbar-tab-background);
-	--gnome-inactive-tabbar-tab-active-background: var(--gnome-tabbar-tab-active-background);
-	--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: #464646;
-	--gnome-switch-hover-background: #525252;
-	--gnome-switch-active-background: #606060;
-	--gnome-switch-border-color: transparent;
-	--gnome-switch-slider-background: #ffffff;
-	--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: #315bef;
-	--gnome-switch-pressed-hover-background: #5073f1;
-	--gnome-switch-pressed-active-background: #6584f3;
-	--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: #1e1e1e;
-	/* 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: #1f1f1f;
-
-	/* Private browsing info box */
-	--gnome-private-text-primary-color: #FBFBFE;
-  }
-}

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

@@ -8,10 +8,6 @@
 :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;
@@ -38,10 +34,10 @@
 
 	/* Popups */
 	--gnome-menu-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-menu-border-color: rgba(0,0,0,.15);
+	--gnome-menu-border-color: color-mix(in srgb, currentColor 12%, transparent);
 	--gnome-popover-background: color-mix(in srgb, var(--toolbar-field-focus-background-color) 95%, transparent);
-	--gnome-popover-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-popover-border-color: color-mix(in srgb, currentColor 12%, transparent);
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12);
 	--gnome-popover-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-popover-button-active-background: color-mix(in srgb, currentColor 20%, transparent);
 	--gnome-popover-separator-color: color-mix(in srgb, currentColor 10%, transparent);
@@ -55,45 +51,40 @@
 	--gnome-inactive-headerbar-box-shadow: 0 1px rgba(var(--lwt-accent-color), 0.35) inset;
 
 	/* Buttons */
-	--button-background-color: color-mix(in srgb, var(--lwt-accent-color, #ffffff) 35%, transparent);
+	--gnome-button-background: color-mix(in srgb, var(--lwt-accent-color, #ffffff) 35%, transparent);
-	--button-background-hover-color: color-mix(in srgb, var(--lwt-accent-color, #ffffff) 75%, transparent);
+	--gnome-button-border-color: color-mix(in srgb, currentColor 15%, transparent);
-	--button-background-active-color: color-mix(in srgb, currentColor 10%, transparent);
+	--gnome-button-border-bottom-color: color-mix(in srgb, currentColor 20%, transparent);
-	--button-background-disabled-color: color-mix(in srgb, var(--lwt-accent-color, #ffffff) 15%, transparent);
+	--gnome-button-box-shadow: inset 0 1px color-mix(in srgb, var(--lwt-accent-color, #ffffff) 50%, transparent), 0 1px 2px rgba(0, 0, 0, 0.03);
-
+	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-background: linear-gradient(to top, var(--button-background-color) 0%, var(--button-background-color) 100%);
+	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
-	--gnome-button-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-button-hover-background: var(--lwt-accent-color, #ffffff);
-	--gnome-button-border-bottom-color: light-dark(rgba(0,0,0,.20), #000000);
+	--gnome-button-active-background: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), 0 1px 2px rgba(0, 0, 0, 0.03);
+	--gnome-button-active-border-color: color-mix(in srgb, currentColor 15%, transparent);
-	--gnome-button-hover-background: linear-gradient(to top, var(--button-background-hover-color) 0%, var(--button-background-hover-color) 100%);
+	--gnome-button-active-bottom-border-color: color-mix(in srgb, currentColor 20%, transparent);
-	--gnome-button-active-background: linear-gradient(to top, var(--button-background-active-color) 0%, var(--button-background-active-color) 100%);
-	--gnome-button-active-border-color: light-dark(rgba(0,0,0,.15), #000000);
-	--gnome-button-active-bottom-border-color: light-dark(rgba(0,0,0,.20), #000000);
 	--gnome-button-active-box-shadow: 0 1px rgba(255, 255, 255, 0) inset;
-	--gnome-button-disabled-background: linear-gradient(to top, var(--button-background-disabled-color) 0%, var(--button-background-disabled-color) 100%);
+	--gnome-button-disabled-background: color-mix(in srgb, currentColor 5%, transparent);
-	--gnome-button-disabled-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-button-disabled-border-color: color-mix(in srgb, currentColor 15%, transparent);
 	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 	--gnome-inactive-button-background: color-mix(in srgb, currentColor 5%, transparent);
-	--gnome-inactive-button-border-color: light-dark(rgba(0,0,0,.15), #000000);
+	--gnome-inactive-button-border-color: color-mix(in srgb, currentColor 15%, transparent);
 	--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-border-accent-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-background: #1961b9;
 	--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-border-accent-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-background: #a0131a;
 	--gnome-button-destructive-action-active-border-color: #b2161d;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 
-	--gnome-button-hover-color: color-mix(in srgb, currentColor 10%, transparent);
-	--gnome-button-active-color: color-mix(in srgb, currentColor 20%, transparent);
 	--gnome-headerbar-button-combined-background: color-mix(in srgb, currentColor 5%, transparent);
 	--gnome-headerbar-button-hover-background: color-mix(in srgb, currentColor 10%, transparent);
 	--gnome-headerbar-button-active-background: color-mix(in srgb, currentColor 15%, transparent);

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

@@ -1,173 +0,0 @@
-@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,10 +8,6 @@
 :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;
@@ -34,10 +30,10 @@
 
 	/* Popups */
 	--gnome-menu-background: rgba(255, 255, 255, 0.95);
-	--gnome-menu-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-menu-border-color: #cfcfcf;
 	--gnome-popover-background: rgba(255, 255, 255, 0.95);
-	--gnome-popover-border-color: rgba(0, 0, 0, 0.12);
+	--gnome-popover-border-color: #cfcfcf;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15);
+	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12);
 	--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);
@@ -70,18 +66,18 @@
 	--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-border-accent-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-background: #1961b9;
 	--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-border-accent-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-background: #a0131a;
 	--gnome-button-destructive-action-active-border-color: #b2161d;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 

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

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

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

@@ -6,12 +6,6 @@
 	--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 {
@@ -22,20 +16,28 @@
 	max-height: 32px !important;
 }
 
-.tab-background, .tab-stack {
+#TabsToolbar .toolbar-items {
-	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 */
-toolbarbutton {
+#TabsToolbar toolbarbutton {
 	fill-opacity: .6 !important;
 }
-toolbarbutton:not([disabled]):hover,
+#TabsToolbar toolbarbutton:not([disabled]):hover,
-toolbarbutton[open=true] {
+#TabsToolbar toolbarbutton[open=true] {
 	fill-opacity: 1 !important;
 }
 
@@ -75,6 +77,23 @@ toolbarbutton[open=true] {
 	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;
@@ -173,6 +192,11 @@ toolbarbutton[open=true] {
 	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;
@@ -184,15 +208,6 @@ toolbarbutton[open=true] {
 	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;
@@ -204,102 +219,6 @@ toolbarbutton[open=true] {
 	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;
@@ -378,15 +297,15 @@ tab[selected]:-moz-window-inactive {
 	display: none !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+.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([soundplaying], [muted], [activemedia-blocked]) {
+.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([soundplaying], [muted], [activemedia-blocked]):hover {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -395,18 +314,6 @@ 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;
@@ -415,10 +322,98 @@ 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(
@@ -437,7 +432,6 @@ tab[selected]:-moz-window-inactive {
 
 #firefox-view-button > .toolbarbutton-icon {
 	box-shadow: none !important;
-	outline: none !important;
 }
 
 #TabsToolbar #firefox-view-button[open] {
@@ -449,6 +443,34 @@ 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,282 +6,76 @@
 	--space-above-tabbar: 0 !important;
 }
 
-#TabsToolbar {
+/* Tabs bar height */
-	/* Remove hover effects on tab bar buttons */
+#tabbrowser-tabs {
-	--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 {
+#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
-		min-height: 32px !important;
-	}
-
-	#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
 	max-height: 32px !important;
-	}
+}
 
-	.toolbar-items {
+#TabsToolbar .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;
-	}
 }
 
 :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 {
+	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 */
 tab {
 	color: var(--gnome-tabbar-tab-color) !important;
@@ -299,6 +93,131 @@ 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;
@@ -327,6 +246,12 @@ tab[selected]:-moz-window-inactive {
 	visibility: visible;
 }
 
+@media (prefers-color-scheme: dark) {
+	.tab-close-button {
+		list-style-image: url("../icons/window-close-symbolic-light.svg") !important;
+	}
+}
+
 :root:-moz-window-inactive .tab-close-button:not(#hack) {
 	opacity: .18 !important;
 }
@@ -362,30 +287,6 @@ 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;
@@ -395,15 +296,15 @@ tab[selected]:-moz-window-inactive {
 	display: none !important;
 }
 
-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+.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([soundplaying], [muted], [activemedia-blocked]) {
+.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([soundplaying], [muted], [activemedia-blocked]):hover {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
 }
 
@@ -412,18 +313,6 @@ 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;
@@ -432,10 +321,98 @@ 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(
@@ -454,7 +431,6 @@ tab[selected]:-moz-window-inactive {
 
 #firefox-view-button > .toolbarbutton-icon {
 	box-shadow: none !important;
-	outline: none !important;
 }
 
 #TabsToolbar #firefox-view-button[open] {
@@ -466,6 +442,34 @@ 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

@@ -8,27 +8,43 @@
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 /* Toolbox colors */
-#navigator-toolbox, #PersonalToolbar, #toolbar-menubar, .notificationbox-stack {
+#navigator-toolbox {
-	border: none !important;
+	border: 0 !important;
+	background: none !important;
+}
+
+toolbar .toolbarbutton-1 {
+	> .toolbarbutton-icon,
+	> .toolbarbutton-text,
+	> .toolbarbutton-badge-stack {
+		border-radius: 0 !important;
+	}
+}
+
+#nav-bar, #PersonalToolbar, #toolbar-menubar, .notificationbox-stack {
+	border: 0 !important;
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
+	border-bottom: none !important;
+}
+
+#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;
 }
 
 #navigator-toolbox {
-	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
+	background: var(--gnome-tabstoolbar-background) !important;
 }
 
-#nav-bar {
+.container.infobar {
-	border: none !important;
+	background: var(--gnome-browser-before-load-background) !important;
-	color: var(--gnome-toolbar-color);
-	background: var(--gnome-headerbar-background) !important;
 }
 
-#nav-bar:-moz-window-inactive {
+#navigator-toolbox:-moz-window-inactive,
-	background: var(--gnome-inactive-toolbar-background) !important;
+#nav-bar:-moz-window-inactive, .notificationbox-stack:-moz-window-inactive,
-}
-
-#navigator-toolbox:-moz-window-inactive, .notificationbox-stack:-moz-window-inactive,
 #PersonalToolbar:-moz-window-inactive, #toolbar-menubar:-moz-window-inactive,
 #TabsToolbar:-moz-window-inactive, findbar:-moz-window-inactive {
 	background: var(--gnome-inactive-toolbar-background) !important;
@@ -42,16 +58,6 @@ findbar:-moz-window-inactive label,
 	opacity: 0.7 !important;
 }
 
-#TabsToolbar {
-	border: none !important;
-	background: var(--gnome-tabstoolbar-background) !important;
-	box-shadow: inset 0 1px var(--gnome-toolbar-border-color) !important;
-}
-
-.container.infobar {
-	background: var(--gnome-browser-before-load-background) !important;
-}
-
 .tab-icon-overlay {
   :is(:root[uidensity="compact"], #tabbrowser-tabs[secondarytext-unsupported], :root:not([uidensity="compact"]) #tabbrowser-tabs:not([secondarytext-unsupported]) .tabbrowser-tab:hover) .tab-icon-stack[indicator-replaces-favicon] > :not(&), :root:not([uidensity="compact"]) #tabbrowser-tabs:not([secondarytext-unsupported]) .tabbrowser-tab:not(:hover) &[indicator-replaces-favicon] {
     opacity: 0 !important;
@@ -128,14 +134,6 @@ findbar:-moz-window-inactive label,
 	border-radius: 0 0 12px 12px !important;
 }
 
-/* Buttons */
-toolbar .toolbarbutton-1 {
-	> .toolbarbutton-icon,
-	> .toolbarbutton-text,
-	> .toolbarbutton-badge-stack {
-		border-radius: 0 !important;
-	}
-}
 /* bookmark-item */
 toolbarbutton.bookmark-item {
 	padding: 3px 6px !important;

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

@@ -14,7 +14,6 @@
 @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

@@ -1,37 +0,0 @@
-@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/infobar.css";
-@import "parts/video-player.css";
-@import "parts/remove-white-flash.css";
-@import "parts/icons.css";
-@import "colors/light.css";
-@import "colors/darker.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-nord.css

@@ -1,36 +0,0 @@
-@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,7 +14,6 @@
 @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,21 +1,20 @@
 @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 tab:only-of-type,
+#tabbrowser-tabs,
-	#alltabs-button {
+#tabbrowser-tabs arrowscrollbox {
-		display: none !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,18 +1,9 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-:root[tabsintitlebar], :root[customtitlebar] {
+:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox-container {
-	&[sizemode="maximized"] {
-		#nav-bar, #titlebar {
-			.titlebar-buttonbox-container {
     display: none !important;
-				padding: 0 !important;
+}
-				right: 0 !important;
+
-			}
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar {
-		}
+    padding-left: 3px !important;
-
-		&:not([inFullscreen]) #nav-bar {
-			padding-left: 8px !important;
-			padding-right: 8px !important;
-		}
-	}
 }

src/other/firefox/common/icons/audio-muted-symbolic.svg

@@ -1,4 +1,4 @@
-<svg width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
  <path d="m12.738 1.2891c-0.37566 0.026625-0.62446 0.4901-0.2832 0.87111a7.9998 7.9998 0 0 1 2.5449 5.8398 7.9998 7.9998 0 0 1-2.5547 5.8515c-0.44599 0.47101 0.18074 1.1485 0.67775 0.72851a8.9999 8.9999 0 0 0 2.877-6.5802 8.9999 8.9999 0 0 0-2.8613-6.5723c-0.13625-0.107-0.27517-0.14755-0.40041-0.13867zm-2.3906 1.416c-0.39561 0.011813-0.64211 0.53575-0.25586 0.91602a6.0001 6.0001 0 0 1 1.9082 4.379 6.0001 6.0001 0 0 1-1.916 4.3888c-0.46901 0.44599 0.17269 1.1465 0.67968 0.72851a7.0001 7.0001 0 0 0 2.2363-5.1172 7.0001 7.0001 0 0 0-2.2246-5.1115c-0.14675-0.13375-0.29586-0.18753-0.42773-0.18359zm-4.3476 0.29492-3 3h-2c-0.55401 0-1 0.44599-1 1v2c0 0.55401 0.44599 1 1 1h2l3 3zm2.0176 1.1836c-0.37584 0.016328-0.64502 0.51398-0.29102 0.89648a3.9999 3.9999 0 0 1 1.2734 2.9199 3.9999 3.9999 0 0 1-1.2773 2.9258c-0.47301 0.43 0.13969 1.1525 0.67968 0.73048a5 5 0 0 0 1.5977-3.6563 5 5 0 0 0-1.5898-3.6504c-0.13-0.1235-0.2673-0.17145-0.39258-0.16602z" opacity=".35"/>
- <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx=".5" ry=".5"/>
+ <rect transform="rotate(45)" x="1.3137" y="-5" width="20" height="1" rx=".5" ry=".5"/>
 </svg>

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

@@ -1,3 +0,0 @@
-<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

@@ -1,3 +0,0 @@
-<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

@@ -1,3 +0,0 @@
-<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

@@ -1,3 +0,0 @@
-<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

@@ -1,3 +0,0 @@
-<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

@@ -1,3 +0,0 @@
-<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

@@ -1,3 +0,0 @@
-<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

@@ -1,3 +0,0 @@
-<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

@@ -1,3 +0,0 @@
-<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,26 +1,24 @@
 @media (prefers-color-scheme: dark) {
   :host,
-  :host(.anonymous-content-host),
   :root {
-    --color-accent-primary: var(--theme-primary-active-color) !important;
+    --in-content-page-background: rgb(29,29,29) !important;
-    --in-content-page-color: var(--gnome-content-page-color) !important;
+    --in-content-page-color: rgb(253,253,253) !important;
-    --in-content-page-background: var(--gnome-content-page-background) !important;
 
-    --in-content-box-background: var(--gnome-browser-before-load-background) !important;
+    --in-content-box-background: rgb(36, 36, 36) !important;
     --in-content-box-background-odd: rgba(250,250,250,0.05) !important;
-    --in-content-box-info-background: var(--gnome-content-box-background) !important;
+    --in-content-box-info-background: rgba(250,250,250,0.15) !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: var(--gnome-content-page-color) !important;
+    --in-content-icon-color: rgb(252,252,252) !important;
 
-    --in-content-primary-button-text-color: var(--gnome-toolbar-color) !important;
+    --in-content-primary-button-text-color: rgb(255,255,255) !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: var(--gnome-browser-before-load-background) !important;
+    --in-content-table-background: rgb(35, 35, 35) !important;
 
     --newtab-background-color: var(--gnome-browser-before-load-background) !important;
     --newtab-background-color-secondary: var(--gnome-menu-background) !important;
@@ -28,13 +26,12 @@
     --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: var(--gnome-content-page-dialog-background) !important;
+      --in-content-page-background: #424242 !important;
     }
   }
 }

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

@@ -1,15 +1,15 @@
 /* about:newtab */
 
 .context-menu {
+	background: var(--gnome-menu-background) !important;
 	border-radius: 12px !important;
-	box-shadow: var(--gnome-popover-shadow), 0 0 0 1px rgba(0, 0, 0, 0.12) !important;
+	box-shadow: var(--gnome-popover-shadow) !important;
 	padding: 6px !important;
 }
 
 @media (prefers-color-scheme: dark) {
 	.context-menu {
 		border: 1px solid rgba(255, 255, 255, 0.06) !important;
-		box-shadow: var(--gnome-popover-shadow), 0 0 0 1px rgba(0, 0, 0, 0.75) !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), 0 0 0 1px var(--gnome-popover-border-color) !important;
+	box-shadow: var(--gnome-popover-shadow) !important;
 	padding: 6px !important;
 }
 
 @media (prefers-color-scheme: dark) {
-	.context-menu {
+.context-menu {
 	border: 1px solid rgba(255, 255, 255, 0.06) !important;
-	}
+}
 }
 
 .context-menu > ul {

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

@@ -16,6 +16,30 @@
 	font-weight: 400 !important;
 }
 
+/* Overrides: Make the back button the same as other buttons */
+:root:not([uidensity=compact]) #back-button {
+	border-radius: var(--toolbarbutton-border-radius) !important;
+}
+:root:not([uidensity=compact]) #back-button > .toolbarbutton-icon {
+	background-color: unset !important;
+	border: unset !important;
+	width: calc(2 * var(--toolbarbutton-inner-padding) + 16px) !important;
+	height: calc(2 * var(--toolbarbutton-inner-padding) + 16px) !important;
+	padding: var(--toolbarbutton-inner-padding) !important;
+	border-radius: var(--toolbarbutton-border-radius);
+	box-shadow: none !important;
+}
+:root:not([uidensity=compact]) #back-button:not([disabled]):not([open]):hover > .toolbarbutton-icon {
+	background-color: var(--toolbarbutton-hover-background) !important;
+	box-shadow: unset;
+	border-color: unset;
+}
+:root:not([uidensity=compact]) #back-button[open] > .toolbarbutton-icon,
+:root:not([uidensity=compact]) #back-button:not([disabled]):hover:active > .toolbarbutton-icon {
+	background-color: var(--toolbarbutton-active-background) !important;
+	border-color: unset;
+}
+
 /* Glitch customizing: Cut / Copy / Paste buttons' icons
  * :not(#hack) is there just to elevate rule priority */
 :root[customizing] #nav-bar > hbox toolbaritem toolbarbutton image:not(#hack) {

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

@@ -45,7 +45,6 @@ button.close:not(.ghost-button),
 button.customizationmode-button {
 	-moz-appearance: none !important;
 	background-image: var(--gnome-button-background) !important;
-	background-color: transparent !important;
 	box-shadow: var(--gnome-button-box-shadow) !important;
 	border: 1px solid var(--gnome-button-border-color) !important;
 	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
@@ -68,8 +67,6 @@ button.customizationmode-button {
 menulist {
 	-moz-appearance: none !important;
 	background-image: var(--gnome-button-background) !important;
-	background-color: transparent !important;
-	background-clip: padding-box;
 	box-shadow: var(--gnome-button-box-shadow) !important;
 	border: 1px solid var(--gnome-button-border-color) !important;
 	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
@@ -170,7 +167,6 @@ menulist:hover .menulist-label-box,
 button.customizationmode-button:hover {
 	outline: 0 !important;
 	background-image: var(--gnome-button-hover-background) !important;
-	background-color: transparent !important;
 }
 
 /* Active buttons */
@@ -208,7 +204,6 @@ menulist[open] .menulist-label-box,
 .permission-popup-permission-remove-button:active,
 button.customizationmode-button:active {
 	background-image: var(--gnome-button-active-background) !important;
-	background-color: transparent !important;
 	box-shadow: var(--gnome-button-active-box-shadow) !important;
 	border-color: var(--gnome-button-active-border-color) !important;
 }
@@ -219,21 +214,20 @@ button.customizationmode-button:active {
 #context-navigation menuitem[disabled],
 button.customizationmode-button[disabled] {
 	background-image: var(--gnome-button-disabled-background) !important;
-	background-color: transparent !important;
 	border-color: var(--gnome-button-disabled-border-color) !important;
 	box-shadow: var(--gnome-button-disabled-box-shadow) !important;
 	opacity: 1 !important;
 }
 
-/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled] image,*/
+#nav-bar toolbarbutton:not(#urlbar-zoom-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):not(.titlebar-button)[disabled]:hover,*/
+#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled]:hover,
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled]:hover {
-	background: none !important;
+	background: transparent !important;
 }
 
 /* Inactive window buttons */
@@ -243,7 +237,6 @@ button.customizationmode-button[disabled] {
 #viewButton:-moz-window-inactive,
 .notification-button:-moz-window-inactive {
 	background-image: var(--gnome-inactive-button-background) !important;
-	background-color: transparent !important;
 	box-shadow: var(--gnome-inactive-button-box-shadow) !important;
 	border-color: var(--gnome-inactive-button-border-color) !important;
 }
@@ -254,12 +247,11 @@ button.customizationmode-button[disabled] {
 button.close:not(.ghost-button),
 #protections-popup-info-button,
 .permission-popup-permission-remove-button {
-	background: none !important;
+	background: transparent !important;
 	box-shadow: none !important;
 	border-color: transparent !important;
 	border-radius: 8px !important;
 	border: none !important;
-	outline: none !important;
 }
 
 .subviewbutton-back:not(#hack):not(:active):hover,
@@ -267,8 +259,7 @@ button.close:not(.ghost-button),
 button.close:not(.ghost-button):not(:active):hover,
 #protections-popup-info-button:hover,
 .permission-popup-permission-remove-button:not(:active):hover {
-	background-color: var(--gnome-headerbar-button-hover-background) !important;
+	background: var(--gnome-headerbar-button-hover-background) !important;
-	background-image: none !important;
 	box-shadow: none !important;
 	border-color: var(--gnome-button-border-color) !important;
 	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
@@ -280,8 +271,7 @@ button.close:not(.ghost-button):active,
 #protections-popup-info-button:active,
 .permission-popup-permission-remove-button:active {
 	box-shadow: none !important;
-	background-color: var(--gnome-headerbar-button-active-background) !important;
+	background: var(--gnome-headerbar-button-active-background) !important;
-	background-image: none !important;
 }
 
 button.close,
@@ -327,37 +317,28 @@ button.close,
 }
 
 /* Buttons with suggested action */
-xul|button[default], button.primary,
-.dialog-button-box button[default="true"],
 #appMenu-popup .panel-banner-item[notificationid="update-restart"],
 button.popup-notification-primary-button,
 #editBookmarkPanelDoneButton,
 #tracking-action-block {
 	color: white !important;
 	background-image: var(--gnome-button-suggested-action-background) !important;
-	background-color: transparent !important;
 	border-color: var(--gnome-button-suggested-action-border-color) !important;
-	border-bottom-color: var(--gnome-button-suggested-action-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-suggested-action-border-accent-color) !important;
 	box-shadow: var(--gnome-button-suggested-action-box-shadow) !important;
 	text-shadow: 0 -1px rgba(0, 0, 0, 0.5) !important;
 }
 
-xul|button[default]:hover, button.primary:hover,
-.dialog-button-box button[default="true"]:hover,
 #appMenu-popup .panel-banner-item[notificationid="update-restart"]:hover,
 button.popup-notification-primary-button:hover,
 #editBookmarkPanelDoneButton:hover {
-	background-image: var(--gnome-button-suggested-action-hover-background) !important;
+	background: var(--gnome-button-suggested-action-hover-background) !important;
-	background-color: transparent !important;
 }
 
-xul|button[default]:active, button.primary:active,
-.dialog-button-box button[default="true"]:active,
 #appMenu-popup .panel-banner-item[notificationid="update-restart"]:active,
 button.popup-notification-primary-button:active,
 #editBookmarkPanelDoneButton:active {
 	background-image: var(--gnome-button-suggested-action-active-background) !important;
-	background-color: transparent !important;
 	border-color: var(--gnome-button-suggested-action-active-border-color) !important;
 	box-shadow: var(--gnome-button-suggested-action-active-box-shadow) !important;
 	text-shadow: none !important;
@@ -369,10 +350,9 @@ button.popup-notification-primary-button:active,
 .identity-popup-permission-remove-button,
 #PanelUI-panic-view-button {
 	color: white !important;
-	background-image: var(--gnome-button-destructive-action-background) !important;
+	background-color: var(--gnome-button-destructive-action-background) !important;
-	background-color: transparent !important;
 	border-color: var(--gnome-button-destructive-action-border-color) !important;
-	border-bottom-color: var(--gnome-button-destructive-action-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-destructive-action-border-accent-color) !important;
 	box-shadow: var(--gnome-button-destructive-action-box-shadow) !important;
 	text-shadow: 0 -1px rgba(0, 0, 0, 0.5) !important;
 }
@@ -381,21 +361,19 @@ button.popup-notification-primary-button:active,
 .identity-popup-permission-remove-button:not(#hack):hover,
 #PanelUI-panic-view-button:hover {
 	background-image: var(--gnome-button-destructive-action-hover-background) !important;
-	background-color: transparent !important;
 }
 
 #editBookmarkPanelRemoveButton:active,
 .identity-popup-permission-remove-button:not(#hack):active,
 #PanelUI-panic-view-button:active {
 	background-image: var(--gnome-button-destructive-action-active-background) !important;
-	background-color: transparent !important;
 	border-color: var(--gnome-button-destructive-action-active-border-color) !important;
 	box-shadow: var(--gnome-button-destructive-action-active-box-shadow) !important;
 }
 
 .identity-popup-permission-remove-button:not(#hack):hover { /* Is flat */
 	border-color: var(--gnome-button-destructive-action-border-color) !important;
-	border-bottom-color: var(--gnome-button-destructive-action-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-destructive-action-border-accent-color) !important;
 	box-shadow: var(--gnome-button-destructive-action-box-shadow) !important;
 }
 .identity-popup-permission-remove-button:not(#hack):hover .button-icon {

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

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

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

@@ -33,9 +33,9 @@ window {
 }
 
 window[role="dialog"] {
-	background: none !important;
+	background: var(--gnome-toolbar-background) !important;
-	border: none !important;
+	border: 0 !important;
-	box-shadow: none !important;
+	box-shadow: var(--gnome-popover-shadow) !important;
 	padding: 0 !important;
 }
 
@@ -43,22 +43,10 @@ dialog {
 	padding: 0 !important;
 }
 
-dialog#handling {
-	padding: 8px 0 6px !important;
-}
-
 dialog[subdialog] {
-	background-color: var(--gnome-popover-background) !important;
 	border-radius: 12px !important;
 	border: none !important;
-	box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08) !important;
+	box-shadow: var(--gnome-popover-shadow) !important;
-}
-
-.dialogBox {
-	&:not(.spotlightBox) {
-		box-shadow: 0 2px 14px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px #000000 !important;
-		border-radius: 12px !important;
-	}
 }
 
 /* Content */
@@ -68,10 +56,6 @@ dialog[subdialog] {
 	padding-bottom: 0;
 }
 
-#description {
-	margin: 8px 10px 16px !important;
-}
-
 #description-box {
 	margin: 24px 24px 0 !important;
 }
@@ -134,9 +118,8 @@ dialog[subdialog] {
 	padding: 0 12px !important;
 	min-height: 26px !important;
 	border: 1px solid var(--gnome-button-border-color) !important;
-	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-border-accent-color) !important;
-	background-color: var(--gnome-urlbar-background) !important;
+	background-color: #ffffff !important;
-	background-clip: padding-box;
 	border-radius: 8px !important;
 }
 
@@ -154,9 +137,8 @@ dialog[subdialog] {
 	background-position: right 12px center !important;
 	background-repeat: no-repeat !important;
 	background-size: auto 12px !important;
-	background-clip: padding-box !important;
 	border: 1px solid var(--gnome-button-border-color) !important;
-	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-border-accent-color) !important;
 	border-radius: 8px !important;
 	padding: 2px 12px !important;
 	min-height: 28px !important;
@@ -171,9 +153,8 @@ dialog[subdialog] {
 	min-height: 28px !important;
 	border-radius: 8px !important;
 	border: 1px solid var(--gnome-button-border-color) !important;
-	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-border-accent-color) !important;
 	color: var(--gnome-toolbar-color) !important;
-	background-clip: padding-box !important;
 }
 
 #print-button.primary {
@@ -201,9 +182,8 @@ dialog[subdialog] {
 }
 
 .toggle-group-label {
-	background-clip: padding-box !important;
 	border: 1px solid var(--gnome-button-border-color) !important;
-	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-border-accent-color) !important;
 }
 
 .toggle-group-label:first-of-type {
@@ -228,6 +208,12 @@ dialog[subdialog] {
 	color: #ffffff !important;
 }
 
+@media (prefers-color-scheme: dark) {
+#editBookmarkPanelContent > input,
+#editBookmarkPanelContent > hbox > input {
+	background-color: #666666 !important;
+}
+
 #cancel-button,
 #print-button.primary {
 	box-shadow: var(--gnome-button-box-shadow) !important;
@@ -235,7 +221,7 @@ dialog[subdialog] {
 
 #print-button.primary {
 	border-color: var(--gnome-button-border-color) !important;
-	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-border-accent-color) !important;
 }
 
 .toggle-group-label {
@@ -244,7 +230,7 @@ dialog[subdialog] {
 
 .toggle-group-input:enabled:checked + .toggle-group-label {
 	border-color: var(--gnome-button-border-color) !important;
-	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
+	border-bottom-color: var(--gnome-button-border-accent-color) !important;
 }
 
 :root[dialogroot] select,

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

@@ -4,15 +4,19 @@
 /* Headerbar */
 #nav-bar {
 	padding: 8px !important;
+}
+
+#nav-bar-customization-target {
+	-moz-window-dragging: drag;
+}
+
+/* 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):not(.titlebar-button),
+#nav-bar toolbarbutton:not(#urlbar-zoom-button),
 toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	border: none !important;
 	box-shadow: none !important;
@@ -27,7 +31,7 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	transition: background 200ms;
 }
 
-:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button) {
+:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button) {
 	background: none !important;
 }
 
@@ -43,7 +47,7 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 }
 
 /* Hover headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([open]):not([disabled]):not([checked]):hover,
+#nav-bar toolbarbutton:not(#urlbar-zoom-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,28 +55,24 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 }
 
 /* Active headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled]):not(#hack):active,
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active,
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled])[open],
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open],
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled])[checked],
+#nav-bar toolbarbutton:not(#urlbar-zoom-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):not(.titlebar-button)[disabled] {
+#nav-bar toolbarbutton:not(#urlbar-zoom-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):not(.titlebar-button):-moz-window-inactive {
+#nav-bar toolbarbutton:not(#urlbar-zoom-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;
@@ -107,10 +107,6 @@ 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,
@@ -120,12 +116,6 @@ 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

@@ -15,6 +15,7 @@ menuitem:not([class*='identity']) .menu-iconic-left .menu-iconic-icon,
 .urlbar-icon,
 #blocked-permissions-container > .blocked-permission-icon,
 .button-icon:not(#hack),
+.bookmark-item[container],
 .notification-anchor-icon,
 .protections-popup-category::after,
 .protections-popup-footer-icon,
@@ -43,7 +44,7 @@ menuitem[type="radio"][checked="true"],
 .tab-icon-overlay,
 .tab-throbber::before,
 .tab-icon-stack::before,
-.close-icon,
+.close-icon:not(.tab-close-button),
 button.close::before,
 #urlbar-search-mode-indicator-close,
 #tracking-protection-icon,
@@ -266,19 +267,16 @@ menu[disabled] > .menu-right {
 }
 
 /* Sound icons */
-.tab-icon-overlay:not([crashed])[soundplaying] {
+.tab-icon-overlay[soundplaying] {
 	list-style-image: url("../icons/audio-playing-symbolic.svg") !important;
-	background-image: none !important;
 }
 
-.tab-icon-overlay:not([crashed])[muted] {
+.tab-icon-overlay[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 {
@@ -360,8 +358,7 @@ 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 */
@@ -669,75 +666,6 @@ 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

@@ -1,97 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-: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-contents.css

@@ -27,6 +27,10 @@
 #context-navigation > menuitem > .menu-iconic-left {
 	margin: auto !important;
 }
+#context-navigation menuitem {
+	--toolbarbutton-active-background: transparent !important;
+	--toolbarbutton-hover-background: transparent !important;
+}
 
 /* Remove icons from the main context menu */
 #contentAreaContextMenu menuitem image,

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

@@ -9,40 +9,30 @@ menupopup, panel {
 	--panel-background: var(--gnome-menu-background) !important;
 	--panel-border-radius: 12px !important;
 	--panel-padding: 6px !important;
-	--panel-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important;
+	--panel-shadow: var(--gnome-popover-shadow) !important;
 	/* --panel-shadow-margin: 3px 8px 13px !important; */
 	--panel-separator-color: var(--gnome-popover-separator-color) !important;
 	--panel-border-color: transparent !important;
-	--panel-color: var(--gnome-toolbar-color) !important;
 	--arrowpanel-border-radius: 12px !important;
 	--arrowpanel-background: var(--gnome-menu-background) !important;
 	--arrowpanel-border-color: transparent !important;
-	--arrowpanel-color: var(--gnome-toolbar-color) !important;
 	color: var(--gnome-toolbar-color) !important;
 	padding: 2px 4px 9px !important;
 }
 
-menupopup {
-	--panel-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-menu-border-color) !important;
-}
-
-.cui-widget-panelview[id^="PanelUI-webext-"] {
-  border-radius: 6px !important;
-}
-
 .panel-arrowcontent {
 	border: none !important;
 }
 
 @media (prefers-color-scheme: dark) {
-	menupopup, panel {
+menupopup, panel {
 	--panel-border-color: rgba(255, 255, 255, 0.06) !important;
 	--arrowpanel-border-color: rgba(255, 255, 255, 0.06) !important;
-	}
+}
 
-	.panel-arrowcontent {
+.panel-arrowcontent {
 	border: 1px solid rgba(255, 255, 255, 0.06) !important;
-	}
+}
 }
 
 menupopup label {
@@ -183,6 +173,8 @@ panelview {
 
 /* Style popovers menu buttons */
 menuitem, menupopup menu,
+.subviewbutton:not(#appMenu-fxa-label2),
+.toolbarbutton-1,
 .protections-popup-footer-button,
 .protections-popup-category,
 .identity-popup-content-blocking-category,
@@ -193,43 +185,20 @@ menuitem, menupopup menu,
 	font: menu !important;
 	padding: 0 6px !important;
 	min-height: 28px !important;
-	margin: 0 !important;
-}
-
-.subviewbutton,
-panelview toolbarbutton {
-	-moz-appearance: none !important;
-	border-radius: 6px !important;
-	color: var(--gnome-toolbar-color) !important;
-	font: menu !important;
-	min-height: 28px !important;
-  padding: 3px 6px !important;
-  margin: 0 !important;
-}
-
-#downloadsHistory {
-	border-radius: 6px !important;
 }
 
 .toolbar-menupopup :is(menu, menuitem) {
 	margin: 0 !important;
 }
 
-#downloadsPanel-mainView .download-state .downloadButton {
+.subviewbutton,
-	border: none !important;
-	background: none !important;
-	box-shadow: none !important;
-	--button-hover-bgcolor: var(--gnome-popover-button-hover-background) !important;
-	--button-active-bgcolor: var(--gnome-popover-button-active-background) !important;
-}
-
 .protections-popup-footer-button,
 .protections-popup-category,
 .identity-popup-content-blocking-category,
 #PlacesToolbar menupopup[placespopup="true"] .bookmark-item,
 .openintabs-menuitem,
 .widget-overflow-list .toolbarbutton-1 {
-	padding: 3px 6px !important;
+	padding: 5px !important;
 	margin: 0 !important;
 }
 
@@ -251,50 +220,51 @@ panelview toolbarbutton {
 }
 
 /* Menu buttons disabled */
-menuitem[disabled="true"],
+menuitem[disabled="true"], menupopup menu[disabled="true"],
-menupopup menu[disabled="true"],
-menuitem[disabled="true"][_moz-menuactive],
-menupopup menu[disabled="true"][_moz-menuactive],
 .subviewbutton[disabled="true"],
 .subviewbutton:not(#appMenu-fxa-label2)[disabled="true"],
 .toolbarbutton-1[disabled="true"],
 .protections-popup-category[disabled="true"],
 .identity-popup-content-blocking-category[disabled="true"] {
-	opacity: 0.35 !important;
-	background-image: none !important;
-	background-color: transparent !important;
-}
-
-#context-navigation menuitem.menuitem-iconic[disabled="true"] {
 	opacity: 1 !important;
 	color: var(--gnome-inactive-toolbar-color) !important;
-	background-image: var(--gnome-button-disabled-background) !important;
+	background-image: none !important;
+	background-color: transparent !important;
 	border-color: var(--gnome-button-disabled-border-color) !important;
 	box-shadow: none !important;
 }
 
+menuitem[disabled="true"] {
+	background-image: var(--gnome-button-disabled-background) !important;
+}
+
+menuitem[disabled="true"][_moz-menuactive], menupopup menu[disabled="true"][_moz-menuactive] {
+	background-image: none !important;
+}
+
 /* Menu buttons hover */
 menuitem:not([disabled="true"]):is(:hover, [_moz-menuactive]),
 menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]),
-.subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2, #downloadsHistory):hover,
+.subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2):hover,
 .protections-popup-footer-button:not([disabled="true"]):hover,
 #protections-popup-show-report-stack:hover .protections-popup-footer-button,
 .protections-popup-category:not([disabled="true"]):hover,
 .identity-popup-content-blocking-category:not([disabled="true"]):hover,
 #PlacesToolbar .bookmark-item:is(:hover, [open], [_moz-menuactive]),
 #downloadsPanel-mainView .download-state:hover {
-	background-image: none !important;
 	background-color: var(--gnome-popover-button-hover-background) !important;
 }
 
 /* Menu buttons active */
-.subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2, #downloadsHistory):active,
+menuitem:not([disabled="true"]):is(:active, [_moz-menuactive]),
+menupopup menu:not([disabled="true"]):is(:active, [_moz-menuactive]),
+.subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2):active,
 .protections-popup-footer-button:not([disabled="true"]):active,
 #protections-popup-show-report-stack:active .protections-popup-footer-button,
 .protections-popup-category:not([disabled="true"]):active,
 .identity-popup-content-blocking-category:not([disabled="true"]):active,
+#PlacesToolbar .bookmark-item:is(:active, [open], [_moz-menuactive]),
 #downloadsPanel-mainView .download-state:active {
-	background-image: none !important;
 	background-color: var(--gnome-popover-button-active-background) !important;
 }
 

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

@@ -1,52 +1,10 @@
 /* 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;
@@ -55,7 +13,6 @@ fxview-search-textbox {
 
 .sidebar-splitter {
 	width: 1px !important;
-	background-color: var(--gnome-toolbar-border-color, var(--gnome-toolbar-background)) !important;
+	background-color: var(--gnome-sidebar-border-color) !important;
-	background-image: linear-gradient(to top, var(--sidebar-background-color) 0%, var(--sidebar-background-color) 100%);
 	border: none !important;
 }