Fixed #1300

Fixed #1283
update
2025-06-06 07:23:02 +00:00 · 2025-06-06 00:29:16 +08:00 · 2025-05-14 11:55:46 +08:00 · 2025-04-25 00:03:35 +08:00 · 2025-04-20 22:28:50 +08:00 · 2025-04-14 08:32:34 +08:00
401 changed files with 11357 additions and 5819 deletions
--- a/.github/AUTHORS
+++ b/.github/AUTHORS
@ -1,6 +1,5 @@
 ------------------------ WhiteSur GTK THEME ------------------------

-CUSTOMIZER:
 Vince Liuice <vinceliuice@hotmail.com> - WhiteSur Gtk Theme (https://github.com/vinceliuice/WhiteSur-gtk-theme)

 ------------------------ WhiteSur GTK THEME ------------------------
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@ -1,14 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version      | Supported          |
-| ------------ | ------------------ |
-| 2021-06-23   | :white_check_mark: |
-| 2021-05-05   | :white_check_mark: |
-| < 2021-04-20 | :x:                |
-
-## Reporting a Vulnerability
-
-Report a security vulnerability to https://github.com/vinceliuice/WhiteSur-gtk-theme/issues
-with a blank template or contact one of the authors.
--- a/.gitignore
+++ b/.gitignore
@ -5,9 +5,7 @@
 src/main/gtk-3.0/gtk*.css
 src/main/gtk-4.0/gtk*.css
 src/main/cinnamon/cinnamon*.css
-src/main/gnome-shell/*/*.css
+src/main/gnome-shell/gnome-shell-Dark.css
+src/main/gnome-shell/gnome-shell-Light.css
 src/other/dash-to-dock/stylesheet.css
 src/other/dash-to-dock/stylesheet-dark.css
-parse-sass.sh
-lib-release.sh
-stable-release/make-releases.sh
--- a/README.md
+++ b/README.md
@ -2,12 +2,12 @@
 <p align="center"> <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/macbook.png"/> </p>

 <br>
-<p align="center"> <b> A macOS BigSur-like theme for your GTK apps </b> </p>
+<p align="center"> <b> A macOS like theme for Linux GTK Desktops </b> </p>
 <br>

 ## Donate

-If you like my project, you can buy me a coffee:
+If you like my project, you can buy me a coffee, many thanks ❤️ !

 <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,17 +48,10 @@ 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 Dash-to-dock theme: `./tweaks.sh -d -r`
 - uninstall Flatpak Gtk themes: `./tweaks.sh -F -r`
- uninstall Snap Gtk themes: `./tweaks.sh -s -r`
-
-</details>

 ## There's so many customizations you can do!
 Usage:  `./install.sh [OPTIONS...]`
@ -67,86 +60,90 @@ Usage:  `./install.sh [OPTIONS...]`

 ```bash

+OPTIONS:
  -d, --dest DIR
- Set destination directory. Default is '/home/vince/.themes'
+   Set destination directory. Default is '/home/[USER_NAME]/.themes'

  -n, --name NAME
- Set theme name. Default is 'WhiteSur'
+   Set theme name. Default is 'WhiteSur'

  -o, --opacity [normal|solid]
- Set theme opacity variants. Repeatable. Default is all variants
+   Set theme opacity variants. Repeatable. Default is all variants

-  -c, --color [Light|Dark]
- Set theme color variants. Repeatable. Default is all variants
+  -c, --color [light|dark]
+   Set theme color variants. Repeatable. Default is all variants

  -a, --alt [normal|alt|all]
- Set window control buttons variant. Repeatable. Default is 'normal'
+   Set window control buttons variant. Repeatable. Default is 'normal'

  -t, --theme [default|blue|purple|pink|red|orange|yellow|green|grey|all]
- Set theme accent color. Repeatable. Default is BigSur-like theme
+   Set theme accent color. Repeatable. Default is BigSur-like theme

-  -p, --panel-opacity [default|30|45|60|75]
- Set panel transparency. Default is 15%
-
-  -P, --panel-size [default|smaller|bigger]
- Set Gnome shell panel height size. Default is 32px
-
-  -s, --size [default|180|220|240|260|280]
- Set Nautilus sidebar minimum width. Default is 200px
-
-  -i, --icon [standard|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin]
- Set 'Activities' icon. Default is 'standard'
-
-  -b, --background [default|blank|IMAGE_PATH]
- Set gnome-shell background image. Default is BigSur-like wallpaper
+  -s, --scheme [standard|nord]
+   Set theme colorscheme style. Repeatable. Default is 'standard'

  -m, --monterey 
- Set to MacOS Monterey style.
+   Set to MacOS Monterey style. 

-  -N, --nautilus-style [stable|normal|mojave|glassy]
- Set Nautilus style. Default is BigSur-like style (stabled sidebar)
+  -N, --nautilus [stable|normal|mojave|glassy|right]
+   Set Nautilus style. Default is BigSur-like style (stabled sidebar)

  -l, --libadwaita 
- Install theme into gtk4.0 config for libadwaita. Default is dark version
+   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
+   Set to High Definition size. Default is laptop size

-  --normal, --normalshowapps
- Set gnome-shell show apps button style to normal. Default is bigsur
+  --shell, --gnomeshell 
+   Tweaks for gnome-shell. Options:
+
+     1. -i, -icon [apple|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin|budgie|gentoo]
+     Set gnome-shell panel 'Activities' icon. Default is 'standard'
+
+     2. -b, -background [default|blank|IMAGE_PATH]
+     Set gnome-shell background image. Default is BigSur-like wallpaper
+
+     3. -p, -panelopacity [default|30|45|60|75]
+     Set gnome-shell panel transparency. Default is 15%
+
+     4. -h, -panelheight [default|smaller|bigger]
+     Set gnome-shell panel height size. Default is 32px
+
+     5. -sf, -smallerfont 
+     Set gnome-shell font size to smaller (10pt). Default is 11pt
+
+     6. normal, -normal 
+     Set gnome-shell show apps button style to normal. Default is BigSur

  --round, --roundedmaxwindow 
- Set maximized window to rounded. Default is square
-
-  --right, --rightplacement
- Set Nautilus titlebutton placement to right. Default is left
+   Set maximized window to rounded. Default is square

  --black, --blackfont 
- Set panel font color to black. Default is white
+   Set panel font color to black. Default is white

  --darker, --darkercolor 
- Install darker 'WhiteSur' dark themes.
-
-  --nord, --nordcolor
- Install 'WhiteSur' Nord ColorScheme themes.
+   Install darker 'WhiteSur' dark themes. 

  --dialog, --interactive 
- Run this installer interactively, with dialogs.
+   Run this installer interactively, with dialogs. 

  --silent-mode 
- Meant for developers: ignore any confirm prompt and params become more strict.
+   Meant for developers: ignore any confirm prompt and params become more strict. 

  -r, --remove, -u, --uninstall 
- Remove all installed WhiteSur themes.
+   Remove all installed WhiteSur themes. 

  -h, --help 
- Show this help.
+   Show this help. 

 ```

 </details>

-### Fix for libadwaita (not perfect)
+## Fix for libadwaita (not perfect)

 <details> <summary> Details <b>(click to open)</b> </summary>

@ -162,34 +159,13 @@ 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
 ```

-### 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"> <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 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
+#### - Install theme accent
 Parameter: `--theme` `-t` (repeatable)

 Example:
@ -200,80 +176,101 @@ 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-style` `-N`
+Parameter: `--nautilus` `-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.

-
-# Let's tweak!
+# <p align="center"> <b> Let's tweak! </b> </p>
 Usage:  `./tweaks.sh [OPTIONS...]`

 <details> <summary> Options <b>(click to open)</b> </summary>

 ```bash

-  -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 theme opacity variants. Default is 'normal'
+   Set 'WhiteSur' GDM/Flatpak theme opacity variants. Default is 'normal'

-  -c, --color [Light|Dark]
- Set 'WhiteSur' GDM and Dash to Dock theme color variants. Default is 'light'
+  -c, --color [light|dark]
+   Set 'WhiteSur' GDM/Flatpak theme color variants. Default is 'light'

  -t, --theme [default|blue|purple|pink|red|orange|yellow|green|grey]
- Set 'WhiteSur' GDM theme accent color. Default is BigSur-like theme
+   Set 'WhiteSur' GDM/Flatpak theme accent color. Default is BigSur-like theme

-  -N, --no-darken
- Don't darken 'WhiteSur' GDM theme background image.
+  -s, --scheme [standard|nord]
+   Set 'WhiteSur' GDM/Flatpak theme colorscheme style. Default is 'standard'

-  -n, --no-blur
- Don't blur 'WhiteSur' GDM theme background image.
   
-  -b, --background [default|blank|IMAGE_PATH]
- Set 'WhiteSur' GDM theme background image. Default is BigSur-like wallpaper
+ Tweaks for GDM theme. options

-  -p, --panel-opacity [default|30|45|60|75]
- Set 'WhiteSur' GDM (GNOME Shell) theme panel transparency. Default is 15%
+  -g, --gdm    Without options default GDM theme will install... 

-  -P, --panel-size [default|smaller|bigger]
- Set 'WhiteSur' Gnome shell panel height size. Default is 32px
+      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'

-  -i, --icon [standard|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin]
- Set 'WhiteSur' GDM (GNOME Shell) 'Activities' icon. Default is 'standard'
+      2. -b, -background [default|blank|IMAGE_PATH]   Set GDM background image Default is BigSur-like wallpaper

-  --nord, --nordcolor
- Install 'WhiteSur' Nord ColorScheme themes.
+      3. -p, -panelopacity [default|30|45|60|75]   Set GDM panel transparency Default is 15%

-  -f, --firefox [default|monterey|alt]
- Install 'WhiteSur|Monterey|Alt' theme for Firefox and connect it to the current Firefox profiles. Default is WhiteSur
+      4. -h, -panelheight [default|smaller|bigger]   Set GDM panel height size Default is 32px

-  -e, --edit-firefox
- Edit 'WhiteSur' theme for Firefox settings and also connect the theme to the current Firefox profiles.
+      5. -sf, -smallerfont    Set GDM font size to smaller (10pt) Default is 11pt

-  -F, --flatpak
- Connect 'WhiteSur' theme to Flatpak.
+      6. -nd, -nodarken    Don't darken 'WhiteSur' GDM theme background image 
+
+      7. -nb, -noblur    Don't blur 'WhiteSur' GDM theme background image 
+
+   
+ Tweaks for firefox. options
+
+  -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. 
+
+   
+ Others. options
+
+  -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.
+   Fixed Dash to Dock theme issue. 

  -r, --remove, --revert 
- Revert to the original themes, do the opposite things of install and connect.
+   Revert to the original themes, do the opposite things of install and connect. 

  --silent-mode 
- Meant for developers: ignore any confirm prompt and params become more strict.
+   Meant for developers: ignore any confirm prompt and params become more strict. 

  -h, --help 
- Show this help.
+   Show this help. 

 ```

@ -286,12 +283,12 @@ Usage:  `./tweaks.sh [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:
@ -302,15 +299,17 @@ 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:
@ -321,33 +320,51 @@ sudo ./tweaks.sh -g -b default          # use the default background
 sudo ./tweaks.sh -g -b blank            # make it blank
 ```

-#### Don't darken the background
-Parameter: `--no-darken` `-N`
+#### - Don't darken the background
+Parameter: `--nodarken` `-nd`

 Example:

 ```bash
-sudo ./tweaks.sh -g -N                          # darken the default background
-sudo ./tweaks.sh -g -N -b "wallpapers/snow.jpg" # darken the custom background
+sudo ./tweaks.sh -g -nd                          # darken the default background
+sudo ./tweaks.sh -g -nd -b "wallpapers/snow.jpg" # darken the custom background
 ```

-#### Don't blur the background
-Parameter: `--no-blur` `-n`
+#### - Don't blur the background
+Parameter: `--noblur` `-nb`

 Example:

 ```bash
-sudo ./tweaks.sh -g -n                           # don't blur the default background
-sudo ./tweaks.sh -g -n -b "wallpapers/rocks.jpg" # don't blur the custom background
+sudo ./tweaks.sh -g -nb                           # don't blur the default background
+sudo ./tweaks.sh -g -nb -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>
@ -357,7 +374,7 @@ like changing theme color (dark and light variant) and accent, GNOME Shell
 </a> </p>
 <br>

-### WhiteSur Wallpapers
+### <p align="center"> <b> WhiteSur Wallpapers </b> </p>
 <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>
--- a/install.sh
+++ b/install.sh
@ -13,7 +13,7 @@
 ###############################################################################

 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
-source "${REPO_DIR}/shell/lib-install.sh"
+source "${REPO_DIR}/libs/lib-install.sh"

 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")
@ -23,32 +23,36 @@ usage() {
  # Please specify their default value manually, some of them come from _variables.scss
  # You also have to check and update them regularly
  helpify_title
-  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 "${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 "-p, --panel-opacity"           "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]" "Set panel transparency"                   "Default is 15%"
-  helpify "-P, --panel-size"              "[$(IFS='|'; echo "${PANEL_SIZE_VARIANTS[*]}")]"    "Set Gnome shell panel height size"        "Default is 32px"
-  helpify "-s, --size"                    "[$(IFS='|'; echo "${SIDEBAR_SIZE_VARIANTS[*]}")]"  "Set Nautilus sidebar minimum width"       "Default is 200px"
-  helpify "-i, --icon"                    "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]"          "Set 'Activities' icon"                    "Default is 'standard'"
-  helpify "-b, --background"              "[default|blank|IMAGE_PATH]"                        "Set gnome-shell background image"         "Default is BigSur-like wallpaper"
-  helpify "-m, --monterey"                ""                                                  "Set to MacOS Monterey style"              ""
-  helpify "-N, --nautilus-style" "[$(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 "-HD, --highdefinition"         ""                                                  "Set to High Definition size"              "Default is laptop size"
-  helpify "--normal, --normalshowapps"    ""                                                  "Set gnome-shell show apps button style to normal" "Default is BigSur"
-  helpify "--default, --defaultactivities" ""                                                 "Set gnome-shell panel activities button style to system default" "Default is Apple icon"
-  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" ""
-  helpify "-h, --help"                    ""                                                  "Show this help"                            ""
+  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 "-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 (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 "   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 "   4. -h, -panelheight"        "[$(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 "   6. normal, -normal"         ""                                                  "    Set gnome-shell show apps button style to normal" "Default is BigSur"
+
+  helpify "--round, --roundedmaxwindow"   ""                                                  "  Set maximized window to rounded"                 "Default is square"
+  helpify "--black, --blackfont"          ""                                                  "  Set panel font color to black"                   "Default is white"
+  helpify "--darker, --darkercolor"       ""                                                  "  Install darker '${THEME_NAME}' dark 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"       ""
+  helpify "-h, --help"                    ""                                                  "  Show this help"                                  ""
 }

 ###############################################################################
@ -70,17 +74,48 @@ while [[ $# -gt 0 ]]; do
  # at once

  case "${1}" in
+    # Parameters that require a value, multiple use
+    -o|--opacity)
+      check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
+    -c|--color)
+      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
+    -d|--dest)
+      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
+#      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
+    --shell|--gnome-shell)
+      shift
+      for variant in "${@}"; do
+        case "${variant}" in
+          -i|-icon)
+            activities_icon="true";
+            check_param "${1}" "${1}" "${2}" "must" "must" "must" && shift 2 || shift ;;
+          -b|-background)
+            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)
+            check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
+          -sf|-smallerfont)
+            smaller_font="true"; shift ;;
+          normal|-normal)
+            showapps_normal="true"; shift ;;
+        esac
+      done
+      ;;
    # Parameters that don't require a value
-    -r|--remove|-u|-uninstall)
-      uninstall='true'; shift ;;
-    --silent-mode)
-      full_sudo "${1}"; silent_mode='true'; shift ;;
-    --dialog|--interactive)
-      interactive='true'; shift ;;
-    --normal|--normalshowapps)
-      showapps_normal="true"; shift ;;
-    --default|--defaultactivities)
-      default_activities="true"; shift ;;
    --right|--rightplacement)
      right_placement="true"; shift ;;
    --round|--roundedmaxwindow)
@ -89,40 +124,20 @@ 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 ;;
-    # Parameters that require a value, single use
-    -b|--background)
-      check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
-    -d|--dest)
-      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 ;;
-    -i|--icon)
-      check_param "${1}" "${1}" "${2}" "must" "must" "must" && shift 2 || shift ;;
-    -s|--size)
-      check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
-    -p|--panel-opacity)
-      check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
-    -P|--panel-size)
-      check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
-    -N|--nautilus-style)
-      check_param "${1}" "${1}" "${2}" "optional" "optional" "optional" && shift 2 || shift ;;
-    # Parameters that require a value, multiple use
-    -a|--alt)
-      check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
-    -o|--opacity)
-      check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
-    -c|--color)
-      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 ;;
+    -f|--fixed)
+      accent_type="fixed"; shift ;;
+    -r|--remove|-u|-uninstall)
+      uninstall='true'; shift ;;
+    --silent-mode)
+      full_sudo "${1}"; silent_mode='true'; shift ;;
+    --dialog|--interactive)
+      interactive='true'; shift ;;
    -h|--help)
      need_help="true"; shift ;;
    *)
@ -155,32 +170,34 @@ if [[ "${uninstall}" == 'true' ]]; then
  fi
 else
  if [[ "${interactive}" == 'true' ]]; then
-    show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog
-    echo; prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo
-  else
-    show_needed_dialogs
+    show_panel_opacity_dialog
+#    show_sidebar_size_dialog
+    show_nautilus_style_dialog
+#  else
+#    show_needed_dialogs
  fi

-  prompt -w "Removing the old '${name}${colorscheme}' themes...\n"
+  prompt -w "Removing the old '${name}' themes...\n"

  remove_themes; customize_theme; avoid_variant_duplicates;

-  prompt -w "Installing '${name}${colorscheme}' themes in '${dest}'...\n";
+  prompt -w "Installing '${name}' 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 "Icon variant     : ${icon}"
-  prompt -i "Nautilus variant : ${nautilus_style}"
+  prompt -i "Scheme variants  : $( IFS=';'; echo "${schemes[*]}" )"
+  prompt -i "Start icon style : ${icon}"
+  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 -w "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!"
    fi
@ -197,7 +214,7 @@ else
    notif_msg="${final_msg}"
  fi

-  echo; prompt -w "${final_msg}"
+  echo; prompt -i "${final_msg}"
 fi

 echo
--- a/shell/lib-core.sh
+++ b/shell/lib-core.sh
@ -26,7 +26,11 @@ 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 "46" ]]; then
+  if [[ "${SHELL_VERSION:-}" -ge "48" ]]; then
+    GNOME_VERSION="48-0"
+  elif [[ "${SHELL_VERSION:-}" -ge "47" ]]; then
+    GNOME_VERSION="47-0"
+  elif [[ "${SHELL_VERSION:-}" -ge "46" ]]; then
    GNOME_VERSION="46-0"
  elif [[ "${SHELL_VERSION:-}" -ge "44" ]]; then
    GNOME_VERSION="44-0"
@ -38,7 +42,7 @@ if command -v gnome-shell &> /dev/null; then
    GNOME_VERSION="3-28"
  fi
 else
-  GNOME_VERSION="46-0"
+  GNOME_VERSION="48-0"
 fi

 #----------Program options-------------#
@ -88,15 +92,17 @@ 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')
-ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'tux' 'arch' 'manjaro' 'fedora' 'debian' 'void' 'opensuse' 'popos' 'mxlinux' 'zorin' 'budgie' 'gentoo')
+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')
+NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy' 'right')

 #--------Customization, default values----------#
 dest="${THEME_DIR}"
@ -105,6 +111,7 @@ 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]}"
@ -112,11 +119,10 @@ panel_size="${PANEL_SIZE_VARIANTS[0]}"
 nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}"
 background="blank"
 compact="true"
-colorscheme=""

 #--Ambigous arguments checking and overriding default values--#
-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" [-P]="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" [-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" [-h]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false")

 #------------Tweaks---------------#
 need_help="false"
@ -253,7 +259,6 @@ if [[ -d "${WHITESUR_TMP_DIR}" ]]; then

  if [[ -d "${WHITESUR_TMP_DIR}" ]]; then
    prompt -e "ERROR: Whitesur installer or tweaks is already running. Probably it's run by '$(ls -ld "${WHITESUR_TMP_DIR}" | awk '{print $3}')'"
-    exit 1
  fi
 fi

@ -394,6 +399,14 @@ helpify() {
  printf "  ${c_blue}%s ${c_green}%s\n ${c_magenta}%s. ${c_cyan}%s\n\n${c_default}" "${1}" "${2}" "${3}" "${4}"
 }

+sec_title() {
+  printf "  ${c_blue}%s ${c_green}%s ${c_magenta}%s ${c_cyan}%s\n\n${c_default}" "${1}" "${2}" "${3}" "${4}"
+}
+
+sec_helpify() {
+  printf "      ${c_blue}%s ${c_green}%s ${c_magenta}%s ${c_cyan}%s\n\n${c_default}" "${1}" "${2}" "${3}" "${4}"
+}
+
 ###############################################################################
 #                                 PARAMETERS                                  #
 ###############################################################################
@ -414,8 +427,6 @@ parsimplify() {
      echo "~-n" | cut -c 2- ;;
    --dest)
      echo "-d" ;;
-    --size)
-      echo "-s" ;;
    --alt)
      echo "-a" ;;
    --opacity)
@ -426,14 +437,16 @@ parsimplify() {
      echo "-i" ;;
    --theme)
      echo "-t" ;;
-    --panel-opacity)
-      echo "-p" ;;
-    --panel-size)
-      echo "-P" ;;
-    --nautilus-style)
+    --scheme)
+      echo "-s" ;;
+    --nautilus)
      echo "-N" ;;
-    --background)
+    -background)
      echo "-b" ;;
+    -panelheight)
+      echo "-h" ;;
+    -panelopacity)
+      echo "-p" ;;
    *)
      echo "${1}" ;;
  esac
@ -490,15 +503,17 @@ 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
@ -510,7 +525,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}"
@ -527,19 +542,19 @@ check_param() {
        remind_relative_path "${display_param}" "${value}"; variant_found="skip" ;;
      -n)
        name="${value}"; variant_found="skip" ;;
-      -s)
-        for i in {0..5}; do
-          if [[ "${value}" == "${SIDEBAR_SIZE_VARIANTS[i]}" ]]; then
-            sidebar_size="${value}"; variant_found="true"; break
-          fi
-        done ;;
+#      -s)
+#        for i in {0..5}; do
+#          if [[ "${value}" == "${SIDEBAR_SIZE_VARIANTS[i]}" ]]; then
+#            sidebar_size="${value}"; variant_found="true"; break
+#          fi
+#        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)
+      -h)
        for i in {0..2}; do
          if [[ "${value}" == "${PANEL_SIZE_VARIANTS[i]}" ]]; then
            panel_size="${value}"; variant_found="true"; break
@ -567,7 +582,7 @@ check_param() {
        done ;;
      -c)
        for i in {0..1}; do
-          if [[ "${value}" == "${COLOR_VARIANTS[i]}" ]]; then
+          if [[ "${value}" == "${COLOR_VARIANTS[i]}" || "${value}" == "${COMMAND_COLOR_VARIANTS[i]}" ]]; then
            colors+=("${COLOR_VARIANTS[i]}"); variant_found="true"; break
          fi
        done ;;
@ -582,19 +597,24 @@ 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..3}; do
+        for i in {0..4}; do
          if [[ "${value}" == "${NAUTILUS_STYLE_VARIANTS[i]}" ]]; then
            nautilus_style="${NAUTILUS_STYLE_VARIANTS[i]}"; variant_found="true"; break
          fi
@ -622,6 +642,7 @@ 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
--- a/shell/lib-flatpak.sh
+++ b/shell/lib-flatpak.sh
@ -7,8 +7,9 @@ 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}${colorscheme}"
+  local FLATPAK_THEME="${name}${color}${opacity}${alt}${theme}${scheme}"

  local GTK_3_THEME_VER=3.22
  local cache_home="${XDG_CACHE_HOME:-$HOME/.cache}"
@ -30,6 +31,18 @@ pakitheme_gtk3() {

  if [[ -n "$theme_path" ]]; then
    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
  else
    prompt -e "Could not locate theme... install theme first! \n"
    exit 0
@ -43,7 +56,7 @@ pakitheme_gtk3() {
  rm -rf "$build_dir"
  mkdir -p "$build_dir/files"

-  cp -a "$theme_path/gtk-3.0/"* "$build_dir/files"
+  cp -a "$theme_path/gtk-3.0/"{gtk.css,gtk-dark.css,gtk.gresource} "$build_dir/files"

  mkdir -p "$build_dir/files/share/appdata"
  cat >"$build_dir/files/share/appdata/$gtk3_app_id.appdata.xml" <<EOF
@ -102,10 +115,16 @@ flatpak_remove() {
  local opacity="$(destify ${2})"
  local alt="$(destify ${3})"
  local theme="$(destify ${4})"
+  local scheme="$(destify ${5})"

-  if [[ -w "/root" ]]; then
-    sudo flatpak remove -y --system org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${colorscheme}
-  else
-    flatpak remove -y --user org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${colorscheme}
+  local system_theme_dir="/var/lib/flatpak/runtime/org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${scheme}"
+  local user_theme_dir="$HOME/.local/share/flatpak/runtime/org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${scheme}"
+
+  if [[ -d "$system_theme_dir" ]]; then
+    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
 }
--- a/shell/lib-install.sh
+++ b/shell/lib-install.sh
@ -8,8 +8,8 @@
 #                                VARIABLES                                    #
 ###############################################################################

-source "${REPO_DIR}/shell/lib-core.sh"
-source "${REPO_DIR}/shell/lib-flatpak.sh"
+source "${REPO_DIR}/libs/lib-core.sh"
+source "${REPO_DIR}/libs/lib-flatpak.sh"
 WHITESUR_SOURCE+=("lib-install.sh")

 ###############################################################################
@ -77,7 +77,11 @@ prepare_deps() {
    prompt -w "DEPS: Your system clock is wrong"
    prompt -i "DEPS: Updating your system clock..."
    # Add "+ 25" here to accomodate potential time delay by sudo prompt
-    sudo date -s "@$((remote_time + 25))"; sudo hwclock --systohc
+    sudo date -s "@$((remote_time + 25))"
+
+    if has_command hwclock; then
+      sudo hwclock --systohc
+    fi
  fi
 }

@ -115,7 +119,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
@ -347,49 +351,30 @@ install_beggy() {
  esac
 }

-install_xfwmy() {
-  local color="$(destify ${1})"
-
-  local TARGET_DIR="${dest}/${name}${color}${colorscheme}"
-  local HDPI_TARGET_DIR="${dest}/${name}${color}${colorscheme}-hdpi"
-  local XHDPI_TARGET_DIR="${dest}/${name}${color}${colorscheme}-xhdpi"
-
-  mkdir -p                                                                                    "${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}${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}${colorscheme}-xhdpi/"*".png"            "${XHDPI_TARGET_DIR}/xfwm4"
-  cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}"                                         "${XHDPI_TARGET_DIR}/xfwm4/themerc"
-}
-
 install_shelly() {
  local color="$(destify ${1})"
  local opacity="$(destify ${2})"
  local alt="$(destify ${3})"
  local theme="$(destify ${4})"
-  local icon="$(destify ${5})"
+  local scheme="$(destify ${5})"
+  local icon="$(destify ${6})"
  local TARGET_DIR=

-  if [[ -z "${6}" ]]; then
-    TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${colorscheme}/gnome-shell"
+  if [[ -z "${7}" ]]; then
+    TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${scheme}/gnome-shell"
  else
-    TARGET_DIR="${6}"
+    TARGET_DIR="${7}"
  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/shell-${GNOME_VERSION}/gnome-shell${color}.scss" "${TARGET_DIR}/gnome-shell.css"
+  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gnome-shell/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}${colorscheme}/"*".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/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"
@ -411,6 +396,7 @@ install_theemy() {
  local opacity="$(destify ${2})"
  local alt="$(destify ${3})"
  local theme="$(destify ${4})"
+  local scheme="$(destify ${5})"

  if [[ "${color}" == '-Light' ]]; then
    local iconcolor=''
@ -418,21 +404,21 @@ install_theemy() {
    local iconcolor='-Dark'
  fi

-  local TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${colorscheme}"
-  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}${colorscheme}"
+  local TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${scheme}"
+  local TMP_DIR_T="${WHITESUR_TMP_DIR}/gtk-3.0${color}${opacity}${alt}${theme}${scheme}"
+  local TMP_DIR_F="${WHITESUR_TMP_DIR}/gtk-4.0${color}${opacity}${alt}${theme}${scheme}"

  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}${colorscheme}\n"
+  desktop_entry+="Name=${name}${color}${opacity}${alt}${theme}${scheme}\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}${colorscheme}\n"
-  desktop_entry+="MetacityTheme=${name}${color}${opacity}${alt}${theme}${colorscheme}\n"
+  desktop_entry+="GtkTheme=${name}${color}${opacity}${alt}${theme}${scheme}\n"
+  desktop_entry+="MetacityTheme=${name}${color}${opacity}${alt}${theme}${scheme}\n"
  desktop_entry+="IconTheme=${name}${iconcolor}\n"
  desktop_entry+="CursorTheme=WhiteSur-cursors\n"
  desktop_entry+="ButtonLayout=close,minimize,maximize:menu\n"
@ -445,13 +431,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}${colorscheme}"          "${TMP_DIR_T}/windows-assets"
+  cp -r "${THEME_SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${scheme}"               "${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}${colorscheme}.png"  "${TARGET_DIR}/gtk-3.0/thumbnail.png"
+  cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}${scheme}.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"
@ -466,7 +452,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}${colorscheme}.png"  "${TARGET_DIR}/gtk-4.0/thumbnail.png"
+  cp -r "${THEME_SRC_DIR}/assets/gtk/thumbnails/thumbnail${color}${theme}${scheme}.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"
@ -476,24 +462,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}${colorscheme}/"*".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}${colorscheme}.png" "${TARGET_DIR}/cinnamon/thumbnail.png"
+  cp -r "${THEME_SRC_DIR}/assets/cinnamon/assets${color}${scheme}/"*".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/thumbnails/thumbnail${color}${theme}${scheme}.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}${colorscheme}"                   "${TARGET_DIR}/gtk-2.0/gtkrc"
+  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/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}${colorscheme}"                 "${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"
+  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${color}${theme}${scheme}/"*".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}/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}/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}/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}${colorscheme}"               "${TARGET_DIR}/metacity-1/titlebuttons"
-  cp -r "${THEME_SRC_DIR}/assets/metacity-1/thumbnail${color}${colorscheme}.png"              "${TARGET_DIR}/metacity-1/thumbnail.png"
+  cp -r "${THEME_SRC_DIR}/assets/metacity-1/titlebuttons${color}${scheme}"                    "${TARGET_DIR}/metacity-1/titlebuttons"
+  cp -r "${THEME_SRC_DIR}/assets/metacity-1/thumbnail${color}${scheme}.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"
@ -503,15 +504,7 @@ install_theemy() {
 }

 remove_packy() {
-  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"
+  rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})$(destify ${5})"{'','-hdpi','-xhdpi'}
 }

 ###############################################################################
@ -520,34 +513,45 @@ remove_old_packy() {

 config_gtk4() {
  local color="$(destify ${1})"
-  local alt="$(destify ${2})"
+  local opacity="$(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-Light.css,gtk-Dark.css,assets,windows-assets}
+  rm -rf                                                                                      "${TARGET_DIR}/"{gtk.css,gtk-dark.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-${colors}.css"                                                    "${TARGET_DIR}/gtk.css"
+  ln -sf "${TARGET_DIR}/gtk${color}.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}${colorscheme}"          "${TARGET_DIR}/windows-assets"
+  cp -r "${THEME_SRC_DIR}/assets/gtk/windows-assets/titlebutton${alt}${scheme}"               "${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]}"
-  color="${colors[1]}"
+  alt="${alts[0]}"
+  theme="${themes[0]}"
+  scheme="${schemes[0]}"

-  gtk_base "${opacities[0]}" "${themes[0]}"
-  config_gtk4 "${colors}" "${alts}"
+  install_theme_deps
+
+  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-Light.css,gtk-Dark.css,assets,windows-assets}
+  rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-dark.css,gtk-Light.css,gtk-Dark.css,assets,windows-assets}
 }

 ###############################################################################
@ -570,14 +574,16 @@ install_themes() {

  install_theme_deps; start_animation; install_beggy

-  for opacity in "${opacities[@]}"; do
-    for alt in "${alts[@]}"; do
-      for theme in "${themes[@]}"; do
-        for color in "${colors[@]}"; do
-          gtk_base "${opacity}" "${theme}" "${compact}"
-          install_theemy "${color}" "${opacity}" "${alt}" "${theme}"
-          install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${icon}"
-          install_xfwmy "${color}"
+  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
+            gtk_base
+            install_theemy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
+            shell_base
+            install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}" "${icon}"
+          done
        done
      done
    done
@ -593,19 +599,9 @@ remove_themes() {
    for opacity in "${OPACITY_VARIANTS[@]}"; do
      for alt in "${ALT_VARIANTS[@]}"; do
        for theme in "${THEME_VARIANTS[@]}"; do
-          remove_packy "${color}" "${opacity}" "${alt}" "${theme}" &
-          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}"
+          for scheme in "${SCHEME_VARIANTS[@]}"; do
+            remove_packy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}" &
+            process_ids+=("${!}")
          done
        done
      done
@ -621,10 +617,10 @@ install_gdm_theme() {
  # Let's go!
  install_theme_deps
  rm -rf "${WHITESUR_GS_DIR}"; install_beggy
-  gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}"
+  gtk_base && shell_base

  if check_theme_file "${COMMON_CSS_FILE}"; then # CSS-based theme
-    install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${icon}" "${WHITESUR_GS_DIR}"
+    install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${schemes[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
@ -640,7 +636,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]}" "${icon}" "${WHITESUR_TMP_DIR}/shelly"
+    install_shelly "${colors[0]}" "${opacities[0]}" "${alts[0]}" "${themes[0]}" "${schemes[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
@ -683,29 +679,44 @@ 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}"

-  if [[ "${monterey}" == 'true' ]]; then
-    udo cp -rf "${FIREFOX_SRC_DIR}"/Monterey                                                  "${TARGET_DIR}"
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,titlebuttons,pages}                         "${TARGET_DIR}"/Monterey
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                              "${TARGET_DIR}"/Monterey
-    udo cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                        "${TARGET_DIR}"/Monterey/parts
-    udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-Monterey.css                                  "${TARGET_DIR}"/userContent.css
-    if [[ "${alttheme}" == 'true' ]]; then
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt.css                             "${TARGET_DIR}"/userChrome.css
-      udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/parts/headerbar-urlbar.css                     "${TARGET_DIR}"/Monterey/parts/headerbar-urlbar-alt.css
-    else
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey.css                                 "${TARGET_DIR}"/userChrome.css
-    fi
+  mkdir -p                                                                                    "${TARGET_DIR}"
+  cp -rf "${FIREFOX_SRC_DIR}/${theme_name}"                                                   "${TARGET_DIR}"
+  [[ -f "${TARGET_DIR}"/customChrome.css ]] && mv "${TARGET_DIR}"/customChrome.css            "${TARGET_DIR}"/customChrome.css.bak
+  cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css                                                "${TARGET_DIR}"
+  cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,pages}                                            "${TARGET_DIR}/${theme_name}"
+
+  if [[ "${colorscheme}" == '-nord' ]]; then
+    cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons-nord                                      "${TARGET_DIR}/${theme_name}"/titlebuttons
  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
-    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
+    cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons                                           "${TARGET_DIR}/${theme_name}"
+  fi
+
+  cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                                    "${TARGET_DIR}/${theme_name}"
+  cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                              "${TARGET_DIR}/${theme_name}"/parts
+  [[ -f "${TARGET_DIR}"/userChrome.css ]] && mv "${TARGET_DIR}"/userChrome.css                "${TARGET_DIR}"/userChrome.css.bak
+  cp -rf "${FIREFOX_SRC_DIR}"/userChrome-"${theme_name}${theme_type}".css                     "${TARGET_DIR}"/userChrome.css
+  [[ -f "${TARGET_DIR}"/userContent.css ]] && mv "${TARGET_DIR}"/userContent.css              "${TARGET_DIR}"/userContent.css.bak
+  cp -rf "${FIREFOX_SRC_DIR}"/userContent-"${theme_name}${theme_type}".css                    "${TARGET_DIR}"/userContent.css
+
+  if [[ "${firefoxtheme}" == 'Flat' && "${theme_name}" == 'Monterey' ]]; then
+    cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt"${theme_type}".css                    "${TARGET_DIR}"/userChrome.css
+    cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/parts/headerbar-urlbar.css                           "${TARGET_DIR}"/Monterey/parts/headerbar-urlbar-alt.css
+  fi
+
+  if [[ "${window}" == "alt" ]]; then
+    sed -i "s|titlebutton-light|titlebutton-light-alt|" "${TARGET_DIR}/${theme_name}"/theme*.css
+    sed -i "s|titlebutton-dark|titlebutton-dark-alt|" "${TARGET_DIR}/${theme_name}"/theme*.css
  fi

  config_firefox
@ -726,17 +737,21 @@ 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"
-      udoify_file                                                                             "${d}/prefs.js"
-      echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >>     "${d}/prefs.js"
-      echo "user_pref(\"browser.tabs.drawInTitlebar\", true);" >>                             "${d}/prefs.js"
-      echo "user_pref(\"browser.uidensity\", 0);" >>                                          "${d}/prefs.js"
-      echo "user_pref(\"layers.acceleration.force-enabled\", true);" >>                       "${d}/prefs.js"
-      echo "user_pref(\"mozilla.widget.use-argb-visuals\", true);" >>                         "${d}/prefs.js"
-      echo "user_pref(\"widget.gtk.rounded-bottom-corners.enabled\", true);" >>               "${d}/prefs.js"
-    fi
+    rm -rf                                                                                  "${d}/chrome"
+    udo ln -sf "${TARGET_DIR}"                                                              "${d}/chrome"
+    rm -rf                                                                                  "${d}/user.js"
+    udoify_file                                                                             "${d}/user.js"
+    #  Enable customChrome.css
+    echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >>     "${d}/user.js"
+    echo "user_pref(\"browser.tabs.drawInTitlebar\", true);"                         >>     "${d}/user.js"
+    # Set UI density to normal
+    echo "user_pref(\"browser.uidensity\", 0);"                                      >>     "${d}/user.js"
+    echo "user_pref(\"layers.acceleration.force-enabled\", true);"                   >>     "${d}/user.js"
+    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
 }

@ -767,7 +782,7 @@ remove_firefox_theme() {
  [[ -f "${TARGET_DIR}"/userChrome.css && ! -f "${TARGET_DIR}"/userChrome.css.bak ]] && cp -r "${TARGET_DIR}"/userChrome.css "${TARGET_DIR}"/userChrome.css.bak
  [[ -f "${TARGET_DIR}"/userContent.css && ! -f "${TARGET_DIR}"/userContent.css.bak ]] && cp -r "${TARGET_DIR}"/userContent.css "${TARGET_DIR}"/userContent.css.bak

-  rm -rf "${TARGET_DIR}/${THEME_NAME}"
+  rm -rf "${TARGET_DIR}/${theme_name}"
  rm -rf "${TARGET_DIR}"/customChrome.css
  rm -rf "${TARGET_DIR}"/userChrome.css
  rm -rf "${TARGET_DIR}"/userContent.css
@ -790,7 +805,7 @@ fix_dash_to_dock() {
 }

 install_dash_to_dock_theme() {
-  gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}"
+  gtk_base

  if [[ -d "${DASH_TO_DOCK_DIR_HOME}" ]]; then
    backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo"
@ -833,11 +848,13 @@ revert_dash_to_dock_theme() {
 connect_flatpak() {
  install_flatpak_deps

-  for opacity in "${opacities[@]}"; do
-    for alt in "${alts[@]}"; do
-      for theme in "${themes[@]}"; do
-        for color in "${colors[@]}"; do
-          pakitheme_gtk3 "${color}" "${opacity}" "${alt}" "${theme}"
+  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
+            pakitheme_gtk3 "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
+          done
        done
      done
    done
@ -845,11 +862,13 @@ connect_flatpak() {
 }

 disconnect_flatpak() {
-  for opacity in "${opacities[@]}"; do
-    for alt in "${alts[@]}"; do
-      for theme in "${themes[@]}"; do
-        for color in "${colors[@]}"; do
-          flatpak_remove "${color}" "${opacity}" "${alt}" "${theme}"
+  for color in "${COLOR_VARIANTS[@]}"; do
+    for opacity in "${OPACITY_VARIANTS[@]}"; do
+      for alt in "${ALT_VARIANTS[@]}"; do
+        for theme in "${THEME_VARIANTS[@]}"; do
+          for scheme in "${SCHEME_VARIANTS[@]}"; do
+            flatpak_remove "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
+          done
        done
      done
    done
@ -891,6 +910,31 @@ 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
 }

 ###############################################################################
@ -900,10 +944,8 @@ gtk_base() {
 customize_theme() {
  cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"}

-  # Nord dark colors
-  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"
+  if [[ "${GNOME_VERSION}" -ge '47-0' ]]; then
+    sed $SED_OPT "/\$shell_version/s/old/new/"                                  "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
  fi

  # Darker dark colors
@ -925,7 +967,7 @@ customize_theme() {
  fi

  # Change Nautilus titlebutton placement style
-  if [[ "${right_placement}" == 'true' ]]; then
+  if [[ "${nautilus_style}" == 'right' ]]; 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
@ -938,7 +980,7 @@ customize_theme() {

  # Change gnome-shell panel transparency
  if [[ "${panel_opacity}" != 'default' ]]; then
-    prompt -s "Changing panel transparency ...\n"
+    prompt -s "Changing panel transparency to ${panel_opacity}% ...\n"
    sed $SED_OPT "/\$panel_opacity/s/0.15/0.${panel_opacity}/"                  "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
  fi

@ -954,10 +996,16 @@ customize_theme() {
    sed $SED_OPT "/\$showapps_button/s/bigsur/normal/"                          "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
  fi

+  # Change gnome-shell font size
+  if [[ "${smaller_font}" == 'true' ]]; then
+    prompt -s "Changing gnome-shell font size to smaller ...\n"
+    sed $SED_OPT "/\$font_size/s/normal/smaller/"                               "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  fi
+
  # Change gnome-shell panel activities button style
-  if [[ "${default_activities}" == 'true' ]]; then
+  if [[ "${activities_icon}" == 'true' ]]; then
    prompt -s "Changing gnome-shell panel activities button style ...\n"
-    sed $SED_OPT "/\$activities/s/apple/normal/"                                "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+    sed $SED_OPT "/\$activities/s/default/icon/"                                "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
  fi

  # Change panel font color
@ -991,22 +1039,20 @@ customize_theme() {
 # values are taken from _variables.scss

 show_panel_opacity_dialog() {
-  install_dialog_deps
  dialogify panel_opacity "${THEME_NAME}" "Choose your panel opacity (Default is 15)" ${PANEL_OPACITY_VARIANTS[*]}
 }

 show_sidebar_size_dialog() {
-  install_dialog_deps
  dialogify sidebar_size "${THEME_NAME}" "Choose your Nautilus minimum sidebar size (default is 200px)" ${SIDEBAR_SIZE_VARIANTS[*]}
 }

 show_nautilus_style_dialog() {
-  install_dialog_deps
  dialogify nautilus_style "${THEME_NAME}" "Choose your Nautilus style (default is BigSur-like style)" ${NAUTILUS_STYLE_VARIANTS[*]}
 }

 show_needed_dialogs() {
+  install_dialog_deps
  if [[ "${need_dialog["-p"]}" == "true" ]]; then show_panel_opacity_dialog; fi
-  if [[ "${need_dialog["-s"]}" == "true" ]]; then show_sidebar_size_dialog; fi
+#  if [[ "${need_dialog["-s"]}" == "true" ]]; then show_sidebar_size_dialog; fi
  if [[ "${need_dialog["-N"]}" == "true" ]]; then show_nautilus_style_dialog; fi
 }
--- a/make-release.sh
+++ b/make-release.sh
@ -2,7 +2,7 @@

 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
 readonly RELEASE_DIR="${REPO_DIR}/release"
-source "${REPO_DIR}/shell/lib-install.sh"
+source "${REPO_DIR}/libs/lib-install.sh"

 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")
@ -10,16 +10,21 @@ opacities=("${OPACITY_VARIANTS[@]}")

 C_VARIANTS=('-Light' '-Dark')
 S_VARIANTS=('' '-solid')
+N_VARIANTS=('' '-nord')

 install() {
  remove_themes; customize_theme; avoid_variant_duplicates
-  install_themes; echo; prompt -s "Install Gnome${RELEASE_VERSION} version finished!"; echo
+  local schemes=("${SCHEME_VARIANTS[@]}")
+  install_themes
+  echo; prompt -s "Install GNOME ${RELEASE_VERSION} version finished!\n"
 }

 compress() {
  for color in "${C_VARIANTS[@]}"; do
    for solid in "${S_VARIANTS[@]}"; do
-      rm -rf ${RELEASE_DIR}/${THEME_NAME}${color}${solid}.tar.xz
+      for scheme in "${N_VARIANTS[@]}"; do
+        rm -rf ${RELEASE_DIR}/${THEME_NAME}${color}${solid}${scheme}.tar.xz
+      done
    done
  done

@ -27,20 +32,41 @@ compress() {

  for color in "${C_VARIANTS[@]}"; do
    for solid in "${S_VARIANTS[@]}"; do
-      tar -Jcf ${RELEASE_DIR}/${THEME_NAME}${color}${solid}.tar.xz ${THEME_NAME}${color}${solid}
+      for scheme in "${N_VARIANTS[@]}"; do
+        tar -Jcf ${RELEASE_DIR}/${THEME_NAME}${color}${solid}${scheme}.tar.xz ${THEME_NAME}${color}${solid}${scheme}
+      done
    done
  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="46-0"
-RELEASE_VERSION="-last"
+GNOME_VERSION="48-0"
+RELEASE_VERSION="48.0"
 install && compress
-prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
-
+prompt -i "Compress ${THEME_NAME} themes finished!\n"
+release_info
 prompt -s "Done!"; echo
+
 exit 0
--- a/parse-sass.sh
+++ b/parse-sass.sh
@ -0,0 +1,43 @@
+#! /usr/bin/env bash
+
+REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+SRC_DIR="${REPO_DIR}/src"
+
+# Check command availability
+function has_command() {
+  command -v $1 > /dev/null
+}
+
+if [ ! "$(which sassc 2> /dev/null)" ]; then
+  echo sassc needs to be installed to generate the css.
+  if has_command zypper; then
+    sudo zypper in sassc
+  elif has_command apt; then
+    sudo apt install -y sassc
+  elif has_command dnf; then
+    sudo dnf install -y sassc
+  elif has_command yum; then
+    sudo yum install -y sassc
+  elif has_command pacman; then
+    sudo pacman -S --noconfirm sassc
+  fi
+fi
+
+SASSC_OPT="-M -t expanded"
+
+_COLOR_VARIANTS=('-Light' '-Dark')
+
+if [ ! -z "${COLOR_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _COLOR_VARIANTS <<< "${COLOR_VARIANTS:-}"
+fi
+
+for color in "${_COLOR_VARIANTS[@]}"; do
+  sassc $SASSC_OPT src/main/gtk-3.0/gtk${color}.{scss,css}
+  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}
+  echo "==> Generating gnome-shell${color}.css..."
+  sassc $SASSC_OPT src/main/cinnamon/cinnamon${color}.{scss,css}
+  echo "==> Generating the cinnamon${color}.css..."
+done
--- a/release/WhiteSur-Dark-nord.tar.xz
+++ b/release/WhiteSur-Dark-nord.tar.xz
--- a/release/WhiteSur-Dark-solid-nord.tar.xz
+++ b/release/WhiteSur-Dark-solid-nord.tar.xz
--- a/release/WhiteSur-Dark-solid.tar.xz
+++ b/release/WhiteSur-Dark-solid.tar.xz
--- a/release/WhiteSur-Dark.tar.xz
+++ b/release/WhiteSur-Dark.tar.xz
--- a/release/WhiteSur-Light-nord.tar.xz
+++ b/release/WhiteSur-Light-nord.tar.xz
--- a/release/WhiteSur-Light-solid-nord.tar.xz
+++ b/release/WhiteSur-Light-solid-nord.tar.xz
--- a/release/WhiteSur-Light-solid.tar.xz
+++ b/release/WhiteSur-Light-solid.tar.xz
--- a/release/WhiteSur-Light.tar.xz
+++ b/release/WhiteSur-Light.tar.xz
--- a/release/release-info.txt
+++ b/release/release-info.txt
@ -0,0 +1,12 @@
+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
--- a/src/assets/gnome-shell/activities-black/activities-apple.svg
+++ b/src/assets/gnome-shell/activities-black/activities-apple.svg
--- a/src/assets/gnome-shell/activities/activities-apple.svg
+++ b/src/assets/gnome-shell/activities/activities-apple.svg
--- a/src/assets/gtk/windows-assets/windows-assets.svg
+++ b/src/assets/gtk/windows-assets/windows-assets.svg
@ -2,25 +2,21 @@
 <!-- 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="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="windows-assets.svg">
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
+   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"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
      <stop
         id="stop1959"
         offset="0"
@ -32,7 +28,7 @@
    </linearGradient>
    <linearGradient
       id="header_button_img"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
      <stop
         style="stop-color:#f1f1f1;stop-opacity:1"
         offset="0"
@ -44,7 +40,7 @@
    </linearGradient>
    <linearGradient
       id="theme_darker_color"
-       osb:paint="solid">
+       inkscape:swatch="solid">
      <stop
         style="stop-color:#4d4d4d;stop-opacity:1;"
         offset="0"
@ -52,7 +48,7 @@
    </linearGradient>
    <linearGradient
       id="button_active"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
      <stop
         style="stop-color:#3d6ffc;stop-opacity:1"
         offset="0"
@ -64,7 +60,7 @@
    </linearGradient>
    <linearGradient
       id="unchecked_highlight"
-       osb:paint="solid">
+       inkscape:swatch="solid">
      <stop
         style="stop-color:#5f5f5f;stop-opacity:1;"
         offset="0"
@ -72,7 +68,7 @@
    </linearGradient>
    <linearGradient
       id="dark_unchecked_bg"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
      <stop
         id="stop1615"
         offset="0"
@ -84,7 +80,7 @@
    </linearGradient>
    <linearGradient
       id="hightlight"
-       osb:paint="solid">
+       inkscape:swatch="solid">
      <stop
         style="stop-color:#5887fc;stop-opacity:1;"
         offset="0"
@ -92,7 +88,7 @@
    </linearGradient>
    <linearGradient
       id="dark_checked_bg"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
      <stop
         style="stop-color:#3458c0;stop-opacity:1"
         offset="0"
@ -104,7 +100,7 @@
    </linearGradient>
    <linearGradient
       id="selected_fg_color"
-       osb:paint="solid">
+       inkscape:swatch="solid">
      <stop
         style="stop-color:#ffffffgit;stop-opacity:1;"
         offset="0"
@ -112,7 +108,7 @@
    </linearGradient>
    <linearGradient
       id="selected_bg_color"
-       osb:paint="solid">
+       inkscape:swatch="solid">
      <stop
         style="stop-color:#5683fa;stop-opacity:1;"
         offset="0"
@ -126,17 +122,17 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="1.4390728"
-     inkscape:cx="174.05714"
-     inkscape:cy="115.84359"
+     inkscape:zoom="1.0175781"
+     inkscape:cx="278.11132"
+     inkscape:cy="133.65067"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="true"
     showborder="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
     inkscape:window-x="0"
-     inkscape:window-y="36"
+     inkscape:window-y="28"
     inkscape:window-maximized="1"
     inkscape:snap-nodes="false"
     inkscape:snap-bbox="true"
@ -155,7 +151,8 @@
     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"
@ -164,20 +161,11 @@
       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"
@ -211,20 +199,6 @@
     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"
--- a/src/main/gnome-shell/_shell-base.scss
+++ b/src/main/gnome-shell/_shell-base.scss
@ -0,0 +1,5 @@
+@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';
--- a/src/main/gnome-shell/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/gnome-shell-Dark.scss
@ -0,0 +1,3 @@
+$variant: 'dark';
+
+@import 'shell-base-temp';
--- a/src/main/gnome-shell/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/gnome-shell-Light.scss
@ -0,0 +1,3 @@
+$variant: 'light';
+
+@import 'shell-base-temp';
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Dark.scss
@ -1,11 +0,0 @@
-$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';
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-Light.scss
@ -1,11 +0,0 @@
-$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';
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Dark.scss
@ -1,8 +0,0 @@
-$variant: 'dark';
-
-@import '../../../sass/variables';
-@import '../../../sass/colors';
-@import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
-@import '../../../sass/gnome-shell/widgets-40-0';
-@import '../../../sass/gnome-shell/extensions-40-0';
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-Light.scss
@ -1,8 +0,0 @@
-$variant: 'light';
-
-@import '../../../sass/variables';
-@import '../../../sass/colors';
-@import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
-@import '../../../sass/gnome-shell/widgets-40-0';
-@import '../../../sass/gnome-shell/extensions-40-0';
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Dark.scss
@ -1,8 +0,0 @@
-$variant: 'dark';
-
-@import '../../../sass/variables';
-@import '../../../sass/colors';
-@import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
-@import '../../../sass/gnome-shell/widgets-42-0';
-@import '../../../sass/gnome-shell/extensions-40-0';
--- a/src/main/gnome-shell/shell-42-0/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-42-0/gnome-shell-Light.scss
@ -1,8 +0,0 @@
-$variant: 'light';
-
-@import '../../../sass/variables';
-@import '../../../sass/colors';
-@import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
-@import '../../../sass/gnome-shell/widgets-42-0';
-@import '../../../sass/gnome-shell/extensions-40-0';
--- a/src/main/gnome-shell/shell-44-0/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-44-0/gnome-shell-Dark.scss
@ -1,8 +0,0 @@
-$variant: 'dark';
-
-@import '../../../sass/variables';
-@import '../../../sass/colors';
-@import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
-@import '../../../sass/gnome-shell/widgets-44-0';
-@import '../../../sass/gnome-shell/extensions-40-0';
--- a/src/main/gnome-shell/shell-44-0/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-44-0/gnome-shell-Light.scss
@ -1,8 +0,0 @@
-$variant: 'light';
-
-@import '../../../sass/variables';
-@import '../../../sass/colors';
-@import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
-@import '../../../sass/gnome-shell/widgets-44-0';
-@import '../../../sass/gnome-shell/extensions-40-0';
--- a/src/main/gnome-shell/shell-46-0/gnome-shell-Dark.scss
+++ b/src/main/gnome-shell/shell-46-0/gnome-shell-Dark.scss
@ -1,8 +0,0 @@
-$variant: 'dark';
-
-@import '../../../sass/variables';
-@import '../../../sass/colors';
-@import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
-@import '../../../sass/gnome-shell/widgets-46-0';
-@import '../../../sass/gnome-shell/extensions-46-0';
--- a/src/main/gnome-shell/shell-46-0/gnome-shell-Light.scss
+++ b/src/main/gnome-shell/shell-46-0/gnome-shell-Light.scss
@ -1,8 +0,0 @@
-$variant: 'light';
-
-@import '../../../sass/variables';
-@import '../../../sass/colors';
-@import '../../../sass/gnome-shell/drawing';
-@import '../../../sass/gnome-shell/common';
-@import '../../../sass/gnome-shell/widgets-46-0';
-@import '../../../sass/gnome-shell/extensions-46-0';
--- a/src/main/gtk-3.0/gtk-Dark.scss
+++ b/src/main/gtk-3.0/gtk-Dark.scss
@ -2,7 +2,8 @@ $variant: 'dark';

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

@import '../../sass/variables';
@import '../../sass/colors';
-@import '../../sass/gtk/drawing';
+@import '../../sass/gtk/drawing-3.0';
@import '../../sass/gtk/common-3.0';
@import '../../sass/gtk/apps-3.0';
@import '../../sass/gtk/colors-public';
+@import '../../sass/gtk/colors-other';
--- a/src/main/gtk-4.0/gtk-Dark.scss
+++ b/src/main/gtk-4.0/gtk-Dark.scss
@ -2,8 +2,8 @@ $variant: 'dark';

@import '../../sass/variables';
@import '../../sass/colors';
-@import '../../sass/gtk/drawing';
+@import '../../sass/gtk/colors-libadwaita';
+@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';
--- a/src/main/gtk-4.0/gtk-Light.scss
+++ b/src/main/gtk-4.0/gtk-Light.scss
@ -2,8 +2,8 @@ $variant: 'light';

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

 	/* Sidebar */
 	--gnome-sidebar-background: #3b3b3b;
 	--gnome-inactive-sidebar-background: #3f3f3f;
+	--gnome-sidebar-border-color: color-mix(in srgb, #ffffff 12%, var(--gnome-sidebar-background));

 	/* Popups */
 	--gnome-menu-background: rgba(51, 51, 51, 0.95);
-	--gnome-menu-border-color: #070707;
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
 	--gnome-popover-background: rgba(51, 51, 51, 0.95);
-	--gnome-popover-border-color: #070707;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
+	--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);
@ -48,14 +54,14 @@
 	/* Buttons */
 	--gnome-button-background: linear-gradient(to top, #636363 0%, #696969 100%);
 	--gnome-button-border-color: #282828;
-	--gnome-button-border-accent-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, #707070 0%, #737373 100%);
 	--gnome-button-active-background: linear-gradient(to top, #464646 0%, #525252 100%);
 	--gnome-button-active-border-color: #1b1b1b;
-	--gnome-button-active-border-accent-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, #434343 0%, #494949 100%);
 	--gnome-button-disabled-border-color: #282828;
@ -64,22 +70,23 @@
 	--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: #0f3b71;
-	--gnome-button-suggested-action-border-accent-color: #092444;;
+	--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: #103e75;
-	--gnome-button-suggested-action-active-border-color: #0f3b71;
+	--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: #851015;
-	--gnome-button-destructive-action-border-accent-color: #570b0e;
+	--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: #8a1116;
-	--gnome-button-destructive-action-active-border-color: #851015;
+	--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);

@ -98,20 +105,17 @@
 	--gnome-private-urlbar-background: #25003e;

 	/* Tabs */
-	--gnome-tabbar-tab-background: #404040;
-	--gnome-tabbar-tab-color: rgb(141, 144, 145);
-	--gnome-tabbar-tab-hover-background: #464646;
-	--gnome-tabbar-tab-hover-border-bottom-color: #1b1b1b;
-	--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-background: rgba(255, 255, 255, 0.06);
+	--gnome-tabbar-tab-color: #909090;
+	--gnome-tabbar-tab-hover-background: rgba(255, 255, 255, 0.12);
+	--gnome-tabbar-tab-hover-color: #c8c8c8;
+	--gnome-tabbar-tab-active-background: rgba(255, 255, 255, 0.16);
 	--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: #383838;
-	--gnome-inactive-tabbar-tab-active-background: #424242;
-	--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-tabbar-tab-active-hover-background: rgba(255, 255, 255, 0.16);
+	--gnome-inactive-tabbar-tab-color: #686868;
+	--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: #898989;
 	--gnome-tab-attention-icon-color: #718be8;

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

--- a/src/other/firefox/Monterey/left_header_button_3.css
+++ b/src/other/firefox/Monterey/left_header_button_3.css
@ -1,18 +1,10 @@
 #TabsToolbar {
-	margin-left: 451px !important;
-}
-
-:root[sizemode="maximized"] #TabsToolbar {
-	margin-left: 491px !important;
+	margin-left: 510px !important;
 }

 /* Left window titlebuttons mode */
