README.md

@@ -1,16 +1,10 @@
 <h1 align="center"> WhiteSur GTK Theme </h1>
-<p align="center"> <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/macbook.png"/> </p>
+<p align="center"> <img src="imagenes/macbook.png"/> </p>
 
 <br>
 <p align="center"> <b> A macOS BigSur-like theme for your GTK apps </b> </p>
 <br>
 
-## Donate
-
-If you like my project, you can buy me a coffee:
-
-<span class="paypal"><a href="https://www.paypal.me/vinceliuice" title="Donate to this project using Paypal"><img src="https://www.paypalobjects.com/webstatic/mktg/Logo/pp-logo-100px.png" alt="PayPal donate button" /></a></span>
-
 # Installation is easy!
 <details> <summary> Required dependencies <b>(click to open)</b> </summary>
 
@@ -42,7 +36,7 @@ Don't worry, WhiteSur installer already provides all of those dependencies.
 
 ### Installing from source
 
-1. Run `git clone https://github.com/vinceliuice/WhiteSur-gtk-theme.git --depth=1`
+1. Run `git clone https://gitea.soloconlinux.org.es/luisgulo/WhiteSur-gtk-theme.git --depth=1`
 
 2. Run `./install.sh` to install the default WhiteSur GTK theme pack.
 
@@ -177,7 +171,7 @@ 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>
+<p align="center"> <img src="imagenes/colors-themes.png"/> </p>
 
 #### Install theme color
 Parameter: `--color` `-c` (repeatable)
@@ -201,7 +195,7 @@ Example:
 ```
 
 ### <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>
+<p align="center"> <img src="imagenes/nautilus.png"/> </p>
 
 Parameter: `--nautilus-style` `-N`
 
@@ -283,7 +277,7 @@ 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.svg"/>
+<img src="imagenes/firefox.svg"/>
 </a> </p>
 
 #### [Install Firefox theme](src/other/firefox)
@@ -303,7 +297,7 @@ Example:
 ```
 
 ### <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>
+<p align="center"> <img src="imagenes/gdm.png"/> </p>
 
 #### Install GDM theme
 Parameter: `--gdm` `-g` (requires to be run as root)
@@ -348,22 +342,22 @@ like changing theme color (dark and light variant) and accent, GNOME Shell
 
 ## Other recommended stuff
 ### WhiteSur Icon Theme
-<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"/>
+<p align="center"> <a href="https://gitea.soloconlinux.org.es/luisgulo/WhiteSur-icon-theme">
+  <img src="imagenes/icon-theme.png"/>
 </a> </p>
 <br>
-<p align="center"> <a href="https://github.com/vinceliuice/WhiteSur-icon-theme">
-  <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/download-button.svg"/>
+<p align="center"> <a href="https://gitea.soloconlinux.org.es/luisgulo/WhiteSur-icon-theme">
+  <img src="imagenes/download-button.svg"/>
 </a> </p>
 <br>
 
 ### WhiteSur Wallpapers
-<p align="center"> <a href="https://github.com/vinceliuice/WhiteSur-wallpapers">
-  <img class="image" src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/wallpaper.gif"/>
+<p align="center"> <a href="https://gitea.soloconlinux.org.es/luisgulo/WhiteSur-wallpapers">
+  <img class="image" src="imagenes/wallpaper.gif"/>
 </a> </p>
 <br>
-<p align="center"> <a href="https://github.com/vinceliuice/WhiteSur-wallpapers">
-  <img src="https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/download-button.svg"/>
+<p align="center"> <a href="https://gitea.soloconlinux.org.es/luisgulo/WhiteSur-wallpapers">
+  <img src="imagenes/download-button.svg"/>
 </a> </p>
 <br>
 

