Fixed #1300

fix: Theme parser error

.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 ------------------------

.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.

.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

README.md

@@ -2,9 +2,15 @@
 <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, 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>
+
 # Installation is easy!
 <details> <summary> Required dependencies <b>(click to open)</b> </summary>
 
@@ -36,21 +42,16 @@ Don't worry, WhiteSur installer already provides all of those dependencies.
 
 ### Installing from source
 
-Run `./install.sh` to install the default WhiteSur GTK theme pack.
+1. Run `git clone https://github.com/vinceliuice/WhiteSur-gtk-theme.git --depth=1`
+
+2. Run `./install.sh` to install the default WhiteSur GTK theme pack.
 
 ### 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...]`
@@ -59,8 +60,9 @@ 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'
@@ -68,7 +70,7 @@ Usage:  `./install.sh [OPTIONS...]`
   -o, --opacity [normal|solid]
    Set theme opacity variants. Repeatable. Default is all variants
 
-  -c, --color [Light|Dark]
+  -c, --color [light|dark]
    Set theme color variants. Repeatable. Default is all variants
 
   -a, --alt [normal|alt|all]
@@ -77,51 +79,54 @@ Usage:  `./install.sh [OPTIONS...]`
   -t, --theme [default|blue|purple|pink|red|orange|yellow|green|grey|all]
    Set theme accent color. Repeatable. Default is BigSur-like theme
 
-  -p, --panel-opacity [default|30|45|60|75]
+  -s, --scheme [standard|nord]
- Set panel transparency. Default is 15%
+   Set theme colorscheme style. Repeatable. Default is 'standard'
-
-  -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
 
   -m, --monterey 
    Set to MacOS Monterey style. 
 
-  -N, --nautilus-style [stable|normal|mojave|glassy]
+  -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
 
+  -f, --fixed 
+   Install fixed accent color version. Default is adaptive version
+
   -HD, --highdefinition 
    Set to High Definition size. Default is laptop size
 
-  --normal, --normalshowapps
+  --shell, --gnomeshell 
- Set gnome-shell show apps button style to normal. Default is bigsur
+   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
-
   --black, --blackfont 
    Set panel font color to black. Default is white
 
   --darker, --darkercolor 
    Install darker 'WhiteSur' dark themes. 
 
-  --nord, --nordcolor
- Install 'WhiteSur' Nord ColorScheme themes.
-
   --dialog, --interactive 
    Run this installer interactively, with dialogs. 
 
@@ -138,7 +143,7 @@ Usage:  `./install.sh [OPTIONS...]`
 
 </details>
 
-### Fix for libadwaita (not perfect)
+## Fix for libadwaita (not perfect)
 
 <details> <summary> Details <b>(click to open)</b> </summary>
 
@@ -154,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)
+## <p align="center"> <b> Change theme color and accent </b> </p>
-Parameter: `--flatpak` `-F`
-
-Example: `./tweaks.sh -F`
-
-Fix for Flatpak gtk-4.0 app:
-
-```bash
-sudo flatpak override --filesystem=xdg-config/gtk-4.0
-```
-
-### <p align="center"> <b> Change theme color and accent </b> </p>
 <p align="center"> <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/colors-themes.png"/> </p>
 
-#### Install theme color
+#### - Install theme accent
-Parameter: `--color` `-c` (repeatable)
-
-Example:
-
-```bash
-./install.sh -c Light          # install light theme color only
-./install.sh -c Dark -c Light  # install dark and light theme colors
-```
-
-#### Install theme accent
 Parameter: `--theme` `-t` (repeatable)
 
 Example:
@@ -192,68 +176,89 @@ 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.
 
-
+# <p align="center"> <b> Let's tweak! </b> </p>
-# Let's tweak!
 Usage:  `./tweaks.sh [OPTIONS...]`
 
 <details> <summary> Options <b>(click to open)</b> </summary>
 
 ```bash
 
-  -g, --gdm [default|x2]
+OPTIONS:
- Install 'WhiteSur' theme for GDM (scaling: 100%/200%, default is 100%). Requires to run this shell as root
-
   -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]
+  -c, --color [light|dark]
- Set 'WhiteSur' GDM and Dash to Dock theme color variants. Default is 'light'
+   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
+  -s, --scheme [standard|nord]
- Don't darken 'WhiteSur' GDM theme background image.
+   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]
+ Tweaks for GDM theme. options
- Set 'WhiteSur' GDM theme background image. Default is BigSur-like wallpaper
 
-  -p, --panel-opacity [default|30|45|60|75]
+  -g, --gdm    Without options default GDM theme will install... 
- Set 'WhiteSur' GDM (GNOME Shell) theme panel transparency. Default is 15%
 
-  -P, --panel-size [default|smaller|bigger]
+      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'
- Set 'WhiteSur' Gnome shell panel height size. Default is 32px
 
-  -i, --icon [standard|simple|gnome|ubuntu|tux|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin]
+      2. -b, -background [default|blank|IMAGE_PATH]   Set GDM background image Default is BigSur-like wallpaper
- Set 'WhiteSur' GDM (GNOME Shell) 'Activities' icon. Default is 'standard'
 
-  --nord, --nordcolor
+      3. -p, -panelopacity [default|30|45|60|75]   Set GDM panel transparency Default is 15%
- Install 'WhiteSur' Nord ColorScheme themes.
 
-  -f, --firefox [default|monterey|alt]
+      4. -h, -panelheight [default|smaller|bigger]   Set GDM panel height size Default is 32px
- Install 'WhiteSur|Monterey|Alt' theme for Firefox and connect it to the current Firefox profiles. Default is WhiteSur
 
-  -e, --edit-firefox
+      5. -sf, -smallerfont    Set GDM font size to smaller (10pt) Default is 11pt
+
+      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. 
 
-  -F, --flatpak
+   
- Connect 'WhiteSur' theme to Flatpak.
+ 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. 
@@ -275,15 +280,15 @@ Usage:  `./tweaks.sh [OPTIONS...]`
 ### <p align="center"> <b> Install and edit Firefox theme </b> </p>
 
 <p align="center"> <a href="src/other/firefox">
-<img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/firefox.png"/>
+<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:
@@ -294,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:
@@ -313,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
+#### - Don't darken the background
-Parameter: `--no-darken` `-N`
+Parameter: `--nodarken` `-nd`
 
 Example:
 
 ```bash
-sudo ./tweaks.sh -g -N                          # darken the default background
+sudo ./tweaks.sh -g -nd                          # darken the default background
-sudo ./tweaks.sh -g -N -b "wallpapers/snow.jpg" # darken the custom background
+sudo ./tweaks.sh -g -nd -b "wallpapers/snow.jpg" # darken the custom background
 ```
 
-#### Don't blur the background
+#### - Don't blur the background
-Parameter: `--no-blur` `-n`
+Parameter: `--noblur` `-nb`
 
 Example:
 
 ```bash
-sudo ./tweaks.sh -g -n                           # don't blur the default background
+sudo ./tweaks.sh -g -nb                           # 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 -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>
@@ -349,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>

install.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# WARNING: Please make this shell not working-directory dependant, for example
+# WARNING: Please make this shell not working-directory dependent, for example
 # instead of using 'ls blabla', use 'ls "${REPO_DIR}/blabla"'
 #
 # WARNING: Don't use "cd" in this shell, use it in a subshell instead,
@@ -13,37 +13,42 @@
 ###############################################################################
 
 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[@]}")
 opacities=("${OPACITY_VARIANTS[@]}")
 
 usage() {
-  # Please specify their default value manually, some of them are come from _variables.scss
+  # Please specify their default value manually, some of them come from _variables.scss
-  # You also have to check and update them regurally
+  # 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 "-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 "-p, --panel-opacity"  "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]"  "Set panel transparency"                           "Default is 15%"
+  helpify "-s, --scheme"                  "[$(IFS='|'; echo "${SCHEME_VARIANTS[*]}")]"        "  Set theme colorscheme style"                    "Repeatable. Default is 'standard'"
-  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 (version < 40.0) sidebar minimum width" "Default is 200px"
-  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 "-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 "--normal, --normalshowapps"    ""                                          "Set gnome-shell show apps button style to normal" "Default is bigsur"
+
+  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 "--right, --rightplacement"     ""                                          "Set Nautilus titlebutton 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"       ""
@@ -63,21 +68,54 @@ while [[ $# -gt 0 ]]; do
   # We can only show dialogs when there's no error and no -r parameter
   #
   # * shift for parameters that have no value
-  # * shift 2 for parameter that have a value
+  # * shift 2 for parameter that has a value
   #
   # Please don't exit any error here if possible. Let it show all error warnings
   # at once
 
   case "${1}" in
-    # Parameters that don't require value
+    # Parameters that require a value, multiple use
-    -r|--remove|-u|-uninstall)
+    -o|--opacity)
-      uninstall='true'; shift ;;
+      check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
-    --silent-mode)
+    -c|--color)
-      full_sudo "${1}"; silent_mode='true'; shift ;;
+      check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
-    --dialog|--interactive)
+    -t|--theme)
-      interactive='true'; shift ;;
+      check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
-    --normal|--normalshowapps)
+    -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
     --right|--rightplacement)
       right_placement="true"; shift ;;
     --round|--roundedmaxwindow)
@@ -86,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 value, single use
+    -f|--fixed)
-    -b|--background)
+      accent_type="fixed"; shift ;;
-      check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
+    -r|--remove|-u|-uninstall)
-    -d|--dest)
+      uninstall='true'; shift ;;
-      check_param "${1}" "${1}" "${2}" "must" "must" "not-at-all" && shift 2 || shift ;;
+    --silent-mode)
-    -n|--name)
+      full_sudo "${1}"; silent_mode='true'; shift ;;
-      check_param "${1}" "${1}" "${2}" "must" "must" "not-at-all" && shift 2 || shift ;;
+    --dialog|--interactive)
-    -i|--icon)
+      interactive='true'; shift ;;
-      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 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 ;;
     -h|--help)
       need_help="true"; shift ;;
     *)
@@ -136,15 +154,15 @@ if [[ "${uninstall}" == 'true' ]]; then
   if [[ "${libadwaita}" == 'true' ]]; then
     if [[ "$UID" != '0' ]]; then
       remove_libadwaita
-      prompt -s "Removed gtk-4.0 theme files in '${HOME}/.config/gtk-4.0/' !"; echo
+      prompt -s "Removed gtk-4.0 theme files in '${HOME}/.config/gtk-4.0/'!"
     else
       prompt -e "Do not run '--libadwaita' option with sudo!"; echo
     fi
   else
     prompt -i "Removing '${name}' gtk themes in '${dest}'... \n"
-    prompt -w "REMOVAL: Non file-related parameters will be ignored. \n"
+    prompt -w "REMOVAL: Non-file-related parameters will be ignored. \n"
     remove_themes; remove_libadwaita
-    prompt -s "Done! All '${name}' gtk themes in has been removed."
+    prompt -s "Done! All '${name}' gtk themes have been removed."
   fi
 
   if [[ -f "${MISC_GR_FILE}.bak" ]]; then
@@ -152,43 +170,41 @@ if [[ "${uninstall}" == 'true' ]]; then
   fi
 else
   if [[ "${interactive}" == 'true' ]]; then
-    show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog
+    show_panel_opacity_dialog
-    echo; prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo
+#    show_sidebar_size_dialog
-  else
+    show_nautilus_style_dialog
-    show_needed_dialogs
+#  else
+#    show_needed_dialogs
   fi
 
-  prompt -w "Removing the old '${name}${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 "Scheme variants  : $( IFS=';'; echo "${schemes[*]}" )"
-  prompt -i "Nautilus variant : ${nautilus_style}"
+  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
   fi
 
-  if (is_running "xfce4-session"); then
+  if (is_my_distro "solus") && (is_running "gnome-session"); then
-    msg="XFCE: you may need to run 'xfce4-panel -r' after changing your theme to fix your panel opacity."
-  elif (is_my_distro "solus") && (is_running "gnome-session"); then
     msg="GNOME: you may need to disable 'User Themes' extension to fix your dock."
-  # elif (is_running "gnome-session") && [[ "${GNOME_VERSION}" == "3-28" ]]; then
-  # msg="GNOME: you may need to disable 'User Themes' extension to fix your logout and authentication dialog."
   fi
 
   if [[ "${msg}" ]]; then
@@ -198,11 +214,7 @@ else
     notif_msg="${final_msg}"
   fi
 
-  echo; prompt -w "${final_msg}"
+  echo; prompt -i "${final_msg}"
-
-#  if has_command notify-send && [[ "$UID" != '0' ]]; then
-#    notify-send "'${name}' theme has been installed. Enjoy!" "${notif_msg}" -i "dialog-information-symbolic"
-#  fi
 fi
 
 echo

libs/lib-core.sh

@@ -26,7 +26,15 @@ 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 "42" ]]; 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"
+  elif [[ "${SHELL_VERSION:-}" -ge "42" ]]; then
     GNOME_VERSION="42-0"
   elif [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
     GNOME_VERSION="40-0"
@@ -34,7 +42,7 @@ if command -v gnome-shell &> /dev/null; then
     GNOME_VERSION="3-28"
   fi
 else
-  GNOME_VERSION="none"
+  GNOME_VERSION="48-0"
 fi
 
 #----------Program options-------------#
@@ -84,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')
+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}"
@@ -101,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]}"
@@ -108,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 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" [-P]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false")
+declare -A need_dialog=([-b]="false" [-s]="false" [-p]="false" [-h]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false")
 
 #------------Tweaks---------------#
 need_help="false"
@@ -249,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
 
@@ -314,7 +323,11 @@ signal_error() {
   prompt -e "\n  =========== SYSTEM INFO ========="
   prompt -e "DISTRO  : $(IFS=';'; echo "${dist_ids[*]}")"
   prompt -e "SUDO    : $([[ -w "/root" ]] && echo "yes" || echo "no")"
-  prompt -e "GNOME  : ${GNOME_VERSION}"
+  if command -v gnome-shell &> /dev/null; then
+    prompt -e "DESKTOP : $(gnome-shell --version)"
+  else
+    prompt -e "DESKTOP : ${DESKTOP_SESSION}"
+  fi
   prompt -e "REPO    : ${repo_ver}\n"
 
   if [[ "$(grep -ril "Release" "${WHITESUR_TMP_DIR}/error_log.txt")" == "${WHITESUR_TMP_DIR}/error_log.txt" ]]; then
@@ -386,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                                  #
 ###############################################################################
@@ -406,8 +427,6 @@ parsimplify() {
       echo "~-n" | cut -c 2- ;;
     --dest)
       echo "-d" ;;
-    --size)
-      echo "-s" ;;
     --alt)
       echo "-a" ;;
     --opacity)
@@ -418,14 +437,16 @@ parsimplify() {
       echo "-i" ;;
     --theme)
       echo "-t" ;;
-    --panel-opacity)
+    --scheme)
-      echo "-p" ;;
+      echo "-s" ;;
-    --panel-size)
+    --nautilus)
-      echo "-P" ;;
-    --nautilus-style)
       echo "-N" ;;
-    --background)
+    -background)
       echo "-b" ;;
+    -panelheight)
+      echo "-h" ;;
+    -panelopacity)
+      echo "-p" ;;
     *)
       echo "${1}" ;;
   esac
@@ -482,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
@@ -519,19 +542,19 @@ check_param() {
         remind_relative_path "${display_param}" "${value}"; variant_found="skip" ;;
       -n)
         name="${value}"; variant_found="skip" ;;
-      -s)
+#      -s)
-        for i in {0..5}; do
+#        for i in {0..5}; do
-          if [[ "${value}" == "${SIDEBAR_SIZE_VARIANTS[i]}" ]]; then
+#          if [[ "${value}" == "${SIDEBAR_SIZE_VARIANTS[i]}" ]]; then
-            sidebar_size="${value}"; variant_found="true"; break
+#            sidebar_size="${value}"; variant_found="true"; break
-          fi
+#          fi
-        done ;;
+#        done ;;
       -p)
         for i in {0..4}; do
           if [[ "${value}" == "${PANEL_OPACITY_VARIANTS[i]}" ]]; then
             panel_opacity="${value}"; variant_found="true"; break
           fi
         done ;;
-      -P)
+      -h)
         for i in {0..2}; do
           if [[ "${value}" == "${PANEL_SIZE_VARIANTS[i]}" ]]; then
             panel_size="${value}"; variant_found="true"; break
@@ -559,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 ;;
@@ -574,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"
+              variant_found="true"; break
-              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
@@ -614,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
@@ -636,6 +665,17 @@ restore_file() {
 }
 
 backup_file() {
+  if [[ -f "${1}.bak" || -d "${1}.bak" ]]; then
+    case "${2}" in
+      sudo)
+        sudo rm -rf "${1}" ;;
+      udo)
+        udo rm -rf "${1}" ;;
+      *)
+        rm -rf "${1}" ;;
+    esac
+  fi
+
   if [[ -f "${1}" || -d "${1}" ]]; then
     case "${2}" in
       sudo)