@media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar {
-		margin-left: 534px !important;
-	}
-
-	:root[sizemode="maximized"] #TabsToolbar {
-		margin-left: 534px !important;
+		margin-left: 590px !important;
 	}
 }
--- a/src/other/firefox/Monterey/left_header_button_4.css
+++ b/src/other/firefox/Monterey/left_header_button_4.css
@ -1,18 +1,10 @@
 #TabsToolbar {
-	margin-left: 491px !important;
-}
-
-:root[sizemode="maximized"] #TabsToolbar {
-	margin-left: 531px !important;
+	margin-left: 552px !important;
 }

 /* Left window titlebuttons mode */
@media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar {
-		margin-left: 574px !important;
-	}
-
-	:root[sizemode="maximized"] #TabsToolbar {
-		margin-left: 574px !important;
+		margin-left: 632px !important;
 	}
 }
--- a/src/other/firefox/Monterey/left_header_button_5.css
+++ b/src/other/firefox/Monterey/left_header_button_5.css
@ -1,18 +1,10 @@
 #TabsToolbar {
-	margin-left: 531px !important;
-}
-
-:root[sizemode="maximized"] #TabsToolbar {
-	margin-left: 571px !important;
+	margin-left: 596px !important;
 }

 /* Left window titlebuttons mode */