imagenes/download-button.svg

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="160"
+   height="48"
+   version="1.1"
+   viewBox="0 0 160 48"
+   id="svg12304"
+   sodipodi:docname="download-button.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs12308" />
+  <sodipodi:namedview
+     id="namedview12306"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="60.610169"
+     inkscape:cy="24.101695"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg12304" />
+  <g
+     fill-opacity="0.97647"
+     stroke-linecap="square"
+     id="g12302"
+     transform="matrix(3.7795573,0,0,3.7795573,-1.7671869e-6,-2.6507804e-7)">
+    <rect
+       x="6.3578e-07"
+       y="9.5367e-08"
+       width="42.333"
+       height="12.7"
+       rx="6.3499999"
+       ry="6.3499999"
+       fill="#0071e3"
+       stroke-width="0.17259"
+       id="rect12282" />
+    <g
+       fill="#ffffff"
+       stroke-width="0.94837"
+       aria-label="Download"
+       id="g12300">
+      <path
+         d="m 8.8054,8.4074 h 1.1966 c 1.1853,0 1.9925,-0.77329 1.9925,-2.032 0,-1.1853 -0.7112,-1.8852 -1.9078,-1.8852 H 8.8054 Z M 9.27389,8.001 V 4.8966 h 0.75636 c 0.95391,0 1.4845,0.5588 1.4845,1.5522 0,0.98778 -0.52493,1.5522 -1.4563,1.5522 z"
+         id="path12284" />
+      <path
+         d="m 13.863,8.4638 c 0.80151,0 1.3434,-0.58138 1.3434,-1.4506 0,-0.84102 -0.50236,-1.3829 -1.2756,-1.3829 -0.80151,0 -1.3377,0.57573 -1.3377,1.445 0,0.84102 0.49671,1.3885 1.27,1.3885 z m 0.06209,-0.39511 c -0.52493,0 -0.88053,-0.42333 -0.88053,-1.0499 0,-0.60396 0.32173,-0.99342 0.82409,-0.99342 0.52493,0 0.88618,0.42898 0.88618,1.0499 0,0.59831 -0.32738,0.99342 -0.82973,0.99342 z"
+         id="path12286" />
+      <path
+         d="m 16.516,8.4074 h 0.44591 l 0.73942,-2.19 0.78458,2.19 h 0.4572 L 19.84058,5.6868 H 19.38902 L 18.71733,7.8938 17.97791,5.6981 H 17.4812 l -0.72813,2.2296 -0.6604,-2.2408 h -0.51364 z"
+         id="path12288" />
+      <path
+         d="m 22.245,8.4074 h 0.45156 V 6.6238 c 0,-0.60396 -0.40076,-0.99342 -1.0104,-0.99342 -0.31044,0 -0.62089,0.10724 -0.88053,0.29916 l -0.1016,-0.24271 h -0.31609 v 2.7206 h 0.45156 v -2.128 c 0.20884,-0.16369 0.4572,-0.254 0.72249,-0.254 0.44027,0 0.68298,0.24836 0.68298,0.68862 z"
+         id="path12290" />
+      <path
+         d="m 24.203,8.4413 c 0.14676,0 0.32173,-0.033867 0.42898,-0.090311 l -0.1016,-0.31609 c -0.06773,0.028222 -0.12982,0.045155 -0.19756,0.045155 -0.19191,0 -0.29351,-0.12982 -0.29351,-0.33867 v -3.5052 h -0.45156 v 3.5616 c 0,0.38947 0.24271,0.64347 0.61524,0.64347 z"
+         id="path12292" />
+      <path
+         d="m 26.252,8.4638 c 0.80151,0 1.3434,-0.58138 1.3434,-1.4506 0,-0.84102 -0.50236,-1.3829 -1.2756,-1.3829 -0.80151,0 -1.3377,0.57573 -1.3377,1.445 0,0.84102 0.49671,1.3885 1.27,1.3885 z m 0.06209,-0.39511 c -0.52493,0 -0.88053,-0.42333 -0.88053,-1.0499 0,-0.60396 0.32173,-0.99342 0.82409,-0.99342 0.52493,0 0.88618,0.42898 0.88618,1.0499 0,0.59831 -0.32738,0.99342 -0.82973,0.99342 z"
+         id="path12294" />
+      <path
+         d="m 30.04,8.4074 h 0.31609 V 6.6407 c 0,-0.64911 -0.38382,-1.0104 -1.095,-1.0104 -0.3556,0 -0.73942,0.095955 -1.0329,0.25964 l 0.11289,0.33302 c 0.28222,-0.12418 0.56444,-0.18627 0.82973,-0.18627 0.48542,0 0.73378,0.2032 0.73378,0.60396 v 0.18062 c -1.2192,0.011289 -1.7498,0.26529 -1.7498,0.84667 0,0.48542 0.36124,0.79587 0.92004,0.79587 0.34431,0 0.63782,-0.11289 0.85796,-0.31044 z M 29.90453,7.7978 c -0.16933,0.16933 -0.41769,0.27093 -0.69991,0.27093 -0.36124,0 -0.59831,-0.18062 -0.59831,-0.45156 0,-0.33867 0.38382,-0.47978 1.2982,-0.48542 z"
+         id="path12296" />
+      <path
+         d="m 32.286,8.4638 c 0.32738,0 0.60396,-0.11853 0.8128,-0.32173 l 0.11289,0.26529 h 0.31609 v -4.1712 h -0.45156 v 1.6369 C 32.88431,5.71502 32.63595,5.63035 32.34809,5.63035 c -0.76764,0 -1.2756,0.57573 -1.2756,1.4393 0,0.83538 0.48542,1.3942 1.2136,1.3942 z m 0.79022,-0.70556 c -0.1524,0.19756 -0.38382,0.31044 -0.6604,0.31044 -0.54187,0 -0.89182,-0.42333 -0.89182,-1.0499 0,-0.59831 0.31609,-0.99342 0.84102,-0.99342 0.3048,0 0.54751,0.12418 0.7112,0.33867 z"
+         id="path12298" />
+    </g>
+  </g>
+</svg>