@@ -669,7 +709,7 @@ remind_relative_path() {
 sudo() {
   local result="0"
 
-  prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root"
+  prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root \n"
 
   if ! ${SUDO_BIN} -n true &> /dev/null; then
     echo -e "\n ${c_magenta} Authentication is required${c_default} ${c_green}(Please input your password):${c_default} \n"
@@ -708,7 +748,7 @@ udo() {
 
 full_sudo() {
   if [[ ! -w "/root" ]]; then
-    prompt -e "ERROR: '${1}' needs a root priviledge. Please run this '${0}' as root"
+    prompt -e "ERROR: '${1}' needs a root privilege. Please run this '${0}' as root"
     has_any_error="true"
   fi
 }

libs/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
+  local system_theme_dir="/var/lib/flatpak/runtime/org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${scheme}"
-    sudo flatpak remove -y --system org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${colorscheme}
+  local user_theme_dir="$HOME/.local/share/flatpak/runtime/org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${scheme}"
-  else
+
-    flatpak remove -y --user org.gtk.Gtk3theme.${name}${color}${opacity}${alt}${theme}${colorscheme}
+  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
 }

libs/lib-install.sh

@@ -8,8 +8,8 @@
 #                                VARIABLES                                    #
 ###############################################################################
 
-source "${REPO_DIR}/shell/lib-core.sh"
+source "${REPO_DIR}/libs/lib-core.sh"
-source "${REPO_DIR}/shell/lib-flatpak.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
@@ -324,16 +328,16 @@ install_beggy() {
 
   case "${background}" in
     blank)
-      cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-blank.png"          "${WHITESUR_TMP_DIR}/beggy.png" ;;
+      cp -r "${THEME_SRC_DIR}/assets/gnome-shell/backgrounds/background-blank.png"            "${WHITESUR_TMP_DIR}/beggy.png" ;;
     default)
       if [[ "${no_blur}" == "false" && "${no_darken}" == "true" ]]; then
-        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-blur.png"         "${WHITESUR_TMP_DIR}/beggy.png"
+        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/backgrounds/background-blur.png"           "${WHITESUR_TMP_DIR}/beggy.png"
       elif [[ "${no_blur}" == "false" && "${no_darken}" == "false" ]]; then
-        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-blur-darken.png"  "${WHITESUR_TMP_DIR}/beggy.png"
+        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/backgrounds/background-blur-darken.png"    "${WHITESUR_TMP_DIR}/beggy.png"
       elif [[ "${no_blur}" == "true" && "${no_darken}" == "true" ]]; then
-        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-default.png"      "${WHITESUR_TMP_DIR}/beggy.png"
+        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/backgrounds/background-default.png"        "${WHITESUR_TMP_DIR}/beggy.png"
       else
-        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/common-assets/background-darken.png"       "${WHITESUR_TMP_DIR}/beggy.png"
+        cp -r "${THEME_SRC_DIR}/assets/gnome-shell/backgrounds/background-darken.png"         "${WHITESUR_TMP_DIR}/beggy.png"
       fi
       ;;
     *)
@@ -347,53 +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
+  if [[ -z "${7}" ]]; then
-    TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${colorscheme}/gnome-shell"
+    TARGET_DIR="${dest}/${name}${color}${opacity}${alt}${theme}${scheme}/gnome-shell"
   else
-    TARGET_DIR="${6}"
+    TARGET_DIR="${7}"
-  fi
-
-  if [[ "${GNOME_VERSION}" == 'none' ]]; then
-    local GNOME_VERSION='42-0'
   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"
@@ -415,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=''
@@ -422,21 +404,21 @@ install_theemy() {
     local iconcolor='-Dark'
   fi
 
-  local TARGET_DIR="${dest}/${name}${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}${colorscheme}"
+  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}${colorscheme}"
+  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+="GtkTheme=${name}${color}${opacity}${alt}${theme}${scheme}\n"
-  desktop_entry+="MetacityTheme=${name}${color}${opacity}${alt}${theme}${colorscheme}\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"
@@ -449,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"
@@ -470,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"
@@ -480,40 +462,49 @@ 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/assets${color}${scheme}/"*".svg"                    "${TARGET_DIR}/cinnamon/assets"
-  cp -r "${THEME_SRC_DIR}/assets/cinnamon/theme${theme}${colorscheme}/"*".svg"                "${TARGET_DIR}/cinnamon/assets"
+  cp -r "${THEME_SRC_DIR}/assets/cinnamon/theme${theme}${scheme}/"*".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/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-common${color}${scheme}"                      "${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${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/titlebuttons${color}${scheme}"                    "${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/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"
   cp -r "${THEME_SRC_DIR}/other/plank/theme${color}/"*".theme"                                "${TARGET_DIR}/plank"
+
+  cp -r "${THEME_SRC_DIR}/assets/unity"                                                       "${TARGET_DIR}"
 }
 
 remove_packy() {
-  rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})${colorscheme}"
+  rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})$(destify ${5})"{'','-hdpi','-xhdpi'}
-  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"
 }
 
 ###############################################################################
@@ -522,57 +513,83 @@ 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}"
-  rm -rf                                                                                      "${TARGET_DIR}/"{gtk.css,gtk-dark.css,assets,windows-assets}
+  # backup_file "${TARGET_DIR}/gtk.css" "udo"
-  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk${color}.scss"                         "${TARGET_DIR}/gtk.css"
+  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-Dark.scss"                            "${TARGET_DIR}/gtk-dark.css"
+  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Light.scss"                           "${TARGET_DIR}/gtk-Light.css"
+  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Dark.scss"                            "${TARGET_DIR}/gtk-Dark.css"
+  ln -sf "${TARGET_DIR}/gtk${color}.css"                                                      "${TARGET_DIR}/gtk.css"
+  ln -sf "${TARGET_DIR}/gtk-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]}"
+  install_theme_deps
-  config_gtk4 "${colors}" "${alts}"
+
+  gtk_base && config_gtk4 "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
 }
 
 remove_libadwaita() {
-  rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-dark.css,assets,windows-assets}
+  # restore_file "${TARGET_DIR}/gtk.css"
+  rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-dark.css,gtk-Light.css,gtk-Dark.css,assets,windows-assets}
 }
 
 ###############################################################################
 #                                   THEMES                                    #
 ###############################################################################
 
+fix_whiskermenu() {
+  if (command -v xfce4-popup-whiskermenu &> /dev/null) && $(sed -i "s|.*menu-opacity=.*|menu-opacity=95|" "$HOME/.config/xfce4/panel/whiskermenu"*".rc" &> /dev/null); then
+    sed -i "s|.*menu-opacity=.*|menu-opacity=95|" "$HOME/.config/xfce4/panel/whiskermenu"*".rc"
+  fi
+
+  if pgrep xfce4-session &> /dev/null && [ "$(id -u)" -ne 0 ]; then
+    xfce4-panel -r
+  fi
+}
+
 install_themes() {
   # "install_theemy" and "install_shelly" require "gtk_base", so multithreading
   # isn't possible
 
   install_theme_deps; start_animation; install_beggy
 
+  for color in "${colors[@]}"; do
     for opacity in "${opacities[@]}"; do
       for alt in "${alts[@]}"; do
         for theme in "${themes[@]}"; do
-        for color in "${colors[@]}"; do
+          for scheme in "${schemes[@]}"; do
-          gtk_base "${opacity}" "${theme}" "${compact}"
+            gtk_base
-          install_theemy "${color}" "${opacity}" "${alt}" "${theme}"
+            install_theemy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
-          install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${icon}"
+            shell_base
-          install_xfwmy "${color}"
+            install_shelly "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}" "${icon}"
+          done
         done
       done
     done
   done
 
-  stop_animation
+  stop_animation; fix_whiskermenu
 }
 
 remove_themes() {
@@ -582,23 +599,13 @@ 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}" &
+          for scheme in "${SCHEME_VARIANTS[@]}"; do
+            remove_packy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}" &
             process_ids+=("${!}")
           done
         done
       done
     done
-
-  for color in '-light' '-dark'; do
-    for opacity in "${OPACITY_VARIANTS[@]}"; do
-      for alt in "${ALT_VARIANTS[@]}"; do
-        for theme in "${THEME_VARIANTS[@]}"; do
-          for scheme in '' '-nord'; do
-            remove_old_packy "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
-          done
-        done
-      done
-    done
   done
 
   wait ${process_ids[*]} &> /dev/null
@@ -610,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
@@ -629,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
@@ -672,33 +679,54 @@ 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
+  mkdir -p                                                                                    "${TARGET_DIR}"
-    udo cp -rf "${FIREFOX_SRC_DIR}"/Monterey                                                  "${TARGET_DIR}"
+  cp -rf "${FIREFOX_SRC_DIR}/${theme_name}"                                                   "${TARGET_DIR}"
-    udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/{icons,titlebuttons,pages}                       "${TARGET_DIR}"/Monterey
+  [[ -f "${TARGET_DIR}"/customChrome.css ]] && mv "${TARGET_DIR}"/customChrome.css            "${TARGET_DIR}"/customChrome.css.bak
-    udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-Monterey.css                                  "${TARGET_DIR}"/userContent.css
+  cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css                                                "${TARGET_DIR}"
-    if [[ "${alttheme}" == 'true' ]]; then
+  cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,pages}                                            "${TARGET_DIR}/${theme_name}"
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt.css                             "${TARGET_DIR}"/userChrome.css
+
+  if [[ "${colorscheme}" == '-nord' ]]; then
+    cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons-nord                                      "${TARGET_DIR}/${theme_name}"/titlebuttons
   else
-      udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey.css                                 "${TARGET_DIR}"/userChrome.css
+    cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons                                           "${TARGET_DIR}/${theme_name}"
   fi