@media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar {
-		margin-left: 614px !important;
-	}
-
-	:root[sizemode="maximized"] #TabsToolbar {
-		margin-left: 614px !important;
+		margin-left: 686px !important;
 	}
 }
--- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css
+++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
@ -2,32 +2,19 @@

@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";

-#urlbar {
-	--urlbar-height: 32px !important;
-	--urlbar-container-height: 32px !important;
-	--urlbar-toolbar-height: 32px !important;
-	--urlbar-inner-padding: 0 !important;
-}
-
 toolbarspring {
 	display: none !important;
 }

 /* URL bar */
 #urlbar {
+	--urlbar-height: 32px !important;
+	--urlbar-container-height: 32px !important;
+	--urlbar-toolbar-height: 32px !important;
+	--urlbar-inner-padding: 0 !important;
 	box-shadow: none !important;
-}
-
-#urlbar-background {
-	box-shadow: none !important;
-	border: 0 !important;
-	background: transparent !important;
-	border-radius: 8px !important;
-	padding: 0 !important;
-}
-
-#urlbar:-moz-window-inactive {
-	border-color: var(--gnome-inactive-headerbar-background) !important;
+	width: 360px !important;
+	min-width: 360px !important;
 }

 #urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background {
@ -36,7 +23,8 @@ toolbarspring {

 #urlbar-container,
 #wrapper-urlbar-container,
-#urlbar #urlbar-input-container {
+#urlbar #urlbar-input-container,
+#urlbar .urlbar-input-container {
 	padding: 0 !important;
 	width: 360px !important;
 	min-width: 360px !important;
@ -49,24 +37,40 @@ 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,
+#urlbar[breakout][breakout-extend] .urlbar-input-container {
 	height: 32px !important;
 	max-height: 32px !important;
 	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;
@ -145,7 +149,19 @@ toolbarspring {
 	margin-left: 6px !important;
 }

+#identity-box[pageproxystate="invalid"] > .identity-box-button,
+#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > .identity-box-button {
+	padding-inline: 6px !important;
+}
+
 /* URL bar and Search bar */
+#urlbar[focused],
+#searchbar:focus-within {
+	outline: none !important;
+	border: none !important;
+	box-shadow: none !important;
+}
+
 #urlbar[focused] .urlbar-textbox-container {
 	margin: -1px !important;
 }
@ -168,17 +184,15 @@ toolbarspring {
 	fill-opacity: 1 !important;
 }

-#identity-box {
-	margin: 3px 2px !important;
-	border-radius: 5px !important;
-}
-
 #notification-popup-box {
 	height: 26px !important;
 	border-radius: 5px !important;
 }

-.urlbar-page-action, #urlbar-go-button, .search-go-button,
+.urlbar-page-action,
+#urlbar-go-button,
+.urlbar-go-button,
+.search-go-button,
 #tracking-protection-icon-container {
 	width: 28px !important;
 	height: 26px !important;
@ -187,10 +201,30 @@ toolbarspring {
 	border-radius: 5px !important;
 }

+#identity-box {
+	margin: 3px 2px !important;
+	border-radius: 5px !important;
+}
+
+#identity-box[pageproxystate="valid"].chromeUI {
+	margin-left: 0 !important;
+}
+
+#tracking-protection-icon-container:hover,
+.urlbar-page-action:hover,
+#urlbar-go-button:hover,
+.urlbar-go-button:hover,
+.search-go-button:hover,
 #identity-box:hover {
 	background: var(--gnome-headerbar-button-hover-background) !important;
 }

+#tracking-protection-icon-container:active,
+#tracking-protection-icon-container[open="true"],
+.urlbar-page-action:active,
+#urlbar-go-button:active,
+.urlbar-go-button:active,
+.search-go-button:active,
 #identity-box:active {
 	background: var(--gnome-headerbar-button-active-background) !important;
 }
--- a/src/other/firefox/Monterey/parts/tabsbar-alt.css
+++ b/src/other/firefox/Monterey/parts/tabsbar-alt.css
@ -7,19 +7,29 @@
 }

 /* Tabs bar height */