install.sh

@@ -1,6 +1,6 @@
-#! /usr/bin/env bash
+#!/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,
@@ -20,34 +20,35 @@ colors=("${COLOR_VARIANTS[@]}")
 opacities=("${OPACITY_VARIANTS[@]}")
 
 usage() {
-  # Please specify their default value manually, some of them are come from _variables.scss
-  # You also have to check and update them regurally
+  # Please specify their default value manually, some of them come from _variables.scss
+  # You also have to check and update them regularly
   helpify_title
-  helpify "-d, --dest"           "DIR"                                                "Set destination directory"                        "Default is '${THEME_DIR}'"
-  helpify "-n, --name"           "NAME"                                               "Set theme name"                                   "Default is '${THEME_NAME}'"
-  helpify "-o, --opacity"        "[$(IFS='|'; echo "${OPACITY_VARIANTS[*]}")]"        "Set theme opacity variants"                       "Repeatable. Default is all variants"
-  helpify "-c, --color"          "[$(IFS='|'; echo "${COLOR_VARIANTS[*]}")]"          "Set theme color variants"                         "Repeatable. Default is all variants"
-  helpify "-a, --alt"            "[$(IFS='|'; echo "${ALT_VARIANTS[*]}")|all]"        "Set window control buttons variant"               "Repeatable. Default is 'normal'"
-  helpify "-t, --theme"          "[$(IFS='|'; echo "${THEME_VARIANTS[*]}")|all]"      "Set theme accent color"                           "Repeatable. Default is BigSur-like theme"
-  helpify "-p, --panel-opacity"  "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]"  "Set panel transparency"                           "Default is 15%"
-  helpify "-P, --panel-size"     "[$(IFS='|'; echo "${PANEL_SIZE_VARIANTS[*]}")]"     "Set Gnome shell panel height size"                "Default is 32px"
-  helpify "-s, --size"           "[$(IFS='|'; echo "${SIDEBAR_SIZE_VARIANTS[*]}")]"   "Set Nautilus sidebar minimum width"               "Default is 200px"
-  helpify "-i, --icon"           "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]"           "Set 'Activities' icon"                            "Default is 'standard'"
-  helpify "-b, --background"     "[default|blank|IMAGE_PATH]"                         "Set gnome-shell background image"                 "Default is BigSur-like wallpaper"
-  helpify "-m, --monterey"                ""                                          "Set to MacOS Monterey style"                      ""
-  helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style"                               "Default is BigSur-like style (stabled sidebar)"
-  helpify "-l, --libadwaita"              ""                                          "Install theme into gtk4.0 config for libadwaita"  "Default is dark version"
-  helpify "-HD, --highdefinition"         ""                                          "Set to High Definition size"                      "Default is laptop size"
-  helpify "--normal, --normalshowapps"    ""                                          "Set gnome-shell show apps button style to normal" "Default is bigsur"
-  helpify "--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"        ""
-  helpify "-h, --help"                    ""                                          "Show this help"                                   ""
+  helpify "-d, --dest"                    "DIR"                                               "Set destination directory"                "Default is '${THEME_DIR}'"
+  helpify "-n, --name"                    "NAME"                                              "Set theme name"                           "Default is '${THEME_NAME}'"
+  helpify "-o, --opacity"                 "[$(IFS='|'; echo "${OPACITY_VARIANTS[*]}")]"       "Set theme opacity variants"               "Repeatable. Default is all variants"
+  helpify "-c, --color"                   "[$(IFS='|'; echo "${COLOR_VARIANTS[*]}")]"         "Set theme color variants"                 "Repeatable. Default is all variants"
+  helpify "-a, --alt"                     "[$(IFS='|'; echo "${ALT_VARIANTS[*]}")|all]"       "Set window control buttons variant"       "Repeatable. Default is 'normal'"
+  helpify "-t, --theme"                   "[$(IFS='|'; echo "${THEME_VARIANTS[*]}")|all]"     "Set theme accent color"                   "Repeatable. Default is BigSur-like theme"
+  helpify "-p, --panel-opacity"           "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]" "Set panel transparency"                   "Default is 15%"
+  helpify "-P, --panel-size"              "[$(IFS='|'; echo "${PANEL_SIZE_VARIANTS[*]}")]"    "Set Gnome shell panel height size"        "Default is 32px"
+  helpify "-s, --size"                    "[$(IFS='|'; echo "${SIDEBAR_SIZE_VARIANTS[*]}")]"  "Set Nautilus sidebar minimum width"       "Default is 200px"
+  helpify "-i, --icon"                    "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]"          "Set 'Activities' icon"                    "Default is 'standard'"
+  helpify "-b, --background"              "[default|blank|IMAGE_PATH]"                        "Set gnome-shell background image"         "Default is BigSur-like wallpaper"
+  helpify "-m, --monterey"                ""                                                  "Set to MacOS Monterey style"              ""
+  helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]"         "Set Nautilus style"                       "Default is BigSur-like style (stabled sidebar)"
+  helpify "-l, --libadwaita"              ""                                                  "Install theme into gtk4.0 config for libadwaita" "Default is dark version"
+  helpify "-HD, --highdefinition"         ""                                                  "Set to High Definition size"              "Default is laptop size"
+  helpify "--normal, --normalshowapps"    ""                                                  "Set gnome-shell show apps button style to normal" "Default is BigSur"
+  helpify "--default, --defaultactivities" ""                                                 "Set gnome-shell panel activities button style to system default" "Default is Apple icon"
+  helpify "--round, --roundedmaxwindow"   ""                                                  "Set maximized window to rounded"          "Default is square"
+  helpify "--right, --rightplacement"     ""                                                  "Set Nautilus title button placement to right" "Default is left"
+  helpify "--black, --blackfont"          ""                                                  "Set panel font color to black"            "Default is white"
+  helpify "--darker, --darkercolor"       ""                                                  "Install darker '${THEME_NAME}' dark themes" ""
+  helpify "--nord, --nordcolor"           ""                                                  "Install '${THEME_NAME}' Nord ColorScheme themes" ""
+  helpify "--dialog, --interactive"       ""                                                  "Run this installer interactively, with dialogs" ""
+  helpify "--silent-mode"                 ""                                                  "Meant for developers: ignore any confirm prompt and params become more strict" ""
+  helpify "-r, --remove, -u, --uninstall" ""                                                  "Remove all installed ${THEME_NAME} themes" ""
+  helpify "-h, --help"                    ""                                                  "Show this help"                            ""
 }
 
 ###############################################################################