-  else
+
-    udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur                                                  "${TARGET_DIR}"
+  cp -rf "${FIREFOX_SRC_DIR}"/common/*.css                                                    "${TARGET_DIR}/${theme_name}"
-    udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-WhiteSur.css                                   "${TARGET_DIR}"/userChrome.css
+  cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css                                              "${TARGET_DIR}/${theme_name}"/parts
-    udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-WhiteSur.css                                  "${TARGET_DIR}"/userContent.css
+  [[ -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
 }
 
 config_firefox() {
-  # if has_snap_app firefox; then
+  if has_snap_app firefox; then
-  #   local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
+    local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
-  #   local FIREFOX_DIR="${FIREFOX_SNAP_DIR_HOME}"
+    local FIREFOX_DIR="${FIREFOX_SNAP_DIR_HOME}"
-  if has_flatpak_app org.mozilla.firefox; then
+  elif has_flatpak_app org.mozilla.firefox; then
     local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}"
     local FIREFOX_DIR="${FIREFOX_FLATPAK_DIR_HOME}"
   else
@@ -709,23 +737,28 @@ 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"
+    rm -rf                                                                                  "${d}/user.js"
-      echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >>     "${d}/prefs.js"
+    udoify_file                                                                             "${d}/user.js"
-      echo "user_pref(\"browser.tabs.drawInTitlebar\", true);" >>                             "${d}/prefs.js"
+    #  Enable customChrome.css
-      echo "user_pref(\"browser.uidensity\", 0);" >>                                          "${d}/prefs.js"
+    echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >>     "${d}/user.js"
-      echo "user_pref(\"layers.acceleration.force-enabled\", true);" >>                       "${d}/prefs.js"
+    echo "user_pref(\"browser.tabs.drawInTitlebar\", true);"                         >>     "${d}/user.js"
-      echo "user_pref(\"mozilla.widget.use-argb-visuals\", true);" >>                         "${d}/prefs.js"
+    # Set UI density to normal
-    fi
+    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
 }
 
 edit_firefox_theme_prefs() {
-  # if has_snap_app firefox; then
+  if has_snap_app firefox; then
-  #   local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
+    local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
-  if has_flatpak_app org.mozilla.firefox; then
+  elif has_flatpak_app org.mozilla.firefox; then
     local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}"
   else
     local TARGET_DIR="${FIREFOX_THEME_DIR}"
@@ -737,33 +770,42 @@ edit_firefox_theme_prefs() {
 }
 
 remove_firefox_theme() {
-  rm -rf "${FIREFOX_DIR_HOME}/"*"default"*"/chrome"
+  if has_snap_app firefox; then
-  rm -rf "${FIREFOX_THEME_DIR}"
+    local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}"
-  rm -rf "${FIREFOX_FLATPAK_DIR_HOME}/"*"default"*"/chrome"
+  elif has_flatpak_app org.mozilla.firefox; then
-  rm -rf "${FIREFOX_FLATPAK_THEME_DIR}"
+    local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}"
-  rm -rf "${FIREFOX_SNAP_DIR_HOME}/"*"default"*"/chrome"
+  else
-  rm -rf "${FIREFOX_SNAP_THEME_DIR}"
+    local TARGET_DIR="${FIREFOX_THEME_DIR}"
+  fi
+
+  [[ -f "${TARGET_DIR}"/customChrome.css && ! -f "${TARGET_DIR}"/customChrome.css.bak ]] && cp -r "${TARGET_DIR}"/customChrome.css "${TARGET_DIR}"/customChrome.css.bak
+  [[ -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}"/customChrome.css
+  rm -rf "${TARGET_DIR}"/userChrome.css
+  rm -rf "${TARGET_DIR}"/userContent.css
 }
 
 ###############################################################################
 #                               DASH TO DOCK                                  #
 ###############################################################################
 
-install_dash_to_dock() {
+fix_dash_to_dock() {
   if [[ -d "${DASH_TO_DOCK_DIR_HOME}" ]]; then
-    backup_file "${DASH_TO_DOCK_DIR_HOME}" "udo"
+    backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo"
-    rm -rf "${DASH_TO_DOCK_DIR_HOME}"
+  elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then
+    backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo"
   fi
 
-  udo cp -rf "${DASH_TO_DOCK_SRC_DIR}/dash-to-dock@micxgx.gmail.com"   "${GNOME_SHELL_EXTENSION_DIR}"
-
   if has_command dbus-launch; then
     udo dbus-launch dconf write /org/gnome/shell/extensions/dash-to-dock/apply-custom-theme true
   fi
 }
 
 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"
@@ -806,11 +848,13 @@ revert_dash_to_dock_theme() {
 connect_flatpak() {
   install_flatpak_deps
 
+  for color in "${colors[@]}"; do
     for opacity in "${opacities[@]}"; do
       for alt in "${alts[@]}"; do
         for theme in "${themes[@]}"; do
-        for color in "${colors[@]}"; do
+          for scheme in "${schemes[@]}"; do
-          pakitheme_gtk3 "${color}" "${opacity}" "${alt}" "${theme}"
+            pakitheme_gtk3 "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
+          done
         done
       done
     done
@@ -818,11 +862,13 @@ connect_flatpak() {
 }
 
 disconnect_flatpak() {
-  for opacity in "${opacities[@]}"; do
+  for color in "${COLOR_VARIANTS[@]}"; do
-    for alt in "${alts[@]}"; do
+    for opacity in "${OPACITY_VARIANTS[@]}"; do
-      for theme in "${themes[@]}"; do
+      for alt in "${ALT_VARIANTS[@]}"; do
-        for color in "${colors[@]}"; do
+        for theme in "${THEME_VARIANTS[@]}"; do
-          flatpak_remove "${color}" "${opacity}" "${alt}" "${theme}"
+          for scheme in "${SCHEME_VARIANTS[@]}"; do
+            flatpak_remove "${color}" "${opacity}" "${alt}" "${theme}" "${scheme}"
+          done
         done
       done
     done
@@ -864,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
 }
 
 ###############################################################################
@@ -873,10 +944,8 @@ gtk_base() {
 customize_theme() {
   cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"}
 
-  # Darker dark colors
+  if [[ "${GNOME_VERSION}" -ge '47-0' ]]; then
-  if [[ "${colorscheme}" == '-nord' ]]; then
+    sed $SED_OPT "/\$shell_version/s/old/new/"                                  "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
-    prompt -s "Changing color scheme style to nord style ...\n"
-    sed $SED_OPT "/\$colorscheme/s/default/nord/"                                "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
   # Darker dark colors
@@ -898,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
@@ -911,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
 
@@ -927,6 +996,18 @@ 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 [[ "${activities_icon}" == 'true' ]]; then
+    prompt -s "Changing gnome-shell panel activities button style ...\n"
+    sed $SED_OPT "/\$activities/s/default/icon/"                                "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  fi
+
   # Change panel font color
   if [[ "${monterey}" == 'true' ]]; then
     black_font="true"
@@ -958,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
 }

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}${RELEASE_VERSION}.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}${RELEASE_VERSION}.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
 }
 
-GNOME_VERSION="3-28"
+release_info() {
-RELEASE_VERSION="-3-38"
+rm -rf ${RELEASE_DIR}/release-info.txt
-install && compress
-prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
 
-GNOME_VERSION="42-0"
+echo >> release-info.txt
-RELEASE_VERSION="-42-0"
+echo "VERSION: (GNOME-SHELL) ${RELEASE_VERSION}" >> ${RELEASE_DIR}/release-info.txt
-install && compress
+echo >> ${RELEASE_DIR}/release-info.txt
-prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
+echo "RELEASE TIME: $(date)" >> ${RELEASE_DIR}/release-info.txt
+echo >> ${RELEASE_DIR}/release-info.txt
+echo "--->>> GTK | GNOME Shell | Cinnamon | Metacity | XFWM | Plank <<<---" >> ${RELEASE_DIR}/release-info.txt
+echo "Color variants   : $( IFS=';'; echo "${colors[*]}" )" >> ${RELEASE_DIR}/release-info.txt
+echo "Theme variants   : $( IFS=';'; echo "${themes[*]}" )" >> ${RELEASE_DIR}/release-info.txt
+echo "Opacity variants : $( IFS=';'; echo "${opacities[*]}" )" >> ${RELEASE_DIR}/release-info.txt
+echo "Alt variants     : $( IFS=';'; echo "${alts[*]}" )" >> ${RELEASE_DIR}/release-info.txt
+echo "Scheme variants  : $( IFS=';'; echo "${SCHEME_VARIANTS[*]}" )" >> ${RELEASE_DIR}/release-info.txt
+echo "Start icon style : ${icon}" >> ${RELEASE_DIR}/release-info.txt
+echo "Nautilus style   : ${nautilus_style}" >> ${RELEASE_DIR}/release-info.txt
+}
 
+#GNOME_VERSION="3-28"
+#RELEASE_VERSION="-3-38"
+#install && compress
+#prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
+
+GNOME_VERSION="48-0"
+RELEASE_VERSION="48.0"
+install && compress
+prompt -i "Compress ${THEME_NAME} themes finished!\n"
+release_info
 prompt -s "Done!"; echo
+
 exit 0

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

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

src/assets/gnome-shell/activities-black/activities-apple.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M29.3 263.776c1.242-1.547 2.084-3.647 1.852-5.776-1.789.075-4.017 1.242-5.308 2.743-1.14 1.332-2.153 3.509-1.89 5.56 2.006.15 4.062-1.015 5.347-2.527zm4.526 13.375c-.043-4.553 3.725-6.763 3.896-6.869-2.132-3.11-5.438-3.533-6.603-3.571-2.778-.283-5.467 1.67-6.884 1.67-1.443-.001-3.62-1.636-5.966-1.59-3.024.045-5.855 1.796-7.405 4.507-3.191 5.542-.812 13.68 2.252 18.148 1.536 2.2 3.324 4.648 5.67 4.551 2.294-.087 3.15-1.456 5.922-1.456 2.744 0 3.548 1.456 5.942 1.41 2.464-.041 4.013-2.204 5.495-4.413 1.765-2.52 2.478-4.99 2.507-5.12-.055-.021-4.776-1.816-4.826-7.267z" style="display:inline;fill:#333;fill-opacity:1;fill-rule:evenodd;stroke-width:.40056705;enable-background:new" transform="translate(0 -252)"/></g></svg>

src/assets/gnome-shell/activities-black/activities-arch.svg

@@ -1,153 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M23.998 258c-1.603 3.928-2.568 6.5-4.354 10.31 1.093 1.16 2.436 2.508 4.618 4.038-2.343-.965-3.946-1.934-5.14-2.942C16.837 274.172 13.261 280.957 6 294c5.706-3.29 10.132-5.323 14.252-6.096a10.447 10.445 0 0 1-.268-2.445l.004-.183c.094-3.656 1.994-6.466 4.248-6.275 2.253.192 4 3.312 3.912 6.964a10.32 10.318 0 0 1-.23 1.964c4.077.8 8.453 2.823 14.082 6.071-1.11-2.04-2.1-3.881-3.049-5.637-1.488-1.157-3.044-2.657-6.211-4.286 2.176.566 3.741 1.22 4.953 1.952-9.618-17.907-10.396-20.287-13.695-28.029z" style="fill:#333;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55919552" transform="translate(0 -252)"/></g></svg>
-<!-- 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"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="activities-arch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="100.91506"
-     inkscape:cy="-4.3148635"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="3840"
-     inkscape:window-height="2032"
-     inkscape:window-x="0"
-     inkscape:window-y="56"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="selected_bg_color"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
-         offset="0"
-         id="stop4140" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title></dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-252)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55919552"
-       d="m 23.997898,258 c -1.60293,3.92818 -2.568087,6.50021 -4.353844,10.30937 1.092714,1.16062 2.436285,2.50828 4.617458,4.03873 -2.342743,-0.96503 -3.945674,-1.93433 -5.14043,-2.94189 -2.283219,4.76571 -5.858984,11.55076 -13.1210622,24.59375 5.7059202,-3.29052 10.1320462,-5.32263 14.2520432,-6.09637 a 10.446679,10.44543 0 0 1 -0.267865,-2.44448 l 0.0042,-0.1828 c 0.09353,-3.65612 1.994097,-6.46621 4.24755,-6.27491 2.253456,0.1914 4.000948,3.31175 3.91166,6.96363 a 10.319125,10.317891 0 0 1 -0.229598,1.96412 c 4.077478,0.79924 8.452585,2.82285 14.08197,6.07085 -1.10972,-2.04064 -2.100389,-3.88144 -3.048542,-5.63721 -1.488131,-1.15636 -3.044291,-2.65706 -6.211883,-4.28532 2.176921,0.56542 3.741588,1.22012 4.953348,1.95134 -9.617599,-17.90644 -10.39568,-20.28716 -13.695079,-28.02877 z"
-       id="path14" />
-  </g>
-</svg>

src/assets/gnome-shell/activities-black/activities-budgie.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#fff" d="M24.002 6A17.998 17.998 0 0 0 6 24.002 17.998 17.998 0 0 0 24.002 42 17.998 17.998 0 0 0 42 24.002 17.998 17.998 0 0 0 24.002 6Zm4.813 4.21c.51-.01.931.05 1.433.131 1.837.298 3.606 1.475 4.728 3.423 1.518 2.627 1.16 5.952-.536 7.78-.922.851-1.118.915-1.688 1.302.391-.612.46-.731.553-1.297-.021-.315-.013-.446-.179-.872a2.279 2.279 0 0 0-1.02-1.1 3.682 3.682 0 0 0-1.586-.315c-.319 0-.514-.009-.944.055-1.973.544-4.184-.213-5.221-2.016-1.242-2.15-.34-5.004 1.888-6.288a5.315 5.315 0 0 1 2.028-.761c.195-.026.374-.034.544-.043zm-13.09 5.863c.318.008.628.05.934.123 1.195.37 1.348.506 1.969.808-.723-.03-.863-.034-1.399.17-.263.174-.382.234-.663.59a2.279 2.279 0 0 0-.446 1.434 3.682 3.682 0 0 0 .518 1.53c.162.277.251.451.523.787 1.459 1.441 1.905 3.733.863 5.531-1.241 2.156-4.166 2.794-6.39 1.51a5.315 5.315 0 0 1-1.671-1.378 6.412 6.412 0 0 1-.915-1.76c-.663-1.735-.527-3.856.596-5.804 1.33-2.3 3.84-3.626 6.075-3.546Zm13.902 11.585c2.488 0 4.503 2.211 4.503 4.784 0 .757-.072 1.47-.357 2.134-.31.723-.638 1.14-1.063 1.667-1.174 1.445-3.083 2.385-5.332 2.385-3.032 0-5.74-1.973-6.467-4.358-.276-1.22-.234-1.42-.28-2.109.335.646.4.765.841 1.122.285.145.396.213.847.285a2.296 2.296 0 0 0 1.462-.336 3.67 3.67 0 0 0 1.067-1.211c.158-.277.268-.443.425-.846.51-1.982 2.28-3.512 4.359-3.512z" style="fill:#333"/></svg>

src/assets/gnome-shell/activities-black/activities-debian.svg

@@ -1,142 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M24 282a18 18 0 0 0-18 18 18 18 0 0 0 18 18 18 18 0 0 0 18-18 18 18 0 0 0-18-18Zm-.293 6c-.196.108-.385.189-.566.316.73-.172.696.076 1.441-.023-.26.04-.578.14-.527.18.836.096.963-.258 1.734 0l-.05-.227c1.076.386 1.3.32 2.464.938.408.022.451-.25 1.067 0 .11.192-.022.226.738.68.085-.035-.156-.253-.34-.423 1.525.817 3.187 2.559 3.691 4.418-.473-.87-.046.443-.21.375A10.133 10.133 0 0 1 33.64 296c-.142-.499-.448-1.7-.98-2.477-.046.502-.695-.344-.34.758.269.391.054-.397.386.297.006.332.13.66.207 1.09-.116-.02-.255-.475-.34-.348.116.542.305.821.38.864-.04.09-.133-.084-.141.285.045.847.237.487.328.527-.094.417-.466.908-.282 1.625-.053-.218-.155-.438-.234-.644-.074.612.135.733-.148 1.476.204-.669.18-1.272-.012-.98.085.95-.751 1.677-.66 2.28l-.242-.335c-.66.952-.013.523-.461 1.246.164-.283-.09-.114.125-.437-.142.008-.636.605-1.086.957-1.772 1.417-3.884 1.605-5.93.84-.08.065.363.411.691.581.78.287 1.661.302 2.356.274-1.502.63-4.362-.635-5.297-2.313.213.046.936 1.18 1.48 1.364-.32-.258-.568-.585-.8-.922a4.705 4.705 0 0 0 1.539 1.176c-.019-.071.02-.113.03-.16.011-.048-.007-.1-.144-.192-1.734-1.33-2.763-2.459-2.406-5.078.264-.198.335-1.29.942-1.672.368-.816 1.479-1.572 2.664-1.59 1.21-.065 2.232.645 2.742 1.317-.93-.87-2.462-1.132-3.766-.489-1.332.601-2.117 2.068-2.004 3.528.048-.071.09-.026.114-.207-.04 2.84 3.062 4.92 5.293 3.87l.027.063c.907-.246.793-.454 1.383-.86-.046.094-.398.34-.188.34.286-.076 1.187-.907 1.63-1.304.203-.437-.109-.236.175-.79l.348-.167c.192-.556.404-.87.378-1.52l-.203.426c.298-.901.13-1.879.172-2.726l-.086-.024c-.07-2.131-1.914-4.398-3.558-5.164-1.412-.655-3.587-.764-4.59-.273.136-.122.687-.176.52-.27-1.574.156-1.219.55-2.426.86-.33.32.966-.258.27.156-.647.178-.953-.113-1.911.879.085.142.611-.406.172.144-.902-.11-2.848 2.058-3.262 2.778l.215.039c-.354.89-.82 1.455-.883 1.988-.09 1.31-.549 3.696.086 4.43l-.062.613c.085.176.154.351.261.516l-.14.011c.669 2.106.719.039 1.597 2.227-.127-.043-.255-.089-.445-.344-.02.196.276.771.625 1.219l-.152.172c.198.354.375.429.511.55-.725-.396.676 1.31.801 1.528l.11-.2c-.015.284.207.65.62 1.16l.344-.01c.142.283.665.789.977.812l-.211.273c.794.25.388.333 1.363.676l-.199-.344c.499.428.648.804 1.348 1.133.972.337 1.102.209 2.097.492-.844-.025-1.835-.013-2.504-.254-4.557-1.233-8.728-6.578-8.421-12.086-.074-1.114.11-2.51-.075-2.785.261-.85.562-1.884 1.168-3.117-.045-.08.102.242.41-.285.188-.411.34-.865.575-1.262l.125-.027c.119-.706 1.644-1.788 2.097-2.332l.032.207c.989-.927 2.754-1.55 3.746-1.993-.261.29.586-.03 1.195-.066z" style="fill:#333;fill-opacity:1;stroke-width:7.5592;paint-order:stroke markers fill" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-debian.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="12.551145"
-     inkscape:cy="21.213203"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       style="fill:#333333;fill-opacity:1;stroke-width:7.5592;paint-order:stroke markers fill"
-       d="M 24,282 A 18,18 0 0 0 6,300 18,18 0 0 0 24,318 18,18 0 0 0 42,300 18,18 0 0 0 24,282 Z m -0.292968,6 c -0.19558,0.1077 -0.384988,0.18901 -0.566408,0.31641 0.731312,-0.1728 0.695924,0.0758 1.441408,-0.0234 -0.260778,0.0396 -0.578364,0.14009 -0.527344,0.17969 0.836192,0.0964 0.963378,-0.25794 1.734374,0 l -0.05078,-0.22657 c 1.077128,0.3855 1.299844,0.31958 2.464842,0.9375 0.408176,0.0226 0.451312,-0.24942 1.066408,0 0.11054,0.19274 -0.02138,0.22617 0.73828,0.67969 0.08504,-0.034 -0.1556,-0.25187 -0.339844,-0.42187 1.524984,0.81634 3.186856,2.5585 3.691408,4.41796 -0.473372,-0.8702 -0.04654,0.443 -0.210938,0.375 A 10.133494,10.133494 0 0 1 33.640624,296 c -0.141728,-0.49886 -0.447574,-1.6999 -0.980468,-2.47656 -0.04535,0.50172 -0.694162,-0.34483 -0.339844,0.75781 0.269278,0.39124 0.05508,-0.39761 0.38672,0.29687 0.0056,0.33164 0.1305,0.65901 0.20703,1.08985 -0.11622,-0.0198 -0.254804,-0.47506 -0.339844,-0.34766 0.11622,0.54138 0.305206,0.82088 0.378906,0.86328 -0.03968,0.0907 -0.13202,-0.0833 -0.14062,0.28516 0.04536,0.84752 0.237426,0.48774 0.328124,0.52734 -0.09354,0.41668 -0.46549,0.90786 -0.281248,1.625 -0.05386,-0.21828 -0.15502,-0.43761 -0.234376,-0.64453 -0.0737,0.61224 0.13502,0.7339 -0.14844,1.47656 0.204026,-0.66896 0.18102,-1.27242 -0.0118,-0.98046 0.08504,0.94958 -0.750856,1.67747 -0.660156,2.28125 L 31.5625,300.41797 c -0.66045,0.95242 -0.013,0.52329 -0.460938,1.24609 0.1644,-0.28356 -0.09042,-0.11436 0.125,-0.4375 -0.14172,0.008 -0.635244,0.60555 -1.085938,0.95703 -1.77159,1.41728 -3.883144,1.60519 -5.929686,0.83985 -0.07936,0.0652 0.3626,0.41203 0.691406,0.58203 0.7795,0.28612 1.661006,0.30184 2.355468,0.27344 -1.502308,0.62926 -4.361474,-0.63444 -5.296874,-2.3125 0.212592,0.0454 0.936236,1.17908 1.480468,1.36328 -0.320302,-0.25794 -0.56835,-0.58458 -0.800782,-0.92188 a 4.7053428,4.7053428 0 0 0 1.539064,1.17578 c -0.0184,-0.0709 0.02098,-0.11232 0.03126,-0.16016 0.0102,-0.0478 -0.0084,-0.0993 -0.14454,-0.1914 -1.73474,-1.3294 -2.763404,-2.459 -2.40625,-5.07812 0.263612,-0.1984 0.334814,-1.28922 0.941406,-1.67188 0.36849,-0.81634 1.479222,-1.57184 2.664062,-1.58984 1.210352,-0.0652 2.231972,0.64463 2.742188,1.31641 -0.92973,-0.8702 -2.461734,-1.13175 -3.765624,-0.48829 -1.332234,0.60092 -2.117286,2.06755 -2.003906,3.52735 0.0482,-0.0709 0.0906,-0.0256 0.11328,-0.20703 -0.03968,2.84022 3.062184,4.91987 5.29297,3.87109 l 0.02734,0.0625 c 0.907054,-0.2466 0.793228,-0.45403 1.382812,-0.85937 -0.04536,0.0935 -0.397256,0.33984 -0.1875,0.33984 0.28629,-0.0765 1.186716,-0.90785 1.628906,-1.30469 0.20408,-0.43652 -0.10768,-0.23632 0.17578,-0.78906 l 0.347656,-0.16798 c 0.19274,-0.55556 0.404426,-0.87041 0.378906,-1.51953 l -0.203126,0.42578 c 0.29764,-0.90138 0.12938,-1.87904 0.17188,-2.72656 l -0.08594,-0.0234 c -0.07086,-2.13158 -1.91456,-4.39872 -3.558594,-5.16406 -1.411604,-0.65478 -3.586418,-0.7638 -4.589844,-0.27344 0.13606,-0.12184 0.686772,-0.17593 0.519532,-0.26953 -1.573172,0.1559 -1.218266,0.55039 -2.425782,0.85937 -0.328808,0.3204 0.96683,-0.25759 0.269532,0.15625 -0.646276,0.17856 -0.95208,-0.11317 -1.910156,0.87891 0.08504,0.1418 0.611228,-0.40537 0.171874,0.14453 -0.901383,-0.11055 -2.847873,2.05737 -3.261716,2.77735 l 0.214844,0.0391 c -0.354318,0.89004 -0.820457,1.4554 -0.882813,1.98828 -0.09071,1.30956 -0.549001,3.69554 0.08594,4.42968 l -0.0625,0.61329 c 0.08504,0.17574 0.154002,0.35122 0.261719,0.51562 l -0.140624,0.0118 c 0.668952,2.10592 0.718948,0.0383 1.597656,2.22656 -0.127554,-0.0425 -0.255396,-0.0887 -0.445312,-0.34375 -0.01984,0.19558 0.276351,0.77091 0.625,1.21875 l -0.152344,0.17188 c 0.198418,0.35432 0.375668,0.42878 0.511718,0.55078 -0.725643,-0.39684 0.676072,1.30909 0.800782,1.52735 l 0.109374,-0.19922 c -0.01418,0.28346 0.20725,0.64993 0.621093,1.16015 l 0.34375,-0.0118 c 0.14173,0.28346 0.664763,0.7899 0.976563,0.8125 L 20.75,310.04297 c 0.793672,0.24944 0.3882,0.3328 1.363282,0.67578 l -0.19922,-0.34375 c 0.49888,0.428 0.647524,0.80401 1.347656,1.13281 0.972248,0.33738 1.102732,0.20873 2.097658,0.49219 -0.844696,-0.0255 -1.834956,-0.013 -2.503908,-0.25391 -4.557945,-1.23304 -8.728004,-6.57841 -8.421874,-12.08593 -0.0737,-1.11398 0.110027,-2.5102 -0.07422,-2.78516 0.260779,-0.85036 0.561376,-1.88417 1.167969,-3.11719 -0.04535,-0.0794 0.10119,0.24207 0.410156,-0.28515 0.18708,-0.411 0.338951,-0.86488 0.574219,-1.26172 l 0.125,-0.0274 c 0.11905,-0.7058 1.644128,-1.78781 2.097656,-2.33203 l 0.03125,0.20703 c 0.989257,-0.9269 2.754003,-1.54998 3.746093,-1.99218 -0.26078,0.28912 0.585888,-0.0296 1.195314,-0.0664 z"
-       id="circle10" />
-  </g>
-</svg>

src/assets/gnome-shell/activities-black/activities-fedora.svg

@@ -1,143 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M24.01 282c-9.94 0-17.99 8.052-18.007 17.992H6v13.928h.003a4.09 4.09 0 0 0 4.09 4.08h13.918C33.953 317.994 42 309.943 42 300.008c0-9.94-8.057-17.992-18.006-17.992zm3.657 7.409c3.023 0 5.877 2.313 5.877 5.505 0 .296.001.592-.047.928-.084.849-.86 1.459-1.705 1.34a1.503 1.503 0 0 1-1.263-1.764c.015-.095.02-.246.02-.505 0-1.81-1.482-2.508-2.882-2.508-1.4 0-2.663 1.177-2.664 2.509.024 1.54 0 3.067 0 4.605l2.599-.02c2.029-.042 2.052 3.012.023 2.998l-2.622.02c-.006 1.239.01 1.015.003 1.639 0 0 .022 1.515-.023 2.662-.314 3.373-3.186 6.068-6.638 6.068-3.66 0-6.673-2.989-6.673-6.655.11-3.77 3.118-6.737 6.907-6.702l2.114-.018v2.992l-2.114.02h-.011c-2.082.062-3.867 1.475-3.9 3.704a3.658 3.658 0 0 0 3.678 3.658c2.035 0 3.663-1.48 3.663-3.654l-.003-11.335c0-.21.007-.377.03-.61.344-2.772 2.825-4.884 5.633-4.884z" style="fill:#333;fill-opacity:1;stroke-width:7.56025" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-fedora.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="11.625"
-     inkscape:cy="19.75"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#333333;fill-opacity:1;stroke-width:7.56025"
-       d="m 24.009509,282 c -9.940398,0 -17.9887244,8.05156 -18.0063081,17.99194 H 6 v 13.92762 H 6.00322 C 6.0079622,316.17396 7.8372626,318 10.093326,318 H 24.011281 C 33.953433,317.994 42,309.94306 42,300.00808 c 1.6e-5,-9.94038 -8.05712,-17.99196 -18.006308,-17.99196 z m 3.657536,7.40856 c 3.022733,0 5.876664,2.31352 5.876664,5.5051 0,0.29606 0.0017,0.59228 -0.04665,0.92792 -0.08376,0.84908 -0.860047,1.45926 -1.705322,1.33952 -0.845278,-0.121 -1.41888,-0.92342 -1.262554,-1.76276 0.0144,-0.0958 0.0196,-0.24626 0.0196,-0.50484 0,-1.80996 -1.481475,-2.50884 -2.882062,-2.50884 -1.400237,0 -2.66226,1.177 -2.664018,2.50884 0.02417,1.53988 0,3.06796 0,4.60554 l 2.598953,-0.02 c 2.029228,-0.0422 2.052086,3.01242 0.02341,2.99806 l -2.621818,0.02 c -0.0062,1.23864 0.0096,1.01464 0.0032,1.63846 0,0 0.02197,1.51496 -0.02327,2.66292 -0.313703,3.37262 -3.186271,6.06782 -6.638068,6.06782 -3.659289,0 -6.673236,-2.98912 -6.673236,-6.6556 0.109868,-3.77038 3.117695,-6.73622 6.907107,-6.70214 l 2.113633,-0.018 v 2.99264 l -2.113633,0.02 h -0.01134 c -2.081979,0.0614 -3.866784,1.4752 -3.900194,3.70412 0,2.03034 1.641316,3.65752 3.67863,3.65752 2.0345,0 3.662808,-1.47968 3.662808,-3.65396 l -0.0032,-11.33454 c 0.0011,-0.21042 0.0078,-0.37758 0.03107,-0.60968 0.343451,-2.77222 2.824068,-4.88504 5.632278,-4.88504 z"
-       id="path14-3" />
-  </g>
-</svg>

src/assets/gnome-shell/activities-black/activities-gentoo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.0"><path fill="#fff" fill-rule="evenodd" d="M20.269 6.012c-7.76.369-13.837 7.376-13.532 11.19.304 3.71 9.74 6.967 9.634 7.078-1.928 1.623-3.206 2.72-4.817 4.19-3.874 3.527-6.552 6.14-5.199 9.813 1.571 4.235 4.993 4.06 9.017 3.276 10.397-2.045 27.477-15.12 26.595-19.944-.715-3.903-10.256-11.618-15.91-14.384a12.05 12.05 0 0 0-5.813-1.219m1.629 6.697c.972-.1 2.097.153 3.363.762 2.755 1.324 5.608 4.844 0 6.848-1.524.533-6.406-1.312-6.265-3.878.13-2.38 1.283-3.593 2.902-3.732" style="stroke-width:2.25029;fill:#333"/></svg>

src/assets/gnome-shell/activities-black/activities-gnome.svg

@@ -1,143 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M35.469 282c-7.109 0-8.44 10.8-4.443 10.8S42.578 282 35.469 282zm-11.284 1.225c-4.065.573-2.636 8.231-.468 8.376 2.16.14 4.537-8.946.468-8.376zm-7.356 2.38a2.492 2.492 0 0 0-.667.17c-3.806 1.446-.579 7.407 1.556 7.008 1.998-.379 2.228-7.48-.885-7.173zm-5 4.797a2.02 2.02 0 0 0-1.101.314c-3.13 1.845 1.054 6.301 2.891 5.613 1.616-.608.587-5.86-1.79-5.932zm14.592 3.6c-5.6-.101-12.99 2.841-14.248 8.743C10.81 309.135 17.79 318 25.078 318c3.584 0 7.717-3.389 8.49-7.679.591-3.27-7.432-1.956-7.16.204.221 1.77-.705 2.687-1.981 2.721-1.743-.212-2.594-1.22-2.827-2.742-.31-3.988 12.262-6.837 11.267-13.023-.366-2.266-3.083-3.419-6.446-3.478z" style="fill:#333;fill-opacity:1;stroke-width:7.5592" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-gnome.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-1"
-     inkscape:cy="5.875"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#333333;fill-opacity:1;stroke-width:7.5592"
-       d="m 35.46896,282 c -7.10901,0 -8.439822,10.79956 -4.44313,10.79956 3.996692,0 11.55214,-10.79956 4.44313,-10.79956 z m -11.284276,1.22452 c -4.06472,0.57398 -2.636116,8.23148 -0.467698,8.37604 2.159914,0.1404 4.53667,-8.94578 0.467698,-8.37604 z m -7.355615,2.38102 a 2.4915546,2.4915546 0 0 0 -0.667532,0.17 c -3.805363,1.4456 -0.578246,7.40664 1.556158,7.00696 1.998346,-0.3784 2.227944,-7.47892 -0.884374,-7.17278 z m -5.000117,4.79602 a 2.0196048,2.0196048 0 0 0 -1.101216,0.31464 c -3.1293237,1.84528 1.054446,6.30116 2.891224,5.61238 1.615685,-0.608 0.586748,-5.85898 -1.790008,-5.93128 z m 14.592178,3.60128 c -5.59962,-0.102 -12.98925,2.84018 -14.247782,8.7417 C 10.80852,309.135 17.789977,318 25.077562,318 c 3.584266,0 7.717016,-3.38868 8.490844,-7.67876 0.591,-3.26964 -7.432146,-1.95582 -7.16003,0.2041 0.221092,1.76874 -0.7058,2.68714 -1.981338,2.72114 -1.74324,-0.2126 -2.5936,-1.22026 -2.827448,-2.7424 -0.310382,-3.9882 12.26219,-6.8369 11.26727,-13.02328 -0.365656,-2.2662 -3.082556,-3.41844 -6.44573,-3.47796 z"
-       id="path12" />
-  </g>
-</svg>

src/assets/gnome-shell/activities-black/activities-manjaro.svg

@@ -1,144 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><path d="M32 282.008v36h10v-36zm-26 .021v10.659h.006l-.002 1.252c-.001.021-.004.041-.004.063v7.001c0 .035.002.068.006.102v16.902h10v-20.005H16v-6h13.998v-9.974zm11.998 11.974-.002 24.005h12.002L30 294.003Z" style="display:inline;fill:#333;fill-opacity:1;fill-rule:evenodd;stroke-width:5.67002;enable-background:new" transform="translate(0 -276)"/></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-manjaro.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-7.25"
-     inkscape:cy="17.375"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:5.6694"
-       d="m 6.0000001,281.99997 v 10.68478 h 0.0057 l -0.0057,3.31524 H 16.000631 v -4 H 29.99811 v -9.97026 H 6.0000001 m 25.9993719,-0.0212 v 35.9915 H 42 v -35.9915 m -24.001891,11.99146 -0.0019,24.00004 H 29.998112 L 30,293.99999 m -23.9943299,4 v 20.00004 H 16.006299 v -20.00004"
-       id="path19"
-       sodipodi:nodetypes="ccccccccccccccccccccc" />
-  </g>
-</svg>

src/assets/gnome-shell/activities-black/activities-mxlinux.svg

@@ -1,38 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#333" d="M24 6C14.028 6 6 14.028 6 24s8.028 18 18 18 18-8.028 18-18S33.972 6 24 6Zm-5.182 8.333 6.18 6.954 5.911-6.954 1.152 1.151-5.972 7.028 4.153 4.673.667-.76 5.758 6.908H11.333l8.637-9.787 1.618 1.752 1.284-1.51-6.357-7.153zm5.144 10.681-1.264 1.487 4.181 4.529 1.206-1.379z"/></svg>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="activities-mxlinux.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#b3b3b3"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="10.90123"
-     inkscape:cx="2.3850521"
-     inkscape:cy="23.300124"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M 24,6 C 14.028,6 6,14.028 6,24 6,33.972 14.028,42 24,42 33.972,42 42,33.972 42,24 42,14.028 33.972,6 24,6 Z m -5.1822,8.3334 6.181,6.9532 5.9102,-6.9532 1.15234,1.15104 -5.9726,7.0274 4.1536,4.6732 0.66666,-0.76042 5.7578,6.9088 h -25.334 l 8.6368,-9.7878 1.61848,1.7526 1.28386,-1.51042 -6.3568,-7.1524 z m 5.1446,10.681 -1.26432,1.48698 4.181,4.5286 1.20572,-1.3789 z"
-     fill="#333333"
-     stroke-width="0.66666"
-     id="path2" />
-</svg>

src/assets/gnome-shell/activities-black/activities-opensuse.svg

@@ -1,40 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#333" d="M24 6a18 18 0 1 0 0 36 18 18 0 0 0 0-36zm0 4A14.001 14.001 0 1 1 24 38a13.895 13.895 0 0 1-9.503-3.75c.808-.11 2.084-.128 3.75.063 2.437.277 3.772.37 5.375.251 3.656-.276 6.071-.88 8.75-2.19 1.403-.68 1.701-.99 1.999-1.81.293-.779.4-1.502.255-1.502-.056 0-.515.179-1.063.438-2.062.978-3.87 1.459-5.443 1.378-1.628-.085-4.26-1.037-7.432-2.564l-1.5-.689-1.127-2.81 1.063.684a31.57 31.57 0 0 0 6.564 3.19c2.73.862 4.86.743 7.058-.375.779-.395 2.254-1.36 2.254-1.5 0-.256-.757-2.79-1.19-3.938-1.08-2.866-1.842-3.835-3.623-4.685-1.981-.944-4.175-1.586-8.189-2.5-1.913-.409-3.801-.821-5.748-1.063l-.064 2.372a64.712 64.712 0 0 0-3.687-1 14.03 14.03 0 0 1 11.502-5.994zm3.312 10.124a2.976 2.976 0 0 1 2.934 2.313c.191.744.132 1.276-.247 2.062a2.874 2.874 0 0 1-3.125 1.565 2.921 2.921 0 0 1-2.19-1.688c-.518-1.127-.276-2.623.626-3.44a3.091 3.091 0 0 1 1.998-.808zm.685 1.565c-1.046 0-1.701.765-1.123 1.31.468.442 1.25.51 1.871.19.408-.208.544-.522.442-.935-.076-.31-.68-.565-1.19-.565z" overflow="visible"/></svg>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   viewBox="0 0 48 48"
-   id="svg4"
-   sodipodi:docname="activities-opensuse.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#dbdbdb"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="10.90123"
-     inkscape:cx="-3.1189142"
-     inkscape:cy="22.382796"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="m 24,6 a 18,18 0 1 0 0,36 18,18 0 0 0 0,-36 z m 0,4.000941 a 14.001176,14.001176 0 1 1 0,27.997816 13.894591,13.894591 0 0 1 -9.502688,-3.750126 c 0.807853,-0.110546 2.083395,-0.127554 3.750126,0.06372 2.436259,0.276373 3.771368,0.36991 5.374299,0.25086 3.656543,-0.276372 6.07156,-0.880119 8.750546,-2.189677 1.403066,-0.680292 1.700747,-0.990635 1.998354,-1.811264 0.293373,-0.778069 0.399663,-1.500881 0.255108,-1.500881 -0.05526,0 -0.514473,0.178571 -1.062977,0.437935 -2.062153,0.977936 -3.869108,1.458399 -5.442331,1.377667 -1.628406,-0.08503 -4.260298,-1.037427 -7.432144,-2.563859 l -1.500882,-0.688795 -1.1267,-2.81044 1.062976,0.684539 a 31.569545,31.569545 0 0 0 6.564799,3.188855 c 2.729633,0.863111 4.859819,0.744068 7.057963,-0.374159 0.77807,-0.395415 2.253477,-1.360583 2.253477,-1.500882 0,-0.255108 -0.756828,-2.789198 -1.190501,-3.937141 -1.079984,-2.865694 -1.841046,-3.835163 -3.622526,-4.685499 -1.981345,-0.943919 -4.175256,-1.585923 -8.188896,-2.500059 -1.913313,-0.408174 -3.801151,-0.820628 -5.74848,-1.062976 l -0.06372,2.372535 a 64.712162,64.712162 0 0 0 -3.686402,-0.999177 14.030657,14.030657 0 0 1 11.501344,-5.995061 z m 3.312145,10.123299 a 2.9762893,2.9762893 0 0 1 2.933731,2.312968 c 0.191331,0.744069 0.13181,1.275542 -0.246604,2.062154 a 2.8742399,2.8742399 0 0 1 -3.125055,1.564681 2.9209558,2.9209558 0 0 1 -2.189677,-1.687972 c -0.518721,-1.126701 -0.276365,-2.62335 0.625018,-3.439745 a 3.0910381,3.0910381 0 0 1 1.998354,-0.807853 z m 0.68454,1.564682 c -1.045969,0 -1.700748,0.765294 -1.122468,1.309558 0.467696,0.442184 1.250067,0.510209 1.87083,0.191331 0.408167,-0.208339 0.544226,-0.522977 0.442184,-0.935377 -0.07653,-0.310381 -0.680292,-0.56549 -1.190501,-0.56549 z"
-     fill="#333333"
-     overflow="visible"
-     stroke-width="4.25183"
-     id="path2" />
-</svg>

src/assets/gnome-shell/activities-black/activities-popos.svg

@@ -1,38 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#333" d="M24 6A18 18 0 0 0 6 24a18 18 0 0 0 18 18 18 18 0 0 0 18-18A18 18 0 0 0 24 6Zm-3.11 5.336c1.52-.036 2.157.323 3.04.898a6.337 6.337 0 0 1 2.648 3.922c.353 1.619.248 2.878-.176 3.778v.07c-.847 1.835-2.26 3.312-4.238 4.031l1.695 4.496c.318.827.6 1.69.352 2.48-.247.792-1.38 1.044-2.191.18-1.554-1.69-6.78-12.337-7.168-13.129-.389-.791-.813-1.439-.813-2.23.035-1.187 1.836-2.408 2.719-3.02.883-.611 2.614-1.44 4.133-1.476zm-1.386 3.277c-1.099.031-.498 2.368-.274 3.02.248.72.919 2.229 1.66 2.984.177.18.355.324.567.36.212.036.636-.181.813-.469.176-.288.21-.501.21-.789a4.52 4.604 0 0 0-.07-1.727c-.318-1.115-.988-2.194-1.871-2.914-.177-.143-.39-.326-.637-.398a1.165 1.165 0 0 0-.398-.066zm11.95 2.72c.166-.004.328.008.464.034a3.059 3.194 0 0 1 1.664.852c.408.39.44.819.305 1.351-.136.533-.61 1.669-.985 2.485l-.953 1.879c-1.835 3.407-2.209 3.764-2.719 3.55-.611-.248-.406-3.655.172-7.808.17-1.136.44-1.704.746-1.988.23-.213.803-.347 1.305-.356zm-2.09 12c.797.013 1.136.895.945 1.577a1.114 1.114 0 0 1-.547.715c-.293.163-.989.163-1.39-.129-.403-.292-.474-.782-.364-1.172.11-.39.473-.811.984-.941.133-.037.257-.053.371-.05zm-12.048 3.6h14.09c.75 0 1.356.535 1.356 1.2 0 .665-.605 1.2-1.356 1.2h-14.09c-.75 0-1.355-.535-1.355-1.2 0-.665.605-1.2 1.355-1.2z" style="stroke-width:2"/></svg>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="activities-popos.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#d1d1d1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="10.90123"
-     inkscape:cx="-4.403173"
-     inkscape:cy="15.044175"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M 24,6 A 18,18 0 0 0 6,24 18,18 0 0 0 24,42 18,18 0 0 0 42,24 18,18 0 0 0 24,6 Z m -3.1094,5.336 c 1.5186,-0.03597 2.1562,0.3229 3.039,0.89844 1.34202,0.89928 2.2952,2.3032 2.6484,3.9218 0.35316,1.61874 0.24802,2.878 -0.17578,3.7774 v 0.07031 c -0.84762,1.83456 -2.2606,3.3118 -4.2382,4.0312 l 1.69532,4.496 c 0.31784,0.82734 0.59876,1.68906 0.35156,2.4804 -0.24722,0.7914 -1.37912,1.04298 -2.1914,0.17968 -1.55394,-1.69068 -6.7792,-12.3376 -7.168,-13.129 -0.38848,-0.79139 -0.8125,-1.43905 -0.8125,-2.23039 0.03532,-1.1871 1.83586,-2.408 2.7188,-3.0196 0.8829,-0.61152 2.6142,-1.44056 4.1328,-1.47656 z m -1.38672,3.2774 c -1.09842,0.03066 -0.49746,2.3676 -0.27344,3.0196 0.24722,0.71946 0.9185,2.229 1.66016,2.9844 0.17658,0.17986 0.3545,0.3234 0.5664,0.35938 0.2119,0.03596 0.63592,-0.18098 0.8125,-0.46876 0.17658,-0.28778 0.21094,-0.50128 0.21094,-0.78906 A 4.5206,4.6044 0 0 0 22.41013,17.9924 c -0.31784,-1.11516 -0.9882,-2.1946 -1.8711,-2.914 -0.17658,-0.143886 -0.3895,-0.3265 -0.63672,-0.39844 -0.152302,-0.05059 -0.2848,-0.06958 -0.39844,-0.06641 z m 11.9492,2.7188 c 0.16728,-0.0028 0.3289,0.0085 0.46484,0.03516 a 3.059,3.1944 0 0 1 1.66406,0.85156 c 0.40784,0.39042 0.44064,0.81912 0.30468,1.35156 -0.13594,0.53238 -0.61052,1.66808 -0.98438,2.4844 l -0.95312,1.8789 c -1.83534,3.4072 -2.209,3.7638 -2.7188,3.5508 -0.61176,-0.24844 -0.40592,-3.656 0.17188,-7.8086 0.16994,-1.13574 0.44022,-1.70436 0.7461,-1.98828 0.22942,-0.21296 0.80284,-0.34716 1.30468,-0.35546 z m -2.0898,12 c 0.79768,0.0138 1.1371,0.89626 0.94532,1.57812 -0.07308,0.29224 -0.2546,0.55248 -0.54688,0.71484 -0.29228,0.16236 -0.98874,0.16334 -1.39062,-0.1289 -0.40188,-0.29224 -0.47288,-0.78224 -0.36328,-1.17188 0.1096,-0.38966 0.47288,-0.81156 0.98438,-0.9414 0.13244,-0.03652 0.25714,-0.05274 0.3711,-0.05078 z m -12.0468,3.6016 h 14.0898 c 0.75056,0 1.35546,0.53442 1.35546,1.19922 0,0.6648 -0.6049,1.19922 -1.35546,1.19922 h -14.0898 c -0.75056,0 -1.35546,-0.53442 -1.35546,-1.19922 0,-0.6648 0.6049,-1.19922 1.35546,-1.19922 z"
-     fill="#333333"
-     id="path2"
-     style="stroke-width:2" />
-</svg>

src/assets/gnome-shell/activities-black/activities-simple.svg

@@ -1,80 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><g transform="matrix(2.13333 0 0 2.13333 0 -2197.04)"><circle cx="3.75" cy="1041.112" r="1.875" style="opacity:1;fill:#333;fill-opacity:1;stroke:none;stroke-width:.9375;stroke-opacity:1"/><circle cx="11.25" cy="1041.112" r="1.875" style="opacity:1;fill:#333;fill-opacity:1;stroke:none;stroke-width:.9375;stroke-opacity:1"/><circle cx="18.75" cy="1041.112" r="1.875" style="opacity:1;fill:#333;fill-opacity:1;stroke:none;stroke-width:.9375;stroke-opacity:1"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg4366"
-   version="1.1"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-simple.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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs4368" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#d1d1d1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="-12.753176"
-     inkscape:cy="16.920055"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:pagecheckerboard="0" />
-  <metadata
-     id="metadata4371">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1029.8622)">
-    <g
-       id="g4494"
-       transform="matrix(2.1333333,0,0,2.1333333,3.75e-7,-1167.1771)">
-      <circle
-         r="1.875"
-         cy="1041.1122"
-         cx="3.75"
-         id="circle4787"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:none;stroke-width:0.9375;stroke-opacity:1" />
-      <circle
-         r="1.875"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:none;stroke-width:0.9375;stroke-opacity:1"
-         id="circle4789"
-         cx="11.25"
-         cy="1041.1122" />
-      <circle
-         r="1.875"
-         cy="1041.1122"
-         cx="18.75"
-         id="circle4791"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:none;stroke-width:0.9375;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>

src/assets/gnome-shell/activities-black/activities-ubuntu.svg

@@ -1,143 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M24 282a18 18 0 1 0 0 36 18 18 0 0 0 0-36zm6.416 5.017a2.398 2.398 0 0 1 1.786 3.584 2.402 2.402 0 1 1-1.786-3.584zm-6.42 2.543c.97 0 1.905.131 2.793.378a3.372 3.372 0 0 0 4.52 2.62 10.417 10.417 0 0 1 3.104 6.772l-3.423.047a7.02 7.02 0 0 0-9.95-5.74l-1.67-2.997a10.404 10.404 0 0 1 4.63-1.08Zm-5.791 1.751 1.76 2.947a7.011 7.011 0 0 0 0 11.484l-1.76 2.942a10.45 10.45 0 0 1-4.312-6.067 3.363 3.363 0 0 0 0-5.234 10.46 10.46 0 0 1 4.312-6.072zm-6.446 6.285a2.404 2.404 0 1 1 0 4.808 2.402 2.402 0 0 1 0-4.804zm19.231 3.023 3.423.055a10.408 10.408 0 0 1-3.104 6.769 3.359 3.359 0 0 0-4.52 2.615 10.434 10.434 0 0 1-7.42-.698l1.672-2.993a7.015 7.015 0 0 0 9.949-5.748zm-1.17 7.593a2.407 2.407 0 1 1 .587 4.78 2.407 2.407 0 0 1-.586-4.78z" style="fill:#333;fill-opacity:1;stroke-width:7.5592" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-ubuntu.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-1"
-     inkscape:cy="5.875"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#333333;fill-opacity:1;stroke-width:7.5592"
-       d="m 24,282 a 18,18 0 1 0 0,36 18,18 0 0 0 0,-36 z m 6.415968,5.01714 a 2.3980158,2.3980158 0 0 1 1.785756,3.58426 2.4022676,2.4022676 0 1 1 -1.785756,-3.58426 z m -6.42022,2.54256 c 0.969412,0 1.904808,0.1318 2.793434,0.37842 a 3.3716784,3.3716784 0 0 0 4.519664,2.6191 c 1.777254,1.7475 2.933742,4.12426 3.103814,6.77314 l -3.422698,0.0468 a 7.0197236,7.0197236 0 0 0 -9.949216,-5.73992 L 19.369788,290.6397 A 10.404157,10.404157 0 0 1 24,289.55976 Z m -5.790952,1.75176 1.760246,2.94648 a 7.01122,7.01122 0 0 0 0,11.48412 l -1.760246,2.94224 a 10.450927,10.450927 0 0 1 -4.311328,-6.0673 3.3631748,3.3631748 0 0 0 0,-5.23398 10.459431,10.459431 0 0 1 4.311328,-6.07156 z m -6.445732,6.28416 a 2.4043936,2.4043936 0 1 1 0,4.80878 2.40227,2.40227 0 0 1 0,-4.80454 z m 19.230898,3.02302 3.422698,0.0552 a 10.408409,10.408409 0 0 1 -3.103814,6.76886 3.358923,3.358923 0 0 0 -4.519664,2.61486 10.43392,10.43392 0 0 1 -7.419394,-0.6973 l 1.670958,-2.99328 a 7.0154718,7.0154718 0 0 0 9.949216,-5.74842 z m -1.169246,7.59372 a 2.4074546,2.4074546 0 1 1 0.586748,4.77902 2.4074546,2.4074546 0 0 1 -0.586748,-4.77902 z"
-       id="path14" />
-  </g>
-</svg>

src/assets/gnome-shell/activities-black/activities-void.svg

@@ -1,61 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path d="M306.463 506.57a105.236 105.236 0 0 0-61.36 19.9l23.903 23.903a72.016 72.016 0 0 1 37.457-10.582c39.772 0 72.014 32.241 72.014 72.014a72.016 72.016 0 0 1-10.602 37.437l23.947 23.95a105.24 105.24 0 0 0 19.875-61.387c0-58.12-47.114-105.235-105.234-105.235zm-85.361 43.85a105.235 105.235 0 0 0-19.875 61.385c0 58.12 47.116 105.236 105.236 105.236a105.23 105.23 0 0 0 61.357-19.9l-23.902-23.903a72.01 72.01 0 0 1-37.455 10.582c-39.773 0-72.016-32.243-72.016-72.015a72.009 72.009 0 0 1 10.602-37.436zm85.343 27.883a33.503 33.503 0 0 0-33.504 33.502 33.503 33.503 0 0 0 33.504 33.504 33.503 33.503 0 0 0 33.504-33.504 33.503 33.503 0 0 0-33.504-33.502z" style="fill:#333" transform="matrix(.17105 0 0 .17105 -28.419 -80.646)"/></svg>
-<svg
-   id="svg5556"
-   version="1.1"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
-   sodipodi:docname="activities-void.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview8"
-     pagecolor="#dbdbdb"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="5.4506148"
-     inkscape:cx="-20.364675"
-     inkscape:cy="18.163089"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5556" />
-  <defs
-     id="defs5550" />
-  <metadata
-     id="metadata5553">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="matrix(7.5590557,0,0,7.5590557,-2.9956602e-7,-2197.0394)"
-     id="layer1">
-    <g
-       transform="matrix(0.02262785,0,0,0.02262785,0.27826107,291.44373)"
-       id="g5457">
-      <path
-         id="path5443"
-         transform="translate(-178.44539,-506.5705)"
-         d="m 306.46289,506.57031 c -22.03188,0.0468 -43.49376,7.00749 -61.35937,19.90039 l 23.90234,23.90235 c 11.27745,-6.8986 24.23694,-10.55955 37.45703,-10.58203 39.77241,-8e-5 72.01375,32.24125 72.01367,72.01367 -0.0318,13.21538 -3.69961,26.16761 -10.60156,37.4375 l 23.94727,23.94922 c 12.8888,-17.87595 19.84123,-39.3488 19.875,-61.38672 0,-58.11963 -47.11476,-105.23438 -105.23438,-105.23438 z m -85.36133,43.84961 c -12.88881,17.87594 -19.84123,39.34684 -19.875,61.38477 0,58.11962 47.1167,105.23633 105.23633,105.23633 22.03188,-0.0468 43.4918,-7.00749 61.35742,-19.9004 l -23.90234,-23.90234 c -11.27745,6.89859 -24.235,10.55956 -37.45508,10.58203 -39.77242,8e-5 -72.0157,-32.24321 -72.01562,-72.01562 0.0318,-13.21538 3.6996,-26.16566 10.60156,-37.43555 z m 85.34375,27.88281 a 33.503357,33.503357 0 0 0 -33.5039,33.50196 33.503357,33.503357 0 0 0 33.5039,33.5039 33.503357,33.503357 0 0 0 33.50391,-33.5039 33.503357,33.503357 0 0 0 -33.50391,-33.50196 z"
-         style="fill:#333333" />
-    </g>
-  </g>
-</svg>

src/assets/gnome-shell/activities-black/activities-zorin.svg

@@ -1,38 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#333" d="M15.741 6c-1.1 0-2.45.79-3 1.754l-2.66 4.676h27.836l3.191 5.593-5.851-10.27c-.55-.963-1.9-1.753-3-1.753Zm25.368 12.023L17.187 30.43h23.664l2.664-4.675c.55-.964.55-2.544 0-3.508zm-33.96-.453-2.664 4.676c-.55.964-.55 2.544 0 3.508l2.406 4.222L30.813 17.57Zm5.594 22.676c.55.964 1.9 1.754 3 1.754h16.515c1.1 0 2.451-.79 3-1.754l2.66-4.676H10.084"/></svg>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="activities-zorin.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#d6d6d6"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="10.90123"
-     inkscape:cx="13.57645"
-     inkscape:cy="20.364675"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M 15.741041,6 C 14.641247,6 13.290253,6.790136 12.741056,7.7538912 L 10.08087,12.429668 H 37.91673 L 41.108114,18.02344 35.256544,7.7538912 C 34.707426,6.790116 33.356353,6 32.256559,6 Z m 25.367873,12.02334 -23.92188,12.406138 h 23.663882 l 2.663986,-4.675777 c 0.549178,-0.963775 0.549178,-2.543987 0,-3.507782 z M 7.1490841,17.570222 4.4850974,22.245999 c -0.5491772,0.963775 -0.5491772,2.543987 0,3.507782 L 6.8912854,29.97636 30.813166,17.570222 Z M 12.742856,40.246109 C 13.292053,41.209884 14.643047,42 15.742841,42 h 16.515518 c 1.099794,0 2.450987,-0.790116 2.999985,-1.753891 L 37.91853,35.570332 H 10.08267"
-     fill="#333333"
-     stroke-width="0.642857"
-     id="path2" />
-</svg>

src/assets/gnome-shell/activities-black/activities.svg

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- 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"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="activities.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="36.697868"
-     inkscape:cy="24.948153"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="3840"
-     inkscape:window-height="2032"
-     inkscape:window-x="0"
-     inkscape:window-y="56"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="selected_bg_color"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
-         offset="0"
-         id="stop4140" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title></dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-252)">
-    <path
-       d="m 29.300605,263.77552 c 1.241756,-1.54604 2.083667,-3.64658 1.851379,-5.77552 -1.788491,0.075 -4.016806,1.24226 -5.307753,2.7433 -1.140333,1.33176 -2.153369,3.50856 -1.890997,5.56043 2.007081,0.1498 4.06267,-1.01559 5.347289,-2.52805 z m 4.525124,13.37571 c -0.0429,-4.5528 3.725274,-6.76334 3.895914,-6.86874 -2.131817,-3.11142 -5.437295,-3.53306 -6.602787,-3.57148 -2.77797,-0.28304 -5.467097,1.6691 -6.884224,1.6691 -1.442242,-2e-4 -3.620284,-1.63532 -5.966007,-1.58882 -3.023559,0.0452 -5.854887,1.79594 -7.404881,4.50706 -3.1909978,5.5412 -0.812151,13.67978 2.252708,18.14795 1.535294,2.1995 3.323745,4.64766 5.669506,4.55092 2.294247,-0.0872 3.149539,-1.45668 5.922504,-1.45668 2.743926,0 3.547704,1.45668 5.941651,1.40982 2.46365,-0.0404 4.013082,-2.20346 5.495181,-4.41206 1.765137,-2.5195 2.477867,-4.98949 2.506307,-5.12105 -0.05492,-0.0204 -4.7754,-1.8156 -4.825872,-7.26602 z"
-       style="display:inline;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:0.40056705;enable-background:new"
-       id="path121"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-apple.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M29.3 263.776c1.242-1.547 2.084-3.647 1.852-5.776-1.789.075-4.017 1.242-5.308 2.743-1.14 1.332-2.153 3.509-1.89 5.56 2.006.15 4.062-1.015 5.347-2.527zm4.526 13.375c-.043-4.553 3.725-6.763 3.896-6.869-2.132-3.11-5.438-3.533-6.603-3.571-2.778-.283-5.467 1.67-6.884 1.67-1.443-.001-3.62-1.636-5.966-1.59-3.024.045-5.855 1.796-7.405 4.507-3.191 5.542-.812 13.68 2.252 18.148 1.536 2.2 3.324 4.648 5.67 4.551 2.294-.087 3.15-1.456 5.922-1.456 2.744 0 3.548 1.456 5.942 1.41 2.464-.041 4.013-2.204 5.495-4.413 1.765-2.52 2.478-4.99 2.507-5.12-.055-.021-4.776-1.816-4.826-7.267z" style="display:inline;fill:#fff;fill-opacity:1;fill-rule:evenodd;stroke-width:.40056705;enable-background:new" transform="translate(0 -252)"/></g></svg>

src/assets/gnome-shell/activities/activities-arch.svg

@@ -1,153 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M23.998 258c-1.603 3.928-2.568 6.5-4.354 10.31 1.093 1.16 2.436 2.508 4.618 4.038-2.343-.965-3.946-1.934-5.14-2.942C16.837 274.172 13.261 280.957 6 294c5.706-3.29 10.132-5.323 14.252-6.096a10.447 10.445 0 0 1-.268-2.445l.004-.183c.094-3.656 1.994-6.466 4.248-6.275 2.253.192 4 3.312 3.912 6.964a10.32 10.318 0 0 1-.23 1.964c4.077.8 8.453 2.823 14.082 6.071-1.11-2.04-2.1-3.881-3.049-5.637-1.488-1.157-3.044-2.657-6.211-4.286 2.176.566 3.741 1.22 4.953 1.952-9.618-17.907-10.396-20.287-13.695-28.029z" style="fill:#fff;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55919552" transform="translate(0 -252)"/></g></svg>
-<!-- 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"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="activities-arch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="100.91506"
-     inkscape:cy="-4.3148635"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="3840"
-     inkscape:window-height="2032"
-     inkscape:window-x="0"
-     inkscape:window-y="56"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="selected_bg_color"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
-         offset="0"
-         id="stop4140" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title></dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-252)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:7.55919552"
-       d="m 23.997898,258 c -1.60293,3.92818 -2.568087,6.50021 -4.353844,10.30937 1.092714,1.16062 2.436285,2.50828 4.617458,4.03873 -2.342743,-0.96503 -3.945674,-1.93433 -5.14043,-2.94189 -2.283219,4.76571 -5.858984,11.55076 -13.1210622,24.59375 5.7059202,-3.29052 10.1320462,-5.32263 14.2520432,-6.09637 a 10.446679,10.44543 0 0 1 -0.267865,-2.44448 l 0.0042,-0.1828 c 0.09353,-3.65612 1.994097,-6.46621 4.24755,-6.27491 2.253456,0.1914 4.000948,3.31175 3.91166,6.96363 a 10.319125,10.317891 0 0 1 -0.229598,1.96412 c 4.077478,0.79924 8.452585,2.82285 14.08197,6.07085 -1.10972,-2.04064 -2.100389,-3.88144 -3.048542,-5.63721 -1.488131,-1.15636 -3.044291,-2.65706 -6.211883,-4.28532 2.176921,0.56542 3.741588,1.22012 4.953348,1.95134 -9.617599,-17.90644 -10.39568,-20.28716 -13.695079,-28.02877 z"
-       id="path14" />
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-budgie.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#fff" d="M24.002 6A17.998 17.998 0 0 0 6 24.002 17.998 17.998 0 0 0 24.002 42 17.998 17.998 0 0 0 42 24.002 17.998 17.998 0 0 0 24.002 6Zm4.813 4.21c.51-.01.931.05 1.433.131 1.837.298 3.606 1.475 4.728 3.423 1.518 2.627 1.16 5.952-.536 7.78-.922.851-1.118.915-1.688 1.302.391-.612.46-.731.553-1.297-.021-.315-.013-.446-.179-.872a2.279 2.279 0 0 0-1.02-1.1 3.682 3.682 0 0 0-1.586-.315c-.319 0-.514-.009-.944.055-1.973.544-4.184-.213-5.221-2.016-1.242-2.15-.34-5.004 1.888-6.288a5.315 5.315 0 0 1 2.028-.761c.195-.026.374-.034.544-.043zm-13.09 5.863c.318.008.628.05.934.123 1.195.37 1.348.506 1.969.808-.723-.03-.863-.034-1.399.17-.263.174-.382.234-.663.59a2.279 2.279 0 0 0-.446 1.434 3.682 3.682 0 0 0 .518 1.53c.162.277.251.451.523.787 1.459 1.441 1.905 3.733.863 5.531-1.241 2.156-4.166 2.794-6.39 1.51a5.315 5.315 0 0 1-1.671-1.378 6.412 6.412 0 0 1-.915-1.76c-.663-1.735-.527-3.856.596-5.804 1.33-2.3 3.84-3.626 6.075-3.546Zm13.902 11.585c2.488 0 4.503 2.211 4.503 4.784 0 .757-.072 1.47-.357 2.134-.31.723-.638 1.14-1.063 1.667-1.174 1.445-3.083 2.385-5.332 2.385-3.032 0-5.74-1.973-6.467-4.358-.276-1.22-.234-1.42-.28-2.109.335.646.4.765.841 1.122.285.145.396.213.847.285a2.296 2.296 0 0 0 1.462-.336 3.67 3.67 0 0 0 1.067-1.211c.158-.277.268-.443.425-.846.51-1.982 2.28-3.512 4.359-3.512z"/></svg>

src/assets/gnome-shell/activities/activities-debian.svg

@@ -1,142 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M24 282a18 18 0 0 0-18 18 18 18 0 0 0 18 18 18 18 0 0 0 18-18 18 18 0 0 0-18-18Zm-.293 6c-.196.108-.385.189-.566.316.73-.172.696.076 1.441-.023-.26.04-.578.14-.527.18.836.096.963-.258 1.734 0l-.05-.227c1.076.386 1.3.32 2.464.938.408.022.451-.25 1.067 0 .11.192-.022.226.738.68.085-.035-.156-.253-.34-.423 1.525.817 3.187 2.559 3.691 4.418-.473-.87-.046.443-.21.375A10.133 10.133 0 0 1 33.64 296c-.142-.499-.448-1.7-.98-2.477-.046.502-.695-.344-.34.758.269.391.054-.397.386.297.006.332.13.66.207 1.09-.116-.02-.255-.475-.34-.348.116.542.305.821.38.864-.04.09-.133-.084-.141.285.045.847.237.487.328.527-.094.417-.466.908-.282 1.625-.053-.218-.155-.438-.234-.644-.074.612.135.733-.148 1.476.204-.669.18-1.272-.012-.98.085.95-.751 1.677-.66 2.28l-.242-.335c-.66.952-.013.523-.461 1.246.164-.283-.09-.114.125-.437-.142.008-.636.605-1.086.957-1.772 1.417-3.884 1.605-5.93.84-.08.065.363.411.691.581.78.287 1.661.302 2.356.274-1.502.63-4.362-.635-5.297-2.313.213.046.936 1.18 1.48 1.364-.32-.258-.568-.585-.8-.922a4.705 4.705 0 0 0 1.539 1.176c-.019-.071.02-.113.03-.16.011-.048-.007-.1-.144-.192-1.734-1.33-2.763-2.459-2.406-5.078.264-.198.335-1.29.942-1.672.368-.816 1.479-1.572 2.664-1.59 1.21-.065 2.232.645 2.742 1.317-.93-.87-2.462-1.132-3.766-.489-1.332.601-2.117 2.068-2.004 3.528.048-.071.09-.026.114-.207-.04 2.84 3.062 4.92 5.293 3.87l.027.063c.907-.246.793-.454 1.383-.86-.046.094-.398.34-.188.34.286-.076 1.187-.907 1.63-1.304.203-.437-.109-.236.175-.79l.348-.167c.192-.556.404-.87.378-1.52l-.203.426c.298-.901.13-1.879.172-2.726l-.086-.024c-.07-2.131-1.914-4.398-3.558-5.164-1.412-.655-3.587-.764-4.59-.273.136-.122.687-.176.52-.27-1.574.156-1.219.55-2.426.86-.33.32.966-.258.27.156-.647.178-.953-.113-1.911.879.085.142.611-.406.172.144-.902-.11-2.848 2.058-3.262 2.778l.215.039c-.354.89-.82 1.455-.883 1.988-.09 1.31-.549 3.696.086 4.43l-.062.613c.085.176.154.351.261.516l-.14.011c.669 2.106.719.039 1.597 2.227-.127-.043-.255-.089-.445-.344-.02.196.276.771.625 1.219l-.152.172c.198.354.375.429.511.55-.725-.396.676 1.31.801 1.528l.11-.2c-.015.284.207.65.62 1.16l.344-.01c.142.283.665.789.977.812l-.211.273c.794.25.388.333 1.363.676l-.199-.344c.499.428.648.804 1.348 1.133.972.337 1.102.209 2.097.492-.844-.025-1.835-.013-2.504-.254-4.557-1.233-8.728-6.578-8.421-12.086-.074-1.114.11-2.51-.075-2.785.261-.85.562-1.884 1.168-3.117-.045-.08.102.242.41-.285.188-.411.34-.865.575-1.262l.125-.027c.119-.706 1.644-1.788 2.097-2.332l.032.207c.989-.927 2.754-1.55 3.746-1.993-.261.29.586-.03 1.195-.066z" style="fill:#fff;fill-opacity:1;stroke-width:7.5592;paint-order:stroke markers fill" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-debian.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="12.551145"
-     inkscape:cy="21.213203"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke-width:7.5592;paint-order:stroke markers fill"
-       d="M 24,282 A 18,18 0 0 0 6,300 18,18 0 0 0 24,318 18,18 0 0 0 42,300 18,18 0 0 0 24,282 Z m -0.292968,6 c -0.19558,0.1077 -0.384988,0.18901 -0.566408,0.31641 0.731312,-0.1728 0.695924,0.0758 1.441408,-0.0234 -0.260778,0.0396 -0.578364,0.14009 -0.527344,0.17969 0.836192,0.0964 0.963378,-0.25794 1.734374,0 l -0.05078,-0.22657 c 1.077128,0.3855 1.299844,0.31958 2.464842,0.9375 0.408176,0.0226 0.451312,-0.24942 1.066408,0 0.11054,0.19274 -0.02138,0.22617 0.73828,0.67969 0.08504,-0.034 -0.1556,-0.25187 -0.339844,-0.42187 1.524984,0.81634 3.186856,2.5585 3.691408,4.41796 -0.473372,-0.8702 -0.04654,0.443 -0.210938,0.375 A 10.133494,10.133494 0 0 1 33.640624,296 c -0.141728,-0.49886 -0.447574,-1.6999 -0.980468,-2.47656 -0.04535,0.50172 -0.694162,-0.34483 -0.339844,0.75781 0.269278,0.39124 0.05508,-0.39761 0.38672,0.29687 0.0056,0.33164 0.1305,0.65901 0.20703,1.08985 -0.11622,-0.0198 -0.254804,-0.47506 -0.339844,-0.34766 0.11622,0.54138 0.305206,0.82088 0.378906,0.86328 -0.03968,0.0907 -0.13202,-0.0833 -0.14062,0.28516 0.04536,0.84752 0.237426,0.48774 0.328124,0.52734 -0.09354,0.41668 -0.46549,0.90786 -0.281248,1.625 -0.05386,-0.21828 -0.15502,-0.43761 -0.234376,-0.64453 -0.0737,0.61224 0.13502,0.7339 -0.14844,1.47656 0.204026,-0.66896 0.18102,-1.27242 -0.0118,-0.98046 0.08504,0.94958 -0.750856,1.67747 -0.660156,2.28125 L 31.5625,300.41797 c -0.66045,0.95242 -0.013,0.52329 -0.460938,1.24609 0.1644,-0.28356 -0.09042,-0.11436 0.125,-0.4375 -0.14172,0.008 -0.635244,0.60555 -1.085938,0.95703 -1.77159,1.41728 -3.883144,1.60519 -5.929686,0.83985 -0.07936,0.0652 0.3626,0.41203 0.691406,0.58203 0.7795,0.28612 1.661006,0.30184 2.355468,0.27344 -1.502308,0.62926 -4.361474,-0.63444 -5.296874,-2.3125 0.212592,0.0454 0.936236,1.17908 1.480468,1.36328 -0.320302,-0.25794 -0.56835,-0.58458 -0.800782,-0.92188 a 4.7053428,4.7053428 0 0 0 1.539064,1.17578 c -0.0184,-0.0709 0.02098,-0.11232 0.03126,-0.16016 0.0102,-0.0478 -0.0084,-0.0993 -0.14454,-0.1914 -1.73474,-1.3294 -2.763404,-2.459 -2.40625,-5.07812 0.263612,-0.1984 0.334814,-1.28922 0.941406,-1.67188 0.36849,-0.81634 1.479222,-1.57184 2.664062,-1.58984 1.210352,-0.0652 2.231972,0.64463 2.742188,1.31641 -0.92973,-0.8702 -2.461734,-1.13175 -3.765624,-0.48829 -1.332234,0.60092 -2.117286,2.06755 -2.003906,3.52735 0.0482,-0.0709 0.0906,-0.0256 0.11328,-0.20703 -0.03968,2.84022 3.062184,4.91987 5.29297,3.87109 l 0.02734,0.0625 c 0.907054,-0.2466 0.793228,-0.45403 1.382812,-0.85937 -0.04536,0.0935 -0.397256,0.33984 -0.1875,0.33984 0.28629,-0.0765 1.186716,-0.90785 1.628906,-1.30469 0.20408,-0.43652 -0.10768,-0.23632 0.17578,-0.78906 l 0.347656,-0.16798 c 0.19274,-0.55556 0.404426,-0.87041 0.378906,-1.51953 l -0.203126,0.42578 c 0.29764,-0.90138 0.12938,-1.87904 0.17188,-2.72656 l -0.08594,-0.0234 c -0.07086,-2.13158 -1.91456,-4.39872 -3.558594,-5.16406 -1.411604,-0.65478 -3.586418,-0.7638 -4.589844,-0.27344 0.13606,-0.12184 0.686772,-0.17593 0.519532,-0.26953 -1.573172,0.1559 -1.218266,0.55039 -2.425782,0.85937 -0.328808,0.3204 0.96683,-0.25759 0.269532,0.15625 -0.646276,0.17856 -0.95208,-0.11317 -1.910156,0.87891 0.08504,0.1418 0.611228,-0.40537 0.171874,0.14453 -0.901383,-0.11055 -2.847873,2.05737 -3.261716,2.77735 l 0.214844,0.0391 c -0.354318,0.89004 -0.820457,1.4554 -0.882813,1.98828 -0.09071,1.30956 -0.549001,3.69554 0.08594,4.42968 l -0.0625,0.61329 c 0.08504,0.17574 0.154002,0.35122 0.261719,0.51562 l -0.140624,0.0118 c 0.668952,2.10592 0.718948,0.0383 1.597656,2.22656 -0.127554,-0.0425 -0.255396,-0.0887 -0.445312,-0.34375 -0.01984,0.19558 0.276351,0.77091 0.625,1.21875 l -0.152344,0.17188 c 0.198418,0.35432 0.375668,0.42878 0.511718,0.55078 -0.725643,-0.39684 0.676072,1.30909 0.800782,1.52735 l 0.109374,-0.19922 c -0.01418,0.28346 0.20725,0.64993 0.621093,1.16015 l 0.34375,-0.0118 c 0.14173,0.28346 0.664763,0.7899 0.976563,0.8125 L 20.75,310.04297 c 0.793672,0.24944 0.3882,0.3328 1.363282,0.67578 l -0.19922,-0.34375 c 0.49888,0.428 0.647524,0.80401 1.347656,1.13281 0.972248,0.33738 1.102732,0.20873 2.097658,0.49219 -0.844696,-0.0255 -1.834956,-0.013 -2.503908,-0.25391 -4.557945,-1.23304 -8.728004,-6.57841 -8.421874,-12.08593 -0.0737,-1.11398 0.110027,-2.5102 -0.07422,-2.78516 0.260779,-0.85036 0.561376,-1.88417 1.167969,-3.11719 -0.04535,-0.0794 0.10119,0.24207 0.410156,-0.28515 0.18708,-0.411 0.338951,-0.86488 0.574219,-1.26172 l 0.125,-0.0274 c 0.11905,-0.7058 1.644128,-1.78781 2.097656,-2.33203 l 0.03125,0.20703 c 0.989257,-0.9269 2.754003,-1.54998 3.746093,-1.99218 -0.26078,0.28912 0.585888,-0.0296 1.195314,-0.0664 z"
-       id="circle10" />
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-fedora.svg

@@ -1,143 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M24.01 282c-9.94 0-17.99 8.052-18.007 17.992H6v13.928h.003a4.09 4.09 0 0 0 4.09 4.08h13.918C33.953 317.994 42 309.943 42 300.008c0-9.94-8.057-17.992-18.006-17.992zm3.657 7.409c3.023 0 5.877 2.313 5.877 5.505 0 .296.001.592-.047.928-.084.849-.86 1.459-1.705 1.34a1.503 1.503 0 0 1-1.263-1.764c.015-.095.02-.246.02-.505 0-1.81-1.482-2.508-2.882-2.508-1.4 0-2.663 1.177-2.664 2.509.024 1.54 0 3.067 0 4.605l2.599-.02c2.029-.042 2.052 3.012.023 2.998l-2.622.02c-.006 1.239.01 1.015.003 1.639 0 0 .022 1.515-.023 2.662-.314 3.373-3.186 6.068-6.638 6.068-3.66 0-6.673-2.989-6.673-6.655.11-3.77 3.118-6.737 6.907-6.702l2.114-.018v2.992l-2.114.02h-.011c-2.082.062-3.867 1.475-3.9 3.704a3.658 3.658 0 0 0 3.678 3.658c2.035 0 3.663-1.48 3.663-3.654l-.003-11.335c0-.21.007-.377.03-.61.344-2.772 2.825-4.884 5.633-4.884z" style="fill:#fff;fill-opacity:1;stroke-width:7.56025" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-fedora.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="11.625"
-     inkscape:cy="19.75"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;stroke-width:7.56025"
-       d="m 24.009509,282 c -9.940398,0 -17.9887244,8.05156 -18.0063081,17.99194 H 6 v 13.92762 H 6.00322 C 6.0079622,316.17396 7.8372626,318 10.093326,318 H 24.011281 C 33.953433,317.994 42,309.94306 42,300.00808 c 1.6e-5,-9.94038 -8.05712,-17.99196 -18.006308,-17.99196 z m 3.657536,7.40856 c 3.022733,0 5.876664,2.31352 5.876664,5.5051 0,0.29606 0.0017,0.59228 -0.04665,0.92792 -0.08376,0.84908 -0.860047,1.45926 -1.705322,1.33952 -0.845278,-0.121 -1.41888,-0.92342 -1.262554,-1.76276 0.0144,-0.0958 0.0196,-0.24626 0.0196,-0.50484 0,-1.80996 -1.481475,-2.50884 -2.882062,-2.50884 -1.400237,0 -2.66226,1.177 -2.664018,2.50884 0.02417,1.53988 0,3.06796 0,4.60554 l 2.598953,-0.02 c 2.029228,-0.0422 2.052086,3.01242 0.02341,2.99806 l -2.621818,0.02 c -0.0062,1.23864 0.0096,1.01464 0.0032,1.63846 0,0 0.02197,1.51496 -0.02327,2.66292 -0.313703,3.37262 -3.186271,6.06782 -6.638068,6.06782 -3.659289,0 -6.673236,-2.98912 -6.673236,-6.6556 0.109868,-3.77038 3.117695,-6.73622 6.907107,-6.70214 l 2.113633,-0.018 v 2.99264 l -2.113633,0.02 h -0.01134 c -2.081979,0.0614 -3.866784,1.4752 -3.900194,3.70412 0,2.03034 1.641316,3.65752 3.67863,3.65752 2.0345,0 3.662808,-1.47968 3.662808,-3.65396 l -0.0032,-11.33454 c 0.0011,-0.21042 0.0078,-0.37758 0.03107,-0.60968 0.343451,-2.77222 2.824068,-4.88504 5.632278,-4.88504 z"
-       id="path14-3" />
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-gentoo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.0"><path fill="#fff" fill-rule="evenodd" d="M20.269 6.012c-7.76.369-13.837 7.376-13.532 11.19.304 3.71 9.74 6.967 9.634 7.078-1.928 1.623-3.206 2.72-4.817 4.19-3.874 3.527-6.552 6.14-5.199 9.813 1.571 4.235 4.993 4.06 9.017 3.276 10.397-2.045 27.477-15.12 26.595-19.944-.715-3.903-10.256-11.618-15.91-14.384a12.05 12.05 0 0 0-5.813-1.219m1.629 6.697c.972-.1 2.097.153 3.363.762 2.755 1.324 5.608 4.844 0 6.848-1.524.533-6.406-1.312-6.265-3.878.13-2.38 1.283-3.593 2.902-3.732" style="stroke-width:2.25029"/></svg>

src/assets/gnome-shell/activities/activities-gnome.svg

@@ -1,143 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M35.469 282c-7.109 0-8.44 10.8-4.443 10.8S42.578 282 35.469 282zm-11.284 1.225c-4.065.573-2.636 8.231-.468 8.376 2.16.14 4.537-8.946.468-8.376zm-7.356 2.38a2.492 2.492 0 0 0-.667.17c-3.806 1.446-.579 7.407 1.556 7.008 1.998-.379 2.228-7.48-.885-7.173zm-5 4.797a2.02 2.02 0 0 0-1.101.314c-3.13 1.845 1.054 6.301 2.891 5.613 1.616-.608.587-5.86-1.79-5.932zm14.592 3.6c-5.6-.101-12.99 2.841-14.248 8.743C10.81 309.135 17.79 318 25.078 318c3.584 0 7.717-3.389 8.49-7.679.591-3.27-7.432-1.956-7.16.204.221 1.77-.705 2.687-1.981 2.721-1.743-.212-2.594-1.22-2.827-2.742-.31-3.988 12.262-6.837 11.267-13.023-.366-2.266-3.083-3.419-6.446-3.478z" style="fill:#fff;fill-opacity:1;stroke-width:7.5592" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-gnome.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-1"
-     inkscape:cy="5.875"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;stroke-width:7.5592"
-       d="m 35.46896,282 c -7.10901,0 -8.439822,10.79956 -4.44313,10.79956 3.996692,0 11.55214,-10.79956 4.44313,-10.79956 z m -11.284276,1.22452 c -4.06472,0.57398 -2.636116,8.23148 -0.467698,8.37604 2.159914,0.1404 4.53667,-8.94578 0.467698,-8.37604 z m -7.355615,2.38102 a 2.4915546,2.4915546 0 0 0 -0.667532,0.17 c -3.805363,1.4456 -0.578246,7.40664 1.556158,7.00696 1.998346,-0.3784 2.227944,-7.47892 -0.884374,-7.17278 z m -5.000117,4.79602 a 2.0196048,2.0196048 0 0 0 -1.101216,0.31464 c -3.1293237,1.84528 1.054446,6.30116 2.891224,5.61238 1.615685,-0.608 0.586748,-5.85898 -1.790008,-5.93128 z m 14.592178,3.60128 c -5.59962,-0.102 -12.98925,2.84018 -14.247782,8.7417 C 10.80852,309.135 17.789977,318 25.077562,318 c 3.584266,0 7.717016,-3.38868 8.490844,-7.67876 0.591,-3.26964 -7.432146,-1.95582 -7.16003,0.2041 0.221092,1.76874 -0.7058,2.68714 -1.981338,2.72114 -1.74324,-0.2126 -2.5936,-1.22026 -2.827448,-2.7424 -0.310382,-3.9882 12.26219,-6.8369 11.26727,-13.02328 -0.365656,-2.2662 -3.082556,-3.41844 -6.44573,-3.47796 z"
-       id="path12" />
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-manjaro.svg

@@ -1,143 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M32 282.008v36h10v-36zm-26 .021v10.659h.006l-.002 1.252c-.001.021-.004.041-.004.063v7.001c0 .035.002.068.006.102v16.902h10v-20.005H16v-6h13.998v-9.974zm11.998 11.974-.002 24.005h12.002L30 294.003Z" style="fill:#fff;fill-opacity:1;fill-rule:evenodd;stroke-width:5.67002" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)"
-   sodipodi:docname="activities-manjaro.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="38.1875"
-     inkscape:cy="12.4375"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1012"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#bebebe">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       id="path19"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:5.6694"
-       d="M 32 282.00781 L 32 318 L 42 318 L 42 282.00781 L 32 282.00781 z M 6 282.0293 L 6 292.68555 L 6.0058594 292.68555 L 6.0039062 293.9375 C 6.0026052 293.95847 6 293.97869 6 294 L 6 296 L 6 301 C 6 301.03462 6.0024575 301.06786 6.0058594 301.10156 L 6.0058594 318 L 16.005859 318 L 16.005859 298 L 16 298 L 16 296 L 16 294 L 16 292 L 29.998047 292 L 29.998047 282.0293 L 6 282.0293 z M 17.998047 294 L 17.996094 318 L 29.998047 318 L 30 294 L 17.998047 294 z " />
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-mxlinux.svg

@@ -1,38 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#fff" d="M24 6C14.028 6 6 14.028 6 24s8.028 18 18 18 18-8.028 18-18S33.972 6 24 6Zm-5.182 8.333 6.18 6.954 5.911-6.954 1.152 1.151-5.972 7.028 4.153 4.673.667-.76 5.758 6.908H11.333l8.637-9.787 1.618 1.752 1.284-1.51-6.357-7.153zm5.144 10.681-1.264 1.487 4.181 4.529 1.206-1.379z"/></svg>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="activities-mxlinux.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#b3b3b3"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="10.90123"
-     inkscape:cx="2.3850521"
-     inkscape:cy="23.300124"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M 24,6 C 14.028,6 6,14.028 6,24 6,33.972 14.028,42 24,42 33.972,42 42,33.972 42,24 42,14.028 33.972,6 24,6 Z m -5.1822,8.3334 6.181,6.9532 5.9102,-6.9532 1.15234,1.15104 -5.9726,7.0274 4.1536,4.6732 0.66666,-0.76042 5.7578,6.9088 h -25.334 l 8.6368,-9.7878 1.61848,1.7526 1.28386,-1.51042 -6.3568,-7.1524 z m 5.1446,10.681 -1.26432,1.48698 4.181,4.5286 1.20572,-1.3789 z"
-     fill="#ffffff"
-     stroke-width="0.66666"
-     id="path2" />
-</svg>

src/assets/gnome-shell/activities/activities-opensuse.svg

@@ -1,40 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#fff" d="M24 6a18 18 0 1 0 0 36 18 18 0 0 0 0-36zm0 4A14.001 14.001 0 1 1 24 38a13.895 13.895 0 0 1-9.503-3.75c.808-.11 2.084-.128 3.75.063 2.437.277 3.772.37 5.375.251 3.656-.276 6.071-.88 8.75-2.19 1.403-.68 1.701-.99 1.999-1.81.293-.779.4-1.502.255-1.502-.056 0-.515.179-1.063.438-2.062.978-3.87 1.459-5.443 1.378-1.628-.085-4.26-1.037-7.432-2.564l-1.5-.689-1.127-2.81 1.063.684a31.57 31.57 0 0 0 6.564 3.19c2.73.862 4.86.743 7.058-.375.779-.395 2.254-1.36 2.254-1.5 0-.256-.757-2.79-1.19-3.938-1.08-2.866-1.842-3.835-3.623-4.685-1.981-.944-4.175-1.586-8.189-2.5-1.913-.409-3.801-.821-5.748-1.063l-.064 2.372a64.712 64.712 0 0 0-3.687-1 14.03 14.03 0 0 1 11.502-5.994zm3.312 10.124a2.976 2.976 0 0 1 2.934 2.313c.191.744.132 1.276-.247 2.062a2.874 2.874 0 0 1-3.125 1.565 2.921 2.921 0 0 1-2.19-1.688c-.518-1.127-.276-2.623.626-3.44a3.091 3.091 0 0 1 1.998-.808zm.685 1.565c-1.046 0-1.701.765-1.123 1.31.468.442 1.25.51 1.871.19.408-.208.544-.522.442-.935-.076-.31-.68-.565-1.19-.565z" overflow="visible"/></svg>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   viewBox="0 0 48 48"
-   id="svg4"
-   sodipodi:docname="activities-opensuse.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#dbdbdb"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="10.90123"
-     inkscape:cx="-3.1189142"
-     inkscape:cy="22.382796"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="m 24,6 a 18,18 0 1 0 0,36 18,18 0 0 0 0,-36 z m 0,4.000941 a 14.001176,14.001176 0 1 1 0,27.997816 13.894591,13.894591 0 0 1 -9.502688,-3.750126 c 0.807853,-0.110546 2.083395,-0.127554 3.750126,0.06372 2.436259,0.276373 3.771368,0.36991 5.374299,0.25086 3.656543,-0.276372 6.07156,-0.880119 8.750546,-2.189677 1.403066,-0.680292 1.700747,-0.990635 1.998354,-1.811264 0.293373,-0.778069 0.399663,-1.500881 0.255108,-1.500881 -0.05526,0 -0.514473,0.178571 -1.062977,0.437935 -2.062153,0.977936 -3.869108,1.458399 -5.442331,1.377667 -1.628406,-0.08503 -4.260298,-1.037427 -7.432144,-2.563859 l -1.500882,-0.688795 -1.1267,-2.81044 1.062976,0.684539 a 31.569545,31.569545 0 0 0 6.564799,3.188855 c 2.729633,0.863111 4.859819,0.744068 7.057963,-0.374159 0.77807,-0.395415 2.253477,-1.360583 2.253477,-1.500882 0,-0.255108 -0.756828,-2.789198 -1.190501,-3.937141 -1.079984,-2.865694 -1.841046,-3.835163 -3.622526,-4.685499 -1.981345,-0.943919 -4.175256,-1.585923 -8.188896,-2.500059 -1.913313,-0.408174 -3.801151,-0.820628 -5.74848,-1.062976 l -0.06372,2.372535 a 64.712162,64.712162 0 0 0 -3.686402,-0.999177 14.030657,14.030657 0 0 1 11.501344,-5.995061 z m 3.312145,10.123299 a 2.9762893,2.9762893 0 0 1 2.933731,2.312968 c 0.191331,0.744069 0.13181,1.275542 -0.246604,2.062154 a 2.8742399,2.8742399 0 0 1 -3.125055,1.564681 2.9209558,2.9209558 0 0 1 -2.189677,-1.687972 c -0.518721,-1.126701 -0.276365,-2.62335 0.625018,-3.439745 a 3.0910381,3.0910381 0 0 1 1.998354,-0.807853 z m 0.68454,1.564682 c -1.045969,0 -1.700748,0.765294 -1.122468,1.309558 0.467696,0.442184 1.250067,0.510209 1.87083,0.191331 0.408167,-0.208339 0.544226,-0.522977 0.442184,-0.935377 -0.07653,-0.310381 -0.680292,-0.56549 -1.190501,-0.56549 z"
-     fill="#ffffff"
-     overflow="visible"
-     stroke-width="4.25183"
-     id="path2" />
-</svg>

src/assets/gnome-shell/activities/activities-popos.svg

@@ -1,38 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#fff" d="M24 6A18 18 0 0 0 6 24a18 18 0 0 0 18 18 18 18 0 0 0 18-18A18 18 0 0 0 24 6Zm-3.11 5.336c1.52-.036 2.157.323 3.04.898a6.337 6.337 0 0 1 2.648 3.922c.353 1.619.248 2.878-.176 3.778v.07c-.847 1.835-2.26 3.312-4.238 4.031l1.695 4.496c.318.827.6 1.69.352 2.48-.247.792-1.38 1.044-2.191.18-1.554-1.69-6.78-12.337-7.168-13.129-.389-.791-.813-1.439-.813-2.23.035-1.187 1.836-2.408 2.719-3.02.883-.611 2.614-1.44 4.133-1.476zm-1.386 3.277c-1.099.031-.498 2.368-.274 3.02.248.72.919 2.229 1.66 2.984.177.18.355.324.567.36.212.036.636-.181.813-.469.176-.288.21-.501.21-.789a4.52 4.604 0 0 0-.07-1.727c-.318-1.115-.988-2.194-1.871-2.914-.177-.143-.39-.326-.637-.398a1.165 1.165 0 0 0-.398-.066zm11.95 2.72c.166-.004.328.008.464.034a3.059 3.194 0 0 1 1.664.852c.408.39.44.819.305 1.351-.136.533-.61 1.669-.985 2.485l-.953 1.879c-1.835 3.407-2.209 3.764-2.719 3.55-.611-.248-.406-3.655.172-7.808.17-1.136.44-1.704.746-1.988.23-.213.803-.347 1.305-.356zm-2.09 12c.797.013 1.136.895.945 1.577a1.114 1.114 0 0 1-.547.715c-.293.163-.989.163-1.39-.129-.403-.292-.474-.782-.364-1.172.11-.39.473-.811.984-.941.133-.037.257-.053.371-.05zm-12.048 3.6h14.09c.75 0 1.356.535 1.356 1.2 0 .665-.605 1.2-1.356 1.2h-14.09c-.75 0-1.355-.535-1.355-1.2 0-.665.605-1.2 1.355-1.2z" style="stroke-width:2"/></svg>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="activities-popos.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#d1d1d1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="10.90123"
-     inkscape:cx="-4.403173"
-     inkscape:cy="15.044175"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M 24,6 A 18,18 0 0 0 6,24 18,18 0 0 0 24,42 18,18 0 0 0 42,24 18,18 0 0 0 24,6 Z m -3.1094,5.336 c 1.5186,-0.03597 2.1562,0.3229 3.039,0.89844 1.34202,0.89928 2.2952,2.3032 2.6484,3.9218 0.35316,1.61874 0.24802,2.878 -0.17578,3.7774 v 0.07031 c -0.84762,1.83456 -2.2606,3.3118 -4.2382,4.0312 l 1.69532,4.496 c 0.31784,0.82734 0.59876,1.68906 0.35156,2.4804 -0.24722,0.7914 -1.37912,1.04298 -2.1914,0.17968 -1.55394,-1.69068 -6.7792,-12.3376 -7.168,-13.129 -0.38848,-0.79139 -0.8125,-1.43905 -0.8125,-2.23039 0.03532,-1.1871 1.83586,-2.408 2.7188,-3.0196 0.8829,-0.61152 2.6142,-1.44056 4.1328,-1.47656 z m -1.38672,3.2774 c -1.09842,0.03066 -0.49746,2.3676 -0.27344,3.0196 0.24722,0.71946 0.9185,2.229 1.66016,2.9844 0.17658,0.17986 0.3545,0.3234 0.5664,0.35938 0.2119,0.03596 0.63592,-0.18098 0.8125,-0.46876 0.17658,-0.28778 0.21094,-0.50128 0.21094,-0.78906 A 4.5206,4.6044 0 0 0 22.41013,17.9924 c -0.31784,-1.11516 -0.9882,-2.1946 -1.8711,-2.914 -0.17658,-0.143886 -0.3895,-0.3265 -0.63672,-0.39844 -0.152302,-0.05059 -0.2848,-0.06958 -0.39844,-0.06641 z m 11.9492,2.7188 c 0.16728,-0.0028 0.3289,0.0085 0.46484,0.03516 a 3.059,3.1944 0 0 1 1.66406,0.85156 c 0.40784,0.39042 0.44064,0.81912 0.30468,1.35156 -0.13594,0.53238 -0.61052,1.66808 -0.98438,2.4844 l -0.95312,1.8789 c -1.83534,3.4072 -2.209,3.7638 -2.7188,3.5508 -0.61176,-0.24844 -0.40592,-3.656 0.17188,-7.8086 0.16994,-1.13574 0.44022,-1.70436 0.7461,-1.98828 0.22942,-0.21296 0.80284,-0.34716 1.30468,-0.35546 z m -2.0898,12 c 0.79768,0.0138 1.1371,0.89626 0.94532,1.57812 -0.07308,0.29224 -0.2546,0.55248 -0.54688,0.71484 -0.29228,0.16236 -0.98874,0.16334 -1.39062,-0.1289 -0.40188,-0.29224 -0.47288,-0.78224 -0.36328,-1.17188 0.1096,-0.38966 0.47288,-0.81156 0.98438,-0.9414 0.13244,-0.03652 0.25714,-0.05274 0.3711,-0.05078 z m -12.0468,3.6016 h 14.0898 c 0.75056,0 1.35546,0.53442 1.35546,1.19922 0,0.6648 -0.6049,1.19922 -1.35546,1.19922 h -14.0898 c -0.75056,0 -1.35546,-0.53442 -1.35546,-1.19922 0,-0.6648 0.6049,-1.19922 1.35546,-1.19922 z"
-     fill="#ffffff"
-     id="path2"
-     style="stroke-width:2" />
-</svg>

src/assets/gnome-shell/activities/activities-simple.svg

@@ -1,80 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><g transform="matrix(2.13333 0 0 2.13333 0 -2197.04)"><circle cx="3.75" cy="1041.112" r="1.875" style="opacity:1;fill:#fff;fill-opacity:1;stroke:none;stroke-width:.9375;stroke-opacity:1"/><circle cx="11.25" cy="1041.112" r="1.875" style="opacity:1;fill:#fff;fill-opacity:1;stroke:none;stroke-width:.9375;stroke-opacity:1"/><circle cx="18.75" cy="1041.112" r="1.875" style="opacity:1;fill:#fff;fill-opacity:1;stroke:none;stroke-width:.9375;stroke-opacity:1"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg4366"
-   version="1.1"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-simple.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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs4368" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#d1d1d1"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="-12.753176"
-     inkscape:cy="16.920055"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:pagecheckerboard="0" />
-  <metadata
-     id="metadata4371">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1029.8622)">
-    <g
-       id="g4494"
-       transform="matrix(2.1333333,0,0,2.1333333,3.75e-7,-1167.1771)">
-      <circle
-         r="1.875"
-         cy="1041.1122"
-         cx="3.75"
-         id="circle4787"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9375;stroke-opacity:1" />
-      <circle
-         r="1.875"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9375;stroke-opacity:1"
-         id="circle4789"
-         cx="11.25"
-         cy="1041.1122" />
-      <circle
-         r="1.875"
-         cy="1041.1122"
-         cx="18.75"
-         id="circle4791"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9375;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-ubuntu.svg

@@ -1,143 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" style="display:inline;enable-background:new" version="1.0"><g style="display:inline"><path d="M24 282a18 18 0 1 0 0 36 18 18 0 0 0 0-36zm6.416 5.017a2.398 2.398 0 0 1 1.786 3.584 2.402 2.402 0 1 1-1.786-3.584zm-6.42 2.543c.97 0 1.905.131 2.793.378a3.372 3.372 0 0 0 4.52 2.62 10.417 10.417 0 0 1 3.104 6.772l-3.423.047a7.02 7.02 0 0 0-9.95-5.74l-1.67-2.997a10.404 10.404 0 0 1 4.63-1.08Zm-5.791 1.751 1.76 2.947a7.011 7.011 0 0 0 0 11.484l-1.76 2.942a10.45 10.45 0 0 1-4.312-6.067 3.363 3.363 0 0 0 0-5.234 10.46 10.46 0 0 1 4.312-6.072zm-6.446 6.285a2.404 2.404 0 1 1 0 4.808 2.402 2.402 0 0 1 0-4.804zm19.231 3.023 3.423.055a10.408 10.408 0 0 1-3.104 6.769 3.359 3.359 0 0 0-4.52 2.615 10.434 10.434 0 0 1-7.42-.698l1.672-2.993a7.015 7.015 0 0 0 9.949-5.748zm-1.17 7.593a2.407 2.407 0 1 1 .587 4.78 2.407 2.407 0 0 1-.586-4.78z" style="fill:#fff;fill-opacity:1;stroke-width:7.5592" transform="translate(0 -276)"/></g></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   sodipodi:docname="activities-ubuntu.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-1"
-     inkscape:cy="5.875"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-276)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;stroke-width:7.5592"
-       d="m 24,282 a 18,18 0 1 0 0,36 18,18 0 0 0 0,-36 z m 6.415968,5.01714 a 2.3980158,2.3980158 0 0 1 1.785756,3.58426 2.4022676,2.4022676 0 1 1 -1.785756,-3.58426 z m -6.42022,2.54256 c 0.969412,0 1.904808,0.1318 2.793434,0.37842 a 3.3716784,3.3716784 0 0 0 4.519664,2.6191 c 1.777254,1.7475 2.933742,4.12426 3.103814,6.77314 l -3.422698,0.0468 a 7.0197236,7.0197236 0 0 0 -9.949216,-5.73992 L 19.369788,290.6397 A 10.404157,10.404157 0 0 1 24,289.55976 Z m -5.790952,1.75176 1.760246,2.94648 a 7.01122,7.01122 0 0 0 0,11.48412 l -1.760246,2.94224 a 10.450927,10.450927 0 0 1 -4.311328,-6.0673 3.3631748,3.3631748 0 0 0 0,-5.23398 10.459431,10.459431 0 0 1 4.311328,-6.07156 z m -6.445732,6.28416 a 2.4043936,2.4043936 0 1 1 0,4.80878 2.40227,2.40227 0 0 1 0,-4.80454 z m 19.230898,3.02302 3.422698,0.0552 a 10.408409,10.408409 0 0 1 -3.103814,6.76886 3.358923,3.358923 0 0 0 -4.519664,2.61486 10.43392,10.43392 0 0 1 -7.419394,-0.6973 l 1.670958,-2.99328 a 7.0154718,7.0154718 0 0 0 9.949216,-5.74842 z m -1.169246,7.59372 a 2.4074546,2.4074546 0 1 1 0.586748,4.77902 2.4074546,2.4074546 0 0 1 -0.586748,-4.77902 z"
-       id="path14" />
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-void.svg

@@ -1,61 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path d="M306.463 506.57a105.236 105.236 0 0 0-61.36 19.9l23.903 23.903a72.016 72.016 0 0 1 37.457-10.582c39.772 0 72.014 32.241 72.014 72.014a72.016 72.016 0 0 1-10.602 37.437l23.947 23.95a105.24 105.24 0 0 0 19.875-61.387c0-58.12-47.114-105.235-105.234-105.235zm-85.361 43.85a105.235 105.235 0 0 0-19.875 61.385c0 58.12 47.116 105.236 105.236 105.236a105.23 105.23 0 0 0 61.357-19.9l-23.902-23.903a72.01 72.01 0 0 1-37.455 10.582c-39.773 0-72.016-32.243-72.016-72.015a72.009 72.009 0 0 1 10.602-37.436zm85.343 27.883a33.503 33.503 0 0 0-33.504 33.502 33.503 33.503 0 0 0 33.504 33.504 33.503 33.503 0 0 0 33.504-33.504 33.503 33.503 0 0 0-33.504-33.502z" style="fill:#fff" transform="matrix(.17105 0 0 .17105 -28.419 -80.646)"/></svg>
-<svg
-   id="svg5556"
-   version="1.1"
-   viewBox="0 0 48 48"
-   height="48"
-   width="48"
-   sodipodi:docname="activities-void.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <sodipodi:namedview
-     id="namedview8"
-     pagecolor="#dbdbdb"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="5.4506148"
-     inkscape:cx="-20.364675"
-     inkscape:cy="18.163089"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5556" />
-  <defs
-     id="defs5550" />
-  <metadata
-     id="metadata5553">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="matrix(7.5590557,0,0,7.5590557,-2.9956602e-7,-2197.0394)"
-     id="layer1">
-    <g
-       transform="matrix(0.02262785,0,0,0.02262785,0.27826107,291.44373)"
-       id="g5457">
-      <path
-         id="path5443"
-         transform="translate(-178.44539,-506.5705)"
-         d="m 306.46289,506.57031 c -22.03188,0.0468 -43.49376,7.00749 -61.35937,19.90039 l 23.90234,23.90235 c 11.27745,-6.8986 24.23694,-10.55955 37.45703,-10.58203 39.77241,-8e-5 72.01375,32.24125 72.01367,72.01367 -0.0318,13.21538 -3.69961,26.16761 -10.60156,37.4375 l 23.94727,23.94922 c 12.8888,-17.87595 19.84123,-39.3488 19.875,-61.38672 0,-58.11963 -47.11476,-105.23438 -105.23438,-105.23438 z m -85.36133,43.84961 c -12.88881,17.87594 -19.84123,39.34684 -19.875,61.38477 0,58.11962 47.1167,105.23633 105.23633,105.23633 22.03188,-0.0468 43.4918,-7.00749 61.35742,-19.9004 l -23.90234,-23.90234 c -11.27745,6.89859 -24.235,10.55956 -37.45508,10.58203 -39.77242,8e-5 -72.0157,-32.24321 -72.01562,-72.01562 0.0318,-13.21538 3.6996,-26.16566 10.60156,-37.43555 z m 85.34375,27.88281 a 33.503357,33.503357 0 0 0 -33.5039,33.50196 33.503357,33.503357 0 0 0 33.5039,33.5039 33.503357,33.503357 0 0 0 33.50391,-33.5039 33.503357,33.503357 0 0 0 -33.50391,-33.50196 z"
-         style="fill:#ffffff" />
-    </g>
-  </g>
-</svg>

src/assets/gnome-shell/activities/activities-zorin.svg

@@ -1,38 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><path fill="#fff" d="M15.741 6c-1.1 0-2.45.79-3 1.754l-2.66 4.676h27.836l3.191 5.593-5.851-10.27c-.55-.963-1.9-1.753-3-1.753Zm25.368 12.023L17.187 30.43h23.664l2.664-4.675c.55-.964.55-2.544 0-3.508zm-33.96-.453-2.664 4.676c-.55.964-.55 2.544 0 3.508l2.406 4.222L30.813 17.57Zm5.594 22.676c.55.964 1.9 1.754 3 1.754h16.515c1.1 0 2.451-.79 3-1.754l2.66-4.676H10.084"/></svg>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="activities-zorin.svg"
-   inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)"
-   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="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#d6d6d6"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="10.90123"
-     inkscape:cx="13.57645"
-     inkscape:cy="20.364675"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M 15.741041,6 C 14.641247,6 13.290253,6.790136 12.741056,7.7538912 L 10.08087,12.429668 H 37.91673 L 41.108114,18.02344 35.256544,7.7538912 C 34.707426,6.790116 33.356353,6 32.256559,6 Z m 25.367873,12.02334 -23.92188,12.406138 h 23.663882 l 2.663986,-4.675777 c 0.549178,-0.963775 0.549178,-2.543987 0,-3.507782 z M 7.1490841,17.570222 4.4850974,22.245999 c -0.5491772,0.963775 -0.5491772,2.543987 0,3.507782 L 6.8912854,29.97636 30.813166,17.570222 Z M 12.742856,40.246109 C 13.292053,41.209884 14.643047,42 15.742841,42 h 16.515518 c 1.099794,0 2.450987,-0.790116 2.999985,-1.753891 L 37.91853,35.570332 H 10.08267"
-     fill="#ffffff"
-     stroke-width="0.642857"
-     id="path2" />
-</svg>

src/assets/gnome-shell/activities/activities.svg

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- 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"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="activities.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   style="display:inline;enable-background:new">
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#f57900"
-     id="base"
-     pagecolor="#bebebe"
-     bordercolor="#525252"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="36.697868"
-     inkscape:cy="24.948153"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="3840"
-     inkscape:window-height="2032"
-     inkscape:window-x="0"
-     inkscape:window-y="56"
-     width="400px"
-     height="300px"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     gridtolerance="10000"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="false"
-     objecttolerance="10000"
-     guidetolerance="10000"
-     borderlayer="true"
-     showborder="true"
-     guidecolor="#ff0b00"
-     guideopacity="1"
-     guidehicolor="#001aff"
-     guidehiopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3123"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="12,12"
-       orientation="1,0"
-       id="guide4135"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="selected_bg_color"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
-         offset="0"
-         id="stop4140" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="" />
-        <dc:title></dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:relation />
-        <dc:language />
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1"
-     transform="translate(0,-252)">
-    <path
-       d="m 29.300605,263.77552 c 1.241756,-1.54604 2.083667,-3.64658 1.851379,-5.77552 -1.788491,0.075 -4.016806,1.24226 -5.307753,2.7433 -1.140333,1.33176 -2.153369,3.50856 -1.890997,5.56043 2.007081,0.1498 4.06267,-1.01559 5.347289,-2.52805 z m 4.525124,13.37571 c -0.0429,-4.5528 3.725274,-6.76334 3.895914,-6.86874 -2.131817,-3.11142 -5.437295,-3.53306 -6.602787,-3.57148 -2.77797,-0.28304 -5.467097,1.6691 -6.884224,1.6691 -1.442242,-2e-4 -3.620284,-1.63532 -5.966007,-1.58882 -3.023559,0.0452 -5.854887,1.79594 -7.404881,4.50706 -3.1909978,5.5412 -0.812151,13.67978 2.252708,18.14795 1.535294,2.1995 3.323745,4.64766 5.669506,4.55092 2.294247,-0.0872 3.149539,-1.45668 5.922504,-1.45668 2.743926,0 3.547704,1.45668 5.941651,1.40982 2.46365,-0.0404 4.013082,-2.20346 5.495181,-4.41206 1.765137,-2.5195 2.477867,-4.98949 2.506307,-5.12105 -0.05492,-0.0204 -4.7754,-1.8156 -4.825872,-7.26602 z"
-       style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:0.40056705;enable-background:new"
-       id="path121"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>