-#tabbrowser-tabs,
-#tabbrowser-tabs arrowscrollbox {
-	min-height: 36px !important;
-	--tab-min-height: 36px !important;
+
+#TabsToolbar {
+	min-height: 32px !important;
 }

-.tab-background, .tab-stack {
-	height: 36px !important;
-	min-height: 36px !important;
+#TabsToolbar #tabbrowser-tabs,
+#TabsToolbar #tabbrowser-tabs arrowscrollbox {
+	min-height: 32px !important;
+	--tab-min-height: 32px !important;
 }

-tab > stack {
-	margin: 0 3px !important;
+#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
+	max-height: 32px !important;
+}
+
+#TabsToolbar .tab-background,
+#TabsToolbar .tab-stack {
+	height: 32px !important;
+	min-height: 32px !important;
+}
+
+#TabsToolbar tab > stack {
+	margin: 6px 3px !important;
 }

 :root:not([sizemode="normal"]) .titlebar-spacer[type="pre-tabs"], :root[gtktiledwindow="true"] .titlebar-spacer[type="pre-tabs"] { /* reset */
@ -30,10 +40,15 @@ tab > stack {
 	width: 8px !important;
 }

-.tabbrowser-tab,
 .tab-background {
 	border: none !important;
 	box-shadow: none !important;
+	outline: none !important;
+	transition: background-color 200ms !important;
+}
+
+#TabsToolbar .tabbrowser-tab,
+#TabsToolbar .tab-background {
 	border-radius: 8px !important;
 	padding: 0 !important;
 	background-image: none !important;
@ -43,26 +58,25 @@ tab > stack {
 	color: var(--gnome-tabbar-tab-color) !important;
 }

+#TabsToolbar .tab-background {
+	margin: 0 !important;
+	margin-block: 0 !important;
+}
+
 .tabbrowser-tab .tab-background:not([selected=true]) {
 	color: var(--gnome-tabbar-tab-active-color) !important;
 }

-.tab-background {
-	margin: 0 !important;
-	transition: all 200ms;
-	margin-block: 0 !important;
-}
-
-#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background {
+.tabbrowser-tab:not([selected=true]) .tab-background {
 	background: var(--gnome-tabbar-tab-background) !important;
 }

-#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
+.tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
 	background: var(--gnome-inactive-tabbar-tab-background) !important;
 }

 /* Tab hover */
-#TabsToolbar .tabbrowser-tab:not([selected=true]):hover > .tab-stack > .tab-background {
+.tabbrowser-tab:not([selected=true]):hover > .tab-stack > .tab-background {
 	background: var(--gnome-tabbar-tab-hover-background) !important;
 }

@ -95,54 +109,20 @@ 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 10px !important;
+	padding: 0 8px !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;
@ -192,6 +172,29 @@ tab[selected]:-moz-window-inactive .tab-label {
 	margin-left: 0 !important
 }

+/* Prevent tab icons size breaking */
+.tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
+	min-width: 16px;
+}
+
+.tabbrowser-tab[soundplaying="true"] .tab-icon-image,
+.tabbrowser-tab[muted="true"] .tab-icon-image {
+	margin-top: 3px !important;
+	margin-left: 2px !important;
+}
+
+.tab-icon-overlay {
+	height: 24px !important;
+	width: 24px !important;
+	padding: 4px !important;
+	border-radius: 100px !important;
+}
+
+.tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+	top: 0 !important;
+	inset-inline-end: 0 !important;
+}
+
 /*Align personal bookmarks v89 */
 #personal-bookmarks {
 	-moz-box-align: center !important;
@ -201,11 +204,24 @@ 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;
-	padding: 0 !important;
 	width: 16px !important;
+	padding: 0 !important;
 }

 .tab-close-button {
@ -229,11 +245,6 @@ tab[selected]:-moz-window-inactive .tab-label {
 	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;
 }
@ -261,6 +272,18 @@ tab[selected]:-moz-window-inactive .tab-label {
 	display: none;
 }

+/* tab-context-line above tabs */
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+	height: 2px;
+	border-radius: 2px;
+	margin: 0 12px !important;
+}
+
+/* Remove alt colours references for multi tabs*/
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
+	display: none;
+}
+
 /* Remove tab separators */
 .tabbrowser-tab::after,
 .tabbrowser-tab::before {
@ -287,11 +310,6 @@ tab[selected]:-moz-window-inactive .tab-label {
 	max-width: .1px !important;
 }

-/* Remove alt colours references for multi tabs*/
-.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
-	display: none;
-}
-
 .tabbrowser-tab[class*="identity-color-"][pinned] {
 	display: flex;
 }
@ -302,14 +320,16 @@ tab[selected]:-moz-window-inactive .tab-label {
 }

 #TabsToolbar .toolbarbutton-1,
-#tabs-newtab-button, #TabsToolbar #new-tab-button {
-	margin: 0 2px !important;
+#TabsToolbar #tabs-newtab-button,
+#TabsToolbar #new-tab-button {
+	min-height: 32px !important;
+	margin: 6px 2px !important;
 	padding: 0 10px !important;
 	border-radius: 8px !important;
 }

 #TabsToolbar .toolbarbutton-1 image,
-#tabs-newtab-button image,
+#TabsToolbar #tabs-newtab-button image,
 #TabsToolbar #new-tab-button image {
 	margin: 0 !important;
 	padding: 0 !important;
@ -319,7 +339,7 @@ tab[selected]:-moz-window-inactive .tab-label {

 #TabsToolbar #scrollbutton-up,
 #TabsToolbar #scrollbutton-down {
-	height: 36px !important;
+	height: 32px !important;
 }

 #TabsToolbar #scrollbutton-up image,
@ -336,9 +356,9 @@ tab[selected]:-moz-window-inactive .tab-label {
  toolbarbutton:not(#firefox-view-button),
  toolbarpaletteitem:not(#wrapper-firefox-view-button)
 ) + #tabbrowser-tabs {
-  border-inline-start: none !important;
-  padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
-  margin-inline-start: 0 !important;
+	border-inline-start: none !important;
+	padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
+	margin-inline-start: 0 !important;
 }

 #firefox-view-button {
@ -356,4 +376,5 @@ tab[selected]:-moz-window-inactive .tab-label {

 #firefox-view-button > .toolbarbutton-icon {
 	box-shadow: none !important;
+	outline: none !important;
 }
--- a/src/other/firefox/Monterey/parts/tabsbar.css
+++ b/src/other/firefox/Monterey/parts/tabsbar.css
@ -2,18 +2,36 @@

@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";

-tab > stack {
+:root[tabsintitlebar] #nav-bar toolbaritem,
+#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;
 }
@ -27,21 +45,25 @@ tab > stack {
 }

 .tab-background {
-	margin: 0 !important;
-	background-color: transparent !important;
-	transition: background 200ms !important;
+	background: transparent !important;
+	transition: background-color 200ms !important;
+	outline: none !important;
 }

-#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background {
+#TabsToolbar .tab-background {
+	margin: 0 !important;
+}
+
+.tabbrowser-tab:not([selected=true]) .tab-background {
 	background: var(--gnome-tabbar-tab-background) !important;
 }

-#TabsToolbar .tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
+.tabbrowser-tab:not([selected=true]) .tab-background:-moz-window-inactive {
 	background: var(--gnome-inactive-tabbar-tab-background) !important;
 }

 /* Tab hover */
-#TabsToolbar .tabbrowser-tab:not([selected=true]):hover .tab-background {
+.tabbrowser-tab:not([selected=true]):hover .tab-background {
 	background: var(--gnome-tabbar-tab-hover-background) !important;
 }

@ -97,12 +119,6 @@ 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;
 }
@ -143,15 +159,15 @@ tab[selected]:-moz-window-inactive .tab-label {
 	inset-inline-end: 0 !important;
 }

-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
-	background-color: var(--gnome-tabbar-tab-background) !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([pinned], [sharing]) {
-	background-color: var(--gnome-tabbar-tab-active-background) !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([pinned], [sharing]):hover {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
 }

@ -160,6 +176,18 @@ tab[selected]:-moz-window-inactive .tab-label {
 	display: none;
 }

+/* tab-context-line above tabs */
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+	height: 2px;
+	border-radius: 2px;
+	margin: 0 12px !important;
+}
+
+/* Remove alt colours references for multi tabs*/
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
+	display: none;
+}
+
 /* Tab attention dot */
 .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]), #firefox-view-button[attention] {
 	background-image: radial-gradient(circle, var(--gnome-tab-attention-icon-color), var(--gnome-tab-attention-icon-color) 2px, transparent 2px) !important;
@ -222,6 +250,7 @@ tab[selected]:-moz-window-inactive .tab-label {
 #firefox-view-button > .toolbarbutton-icon {
 	filter: none !important;
 	box-shadow: none !important;
+	outline: none !important;
 }

 /* Remove shadow next to tab scroll buttons */
--- a/src/other/firefox/Monterey/parts/toolbox-alt.css
+++ b/src/other/firefox/Monterey/parts/toolbox-alt.css
@ -14,36 +14,24 @@
 #TabsToolbar,
 #navigator-toolbox,
 .notificationbox-stack {
-	border: none !important;
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
+	transition: none !important;
 }

-#TabsToolbar {
+#navigator-toolbox {
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }

-findbar {
-	border: 0 !important;
-	background: var(--gnome-findbar-background) !important;
-	border-top: 1px solid var(--gnome-toolbar-border-color) !important;
-}
-
 #nav-bar:-moz-window-inactive,
+#titlebar:-moz-window-inactive,
 #PersonalToolbar:-moz-window-inactive,
 #toolbar-menubar:-moz-window-inactive,
 #TabsToolbar:-moz-window-inactive,
-#navigator-toolbox:-moz-window-inactive,
-findbar:-moz-window-inactive {
+#navigator-toolbox:-moz-window-inactive {
 	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);
@ -62,7 +50,7 @@ findbar:-moz-window-inactive {
 }

 /* allow to drag headerbar empty space */
-:root[tabsintitlebar] #nav-bar .chromeclass-location {
+#nav-bar .chromeclass-location {
 	-moz-window-dragging: drag !important;
 }

@ -90,20 +78,6 @@ findbar:-moz-window-inactive {
 #navigator-toolbox #TabsToolbar {
 	-moz-box-ordinal-group: 100;
 	order: 100;
-	padding-bottom: 6px !important;
-}
-
-/* Sidebar */
-#sidebar-box, #sidebar,
-.sidebar-panel[lwt-sidebar] {
-	color: var(--gnome-toolbar-color) !important;
-	background: var(--gnome-toolbar-background) !important;
-}
-
-.sidebar-splitter {
-	width: 1px !important;
-	background-color: var(--gnome-toolbar-border-color) !important;
-	border: none !important;
 }

 /* Customization page */
@ -119,9 +93,10 @@ findbar:-moz-window-inactive {
 }

 #PersonalToolbar {
-	padding: 0 3px 3px !important;
-	height: 32px !important;
-	max-height: 32px !important;
+	height: 28px !important;
+	max-height: 28px !important;
+	padding: 0 2px !important;
+	--bookmarks-toolbar-overlapping-browser-height: auto;
 }

 /* bookmark-item */
--- a/src/other/firefox/Monterey/parts/toolbox.css
+++ b/src/other/firefox/Monterey/parts/toolbox.css
@ -10,33 +10,19 @@
 #nav-bar, #PersonalToolbar, #toolbar-menubar, #titlebar {
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
-	border: none !important;
 }

-#PersonalToolbar {
+#navigator-toolbox {
 	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }

-findbar {
-	border: none !important;
-	background: var(--gnome-findbar-background) !important;
-	border-top: 1px solid var(--gnome-toolbar-border-color) !important;
-}
-
 #nav-bar:-moz-window-inactive,
 #PersonalToolbar:-moz-window-inactive,
 #toolbar-menubar:-moz-window-inactive,
-findbar:-moz-window-inactive,
 #titlebar:-moz-window-inactive {
 	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);
@ -47,6 +33,10 @@ findbar:-moz-window-inactive,
 	max-height: 42px !important;
 }

+.titlebar-spacer[type="pre-tabs"], .titlebar-spacer[type="post-tabs"] {
+	width: 0 !important;
+}
+
 #TabsToolbar {
 	margin-top: -40px !important;
 	margin-bottom: 8px !important;
@ -61,7 +51,7 @@ findbar:-moz-window-inactive,
 }

 /* allow to drag headerbar empty space */
-:root[tabsintitlebar] #nav-bar .chromeclass-location {
+#nav-bar .chromeclass-location {
 	-moz-window-dragging: drag !important;
 }

@ -91,22 +81,10 @@ findbar:-moz-window-inactive,
 }

 #PersonalToolbar {
-	padding: 0 3px 3px !important;
-	height: 32px !important;
-	max-height: 32px !important;
-}
-
-/* Sidebar */
-#sidebar-box, #sidebar,
-.sidebar-panel[lwt-sidebar] {
-	color: var(--gnome-toolbar-color) !important;
-	background: var(--gnome-toolbar-background) !important;
-}
-
-.sidebar-splitter {
-	width: 1px !important;
-	background-color: var(--gnome-toolbar-border-color) !important;
-	border: none !important;
+	height: 28px !important;
+	max-height: 28px !important;
+	padding: 0 2px !important;
+	--bookmarks-toolbar-overlapping-browser-height: auto;
 }

 /* Customization page */
--- a/src/other/firefox/Monterey/right_header_button_3.css
+++ b/src/other/firefox/Monterey/right_header_button_3.css
@ -1,10 +1,10 @@
-#TabsToolbar {
-	margin-right: 14vw !important;
+#TabsToolbar, #urlbar-container {
+	margin-right: 16vw !important;
 }

 /* Left window titlebuttons mode */
@media (-moz-gtk-csd-reversed-placement) {
-	#TabsToolbar {
-		margin-right: 10vw !important;
+	#TabsToolbar, #urlbar-container {
+		margin-right: 12vw !important;
 	}
 }
--- a/src/other/firefox/Monterey/right_header_button_4.css
+++ b/src/other/firefox/Monterey/right_header_button_4.css
@ -1,10 +1,10 @@
-#TabsToolbar {
-	margin-right: 16vw !important;
+#TabsToolbar, #urlbar-container {
+	margin-right: 18vw !important;
 }

 /* Left window titlebuttons mode */
@media (-moz-gtk-csd-reversed-placement) {
-	#TabsToolbar {
-		margin-right: 12vw !important;
+	#TabsToolbar, #urlbar-container {
+		margin-right: 14vw !important;
 	}
 }
--- a/src/other/firefox/Monterey/right_header_button_5.css
+++ b/src/other/firefox/Monterey/right_header_button_5.css
@ -1,10 +1,10 @@
-#TabsToolbar {
-	margin-right: 18vw !important;
+#TabsToolbar, #urlbar-container {
+	margin-right: 20vw !important;
 }

 /* Left window titlebuttons mode */
@media (-moz-gtk-csd-reversed-placement) {
-	#TabsToolbar {
-		margin-right: 14vw !important;
+	#TabsToolbar, #urlbar-container {
+		margin-right: 16vw !important;
 	}
 }
--- a/src/other/firefox/Monterey/theme-adaptive.css
+++ b/src/other/firefox/Monterey/theme-adaptive.css
@ -0,0 +1,37 @@
+@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-adaptive.css";
+@import "colors/dark-adaptive.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;
+}
--- a/src/other/firefox/Monterey/theme-alt-adaptive.css
+++ b/src/other/firefox/Monterey/theme-alt-adaptive.css
@ -0,0 +1,37 @@
+@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-adaptive.css";
+@import "colors/dark-adaptive.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;
+}
--- a/src/other/firefox/Monterey/theme-alt-darker.css
+++ b/src/other/firefox/Monterey/theme-alt-darker.css
@ -0,0 +1,37 @@
+@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;
+}
--- a/src/other/firefox/Monterey/theme-alt.css
+++ b/src/other/firefox/Monterey/theme-alt.css
@ -11,11 +11,12 @@
@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/custom-icons.css";
@import "parts/icons.css";
@import "colors/light.css";
@import "colors/dark.css";
@ -32,4 +33,5 @@
 #customization-container {
 	background-color: var(--gnome-browser-before-load-background) !important;
 	color: var(--gnome-toolbar-color) !important;
+	background-image: none !important;
 }
--- a/src/other/firefox/Monterey/theme-darker.css
+++ b/src/other/firefox/Monterey/theme-darker.css
@ -0,0 +1,37 @@
+@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;
+}
--- a/src/other/firefox/Monterey/theme.css
+++ b/src/other/firefox/Monterey/theme.css
@ -11,11 +11,12 @@
@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/custom-icons.css";
@import "parts/icons.css";
@import "colors/light.css";
@import "colors/dark.css";
@ -32,4 +33,5 @@
 #customization-container {
 	background-color: var(--gnome-browser-before-load-background) !important;
 	color: var(--gnome-toolbar-color) !important;
+	background-image: none !important;
 }
--- a/src/other/firefox/README.md
+++ b/src/other/firefox/README.md
@ -10,16 +10,21 @@ Based on https://github.com/rafaelmardojai/firefox-gnome-theme

 ## Installation

-Run `./tweaks.sh -f`
+Run: `./tweaks.sh -f`

 if you want to use `Monterey` style then:

-Run `./tweaks.sh -f monterey`
+Run: `./tweaks.sh -f monterey`

 ### Tips about monterey options (Fix the urlbar attached tabs issue)

 1. Remove all space separators on left of urlbar
-2. Make sure how many buttons you put on side of urlbar an then run `./tweaks.sh -f monterey -e`
+2. Make sure how many buttons on side of urlbar, a: left side buttons number(3-5), b: right side buttons number(3-5).
+3. then run: `./tweaks.sh -f monterey a+b` for example: `./tweaks.sh -f monterey 5+5`
+
+or you can edit the config file
+
+1. run: `./tweaks.sh -f monterey -e`

 ```
 /*--------------Configure your Monterey theme--------------
@ -39,7 +44,15 @@ Run `./tweaks.sh -f monterey`

 ```

-3. Choose the right buttons number config then remove `/*` to enable it and add `/*` to disable the default one
+2. Choose the right buttons number config then remove `/*` to enable it and add `/*` to disable the default one
+
+### Adaptive version support now!
+
+https://github.com/user-attachments/assets/9b99297f-e6b3-4aa0-812a-331cddb517ce
+
+Run: `./tweaks.sh -f adaptive` to install it
+
+You need install adaptive-tab-bar-colour plugin first. https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/

 ### Manual installation

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

 	/* Sidebar */
+	--sidebar-background-color: #323232 !important;
 	--gnome-sidebar-background: #3b3b3b;
 	--gnome-inactive-sidebar-background: #3f3f3f;
+	--gnome-sidebar-border-color: color-mix(in srgb, #000000 75%, var(--gnome-sidebar-background));

 	/* Popups */
 	--gnome-menu-background: rgba(51, 51, 51, 0.95);
-	--gnome-menu-border-color: #070707;
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.75);
 	--gnome-popover-background: rgba(51, 51, 51, 0.95);