@@ -63,13 +64,13 @@ 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 don't require a value
     -r|--remove|-u|-uninstall)
       uninstall='true'; shift ;;
     --silent-mode)
@@ -78,6 +79,8 @@ while [[ $# -gt 0 ]]; do
       interactive='true'; shift ;;
     --normal|--normalshowapps)
       showapps_normal="true"; shift ;;
+    --default|--defaultactivities)
+      default_activities="true"; shift ;;
     --right|--rightplacement)
       right_placement="true"; shift ;;
     --round|--roundedmaxwindow)
@@ -94,7 +97,7 @@ while [[ $# -gt 0 ]]; do
       monterey="true"; shift ;;
     -l|--libadwaita)
       libadwaita="true"; shift ;;
-    # Parameters that require value, single use
+    # Parameters that require a value, single use
     -b|--background)
       check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
     -d|--dest)
@@ -111,7 +114,7 @@ while [[ $# -gt 0 ]]; do
       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
+    # Parameters that require a value, multiple use
     -a|--alt)
       check_param "${1}" "${1}" "${2}" "not-at-all" "must" "must" && shift 2 || shift ;;
     -o|--opacity)
@@ -136,15 +139,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
@@ -183,12 +186,8 @@ else
     fi
   fi
 
-  if (is_running "xfce4-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
+  if (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
@@ -199,10 +198,6 @@ else
   fi
 
   echo; prompt -w "${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

make-release.sh

@@ -19,7 +19,7 @@ install() {
 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
+      rm -rf ${RELEASE_DIR}/${THEME_NAME}${color}${solid}.tar.xz
     done
   done
 
@@ -27,7 +27,7 @@ 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}
+      tar -Jcf ${RELEASE_DIR}/${THEME_NAME}${color}${solid}.tar.xz ${THEME_NAME}${color}${solid}
     done
   done
 }
@@ -37,8 +37,8 @@ compress() {
 #install && compress
 #prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
 
-GNOME_VERSION="44-0"
-RELEASE_VERSION="-44-0"
+GNOME_VERSION="46-0"
+RELEASE_VERSION="-last"
 install && compress
 prompt -s "Compress Gnome${RELEASE_VERSION} version finished!"; echo
 

shell/lib-core.sh

@@ -26,7 +26,9 @@ MY_HOME=$(getent passwd "${MY_USERNAME}" | cut -d: -f6)
 
 if command -v gnome-shell &> /dev/null; then
   SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
-  if [[ "${SHELL_VERSION:-}" -ge "44" ]]; then
+  if [[ "${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"
@@ -36,7 +38,7 @@ if command -v gnome-shell &> /dev/null; then
     GNOME_VERSION="3-28"
   fi
 else
-  GNOME_VERSION="none"
+  GNOME_VERSION="46-0"
 fi
 
 #----------Program options-------------#
@@ -314,10 +316,14 @@ signal_error() {
   done
 
   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}"
-  prompt -e "REPO   : ${repo_ver}\n"
+  prompt -e "DISTRO  : $(IFS=';'; echo "${dist_ids[*]}")"
+  prompt -e "SUDO    : $([[ -w "/root" ]] && echo "yes" || echo "no")"
+  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
     prompt -w "HINT: You can run: 'sudo apt install sassc libglib2.0-dev libxml2-utils' on ubuntu 18.04 or 'sudo apt install sassc libglib2.0-dev-bin' on ubuntu >= 20.04 \n"
@@ -721,7 +727,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
 }

shell/lib-install.sh

@@ -381,10 +381,6 @@ install_shelly() {
     TARGET_DIR="${6}"
   fi
 
-  if [[ "${GNOME_VERSION}" == 'none' ]]; then
-    local GNOME_VERSION='44-0'
-  fi
-
   mkdir -p                                                                                    "${TARGET_DIR}"
   mkdir -p                                                                                    "${TARGET_DIR}/assets"
   cp -r "${THEME_SRC_DIR}/assets/gnome-shell/icons"                                           "${TARGET_DIR}"
@@ -530,9 +526,11 @@ config_gtk4() {
 
   # Install gtk4.0 into config for libadwaita
   mkdir -p                                                                                    "${TARGET_DIR}"
-  rm -rf                                                                                      "${TARGET_DIR}/"{gtk.css,gtk-dark.css,assets,windows-assets}
-  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk${color}.scss"                         "${TARGET_DIR}/gtk.css"
-  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Dark.scss"                            "${TARGET_DIR}/gtk-dark.css"
+  # backup_file "${TARGET_DIR}/gtk.css" "udo"
+  rm -rf                                                                                      "${TARGET_DIR}/"{gtk.css,gtk-Light.css,gtk-Dark.css,assets,windows-assets}
+  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Light.scss"                           "${TARGET_DIR}/gtk-Light.css"
+  sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Dark.scss"                            "${TARGET_DIR}/gtk-Dark.css"
+  ln -sf "${TARGET_DIR}/gtk-${colors}.css"                                                    "${TARGET_DIR}/gtk.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"
@@ -548,13 +546,24 @@ install_libadwaita() {
 }
 
 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-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
@@ -574,7 +583,7 @@ install_themes() {
     done
   done
 
-  stop_animation
+  stop_animation; fix_whiskermenu
 }
 
 remove_themes() {
@@ -726,6 +735,7 @@ config_firefox() {
       echo "user_pref(\"browser.uidensity\", 0);" >>                                          "${d}/prefs.js"
       echo "user_pref(\"layers.acceleration.force-enabled\", true);" >>                       "${d}/prefs.js"
       echo "user_pref(\"mozilla.widget.use-argb-visuals\", true);" >>                         "${d}/prefs.js"
+      echo "user_pref(\"widget.gtk.rounded-bottom-corners.enabled\", true);" >>               "${d}/prefs.js"
     fi
   done
 }
@@ -767,14 +777,13 @@ remove_firefox_theme() {
 #                               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"
-    rm -rf "${DASH_TO_DOCK_DIR_HOME}"
+    backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo"
+  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
@@ -789,7 +798,7 @@ install_dash_to_dock_theme() {
     if [[ "${GNOME_VERSION}" != '3-28'  ]]; then
       udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-4.scss"                       "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css"
     else
-      udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss"                      "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css"
+      udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss"                       "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css"
     fi
   elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then
     backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo"
@@ -945,6 +954,12 @@ customize_theme() {
     sed $SED_OPT "/\$showapps_button/s/bigsur/normal/"                          "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
   fi
 
+  # Change gnome-shell panel activities button style
+  if [[ "${default_activities}" == 'true' ]]; then
+    prompt -s "Changing gnome-shell panel activities button style ...\n"
+    sed $SED_OPT "/\$activities/s/apple/normal/"                                "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
+  fi
+
   # Change panel font color
   if [[ "${monterey}" == 'true' ]]; then
     black_font="true"