-	--gnome-popover-border-color: #070707;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.75);
+	--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);
@ -47,45 +54,46 @@

 	/* Buttons */
 	--gnome-button-background: linear-gradient(to top, #636363 0%, #696969 100%);
-	--gnome-button-border-color: #282828;
-	--gnome-button-border-accent-color: #282828;
+	--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, #707070 0%, #737373 100%);
-	--gnome-button-active-background: linear-gradient(to top, #464646 0%, #525252 100%);
-	--gnome-button-active-border-color: #1b1b1b;
-	--gnome-button-active-border-accent-color: #1b1b1b;
+	--gnome-button-active-background: linear-gradient(to top, #808080 0%, #858585 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, #434343 0%, #494949 100%);
-	--gnome-button-disabled-border-color: #282828;
+	--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(#383838, #383838);
-	--gnome-inactive-button-border-color: #323232;
+	--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: #0f3b71;
-	--gnome-button-suggested-action-border-accent-color: #092444;;
+	--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: #103e75;
-	--gnome-button-suggested-action-active-border-color: #0f3b71;
+	--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: #851015;
-	--gnome-button-destructive-action-border-accent-color: #570b0e;
+	--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: #8a1116;
-	--gnome-button-destructive-action-active-border-color: #851015;
+	--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: #464646;
-	--gnome-urlbar-border-color: #282828;
+	--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;
@ -99,18 +107,20 @@

 	/* Tabs */
 	--gnome-tabbar-tab-background: #262626;
-	--gnome-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-tabbar-tab-color: #909090;
+	--gnome-tabbar-tab-border-color: #070707;
 	--gnome-tabbar-tab-hover-background: #2b2b2b;
-	--gnome-tabbar-tab-hover-border-bottom-color: #1b1b1b;
-	--gnome-tabbar-tab-hover-color: rgb(200, 200, 200);
+	--gnome-tabbar-tab-hover-border-color: #070707;
+	--gnome-tabbar-tab-hover-color: #c8c8c8;
 	--gnome-tabbar-tab-active-background: #373737;
-	--gnome-tabbar-tab-active-border-bottom-color: #15539e;
+	--gnome-tabbar-tab-active-border-color: #070707;
 	--gnome-tabbar-tab-active-color: #ffffff;
 	--gnome-tabbar-tab-active-hover-background: #313131;
-	--gnome-inactive-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-inactive-tabbar-tab-color: #686868;
+	--gnome-inactive-tabbar-tab-background: #202020;
 	--gnome-inactive-tabbar-tab-active-background: #313131;
-	--gnome-inactive-tabbar-tab-active-border-bottom-color: var(--gnome-tabbar-tab-active-border-bottom-color);
-	--gnome-inactive-tabbar-tab-active-color: var(--gnome-inactive-tabbar-tab-color);
+	--gnome-inactive-tabbar-tab-active-border-color: var(--gnome-tabbar-tab-active-border-bottom-color);
+	--gnome-inactive-tabbar-tab-active-color: #898989;
 	--gnome-tab-attention-icon-color: #718be8;

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

 	/* Sidebar */
 	--gnome-sidebar-background: #f5f5f5;
 	--gnome-inactive-sidebar-background: #f9f9f8;
+	--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: #cdc7c2;
+	--gnome-menu-border-color: rgba(0, 0, 0, 0.12);
 	--gnome-popover-background: rgba(255, 255, 255, 0.95);
-	--gnome-popover-border-color: #cdc7c2;
-	--gnome-popover-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.12);
+	--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: #ffffff;
-	--gnome-headerbar-border-color: #bdb7b0;
+	--gnome-headerbar-border-color: #cfcfcf;
 	--gnome-headerbar-box-shadow: 0 1px rgba(255, 255, 255, 0.65) inset;
 	--gnome-inactive-headerbar-background: #f5f5f5;
 	--gnome-inactive-headerbar-border-color: #dadada;
@ -46,38 +52,40 @@

 	/* Buttons */
 	--gnome-button-background: linear-gradient(to top, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
-	--gnome-button-border-color: #cdc7c2;
-	--gnome-button-border-accent-color: #b2b2b1;
+	--gnome-button-border-color: #cfcfcf;
+	--gnome-button-border-bottom-color: #cfcfcf;
 	--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, #fdfdfd 0%, #ffffff 100%);
 	--gnome-button-active-background: #cfcfcf;
 	--gnome-button-active-border-color: #b2b2b1;
+	--gnome-button-active-border-bottom-color: #b2b2b1;
 	--gnome-button-active-box-shadow: 0 1px rgba(255, 255, 255, 0) inset;
 	--gnome-button-disabled-background: #faf9f8;
-	--gnome-button-disabled-border-color: #cdc7c2;
+	--gnome-button-disabled-border-color: #cfcfcf;
 	--gnome-button-disabled-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
 	--gnome-inactive-button-background: #f6f5f4;
 	--gnome-inactive-button-border-color: #dadada;
 	--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-accent-color: #15539e;
+	--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: #1961b9;
+	--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-accent-color: #851015;
+	--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: #a0131a;
+	--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);

@ -96,18 +104,20 @@
 	--gnome-private-urlbar-background: #e6c2ff;

 	/* Tabs */
-	--gnome-tabbar-tab-background: #E5E5E5;
+	--gnome-tabbar-tab-background: #e5e5e5;
 	--gnome-tabbar-tab-color: rgb(141, 144, 145);
+	--gnome-tabbar-tab-border-color: #cfcfcf;
 	--gnome-tabbar-tab-hover-background: #d5d5d5;
-	--gnome-tabbar-tab-hover-border-bottom-color: #b6b6b3;
+	--gnome-tabbar-tab-hover-border-color: #cfcfcf;
 	--gnome-tabbar-tab-hover-color: rgb(93, 98, 99);
 	--gnome-tabbar-tab-active-background: #ffffff;
-	--gnome-tabbar-tab-active-border-bottom-color: #4a90d9;
+	--gnome-tabbar-tab-active-border-color: #cfcfcf;
 	--gnome-tabbar-tab-active-color: rgb(46, 52, 54);
 	--gnome-tabbar-tab-active-hover-background: #f5f5f5;
 	--gnome-inactive-tabbar-tab-color: #8b8e8f;
+	--gnome-inactive-tabbar-tab-background: #dfdfdf;
 	--gnome-inactive-tabbar-tab-active-background: #f5f5f5;
-	--gnome-inactive-tabbar-tab-active-border-bottom-color: var(--gnome-tabbar-tab-active-border-bottom-color);
+	--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;

--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@ -2,13 +2,6 @@

@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";

-#urlbar {
-	--urlbar-height: 32px !important;
-	--urlbar-container-height: 32px !important;
-	--urlbar-toolbar-height: 32px !important;
-	--urlbar-inner-padding: 0 !important;
-}
-
 /* Center the URL bar */
 toolbarspring {
 	max-width: 10000px !important;
@ -16,32 +9,45 @@ toolbarspring {

 /* URL bar */
 #urlbar {
+	--urlbar-height: 32px !important;
+	--urlbar-container-height: 32px !important;
+	--urlbar-toolbar-height: 32px !important;
+	--urlbar-inner-padding: 0 !important;
 	box-shadow: none !important;
+	border: none !important;
+	padding: 0 !important;
+	padding-block: 0 !important;
+	padding-inline: 0 !important;
 }

 #urlbar-background {
 	box-shadow: none !important;
-	border: 0 !important;
+	border: none !important;
 	background: transparent !important;
 	border-radius: 8px !important;
 	padding: 0 !important;
 }

+#urlbar-input-container,
+.urlbar-input-container {
+	border: none !important;
+	padding: 0 3px !important;
+	background: none !important;
+}
+
 #urlbar:-moz-window-inactive {
 	border-color: var(--gnome-inactive-headerbar-background) !important;
 }

-#urlbar #urlbar-input-container {
-	padding: 0 !important;
-}
-
 #urlbar[breakout][breakout-extend] {
-	left: 0 !important;
-	top: 0 !important;
-	width: 100% !important;
+	width: var(--urlbar-width) !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] {
@ -49,10 +55,10 @@ toolbarspring {
 	max-height: unset !important;
 }

-#urlbar[breakout][breakout-extend] #urlbar-input-container {
+#urlbar[breakout][breakout-extend] #urlbar-input-container,
+#urlbar[breakout][breakout-extend] > .urlbar-input-container {
 	height: 32px !important;
 	max-height: 32px !important;
-	padding: 0 !important;
 }

 #urlbar-input {
@ -90,7 +96,7 @@ toolbarspring {
 	border: 0 !important;
 }

-.urlbarView-row-inner, .urlbarView-no-wrap  {
+.urlbarView-row-inner, .urlbarView-no-wrap {
 	align-items: center !important;
 }

@ -113,14 +119,14 @@ toolbarspring {
 }

 .searchbar-engine-one-off-item {
-	--toolbarbutton-active-background: transparent !important;
-	--toolbarbutton-hover-background: transparent !important;
+	--toolbarbutton-active-background: var(--gnome-button-hover-background) !important;
+	--toolbarbutton-hover-background: var(--gnome-button-active-background) !important;
 	-moz-appearance: none !important;
-	background: var(--gnome-button-background) !important;
+	background-image: var(--gnome-button-background) !important;
 	box-shadow: var(--gnome-button-box-shadow) !important;
 	border: 1px solid var(--gnome-button-border-color) !important;
 	border-left-width: 0 !important;
-	border-bottom-color: var(--gnome-button-border-accent-color) !important;
+	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
 	padding: 0 2px !important;
 	min-height: 34px !important;
 	min-width: 34px !important;
@ -129,7 +135,7 @@ toolbarspring {
 }

 .searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] {
-	background: var(--gnome-button-hover-background) !important;
+	background-image: var(--gnome-button-hover-background) !important;
 	color: unset !important;
 }

@ -137,6 +143,7 @@ toolbarspring {
 	border-radius: 5px 0 0 5px !important;
 	border-left-width: 1px !important;
 }
+
 .searchbar-engine-one-off-item.last-engine, .searchbar-engine-one-off-item:not(.search-setting-button):last-child {
 	border-radius: 0 5px 5px 0 !important;
 }
@ -144,11 +151,16 @@ toolbarspring {
 #urlbar-anon-search-settings-compact,
 .search-setting-button {
 	border-left-width: 1px !important;
-	border-bottom: 1px solid var(--gnome-button-border-accent-color) !important;
+	border-bottom: 1px solid var(--gnome-button-border-bottom-color) !important;
 	border-radius: 5px !important;
 	margin-left: 6px !important;
 }

+#identity-box[pageproxystate="invalid"] > .identity-box-button,
+#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > .identity-box-button {
+	padding-inline: 6px !important;
+}
+
 /* URL bar and Search bar */
 #urlbar[focused] .urlbar-textbox-container {
 	margin: -1px !important;
@ -174,11 +186,6 @@ toolbarspring {
 	fill-opacity: 1 !important;
 }

-#identity-box {
-	margin: 3px 2px !important;
-	border-radius: 5px !important;
-}
-
 #notification-popup-box {
 	height: 26px !important;
 	width: 28px !important;
@ -190,7 +197,10 @@ toolbarspring {
 	padding: 0 !important;
 }

-.urlbar-page-action, #urlbar-go-button, .search-go-button,
+.urlbar-page-action,
+#urlbar-go-button,
+.urlbar-go-button,
+.search-go-button,
 #tracking-protection-icon-container {
 	width: 28px !important;
 	height: 26px !important;
@ -199,14 +209,34 @@ toolbarspring {
 	border-radius: 5px !important;
 }

-#star-button-box.urlbar-page-action {
+.urlbar-page-action {
 	padding: 5px 6px !important;
 }

+#identity-box {
+	margin: 3px 2px !important;
+	border-radius: 5px !important;
+}
+
+#identity-box[pageproxystate="valid"].chromeUI {
+	margin-left: 0 !important;
+}
+
+#tracking-protection-icon-container:hover,
+.urlbar-page-action:hover,
+#urlbar-go-button:hover,
+.urlbar-go-button:hover,
+.search-go-button:hover,
 #identity-box:hover {
 	background: var(--gnome-headerbar-button-hover-background) !important;
 }

+#tracking-protection-icon-container:active,
+#tracking-protection-icon-container[open="true"],
+.urlbar-page-action:active,
+#urlbar-go-button:active,
+.urlbar-go-button:active,
+.search-go-button:active,
 #identity-box:active {
 	background: var(--gnome-headerbar-button-active-background) !important;
 }
--- a/src/other/firefox/WhiteSur/parts/tabsbar-adaptive.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar-adaptive.css
@ -0,0 +1,466 @@
+/* Tabs bar  */
+
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+:root {
+	--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 {
+	--tab-min-height: 32px !important;
+}
+
+#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
+	max-height: 32px !important;
+}
+
+.tab-background, .tab-stack {
+	min-height: 32px !important;
+}
+
+.toolbar-items {
+	margin-bottom: -1px !important;
+}
+
+/* New hover effect */
+toolbarbutton {
+	fill-opacity: .6 !important;
+}
+toolbarbutton:not([disabled]):hover,
+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-toolbar-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;
+}
+
+/* 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;
+}
+
+/* centre text when audio is playing */
+.tabbrowser-tab:is([soundplaying]) .tab-label-container {
+	margin-left: 0 !important;
+	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;
+	padding: 0 !important;
+	width: 16px !important;
+}
+
+.tab-close-button {
+	-moz-appearance: none !important;
+	margin-inline-end: 0 !important;
+	border: none !important;
+	box-sizing: content-box; /* Avoid deformation on flexbox */
+	border-radius: 3px !important;
+	list-style-image: url("../icons/window-close-symbolic.svg") !important;
+	height: 16px;
+	opacity: .3;
+	padding: 0;
+	width: 16px;
+}
+
+.tabbrowser-tab > .tab-stack > .tab-content > .tab-close-button {
+	visibility: hidden;
+}
+
+.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;
+}
+:root:not(:-moz-window-inactive) .tab-close-button:hover {
+	background-color: var(--gnome-button-hover-color) !important;
+	border: none !important;
+	opacity: 1;
+}
+:root:not(:-moz-window-inactive) .tab-close-button:active {
+	background-color: var(--gnome-button-active-color) !important;
+}
+
+.tab-close-button:active:not(:hover) {
+	background-image: none !important;
+	box-shadow: none !important;
+}
+
+/* Tab close button etc. positioning */
+.tab-throbber, .tab-icon-image, .tab-sharing-icon-overlay, .tab-icon-sound, .tab-close-button {
+	margin-top: 0 !important;
+}
+
+.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:not(:hover) .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+	display: none !important;
+}
+
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+	background-color: var(--gnome-tabbar-tab-background) !important;
+}
+
+.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
+	background-color: var(--gnome-tabbar-tab-active-background) !important;
+}
+
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]):hover {
+	background-color: var(--gnome-tabbar-tab-hover-background) !important;
+}
+
+/* Remove blue line above tabs */
+.tab-line {
+	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;
+	background-position: center bottom 3px !important;
+	background-size: 4px 4px;
+	background-repeat: no-repeat;
+}
+
+.tabbrowser-tab[class*="identity-color-"][pinned] {
+	display: flex;
+}
+
+/* firefox-view-button */
+:root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
+:root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
+  toolbarbutton:not(#firefox-view-button),
+  toolbarpaletteitem:not(#wrapper-firefox-view-button)
+) + #tabbrowser-tabs {
+	border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important;
+	padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
+	margin-inline-start: 0 !important;
+}
+
+#TabsToolbar #firefox-view-button {
+	border-radius: 0 !important;
+	padding: 0 4px !important;
+}
+
+#firefox-view-button > .toolbarbutton-icon {
+	box-shadow: none !important;
+	outline: none !important;
+}
+
+#TabsToolbar #firefox-view-button[open] {
+	background-color: var(--gnome-tabbar-tab-active-background) !important;
+	box-shadow: inset 0 -1px var(--gnome-toolbar-border-color) !important;
+}
+
+#TabsToolbar #firefox-view-button[open]:-moz-window-inactive {
+	background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
+}
+
+/* fix pip on small displays */
+.tab-icon-overlay[pictureinpicture] {
+	top: 3px !important;
+	inset-inline-end: 13px !important;
+	z-index: 1 !important;
+	max-width: 10px;
+	max-height: 10px;
+}
+
+/* fix spacing on too many tabs */
+.tab-icon-overlay:not([pinned], [sharing]),
+[pictureinpicture] {
+	margin-inline-end: 4px !important;
+	margin-inline-start: 4px !important;
+}
--- a/src/other/firefox/WhiteSur/parts/tabsbar.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar.css
@ -6,78 +6,280 @@
 	--space-above-tabbar: 0 !important;
 }

-#TabsToolbar:not([inFullscreen]) > .toolbar-items {
-	margin-bottom: -1px !important;
-}
-
-/* Tabs bar height */
-#tabbrowser-tabs {
-	--tab-min-height: 32px !important;
-}
-
-#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
-	max-height: 32px !important;
-}
-
-#TabsToolbar .toolbar-items {
-	margin-bottom: -1px !important;
-}
-
-:root[tabsintitlebar][inFullscreen] #TabsToolbar .toolbar-items {
-	margin-bottom: 0 !important;
-}
-
-/* Remove hover effects on tab bar buttons */
 #TabsToolbar {
+	/* Remove hover effects on tab bar buttons */
 	--toolbarbutton-active-background: transparent !important;
 	--toolbarbutton-hover-background: transparent !important;
 	padding: 0 !important;
 	box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 1px 3px rgba(0, 0, 0, 0.08) !important;
+
+	/* New hover effect */
+	toolbarbutton {
+		fill-opacity: .6 !important;
+	}
+	toolbarbutton:not([disabled]):hover,
+	toolbarbutton[open=true] {
+		fill-opacity: 1 !important;
+	}
+	/* Tabs bar height */
+	#tabbrowser-tabs {
+		--tab-min-height: 32px !important;
+		--tabstrip-min-height: 32px !important;
+	}
+
+	.tab-background, .tab-stack {
+		min-height: 32px !important;
+	}
+
+	#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
+		max-height: 32px !important;
+	}
+
+	.toolbar-items {
+		margin-bottom: -1px !important;
+	}
+
+	/* Remove shadow next to tab scroll buttons */
+	.arrowscrollbox-overflow-start-indicator,
+	.arrowscrollbox-overflow-end-indicator {
+		display: none;
+	}
+
+	/* Remove tab separators */
+	.tabbrowser-tab::after,
+	.tabbrowser-tab::before {
+		border-color: transparent !important;
+		border-image: none !important;
+	}
+
+	/* Tabs separators */
+	.tabbrowser-tab {
+		border-left: 1px solid transparent !important;
+	}
+
+	.tabbrowser-tab + .tabbrowser-tab:not([selected], :hover) {
+		border-color: var(--gnome-tabbar-tab-border-color) !important;
+	}
+
+	.tabbrowser-tab[selected] + .tabbrowser-tab,
+	.tabbrowser-tab:hover + .tabbrowser-tab {
+		border-color: transparent !important;
+	}
+
+	.tabbrowser-tab:first-of-type {
+		border-left: none !important;
+	}
+
+	/* Space between tabs */
+	.tabbrowser-tab:not([pinned]) {
+		margin: 0 !important;
+	}
+
+	/* Center all inside tab */
+	.tab-content {
+		display: flex;
+		flex-direction: row;
+		justify-content: center !important;
+		align-items: center !important;
+		min-width: 44px !important;
+		min-height: 32px !important;
+		padding: 0 8px !important;
+	}
+
+	/* Fix custom info tab icon */
+	.tabbrowser-tab[image="chrome://global/skin/icons/info.svg"]:not([pinned]):not([busy]):not([progress]) .tab-icon-stack::before {
+		margin-inline-end: 5.5px;
+	}
+
+	/* Prevent tab icons size breaking */
+	.tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
+		min-width: 16px;
+	}
+
+	/* Center tab text */
+	.tab-label {
+		margin-inline: 0 !important;
+	}
+
+	/* Adjust tab label width */
+	.tab-label-container {
+		min-width: 0 !important;
+	}
+
+	.tabbrowser-tab:not([pinned]) .tab-label-container {
+		max-width: min-content !important;
+	}
+
+	.tabbrowser-tab[pinned] .tab-label-container {
+		display: none !important;
+	}
+
+	.tab-throbber:not([pinned]), .tab-icon-pending:not([pinned]), .tab-icon-image:not([pinned]), .tab-sharing-icon-overlay:not([pinned]), .tab-icon-overlay:not([pinned]) {
+		margin-inline-end: 0 !important;
+	}
+
+	.tabbrowser-tab:not([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-icon-stack {
+		padding: 6px;
+	}
+
+	/* Hide secondary label about muting */
+	.tabbrowser-tab:is([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-secondary-label {
+		display: none;
+	}
+
+	/* Put tab close button and icon sound to the right */
+	.tab-icon-sound[soundplaying="true"], .tab-icon-sound[muted="true"],
+	.tab-icon-sound[activemedia-blocked="true"] {
+		margin-left: auto !important;
+	}
+	/*.tabbrowser-tab:not([soundplaying]):not([muted]):not([activemedia-blocked]) .tab-close-button {*/
+	/*	margin-left: auto !important;*/
+	/*}*/
+	.tab-icon-sound {
+		margin-right: 6px;
+	}
+
+	/* Force tab favicon to the center */
+	.tab-throbber, .tab-throbber-fallback,
+	.tabbrowser-tab:not([busy]):not([muted="true"]) .tab-icon-image,
+	.tabbrowser-tab .tab-icon-stack {
+		margin-left: auto !important;
+	}
+
+	.tabbrowser-tab:is([pinned]) .tab-icon-stack {
+		margin-left: 0 !important;
+	}
+
+	.tabbrowser-tab:not([busy]):not([muted="true"]) .tab-icon-stack .tab-icon-image {
+		margin: auto !important;
+	}
+
+	/* If tab favicon is not present, force tab label to the center */
+	.tabbrowser-tab .tab-label-container {
+		margin-left: 0 !important;
+		margin-right: auto !important;
+	}
+
+	.tabbrowser-tab:not([image]):not([busy]):not([progress]) .tab-label-container {
+		margin-left: auto !important;
+	}
+
+	/* Fix website with no favicon centred text */
+	.tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]) .tab-icon-stack {
+		margin-left: 0 !important
+	}
+
+	.tabbrowser-tab:not([image], [busy]) .tab-icon-stack {
+		margin-left: 0 !important
+	}
+
+	/*Align personal bookmarks v89 */
+	#personal-bookmarks {
+		-moz-box-align: center !important;
+	}
+
+	/* fix misc spacing between tabs */
+	.tabbrowser-tab {
+		padding-inline: 0 !important;
+		padding: 0 !important;
+	}
+
+	.tabbrowser-tab[selected="true"] > .tab-stack > .tab-background {
+		margin-left: 0px !important;
+		margin-right: 0px !important;
+	}
+
+	/* centre text when audio is playing */
+	.tabbrowser-tab:is([soundplaying]) .tab-label-container {
+		margin-left: 0 !important;
+		margin-right: auto !important
+	}
+
+	/* Tabs */
+	.tab-background {
+		transition: background-color 200ms;
+		border-radius: 0 !important;
+		margin-block: 0 !important;
+		outline: none !important;
+	}
+
+	/* Tab hover */
+	.tabbrowser-tab:not([selected=true]):hover .tab-background {
+		background-color: var(--gnome-tabbar-tab-hover-background) !important;
+		border-image: none !important;
+		box-shadow: inset 0 1px var(--gnome-tabbar-tab-hover-border-color), inset 0 -1px var(--gnome-tabbar-tab-hover-border-color) !important;
+	}
+
+	/* Active tab */
+	.tab-background:is([selected]) {
+		background-color: var(--gnome-tabbar-tab-active-background) !important;
+		background-image: none !important;
+		border: none !important;
+		border-image: none !important;
+		transition: none !important;
+		margin-left: -1px !important;
+		margin-right: -1px !important;
+		border-radius: 0 !important;
+		box-shadow: 1px 0 var(--gnome-tabbar-tab-active-border-color), 1px 0 3px rgba(0, 0, 0, 0.08),
+		            -1px 0 var(--gnome-tabbar-tab-active-border-color), -1px 0 3px rgba(0, 0, 0, 0.08),
+		            inset 0 -1px var(--gnome-tabbar-tab-active-border-color) !important;
+	}
+
+	.tab-background:is([selected]):-moz-window-inactive {
+		background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
+		border-image: none !important;
+	}
+
+	/* Tabs scroll buttons */
+	#scrollbutton-up:not([disabled]):hover,
+	#scrollbutton-down:not([disabled]):hover {
+		background: var(--gnome-tabbar-tab-active-hover-background) !important;
+	}
+
+	/* Full width tabs */
+	.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
+	.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
+		max-width: 100% !important;
+	}
+
+	.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]),
+	.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) {
+		max-width: .1px !important;
+	}
+
+	/* Remove blank spaces on tabs start and end */
+	.titlebar-spacer {
+		display: none !important;
+	}
+
+	/* TabsToolbar buttons */
+	.toolbarbutton-1 {
+		margin: 0 !important;
+		border-radius: 0 !important;
+		min-width: 32px !important;
+		min-height: 32px !important;
+		padding: 0 !important;
+		border: none !important;
+	}
+
+	.toolbarbutton-1 > .toolbarbutton-icon,
+	.toolbarbutton-1 > .toolbarbutton-text,
+	.toolbarbutton-1 > .toolbarbutton-badge-stack {
+		padding: 8px !important;
+	}
+
+	.toolbarbutton-1 > .toolbarbutton-icon {
+		width: 32px !important;
+		height: 32px !important;
+	}
+
+	#alltabs-button {
+		display: none !important;
+	}
 }

-/* New hover effect */
-#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-toolbar-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;
+:root[tabsintitlebar][inFullscreen] #TabsToolbar .toolbar-items {
+	margin-bottom: 0 !important;
 }

 /* Tab labels */
@ -97,129 +299,6 @@ tab[selected]:-moz-window-inactive {
 	color: var(--gnome-inactive-tabbar-tab-active-color) !important;
 }

-/* Center all inside tab */
-.tab-content {
-	display: flex;
-	flex-direction: row;
-	justify-content: center !important;
-	align-items: center !important;
-	min-width: 44px !important;
-	min-height: 32px !important;
-	padding: 0 8px !important;
-}
-
-/* Fix custom info tab icon */
-.tabbrowser-tab[image="chrome://global/skin/icons/info.svg"]:not([pinned]):not([busy]):not([progress]) .tab-icon-stack::before {
-	margin-inline-end: 5.5px;
-}
-
-/* Prevent tab icons size breaking */
-.tab-icon-image, .tab-icon-sound, .tab-throbber, .tab-throbber-fallback, .tab-close-button {
-	min-width: 16px;
-}
-
-/* Center tab text */
-.tab-label {
-	margin-inline: 0 !important;
-}
-
-/* Adjust tab label width */
-.tab-label-container {
-	min-width: 0 !important;
-}
-
-.tabbrowser-tab:not([pinned]) .tab-label-container {
-	max-width: min-content !important;
-}
-
-.tabbrowser-tab[pinned] .tab-label-container {
-	display: none !important;
-}
-
-.tab-throbber:not([pinned]), .tab-icon-pending:not([pinned]), .tab-icon-image:not([pinned]), .tab-sharing-icon-overlay:not([pinned]), .tab-icon-overlay:not([pinned]) {
-	margin-inline-end: 0 !important;
-}
-
-.tabbrowser-tab:not([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-icon-stack {
-	padding: 6px;
-}
-
-/* Hide favicon when mute icon is present */
-.tabbrowser-tab:not([pinned]):is([soundplaying], [muted], [activemedia-blocked], [crashed]) .tab-icon-image:not([sharing]),
-.tabbrowser-tab:not([pinned]):is([soundplaying], [muted], [activemedia-blocked], [crashed])[selected] .tab-icon-image {
-	display: none;
-}
-
-/* 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([soundplaying="true"],[muted="true"]) .tab-icon-image,
-.tabbrowser-tab .tab-icon-stack {
-	margin-left: 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;
@ -248,12 +327,6 @@ 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;
 }
@ -289,20 +362,48 @@ 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;
 }

-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+.tabbrowser-tab:not(:hover) .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+	display: none !important;
+}
+
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
 	background-color: var(--gnome-tabbar-tab-background) !important;
 }

-.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([pinned], [sharing]) {
+.tabbrowser-tab[selected=true] .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]) {
 	background-color: var(--gnome-tabbar-tab-active-background) !important;
 }

-.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([pinned], [sharing]):hover {
+.tabbrowser-tab .tab-icon-overlay:not([crashed]):is([soundplaying], [muted], [activemedia-blocked]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
 }

@ -311,6 +412,18 @@ tab[selected]:-moz-window-inactive {
 	display: none;
 }

+/* tab-context-line above tabs */
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
+	height: 2px;
+	border-radius: 0 !important;
+	margin: 0 !important;
+}
+
+/* Remove alt colours references for multi tabs*/
+.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-bottom-line {
+	display: none;
+}
+
 /* Tab attention dot */
 .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]), #firefox-view-button[attention] {
 	background-image: radial-gradient(circle, var(--gnome-tab-attention-icon-color), var(--gnome-tab-attention-icon-color) 2px, transparent 2px) !important;
@ -319,107 +432,19 @@ tab[selected]:-moz-window-inactive {
 	background-repeat: no-repeat;
 }

-/* Remove alt colours references for multi tabs*/
-.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line {
-	display: none;
-}
-
 .tabbrowser-tab[class*="identity-color-"][pinned] {
 	display: flex;
 }

-.tab-background {
-	background-color: transparent !important;
-	transition: background-color 200ms;
-}
-
-.tab-background, .tab-stack {
-	min-height: 32px !important;
-}
-
-/* Tab hover */
-#TabsToolbar .tabbrowser-tab:not([selected=true]):hover .tab-background {
-	background-color: var(--gnome-tabbar-tab-active-hover-background) !important;
-	border-image: none !important;
-	box-shadow: inset 0 1px var(--gnome-toolbar-border-color), inset 0 -1px var(--gnome-toolbar-border-color) !important;
-}
-
-/* Active tab */
-.tab-background:is([selected]) {
-	background-color: var(--gnome-tabbar-tab-active-background) !important;
-	background-image: none !important;
-	border: none !important;
-	border-image: none !important;
-	transition: none !important;
-	margin-left: -1px !important;
-	margin-right: -1px !important;
-	border-radius: 0 !important;
-	box-shadow: 1px 0 var(--gnome-toolbar-border-color), 1px 0 3px rgba(0, 0, 0, 0.08),
-	            -1px 0 var(--gnome-toolbar-border-color), -1px 0 3px rgba(0, 0, 0, 0.08),
-	            inset 0 -1px var(--gnome-toolbar-border-color) !important;
-}
-
-.tab-background:is([selected]):-moz-window-inactive {
-	background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
-	border-image: none !important;
-}
-
-/* Tabs scroll buttons */
-#TabsToolbar #scrollbutton-up:not([disabled]):hover,
-#TabsToolbar #scrollbutton-down:not([disabled]):hover {
-	background: var(--gnome-tabbar-tab-active-hover-background) !important;
-}
-
-/* Full width tabs */
-.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
-.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
-	max-width: 100% !important;
-}
-
-.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]),
-.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) {
-	max-width: .1px !important;
-}
-
-/* Remove blank spaces on tabs start and end */
-#TabsToolbar .titlebar-spacer {
-	display: none !important;
-}
-
-/* TabsToolbar buttons */
-#TabsToolbar .toolbarbutton-1 {
-	margin: 0 !important;
-	border-radius: 0 !important;
-	min-width: 32px !important;
-	min-height: 32px !important;
-	padding: 0 !important;
-	border: none !important;
-}
-
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon,
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-text,
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-badge-stack {
-	padding: 8px !important;
-}
-
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon {
-	width: 32px !important;
-	height: 32px !important;
-}
-
-#TabsToolbar #alltabs-button {
-	display: none !important;
-}
-
 /* firefox-view-button */
 :root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
 :root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
  toolbarbutton:not(#firefox-view-button),
  toolbarpaletteitem:not(#wrapper-firefox-view-button)
 ) + #tabbrowser-tabs {
-  border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important;
-  padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
-  margin-inline-start: 0 !important;
+	border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important;
+	padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
+	margin-inline-start: 0 !important;
 }

 #TabsToolbar #firefox-view-button {
@ -429,6 +454,7 @@ tab[selected]:-moz-window-inactive {

 #firefox-view-button > .toolbarbutton-icon {
 	box-shadow: none !important;
+	outline: none !important;
 }

 #TabsToolbar #firefox-view-button[open] {
@ -440,34 +466,6 @@ tab[selected]:-moz-window-inactive {
 	background-color: var(--gnome-inactive-tabbar-tab-active-background) !important;
 }

-/* Create new container tab indicator */
-.tabbrowser-tab[class*="identity-color-"] .tab-content::before {
-	content: "";
-	display: block;
-	background-image: var(#userContext-icons:--identity-icon);
-	background: var( --identity-tab-color);
-	-moz-context-properties: fill;
-	fill: var(--identity-icon-color);
-	background-size: contain;
-	background-repeat: no-repeat;
-	background-position: center center;
-	min-width: 10px;
-	height: 10px;
-	margin-right: 5px;
-	margin-left: auto !important;
-	border-radius: 100%;
-}
-
-.tabbrowser-tab[class*="identity-color-"][pinned] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][image] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][busy] .tab-content::before,
-.tabbrowser-tab[class*="identity-color-"][progress] .tab-content::before {
-	right: -10px;
-	top: -8px;
-	position: relative;
-	margin-right: -10px;
-}
-
 /* fix pip on small displays */
 .tab-icon-overlay[pictureinpicture] {
 	top: 3px !important;
--- a/src/other/firefox/WhiteSur/parts/toolbox.css
+++ b/src/other/firefox/WhiteSur/parts/toolbox.css
@ -8,46 +8,27 @@
@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";

 /* Toolbox colors */
-#navigator-toolbox {
-	border: 0 !important;
-	background: none !important;
-}
-
-.toolbarbutton-icon {
-	color: var(--gnome-toolbar-color);
-	fill: var(--gnome-toolbar-color);
-}
-
-#nav-bar, #PersonalToolbar, #toolbar-menubar, .notificationbox-stack {
-	border: 0 !important;
+#navigator-toolbox, #PersonalToolbar, #toolbar-menubar, .notificationbox-stack {
+	border: none !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 {
-	background: var(--gnome-tabstoolbar-background) !important;
+	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
 }

-findbar {
-	border: 0 !important;
-	background: var(--gnome-findbar-background) !important;
-	border-top: 1px solid var(--gnome-toolbar-border-color) !important;
+#nav-bar {
+	border: none !important;
+	color: var(--gnome-toolbar-color);
+	background: var(--gnome-headerbar-background) !important;
 }

-.container.infobar {
-	background: var(--gnome-browser-before-load-background) !important;
+#nav-bar:-moz-window-inactive {
+	background: var(--gnome-inactive-toolbar-background) !important;
 }

-#navigator-toolbox:-moz-window-inactive,
-#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;
@ -61,13 +42,31 @@ 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;
+  }
+}
+
 #toolbar-menubar:not([inactive=true]) {
 	margin-bottom: 0 !important;
 }

 #PersonalToolbar {
-	padding: 2px 4px 0 4px !important;
-	height: 32px !important;
+	height: 28px !important;
+	max-height: 28px !important;
+	padding: 0 2px !important;
+	--bookmarks-toolbar-overlapping-browser-height: auto;
 }

 /* Overrides: Remove border below the menu bar / above the header bar */
@ -117,25 +116,6 @@ findbar:-moz-window-inactive label,
 	margin-top: 0 !important;
 }

-#PersonalToolbar {
-	padding: 0 3px 3px !important;
-	height: 32px !important;
-	max-height: 32px !important;
-}
-
-/* Sidebar */
-#sidebar-box, #sidebar,
-.sidebar-panel[lwt-sidebar] {
-	color: var(--gnome-toolbar-color) !important;
-	background: var(--gnome-toolbar-background) !important;
-}
-
-.sidebar-splitter {
-	width: 1px !important;
-	background-color: var(--gnome-toolbar-border-color) !important;
-	border: none !important;
-}
-
 /* Customization page */
 #customization-container:-moz-lwtheme {
 	background-image: linear-gradient(var(--gnome-browser-before-load-background), var(--gnome-browser-before-load-background)) !important;
@ -148,10 +128,19 @@ 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;
 	margin: 0 2px !important;
 	border-radius: 3px !important;
 	max-height: 24px !important;
+	color: var(--gnome-toolbar-color) !important;
 }
--- a/src/other/firefox/WhiteSur/theme-adaptive.css
+++ b/src/other/firefox/WhiteSur/theme-adaptive.css
@ -0,0 +1,37 @@
+@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-adaptive.css";
+@import "colors/dark-adaptive.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;
+}
--- a/src/other/firefox/WhiteSur/theme-darker.css
+++ b/src/other/firefox/WhiteSur/theme-darker.css
@ -0,0 +1,37 @@
+@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;
+}
--- a/src/other/firefox/WhiteSur/theme-nord.css
+++ b/src/other/firefox/WhiteSur/theme-nord.css
@ -0,0 +1,36 @@
+@import "parts/toolbox.css";
+@import "parts/buttons.css";
+@import "parts/entries.css";
+@import "parts/controls.css";
+@import "parts/headerbar-urlbar.css";
+@import "parts/headerbar-private-urlbar.css";
+@import "parts/headerbar.css";
+@import "parts/csd.css";
+@import "parts/titlebutton-light.css";
+@import "parts/titlebutton-dark.css";
+@import "parts/popups.css";
+@import "parts/tabsbar.css";
+@import "parts/findbar.css";
+@import "parts/sidebar.css";
+@import "parts/dialogs.css";
+@import "parts/notification.css";
+@import "parts/video-player.css";
+@import "parts/remove-white-flash.css";
+@import "parts/icons.css";
+@import "colors/light-nord.css";
+@import "colors/dark-nord.css";
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+/* Set theme version text in customization panel */
+#customization-footer::before {
+	background: url("icons/icon.svg") no-repeat;
+	background-size: contain;
+	content: "Firefox WhiteSur theme";
+	padding: 10px 10px 10px 50px;
+}
+
+#customization-container {
+	background-color: var(--gnome-browser-before-load-background) !important;
+	color: var(--gnome-toolbar-color) !important;
+	background-image: none !important;
+}
--- a/src/other/firefox/WhiteSur/theme.css
+++ b/src/other/firefox/WhiteSur/theme.css
@ -11,11 +11,12 @@
@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/custom-icons.css";
@import "parts/icons.css";
@import "colors/light.css";
@import "colors/dark.css";
@ -32,4 +33,5 @@
 #customization-container {
 	background-color: var(--gnome-browser-before-load-background) !important;
 	color: var(--gnome-toolbar-color) !important;
+	background-image: none !important;
 }
--- a/src/other/firefox/common/hide-single-tab.css
+++ b/src/other/firefox/common/hide-single-tab.css
@ -1,16 +1,21 @@
@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

-#tabbrowser-tabs tab:only-of-type,
-#TabsToolbar #alltabs-button {
-	display: none !important;
-}
-
-.tab-background, .tab-stack {
+#TabsToolbar {
 	min-height: 0 !important;
-}

-#tabbrowser-tabs,
-#tabbrowser-tabs arrowscrollbox {
-	min-height: 0 !important;
-	--tab-min-height: 0 !important;
+	#tabbrowser-tabs tab:only-of-type,
+	#alltabs-button {
+		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;
+	}
 }
--- a/src/other/firefox/common/hide-window-buttons.css
+++ b/src/other/firefox/common/hide-window-buttons.css
@ -1,9 +1,18 @@
@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

-:root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-buttonbox-container {
-    display: none !important;
-}
+:root[tabsintitlebar], :root[customtitlebar] {
+	&[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;
+		}
+	}
 }
--- a/src/other/firefox/common/icons/application-x-addon-blocked-symbolic.svg
+++ b/src/other/firefox/common/icons/application-x-addon-blocked-symbolic.svg
@ -1,7 +1,4 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#6e6e6e; } .ColorScheme-Highlight { color:#5294e2; }</style>
- </defs>
- <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v3.1543h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h3.1543v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h3.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h3c0.554 0 1 0.446 1 1v3h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h3v-2c0-0.554 0.446-1 1-1z" fill="#363636" opacity=".35"/>
- <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2.2361"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v3.1543h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h3.1543v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h3.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h3c0.554 0 1 0.446 1 1v3h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v3c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h3v-2c0-0.554 0.446-1 1-1z" opacity=".35"/>
+ <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0"/>
 </svg>
--- a/src/other/firefox/common/icons/application-x-addon-symbolic.svg
+++ b/src/other/firefox/common/icons/application-x-addon-symbolic.svg
@ -1,16 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <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>
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#6e6e6e; } .ColorScheme-Highlight { color:#5294e2; }</style>
- </defs>
- <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v2.1543 1h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v1 2.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h2.1543 1v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h1 2.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h1 2c0.554 0 1 0.446 1 1v2 1h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v1 2c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h2 1v-2c0-0.554 0.446-1 1-1z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7 0c-1.108 0-2 0.892-2 2v1h-2.1543c-1.0228 0-1.8457 0.82293-1.8457 1.8457v2.1543 1h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v1 2.1543c0 1.0228 0.82293 1.8457 1.8457 1.8457h2.1543 1v-2c0-0.554 0.446-1 1-1s1 0.446 1 1v2h1 2.1543c1.0228 0 1.8457-0.82293 1.8457-1.8457v-2.1543h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2.1543c0-1.0228-0.82293-1.8457-1.8457-1.8457h-2.1543v-1c0-1.108-0.892-2-2-2zm0 1c0.554 0 1 0.446 1 1v2h1 2c0.554 0 1 0.446 1 1v2 1h2c0.554 0 1 0.446 1 1s-0.446 1-1 1h-2v1 2c0 0.554-0.446 1-1 1h-2v-1c0-1.108-0.892-2-2-2s-2 0.892-2 2v1h-2c-0.554 0-1-0.446-1-1v-2h1c1.108 0 2-0.892 2-2s-0.892-2-2-2h-1v-2c0-0.554 0.446-1 1-1h2 1v-2c0-0.554 0.446-1 1-1z"/>
 </svg>
--- a/src/other/firefox/common/icons/applications-engineering-symbolic.svg
+++ b/src/other/firefox/common/icons/applications-engineering-symbolic.svg
@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m11.02 0.53711a1.0001 1.0001 0 0 0-0.58984 0.19336c-0.89811 0.65868-1.4296 1.7085-1.4297 2.8223 0.00118 1.3259 0.86654 2.3529 2 2.9434v1.1797a7 7 0 0 1 1 0.58008v-2.2559c-1.1632-0.23743-1.9989-1.2601-2-2.4473 9.8e-5 -0.7962 0.37943-1.5447 1.0215-2.0156-4e-3 0.036332-0.021484 0.068046-0.021484 0.10547v2c0 0.554 0.446 1 1 1h1c0.554 0 1-0.446 1-1v-2c0-0.037422-0.017524-0.069136-0.021484-0.10547 0.64204 0.47088 1.0214 1.2194 1.0215 2.0156-1.29e-4 1.1879-0.83612 2.2116-2 2.4492v3.0996a7 7 0 0 1 1 1.2949v-3.9004c1.134-0.59095 1.9999-1.6166 2-2.9434-1.38e-4 -1.1138-0.53157-2.1636-1.4297-2.8223a1.0001 1.0001 0 0 0-1.5859 0.91602c0.01271 0.11643 0.014165 0.1478 0.015625 0.16797v1.8281h-1v-1.8281c0.0015-0.020168 0.002895-0.051534 0.015625-0.16797a1.0001 1.0001 0 0 0-0.99609-1.1094zm-3.0195 7.4629a6 6 0 0 0-6 6h-2v1h16v-1h-2a6 6 0 0 0-6-6zm0 1a5 5 0 0 1 5 5h-1a4 4 0 0 0-4-4 4 4 0 0 0-0.060547 0 4 4 0 0 0-3.9395 4h-1a5 5 0 0 1 5-5zm-0.052734 2a3 3 0 0 1 0.0019532 0 3 3 0 0 1 0.050781 0 3 3 0 0 1 3 3h-6a3 3 0 0 1 2.9473-3z" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m11.02 0.53711a1.0001 1.0001 0 0 0-0.58984 0.19336c-0.89811 0.65868-1.4296 1.7085-1.4297 2.8223 0.00118 1.3259 0.86654 2.3529 2 2.9434v1.1797a7 7 0 0 1 1 0.58008v-2.2559c-1.1632-0.23743-1.9989-1.2601-2-2.4473 9.8e-5 -0.7962 0.37943-1.5447 1.0215-2.0156-4e-3 0.036332-0.021484 0.068046-0.021484 0.10547v2c0 0.554 0.446 1 1 1h1c0.554 0 1-0.446 1-1v-2c0-0.037422-0.017524-0.069136-0.021484-0.10547 0.64204 0.47088 1.0214 1.2194 1.0215 2.0156-1.29e-4 1.1879-0.83612 2.2116-2 2.4492v3.0996a7 7 0 0 1 1 1.2949v-3.9004c1.134-0.59095 1.9999-1.6166 2-2.9434-1.38e-4 -1.1138-0.53157-2.1636-1.4297-2.8223a1.0001 1.0001 0 0 0-1.5859 0.91602c0.01271 0.11643 0.014165 0.1478 0.015625 0.16797v1.8281h-1v-1.8281c0.0015-0.020168 0.002895-0.051534 0.015625-0.16797a1.0001 1.0001 0 0 0-0.99609-1.1094zm-3.0195 7.4629a6 6 0 0 0-6 6h-2v1h16v-1h-2a6 6 0 0 0-6-6zm0 1a5 5 0 0 1 5 5h-1a4 4 0 0 0-4-4 4 4 0 0 0-0.060547 0 4 4 0 0 0-3.9395 4h-1a5 5 0 0 1 5-5zm-0.052734 2a3 3 0 0 1 0.0019532 0 3 3 0 0 1 0.050781 0 3 3 0 0 1 3 3h-6a3 3 0 0 1 2.9473-3z"/>
 </svg>
--- a/src/other/firefox/common/icons/audio-muted-symbolic-light.svg
+++ b/src/other/firefox/common/icons/audio-muted-symbolic-light.svg
@ -1,4 +0,0 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <path d="m3.3703 0.34106c-0.099392 0.0070445-0.16522 0.12967-0.07493 0.23048a2.1166 2.1166 0 0 1 0.67334 1.5451 2.1166 2.1166 0 0 1-0.67592 1.5482c-0.118 0.12462 0.047819 0.30388 0.17932 0.19275a2.3812 2.3812 0 0 0 0.76119-1.741 2.3812 2.3812 0 0 0-0.75705-1.7389c-0.036049-0.02831-0.072805-0.039038-0.10594-0.03669zm-0.63251 0.37465c-0.10467 0.0031254-0.16989 0.14175-0.067696 0.24236a1.5875 1.5875 0 0 1 0.50487 1.1586 1.5875 1.5875 0 0 1-0.50694 1.1612c-0.12409 0.118 0.04569 0.30335 0.17983 0.19275a1.8521 1.8521 0 0 0 0.59169-1.3539 1.8521 1.8521 0 0 0-0.58859-1.3524c-0.038827-0.035388-0.078279-0.049617-0.11317-0.048575zm-1.1503 0.078031-0.79374 0.79374h-0.52916c-0.14658 0-0.26458 0.118-0.26458 0.26458v0.52916c3.9166e-17 0.14658 0.118 0.26458 0.26458 0.26458h0.52916l0.79374 0.79374v-2.6458zm0.53381 0.31316c-0.099441 0.0043159-0.17066 0.13599-0.076997 0.23719a1.0583 1.0583 0 0 1 0.33693 0.77256 1.0583 1.0583 0 0 1-0.33796 0.77411c-0.12515 0.11377 0.036959 0.30492 0.17983 0.19327a1.3229 1.3229 0 0 0 0.42271-0.96738 1.3229 1.3229 0 0 0-0.42064-0.96582c-0.034396-0.032676-0.070722-0.045363-0.10387-0.043925z" fill="#dfdfdf" opacity=".35" stroke-width=".26458"/>
- <rect transform="rotate(45)" x=".34758" y="-.13229" width="5.2916" height=".26458" rx=".13229" ry=".13229" fill="#dfdfdf" style="paint-order:markers stroke fill"/>
-</svg>
--- a/src/other/firefox/common/icons/audio-muted-symbolic.svg
+++ b/src/other/firefox/common/icons/audio-muted-symbolic.svg
@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
- <path d="m3.3703 0.34106c-0.099392 0.0070445-0.16522 0.12967-0.07493 0.23048a2.1166 2.1166 0 0 1 0.67334 1.5451 2.1166 2.1166 0 0 1-0.67592 1.5482c-0.118 0.12462 0.047819 0.30388 0.17932 0.19275a2.3812 2.3812 0 0 0 0.76119-1.741 2.3812 2.3812 0 0 0-0.75705-1.7389c-0.036049-0.02831-0.072805-0.039038-0.10594-0.03669zm-0.63251 0.37465c-0.10467 0.0031254-0.16989 0.14175-0.067696 0.24236a1.5875 1.5875 0 0 1 0.50487 1.1586 1.5875 1.5875 0 0 1-0.50694 1.1612c-0.12409 0.118 0.04569 0.30335 0.17983 0.19275a1.8521 1.8521 0 0 0 0.59169-1.3539 1.8521 1.8521 0 0 0-0.58859-1.3524c-0.038827-0.035388-0.078279-0.049617-0.11317-0.048575zm-1.1503 0.078031-0.79374 0.79374h-0.52916c-0.14658 0-0.26458 0.118-0.26458 0.26458v0.52916c3.9166e-17 0.14658 0.118 0.26458 0.26458 0.26458h0.52916l0.79374 0.79374v-2.6458zm0.53381 0.31316c-0.099441 0.0043159-0.17066 0.13599-0.076997 0.23719a1.0583 1.0583 0 0 1 0.33693 0.77256 1.0583 1.0583 0 0 1-0.33796 0.77411c-0.12515 0.11377 0.036959 0.30492 0.17983 0.19327a1.3229 1.3229 0 0 0 0.42271-0.96738 1.3229 1.3229 0 0 0-0.42064-0.96582c-0.034396-0.032676-0.070722-0.045363-0.10387-0.043925z" fill="#363636" opacity=".35" stroke-width=".26458"/>
- <rect transform="rotate(45)" x=".34758" y="-.13229" width="5.2916" height=".26458" rx=".13229" ry=".13229" fill="#363636"/>
+<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="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"/>
 </svg>
--- a/src/other/firefox/common/icons/audio-playing-symbolic-light.svg
+++ b/src/other/firefox/common/icons/audio-playing-symbolic-light.svg
@ -1,3 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m12.738 1.2891c-0.37566 0.026625-0.62445 0.49009-0.2832 0.87109a8 8 0 0 1 2.5449 5.8398 8 8 0 0 1-2.5547 5.8516c-0.446 0.471 0.18074 1.1485 0.67774 0.72852a9 9 0 0 0 2.877-6.5801 9 9 0 0 0-2.8613-6.5723c-0.13625-0.107-0.27517-0.14755-0.40039-0.13867zm-2.3906 1.416c-0.39562 0.011812-0.64211 0.53577-0.25586 0.91602a6 6 0 0 1 1.9082 4.3789 6 6 0 0 1-1.916 4.3887c-0.469 0.446 0.17269 1.1465 0.67969 0.72852a7 7 0 0 0 2.2363-5.1172 7 7 0 0 0-2.2246-5.1113c-0.14675-0.13375-0.29586-0.18753-0.42774-0.18359zm-4.3477 0.29492-3 3h-2c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h2l3 3v-10zm2.0176 1.1836c-0.37584 0.016312-0.64502 0.51398-0.29102 0.89648a4 4 0 0 1 1.2734 2.9199 4 4 0 0 1-1.2773 2.9258c-0.473 0.43 0.13969 1.1525 0.67969 0.73047a5 5 0 0 0 1.5977-3.6562 5 5 0 0 0-1.5898-3.6504c-0.13-0.1235-0.2673-0.17145-0.39258-0.16602z" fill="#dedede"/>
-</svg>
--- a/src/other/firefox/common/icons/audio-playing-symbolic.svg
+++ b/src/other/firefox/common/icons/audio-playing-symbolic.svg
@ -1,63 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="audio-playing-symbolic.svg"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
-   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="defs14" />
-  <sodipodi:namedview
-     id="namedview12"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="7.9661017"
-     inkscape:cy="8"
-     inkscape:window-width="960"
-     inkscape:window-height="600"
-     inkscape:window-x="25"
-     inkscape:window-y="59"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
-  <g
-     transform="translate(0,-4.7914e-4)"
-     fill="#363636"
-     id="g14">
-    <rect
-       y="6"
-       width="5"
-       height="4"
-       ry="1"
-       fill-rule="evenodd"
-       id="rect2"
-       x="0" />
-    <path
-       d="M 6,3 3,6 v 4 l 3,3 z"
-       id="path4" />
-    <g
-       fill-rule="evenodd"
-       id="g12">
-      <path
-         d="M 13.139,1.428 C 12.594,1 12,1.652 12.455,2.16 A 8,8 0 0 1 15,8 8,8 0 0 1 12.446,13.852 C 12,14.323 12.626,15 13.123,14.58 A 9,9 0 0 0 16,8 9,9 0 0 0 13.139,1.428 Z"
-         id="path6" />
-      <path
-         d="M 10.775,2.889 C 10.188,2.354 9.576,3.114 10.091,3.621 A 6,6 0 0 1 12,8 6,6 0 0 1 10.084,12.389 c -0.469,0.446 0.173,1.146 0.68,0.728 A 7,7 0 0 0 13,8 7,7 0 0 0 10.775,2.889 Z"
-         id="path8" />
-      <path
-         d="M 8.41,4.35 C 7.89,3.856 7.255,4.57 7.727,5.08 A 4,4 0 0 1 9,8 4,4 0 0 1 7.723,10.926 c -0.473,0.43 0.14,1.152 0.68,0.73 A 5,5 0 0 0 10,8 5,5 0 0 0 8.41,4.35 Z"
-         id="path10" />
-    </g>
-  </g>
+<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.62445 0.49009-0.2832 0.87109a8 8 0 0 1 2.5449 5.8398 8 8 0 0 1-2.5547 5.8516c-0.446 0.471 0.18074 1.1485 0.67774 0.72852a9 9 0 0 0 2.877-6.5801 9 9 0 0 0-2.8613-6.5723c-0.13625-0.107-0.27517-0.14755-0.40039-0.13867zm-2.3906 1.416c-0.39562 0.011812-0.64211 0.53577-0.25586 0.91602a6 6 0 0 1 1.9082 4.3789 6 6 0 0 1-1.916 4.3887c-0.469 0.446 0.17269 1.1465 0.67969 0.72852a7 7 0 0 0 2.2363-5.1172 7 7 0 0 0-2.2246-5.1113c-0.14675-0.13375-0.29586-0.18753-0.42774-0.18359zm-4.3477 0.29492-3 3h-2c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h2l3 3v-10zm2.0176 1.1836c-0.37584 0.016312-0.64502 0.51398-0.29102 0.89648a4 4 0 0 1 1.2734 2.9199 4 4 0 0 1-1.2773 2.9258c-0.473 0.43 0.13969 1.1525 0.67969 0.73047a5 5 0 0 0 1.5977-3.6562 5 5 0 0 0-1.5898-3.6504c-0.13-0.1235-0.2673-0.17145-0.39258-0.16602z"/>
 </svg>
--- a/src/other/firefox/common/icons/autoplay-media-blocked-symbolic.svg
+++ b/src/other/firefox/common/icons/autoplay-media-blocked-symbolic.svg
@ -1,4 +1,4 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z" fill="#363636" opacity=".35" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2"/>
- <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0" fill="#363636"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z" opacity=".35"/>
+ <rect transform="rotate(45)" x="1.3137" y="-.5" width="20" height="1" rx="0" ry="0"/>
 </svg>
--- a/src/other/firefox/common/icons/autoplay-media-symbolic.svg
+++ b/src/other/firefox/common/icons/autoplay-media-symbolic.svg
@ -1,3 +1,3 @@
-<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".86" stroke-width="2"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7.9062 1a7 7 0 0 0-6.9062 7 7 7 0 0 0 7 7 7 7 0 0 0 6.9277-6h-1.0117a6 6 0 0 1-5.916 5 6 6 0 0 1-6-6 6 6 0 0 1 6-6h2l-1.8281 1.8281 0.70703 0.70703 2.8281-2.8281-0.70703-0.70703h-3a7 7 0 0 0-0.09375 0zm-1.4238 4a0.50005 0.50005 0 0 0-0.48242 0.5v5a0.50005 0.50005 0 0 0 0.76562 0.42383l4-2.5a0.50005 0.50005 0 0 0 0-0.84766l-4-2.5a0.50005 0.50005 0 0 0-0.2832-0.076172z"/>
 </svg>
--- a/src/other/firefox/common/icons/blocked-permission-symbolic.svg
+++ b/src/other/firefox/common/icons/blocked-permission-symbolic.svg
@ -1,9 +1,4 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#363636;
-      }</style>
- </defs>
- <path class="ColorScheme-Text" d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h5.7617a4.5 4.5 0 0 1-0.49805-1h-5.2637c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1h10c0.554 0 1 0.446 1 1v3.2637a4.5 4.5 0 0 1 1 0.49609v-5.7598c0-1.108-0.892-2-2-2h-10z" fill="currentColor"/>
- <path class="ColorScheme-Text" d="m14.975 10.025c-1.3668-1.3668-3.5829-1.3668-4.9497 0-1.3668 1.3668-1.3668 3.5829 0 4.9497 1.3668 1.3668 3.5829 1.3668 4.9497 0 1.3668-1.3668 1.3668-3.5829 0-4.9497zm-1.0607 0.35355 0.70711 0.70711-1.4142 1.4142 1.4142 1.4142-0.70711 0.70711-1.4142-1.4142-1.4142 1.4142-0.70711-0.70711 1.4142-1.4142-1.4142-1.4142 0.70711-0.70711 1.4142 1.4142z" fill="#ff8080"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h5.7617a4.5 4.5 0 0 1-0.49805-1h-5.2637c-0.554 0-1-0.446-1-1v-8c0-0.554 0.446-1 1-1h10c0.554 0 1 0.446 1 1v3.2637a4.5 4.5 0 0 1 1 0.49609v-5.7598c0-1.108-0.892-2-2-2h-10z"/>
+ <path d="m14.975 10.025c-1.3668-1.3668-3.5829-1.3668-4.9497 0-1.3668 1.3668-1.3668 3.5829 0 4.9497 1.3668 1.3668 3.5829 1.3668 4.9497 0 1.3668-1.3668 1.3668-3.5829 0-4.9497zm-1.0607 0.35355 0.70711 0.70711-1.4142 1.4142 1.4142 1.4142-0.70711 0.70711-1.4142-1.4142-1.4142 1.4142-0.70711-0.70711 1.4142-1.4142-1.4142-1.4142 0.70711-0.70711 1.4142 1.4142z" fill="#ff8080"/>
 </svg>
--- a/src/other/firefox/common/icons/bookmarks-symbolic.svg
+++ b/src/other/firefox/common/icons/bookmarks-symbolic.svg
@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.8008 0s-0.43146-0.012793-0.87695 0.22852c-0.44549 0.24131-0.92383 0.89765-0.92383 1.6387v12.133a1.0001 1.0001 0 0 0 1.5449 0.83789l3.4551-2.2461 3.4551 2.2461a1.0001 1.0001 0 0 0 1.5449-0.83789v-12.133s0.01489-0.40654-0.19141-0.85352c-0.2063-0.44698-0.84826-1.0137-1.6094-1.0137h-6.3984zm0 1h6.3984c0.8 0 0.80078 0.86719 0.80078 0.86719v12.133l-4-2.5996-4 2.5996v-12.133c0-0.86667 0.80078-0.86719 0.80078-0.86719z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#363636" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m4.8008 0s-0.43146-0.012793-0.87695 0.22852c-0.44549 0.24131-0.92383 0.89765-0.92383 1.6387v12.133a1.0001 1.0001 0 0 0 1.5449 0.83789l3.4551-2.2461 3.4551 2.2461a1.0001 1.0001 0 0 0 1.5449-0.83789v-12.133s0.01489-0.40654-0.19141-0.85352c-0.2063-0.44698-0.84826-1.0137-1.6094-1.0137h-6.3984zm0 1h6.3984c0.8 0 0.80078 0.86719 0.80078 0.86719v12.133l-4-2.5996-4 2.5996v-12.133c0-0.86667 0.80078-0.86719 0.80078-0.86719z"/>
 </svg>
--- a/src/other/firefox/common/icons/briefcase.svg
+++ b/src/other/firefox/common/icons/briefcase.svg
@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m6 1c-1.108 0-2 0.892-2 2v2h-2c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2h-2v-2c0-1.108-0.892-2-2-2h-4zm0 1h4c0.554 0 1 0.446 1 1v2h-6v-2c0-0.554 0.446-1 1-1zm-4 4h1v8h-1c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1zm2 0h1 6 1v8h-8v-8zm9 0h1c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-1v-8z"/>
+</svg>
--- a/src/other/firefox/common/icons/bullet-symbolic.svg
+++ b/src/other/firefox/common/icons/bullet-symbolic.svg
@ -1,38 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="14"
-   width="14"
-   version="1.1"
-   id="svg442"
-   sodipodi:docname="bullet-symbolic.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   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="defs446" />
-  <sodipodi:namedview
-     id="namedview444"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="33.714286"
-     inkscape:cx="-7.0444915"
-     inkscape:cy="8.0677965"
-     inkscape:window-width="3840"
-     inkscape:window-height="2034"
-     inkscape:window-x="0"
-     inkscape:window-y="58"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg442" />
-  <path
-     d="M 7,3 C 4.793,3 3,4.793 3,7 3,9.207 4.793,11 7,11 9.208,11 11,9.207 11,7 11,4.793 9.208,3 7,3 Z"
-     id="path438"
-     style="fill:#333333" />
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m7 3c-2.207 0-4 1.793-4 4s1.793 4 4 4c2.208 0 4-1.793 4-4s-1.792-4-4-4z"/>
 </svg>
--- a/src/other/firefox/common/icons/cart.svg
+++ b/src/other/firefox/common/icons/cart.svg
@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m0.5 1a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5h1.6152l1.9023 7.1289a0.50005 0.50005 0 0 0 0.48242 0.37109h9a0.50005 0.50005 0 0 0 0.47461-0.3418l1.5-4.5a0.50005 0.50005 0 0 0-0.47461-0.6582h-11.316l-0.70117-2.6289a0.50005 0.50005 0 0 0-0.48242-0.37109h-2zm3.4512 4h10.355l-1.168 3.5h-8.2539l-0.93359-3.5zm0.54883 6c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h9c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-9zm1.75 1.5a1.25 1.25 0 0 0-1.25 1.25 1.25 1.25 0 0 0 1.25 1.25 1.25 1.25 0 0 0 1.25-1.25 1.25 1.25 0 0 0-1.25-1.25zm5.5 0a1.25 1.25 0 0 0-1.25 1.25 1.25 1.25 0 0 0 1.25 1.25 1.25 1.25 0 0 0 1.25-1.25 1.25 1.25 0 0 0-1.25-1.25zm-5.5 1a0.25 0.25 0 0 1 0.25 0.25 0.25 0.25 0 0 1-0.25 0.25 0.25 0.25 0 0 1-0.25-0.25 0.25 0.25 0 0 1 0.25-0.25zm5.5 0a0.25 0.25 0 0 1 0.25 0.25 0.25 0.25 0 0 1-0.25 0.25 0.25 0.25 0 0 1-0.25-0.25 0.25 0.25 0 0 1 0.25-0.25z"/>
+</svg>
--- a/src/other/firefox/common/icons/character-symbolic.svg
+++ b/src/other/firefox/common/icons/character-symbolic.svg
@ -1,18 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <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 fill="#363636" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <g>
  <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-10zm0 1h10c0.554 0 1 0.446 1 1v10c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-10c0-0.554 0.446-1 1-1z"/>
  <path d="m6 9c-0.554 0-1 0.446-1 1v1c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-1c0-0.554-0.446-1-1-1zm0 1h4v1h-4z"/>
  <path d="m5 7v1h5v2h1v-2c0-0.554-0.446-1-1-1z"/>
-  <rect transform="rotate(-30)" x="2.1603" y="7.5981" width="5" height="1" rx="0" ry="0" stroke-width=".91287"/>
+  <rect transform="rotate(-30)" x="2.1603" y="7.5981" width="5" height="1" rx="0" ry="0"/>
 </g>
 </svg>
--- a/src/other/firefox/common/icons/checkbox-checked-symbolic.svg
+++ b/src/other/firefox/common/icons/checkbox-checked-symbolic.svg
@ -1,5 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
- <rect y="6.1719e-7" width="16" height="16" color="#000000" fill="none"/>
- <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-10zm8.2773 3.8438c0.25562 0 0.51116 0.097101 0.70703 0.29297 0.39174 0.39174 0.39174 1.0223 0 1.4141l-4.2422 4.2422c-0.39173 0.39173-0.99323 0.42083-1.3496 0.064453l-0.064453-0.064453-2.1855-2.1836c-0.35633-0.35637-0.32729-0.95983 0.064453-1.3516 0.39173-0.39173 0.99323-0.41888 1.3496-0.0625l1.4785 1.4766 3.5352-3.5352c0.19587-0.19587 0.45141-0.29297 0.70703-0.29297z" color="#000000" fill="#474747" style="paint-order:fill markers stroke"/>
- <rect transform="rotate(45)" x="8.1066" y="1.1569" width="3" height="1" fill-opacity="0"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-10zm8.2773 3.8438c0.25562 0 0.51116 0.097101 0.70703 0.29297 0.39174 0.39174 0.39174 1.0223 0 1.4141l-4.2422 4.2422c-0.39173 0.39173-0.99323 0.42083-1.3496 0.064453l-0.064453-0.064453-2.1855-2.1836c-0.35633-0.35637-0.32729-0.95983 0.064453-1.3516 0.39173-0.39173 0.99323-0.41888 1.3496-0.0625l1.4785 1.4766 3.5352-3.5352c0.19587-0.19587 0.45141-0.29297 0.70703-0.29297z"/>
 </svg>
--- a/src/other/firefox/common/icons/checkbox-symbolic.svg
+++ b/src/other/firefox/common/icons/checkbox-symbolic.svg
@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5.66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#474747"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+    <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5.66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z"/>
 </svg>
--- a/src/other/firefox/common/icons/container-openin.svg
+++ b/src/other/firefox/common/icons/container-openin.svg
@ -0,0 +1,3 @@
+<svg data-name="icon" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
+ <path d="m2 1c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm7.5 0c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h3.791l-4.1445 4.1465c-0.19587 0.19587-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l4.1465-4.1445v3.791c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-5c0-0.277-0.223-0.5-0.5-0.5h-5zm-7.5 1h4v4h-4v-4zm0 7c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm8 0c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-4zm-8 1h4v4h-4v-4zm8 0h4v4h-4v-4z"/>
+</svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
vinceliuice	68e421a65d	Fixed #1300	2025-06-06 00:29:16 +08:00
vinceliuice	1e0656208d	Fixed #1283	2025-05-14 11:55:46 +08:00
vinceliuice	f67de5aeab	update	2025-04-25 00:03:35 +08:00
vinceliuice	3dc9dc0fb1	Fixed #1265	2025-04-20 22:28:50 +08:00
vinceliuice	20c07522ec	update	2025-04-14 08:32:34 +08:00
vinceliuice	4090a93776	update	2025-04-12 20:32:28 +08:00
vinceliuice	7d9b702418	Update #1259	2025-04-12 13:59:40 +08:00
vinceliuice	1b4893fc93	update	2025-04-12 12:12:31 +08:00
vinceliuice	22bcd1a0f6	Update _colors-libadwaita.scss	2025-04-11 08:38:28 +08:00
vinceliuice	29dc25d7a4	Fixed builder issues	2025-04-11 08:35:24 +08:00
vinceliuice	5cbdad0eb6	update	2025-04-10 17:28:59 +08:00
vinceliuice	e754e93a2d	update	2025-04-10 13:41:26 +08:00
vinceliuice	8fa229c58e	update	2025-04-10 13:22:58 +08:00
vinceliuice	12aa63f12d	update	2025-04-10 12:41:17 +08:00
vinceliuice	e289dab0ac	Fixed #1258	2025-04-10 11:54:13 +08:00
vinceliuice	a40015ccb6	Update _common-4.0.scss	2025-04-10 11:38:08 +08:00
vinceliuice	4ced02d386	update #1257	2025-04-10 10:32:34 +08:00
vinceliuice	126d75ec2d	update	2025-04-10 07:41:24 +08:00
vinceliuice	611c499519	update	2025-04-10 00:27:21 +08:00
vinceliuice	20ea5a2a57	update	2025-04-09 23:49:35 +08:00
vinceliuice	a8314c62b7	Merge branch 'master' of https://github.com/vinceliuice/WhiteSur-gtk-theme	2025-04-09 05:40:11 +08:00
vinceliuice	deea65de36	update	2025-04-09 05:39:47 +08:00
Vince	e4a2990668	Merge pull request #1251 from ging-dev/fix fix: Theme parser error	2025-04-05 12:03:30 +08:00
ging-dev	219e7f9914	fix: Theme parser error	2025-04-05 10:26:27 +07:00
vinceliuice	e8b316057a	Update _gnome-40.0.scss	2025-04-05 10:30:14 +08:00
vinceliuice	9f9646c02a	update	2025-04-03 08:21:25 +08:00
vinceliuice	8ff1fe69ab	Fixed #1245 , fixed #1237	2025-03-28 14:56:20 +08:00
vinceliuice	c20f9cf7e7	update	2025-03-20 00:29:44 +08:00
vinceliuice	02e254ff8f	Merge branch 'master' of https://github.com/vinceliuice/WhiteSur-gtk-theme	2025-03-14 03:29:55 +08:00
vinceliuice	9056349269	Update tabsbar.css	2025-03-13 19:46:33 +08:00
Vince	f78141b7bb	Merge pull request #1240 from step-/patch-1 fix #1238	2025-03-13 16:50:24 +08:00
step	f63fefe0b3	fix #1238	2025-03-12 13:39:19 +01:00
vinceliuice	a087b8f7f0	update	2025-02-26 11:39:04 +08:00
vinceliuice	88d6925af5	Update #1222	2025-02-16 02:11:11 +08:00
vinceliuice	ac8466902b	Fixed #1222	2025-02-16 02:10:00 +08:00
vinceliuice	b38ee74585	Fixed #1221	2025-02-16 01:51:13 +08:00
vinceliuice	9ab22d5b20	update	2025-02-14 12:44:33 +08:00
vinceliuice	dcae62161e	update	2025-02-14 12:29:06 +08:00
vinceliuice	3721e6be26	Fixed #1217	2025-02-13 18:39:27 +08:00
vinceliuice	d3ed65081c	update	2025-02-12 12:27:26 +08:00
vinceliuice	34bb3b6154	Update csd.css	2025-02-12 11:48:27 +08:00
vinceliuice	83f8751767	Fixed #1216	2025-02-12 11:45:03 +08:00
Vince	e7841d81b8	update	2025-02-07 16:52:14 +08:00
vinceliuice	836c8c73f7	Fixed #1210	2025-02-06 13:28:09 +08:00
vinceliuice	b0347cc134	update	2025-02-04 02:44:45 +08:00
Vince	5a23953d32	Fixed issues	2025-02-03 19:17:38 +08:00
Vince	c35786dd2d	Merge branch 'master' of https://github.com/vinceliuice/WhiteSur-gtk-theme	2025-01-29 17:04:48 +08:00
Vince	3a152934c1	update	2025-01-29 17:04:46 +08:00
vinceliuice	04d96d4738	Update	2025-01-22 00:10:20 +08:00
vinceliuice	058ecb7c5c	Fixed #1199	2025-01-21 10:22:29 +08:00
vinceliuice	84bf695306	Merge branch 'master' of github.com:vinceliuice/WhiteSur-gtk-theme	2025-01-15 03:29:25 +08:00
vinceliuice	590d72a4c9	update	2025-01-15 03:29:07 +08:00
Vince	bfc8f1efd8	Fixed #1200	2025-01-13 14:09:57 +08:00
vinceliuice	75da82ed8b	Update headerbar.css	2025-01-11 15:22:38 +08:00
vinceliuice	0d5ce9285b	Fixed issues	2025-01-11 15:19:09 +08:00
vinceliuice	45d08171b6	Fixed #1188	2025-01-11 15:09:34 +08:00
vinceliuice	6872a8bd86	Update headerbar.css	2025-01-11 10:24:49 +08:00
vinceliuice	d874956d01	update	2024-12-21 00:38:34 +08:00
vinceliuice	7d073f781d	update	2024-12-08 00:30:13 +08:00
vinceliuice	e80960b104	Merge branch 'master' of github.com:vinceliuice/WhiteSur-gtk-theme	2024-12-04 23:33:41 +08:00
vinceliuice	b0ccad632a	Update #877	2024-12-04 23:33:30 +08:00
Vince	3a26c37aca	Merge branch 'master' of https://github.com/vinceliuice/WhiteSur-gtk-theme	2024-12-03 12:40:37 +08:00
Vince	d181e4c960	update	2024-12-03 12:40:24 +08:00
vinceliuice	04790fc2c2	Fixed #877	2024-12-02 21:54:38 +08:00
vinceliuice	e36a97939e	update	2024-12-01 19:52:19 +08:00
vinceliuice	9c4050dfc8	update	2024-12-01 13:01:00 +08:00
vinceliuice	f86c226173	Fixed #1072	2024-12-01 11:49:13 +08:00
vinceliuice	8b22fbefe7	Update headerbar.css	2024-12-01 00:16:01 +08:00
vinceliuice	05a40f8c5e	update update	2024-12-01 00:04:30 +08:00
vinceliuice	caceb1d0d6	Fixed firefox vertical tabs issues	2024-11-30 21:45:49 +08:00
vinceliuice	8098a8da28	Fixed issues	2024-11-30 12:26:45 +08:00
vinceliuice	328ca7b9d3	Update csd.css	2024-11-30 11:49:44 +08:00
vinceliuice	0d4c85aa39	Fixed #1180	2024-11-29 19:12:15 +08:00
vinceliuice	4ce80c209b	Fixed #1176	2024-11-24 23:59:23 +08:00
vinceliuice	1afceb0b31	update	2024-11-18 00:52:58 +08:00
vinceliuice	1f605c2339	update	2024-11-18 00:50:20 +08:00
vinceliuice	91b28c11b7	update	2024-11-08 15:43:24 +08:00
vinceliuice	bef68bd6e3	update #1167	2024-11-08 15:40:25 +08:00
vinceliuice	1cfb473c9e	update	2024-11-07 10:44:13 +08:00
vinceliuice	6bb490fb89	update	2024-11-06 02:56:09 +08:00
vinceliuice	dc2e2b7db6	update	2024-11-06 02:55:41 +08:00
vinceliuice	7d9b8ff031	update #1165	2024-11-06 02:46:56 +08:00
vinceliuice	1a7397066f	Update popups.css	2024-11-03 00:28:26 +08:00
vinceliuice	2897ffcdf9	Fixed #1164	2024-11-02 16:53:51 +08:00
vinceliuice	c1cd59ca3f	Merge branch 'master' of github.com:vinceliuice/WhiteSur-gtk-theme	2024-10-31 17:21:10 +08:00
vinceliuice	84e325884f	update	2024-10-31 17:20:02 +08:00
Vince	c942ccd669	Delete release-info.txt	2024-10-31 12:44:43 +08:00
vinceliuice	806e35733e	update	2024-10-30 22:58:06 +08:00
vinceliuice	ad65bb3071	Update userContent-WhiteSur.css	2024-10-30 21:52:57 +08:00
vinceliuice	3610588e6d	update	2024-10-30 21:10:25 +08:00
vinceliuice	207c4d9496	update	2024-10-30 20:06:51 +08:00
vinceliuice	512c6c0822	update	2024-10-30 19:59:27 +08:00
vinceliuice	b1edd13488	update	2024-10-30 19:00:25 +08:00
vinceliuice	097c91819e	update	2024-10-30 18:42:12 +08:00
vinceliuice	7ad7afda3d	update	2024-10-30 18:41:44 +08:00
vinceliuice	46c06f498c	Fixed #1123	2024-10-30 18:05:53 +08:00
vinceliuice	4bd14d1ccc	Update _gnome-40.0.scss	2024-10-30 00:21:59 +08:00
vinceliuice	d9f5566e64	update	2024-10-24 13:29:35 +08:00
vinceliuice	3bbe4c1994	update	2024-10-24 13:24:47 +08:00
vinceliuice	3669dae34d	Fixed issues	2024-10-16 16:08:24 +08:00
vinceliuice	d6643b7012	update #1151	2024-10-16 15:12:23 +08:00
vinceliuice	5d09b0610b	update #1148	2024-10-15 19:03:33 +08:00
vinceliuice	b453da1bec	update	2024-10-15 17:25:28 +08:00
vinceliuice	2daa096a09	update	2024-10-15 17:23:12 +08:00
vinceliuice	b7d3d0a6e7	update	2024-10-15 16:52:53 +08:00
vinceliuice	e526f79e50	update	2024-10-15 16:41:15 +08:00
vinceliuice	ea95cfa5e2	Fixed #1148	2024-10-15 16:30:39 +08:00
vinceliuice	790b4ecc7c	Fixed #1147	2024-10-15 14:35:29 +08:00
vinceliuice	e60692a414	update	2024-10-13 20:36:04 +08:00
vinceliuice	68635a8997	Update README.md	2024-10-13 17:03:10 +08:00
vinceliuice	3f4f42591d	Update README.md	2024-10-13 16:59:35 +08:00
vinceliuice	69ea94ccba	Update README.md	2024-10-13 16:57:03 +08:00
vinceliuice	fb3e9c51aa	Update README.md	2024-10-13 16:54:37 +08:00
vinceliuice	b5ab85e054	Update README.md	2024-10-13 16:49:32 +08:00
vinceliuice	3fc33f59cc	Update README.md	2024-10-13 16:47:36 +08:00
vinceliuice	e3457258e5	Update README.md	2024-10-13 16:45:51 +08:00
vinceliuice	9c6b85c5bd	update	2024-10-13 16:39:26 +08:00
Vince	e131037d66	Merge pull request #1145 from danielvxsp/patch-1 Correct --help prompt	2024-10-11 11:51:49 +08:00
Daniel	b7f3d27010	Correct --help prompt Changed the panel opacity setting under --shell from -o to -p when running --help since -o no longer exists	2024-10-10 21:05:17 +02:00
vinceliuice	c94edd60fd	update	2024-10-09 11:27:32 +08:00
vinceliuice	34492c1c47	Merge branch 'master' of github.com:vinceliuice/WhiteSur-gtk-theme	2024-10-02 01:13:01 +08:00
vinceliuice	080a52187a	update	2024-10-02 01:12:56 +08:00
Vince	804891bc12	Merge pull request #1139 from FelixFourcolor/master Edited tweaks.sh -h for Firefox	2024-10-01 20:10:04 +08:00
Felix	067c574576	Fixed tweaks help for Firefox alt	2024-09-30 17:51:17 -07:00
FelixFourcolor	c6294684d8	Merge pull request #1 from fernandesafp/master Fixed help improvements	2024-09-30 17:30:18 -07:00
Vince	68de9edc46	Merge pull request #1140 from fernandesafp/css_fix Removal of forcing background-color for tabs	2024-10-01 08:09:55 +08:00
André Fernandes	09924e7242	Fixed help improvements	2024-09-30 21:59:46 +01:00
André Fernandes	483b372321	Removal of forcing background-color for tabs Fixes #1138, however, now the tabs background colors cannot be changed from firefox/WhiteSur/colors/ css files to accomodate darker style.	2024-09-30 21:42:50 +01:00
Felix	fd6b504492	Edited tweaks.sh -h for Firefox 1) Removed "alt" option, which has been renamed "flat" (Fixed #1130) 2) Added an indication that "darker" and "adaptive" cannot be used together	2024-09-30 12:47:07 -07:00
vinceliuice	3077e053f9	Merge branch 'master' of github.com:vinceliuice/WhiteSur-gtk-theme	2024-09-30 18:55:05 +08:00
vinceliuice	b45b7c4e1b	Fixed #1132	2024-09-30 18:55:00 +08:00
Vince	cb295bd36d	Merge pull request #1136 from fernandesafp/master Update README.md	2024-09-29 19:47:38 +08:00
André Fernandes	49d2789916	Update README.md	2024-09-29 11:51:12 +01:00
Vince	a55376daf2	Merge pull request #1135 from fernandesafp/darker-firefox Added darker Firefox theme option	2024-09-29 17:42:43 +08:00
André Fernandes	aeb18dde67	Update README.md	2024-09-29 02:03:44 +01:00
André Fernandes	3589f39ea7	Added darker Firefox theme option Closes #983	2024-09-29 01:56:04 +01:00
Vince	02036bfd0a	Merge pull request #1133 from fernandesafp/master Fixed typo	2024-09-25 15:14:20 +08:00
André Fernandes	9fd66c5cbb	Fixed typo	2024-09-24 19:55:23 +01:00
vinceliuice	51e4bea779	update	2024-09-19 23:32:57 +08:00
vinceliuice	360d4a0c95	update	2024-09-19 23:31:45 +08:00
vinceliuice	c81cac05b2	Fixed issues	2024-09-19 11:25:09 +08:00
vinceliuice	a685a9a6fe	Fixed #982	2024-09-18 12:18:23 +08:00
vinceliuice	ec179b2109	Update #1127	2024-09-12 10:38:03 +08:00
vinceliuice	01229b5c5b	update	2024-09-11 11:27:43 +08:00
vinceliuice	49901d0b4a	update	2024-09-11 00:28:18 +08:00
vinceliuice	eee0898260	update	2024-09-05 20:40:17 +08:00
vinceliuice	d619cfffc0	Fixed issues	2024-09-05 13:39:53 +08:00
vinceliuice	3900606796	update	2024-09-04 02:47:17 +08:00
vinceliuice	59318457d6	Update popups.css	2024-09-04 01:29:23 +08:00
vinceliuice	613c1c2c99	update	2024-09-03 17:36:03 +08:00
vinceliuice	fa0ca16c4b	update	2024-09-03 16:58:53 +08:00
vinceliuice	7ae37db37e	Update popups.css	2024-09-03 16:25:07 +08:00
vinceliuice	8fae04202a	Update toolbox.css	2024-09-03 14:20:12 +08:00
vinceliuice	da7100ce71	update	2024-09-03 12:31:57 +08:00
vinceliuice	3f55808724	Update tweaks.sh	2024-09-03 11:49:14 +08:00
vinceliuice	095f4af8a0	Fixed #1117	2024-09-03 11:33:35 +08:00
vinceliuice	5c9a82d063	update	2024-09-03 11:26:46 +08:00
vinceliuice	8795e203a0	update	2024-09-02 04:45:13 +08:00
vinceliuice	99297948fa	Fixed #988	2024-09-02 01:25:31 +08:00
vinceliuice	9166992af5	Fixed #1118	2024-09-01 21:37:48 +08:00
vinceliuice	95d5606e0b	Update dark.css	2024-09-01 20:57:11 +08:00
vinceliuice	823cd5237d	update	2024-09-01 20:53:28 +08:00
vinceliuice	e9b37de8d9	update	2024-09-01 20:38:26 +08:00
vinceliuice	217ea70220	Fixed issues	2024-09-01 17:09:45 +08:00
vinceliuice	bf714978b2	update	2024-09-01 01:16:34 +08:00
vinceliuice	fbd33af094	Update README.md	2024-08-31 22:48:37 +08:00
vinceliuice	e4209c8388	Update README.md	2024-08-31 22:47:25 +08:00
vinceliuice	5cccfb51cf	update	2024-08-31 22:32:50 +08:00
vinceliuice	7a4827bd1c	update	2024-08-31 20:34:02 +08:00
vinceliuice	90b19706cb	update	2024-08-31 17:37:21 +08:00
vinceliuice	e3b8124848	Update README.md	2024-08-31 17:04:10 +08:00
vinceliuice	785a063f8e	Update install.sh	2024-08-31 17:02:33 +08:00
vinceliuice	9b1032cb42	Fixed #1116 , update #1066	2024-08-31 16:58:31 +08:00
vinceliuice	83038956a6	Merge branch 'master' of github.com:vinceliuice/WhiteSur-gtk-theme	2024-08-30 11:24:53 +08:00
vinceliuice	e2c38a69f1	Fixed issues	2024-08-30 11:24:49 +08:00
Vince	643ca7b3d7	Merge pull request #1066 from kernelb00t/patch-1 Adapt font size if laptop or not	2024-08-29 06:50:35 +08:00
vinceliuice	bbe6cf460f	Fixed #1115	2024-08-28 23:31:20 +08:00
vinceliuice	481d902d64	update	2024-08-28 21:41:33 +08:00
vinceliuice	7250790b8b	update	2024-08-28 21:03:23 +08:00
vinceliuice	1f60c8eb3e	Fixed libreoffice issues	2024-08-28 20:36:57 +08:00
vinceliuice	2b5f84adb0	update	2024-08-28 01:05:37 +08:00
vinceliuice	47c2615e7a	Fixed #1114	2024-08-27 12:30:03 +08:00
vinceliuice	e4a9ba7153	Fixed issues	2024-08-25 10:18:09 +08:00
vinceliuice	945fe727b1	update	2024-08-24 15:39:43 +08:00
vinceliuice	ece7f3c831	Update tabsbar.css	2024-08-22 11:29:27 +08:00
vinceliuice	dca903bd12	Fixed #1109	2024-08-22 11:20:23 +08:00
vinceliuice	f8ad6a9032	update	2024-08-22 00:00:56 +08:00
vinceliuice	1820fbf1da	update	2024-08-20 00:07:22 +08:00
vinceliuice	a28a49c2f6	Fixed #1106	2024-08-17 20:25:49 +08:00
vinceliuice	f8b9a8cf81	Update icons.css	2024-08-07 01:59:55 +08:00
vinceliuice	bd8a979a75	update	2024-08-04 01:15:09 +08:00
vinceliuice	2a983d2e57	update	2024-08-04 01:12:51 +08:00
vinceliuice	a06e1706e9	update	2024-08-04 01:11:43 +08:00
vinceliuice	711894d803	update	2024-08-03 23:21:57 +08:00
vinceliuice	8c925ec344	update	2024-08-03 21:55:15 +08:00
vinceliuice	8407b56d6b	Update #1094	2024-08-03 21:46:40 +08:00
vinceliuice	260aa9bcb2	update	2024-08-03 20:42:01 +08:00
vinceliuice	c9375999b4	Update #1093	2024-08-03 00:04:31 +08:00
vinceliuice	ca9cc433ba	Fixed #1093	2024-08-01 09:10:40 +08:00
vinceliuice	dcfa6c3cb4	update	2024-07-25 00:46:29 +08:00
vinceliuice	b67b24e8c4	Fixed #1086	2024-07-22 18:30:29 +08:00
vinceliuice	e3345227c0	update	2024-07-18 23:45:00 +08:00
vinceliuice	5092502442	Fixed issues	2024-07-18 23:38:12 +08:00
vinceliuice	d9078e6263	update	2024-07-18 20:59:58 +08:00
vinceliuice	718234ff18	Fixed #1088	2024-07-18 20:38:54 +08:00
vinceliuice	ed7c92495e	Fixed #1082	2024-07-14 08:01:21 +08:00
Vince	453e281225	Merge pull request #1078 from fredcw/calendartext cinnamon.scss: fix calendar applet scaled text bug	2024-06-21 09:13:08 +08:00
fredcw	319d8ca6e4	cinnamon.scss: fix calendar applet scaled text bug Cinnamon calendar applet: remove width limit to allow for larger font sizes or cinnamon text scaling.	2024-06-20 21:41:43 +01:00
vinceliuice	60cdab76a0	update	2024-06-19 18:55:07 +08:00
vinceliuice	71e56a3082	Fixed issues	2024-06-19 18:50:25 +08:00
vinceliuice	c912fe6942	Update README.md	2024-06-19 16:53:38 +08:00
vinceliuice	986498c0b1	Update README.md	2024-06-19 16:52:38 +08:00
vinceliuice	974cc79a17	update	2024-06-02 00:50:46 +08:00
Leo THIVILLON	d2473037af	Adapt font size if laptop or not Sets the base font size to 10pt if laptop mode is enabled, or 11pt if not in laptop mode.	2024-05-21 17:50:44 +02:00
vinceliuice	cc39a8d37a	update	2024-05-20 18:14:51 +08:00
Vince	4899be27a7	update	2024-05-20 12:06:29 +08:00
vinceliuice	d84b269e76	Update #1009	2024-05-18 17:19:45 +08:00
Vince	d6059585d2	update	2024-05-13 14:48:16 +08:00
Vince	0ce56c8644	update	2024-05-13 13:26:12 +08:00
vinceliuice	3f4a1f114c	update	2024-05-11 07:33:00 +08:00
vinceliuice	75eb5b57a4	Merge branch 'master' of github.com:vinceliuice/WhiteSur-gtk-theme	2024-05-11 07:14:36 +08:00
vinceliuice	1780c36eb8	update	2024-05-11 07:14:31 +08:00
Vince	91b02a1f43	Merge pull request #1060 from samlane-ma/master remove executable bit from dock.theme	2024-05-03 06:36:39 +08:00
Samuel Lane	5660d9c574	remove executable bit from dock.theme	2024-05-02 11:52:52 -04:00