Fixed issues

Update _switcher-popup.scss

.gitignore

@@ -11,3 +11,12 @@ src/main/gnome-shell/gnome-shell-Dark.css
 src/main/cinnamon/cinnamon.css
 src/main/cinnamon/cinnamon-Light.css
 src/main/cinnamon/cinnamon-Dark.css
+release/Colloid-Catppuccin.tar.xz
+release/Colloid-Dracula.tar.xz
+release/Colloid-Everforest.tar.xz
+release/Colloid-Gruvbox.tar.xz
+release/Colloid-Nord.tar.xz
+release/Colloid.tar.xz
+src/main/libadwaita/libadwaita-Dark.css
+src/main/libadwaita/libadwaita-Light.css
+src/main/libadwaita/libadwaita.css

README.md

@@ -40,26 +40,54 @@ Run the following commands in the terminal:
 -c, --color VARIANT...  Specify color variant(s) [standard|light|dark] (Default: All variants)
 -s, --size VARIANT...   Specify size variant [standard|compact] (Default: standard variant)
 
--l, --libadwaita        Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme
-
--r, --remove,
--u, --uninstall         Uninstall/Remove installed themes or links
+-l, --libadwaita        Install specify gtk-4.0 theme into config folder ($HOME/.config/gtk-4.0) for all gtk4 apps use this theme
+                        Default ColorSchemes theme will follow the system style (light/dark mode switch), all ColorSchemes versions not support this !
+                        Options for default ColorSchemes:
+                        1. system                      Default option (using system colors for light/dark mode switching)
+                        2. fixed                       Using fixed theme colors (that will break light/dark mode switch)
 
 --tweaks                Specify versions for tweaks
-                        1. [nord|dracula|gruvbox|all]  (Nord/Dracula/gruvbox/all) ColorSchemes version
+                        1. [nord|dracula|gruvbox|everforest|catppuccin|all]  (Nord/Dracula/Gruvbox/Everforet/Catppuccin/all) ColorSchemes version
                         2. black                       Blackness color version
                         3. rimless                     Remove the 1px border about windows and menus
                         4. normal                      Normal windows button style like gnome default theme (titlebuttons: max/min/close)
                         5. float                       Floating gnome-shell panel style
 
+-r, --remove,
+-u, --uninstall         Uninstall/Remove installed themes or links
+
 -h, --help              Show help
 ```
 
 > For more information, run: `./install.sh --help`
 
+### Fix for Libadwaita
+
+```sh
+./install.sh -l
+```
+
+Default ColorSchemes themes will follow the system style now ! (switch [light/dark] mode)
+
+https://github.com/vinceliuice/Colloid-gtk-theme/assets/7604295/d5c24086-08bc-45a4-b4d9-124c02249216
+
+### Fix for Flatpak
+
+```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
+
+### ColorSchemes
+
+![colorschemes](colorschemes.png?raw=true)
+
+### Tweaks
+
 ![tweaks](tweaks.png?raw=true)
 
-### Flatpak Installation
+### Flatpak Installation (gtk-3.0)
 
 Automatically install your host GTK+ theme as a Flatpak. Use this:
 

assets.sh

@@ -177,46 +177,87 @@ make_assets() {
   if [[ "$scheme" == '-Everforest' ]]; then
     case "$theme" in
       '')
-          theme_color_dark='#458588'
-          theme_color_light='#83a598'
+        theme_color_dark='#3a94c5'
+        theme_color_light='#7fbbb3'
         ;;
       -Purple)
-          theme_color_dark='#ab62b1'
-          theme_color_light='#d386cd'
+        theme_color_dark='#df69ba'
+        theme_color_light='#D699B6'
         ;;
       -Pink)
         theme_color_dark='#b16286'
         theme_color_light='#d3869b'
         ;;
       -Red)
-          theme_color_dark='#cc241d'
-          theme_color_light='#fb4934'
+        theme_color_dark='#f85552'
+        theme_color_light='#E67E80'
         ;;
       -Orange)
-          theme_color_dark='#d65d0e'
+        theme_color_dark='#f57d26'
+        theme_color_light='#E69875'
+        ;;
+      -Yellow)
+        theme_color_dark='#dfa000'
+        theme_color_light='#DBBC7F'
+        ;;
+      -Green)
+        theme_color_dark='#8da101'
+        theme_color_light='#A7C080'
+        ;;
+      -Teal)
+        theme_color_dark='#35a77c'
+        theme_color_light='#83C092'
+        ;;
+      -Grey)
+        theme_color_dark='#414b50'
+        theme_color_light='#e6e2cc'
+        ;;
+    esac
+  fi
+
+  if [[ "$scheme" == '-Catppuccin' ]]; then
+    case "$theme" in
+      '')
+        theme_color_dark='#1e66f5'
+        theme_color_light='#8caaee'
+        ;;
+      -Purple)
+        theme_color_dark='#8839ef'
+        theme_color_light='#ca9ee6'
+        ;;
+      -Pink)
+        theme_color_dark='#ea76cb'
+        theme_color_light='#f4b8e4'
+        ;;
+      -Red)
+        theme_color_dark='#e64553'
+        theme_color_light='#ea999c'
+        ;;
+      -Orange)
+        theme_color_dark='#fe640b'
         theme_color_light='#fe8019'
         ;;
       -Yellow)
-          theme_color_dark='#d79921'
-          theme_color_light='#fabd2f'
+        theme_color_dark='#df8e1d'
+        theme_color_light='#ef9f76'
         ;;
       -Green)
-          theme_color_dark='#98971a'
-          theme_color_light='#b8bb26'
+        theme_color_dark='#40a02b'
+        theme_color_light='#a6d189'
         ;;
       -Teal)
-          theme_color_dark='#689d6a'
-          theme_color_light='#8ec07c'
+        theme_color_dark='#179299'
+        theme_color_light='#81c8be'
         ;;
       -Grey)
-          theme_color_dark='#3c3836'
-          theme_color_light='#a89984'
+        theme_color_dark='#5c5f77'
+        theme_color_light='#ccd0da'
         ;;
     esac
   fi
 
   if [[ "$blackness" == 'true' ]]; then
-    case "$ctype" in
+    case "$scheme" in
       '')
         background_light='#FFFFFF'
         background_dark='#0F0F0F'
@@ -238,6 +279,13 @@ make_assets() {
         titlebar_light='#f0f1f4'
         titlebar_dark='#020203'
         ;;
+      -Gruvbox)
+        background_light='#f9f5d7'
+        background_dark='#0f0e0e'
+        background_dark_alt='#121110'
+        titlebar_light='#fbf1c7'
+        titlebar_dark='#0d0907'
+        ;;
       -Everforest)
         background_light='#fffbef'
         background_dark='#1e2326'
@@ -245,9 +293,16 @@ make_assets() {
         titlebar_light='#f2efdf'
         titlebar_dark='#020203'
         ;;
+      -Catppuccin)
+        background_light='#eff1f5'
+        background_dark='#181825'
+        background_darker='#1e1e2e'
+        titlebar_light='#e6e9ef'
+        titlebar_dark='#11111b'
+        ;;
     esac
   else
-    case "$ctype" in
+    case "$scheme" in
       '')
         background_light='#ffffff'
         background_dark='#2c2c2c'
@@ -269,12 +324,26 @@ make_assets() {
         titlebar_light='#f0f1f4'
         titlebar_dark='#1f2029'
         ;;
+      -Gruvbox)
+        background_light='#f9f5d7'
+        background_dark='#282524'
+        background_dark_alt='#3c3836'
+        titlebar_light='#fbf1c7'
+        titlebar_dark='#242220'
+        ;;
       -Everforest)
-        background_light='#fffbef'
-        background_dark='#232A2E'
-        background_dark_alt='#343F44'
-        background_light='#edeada'
-        background_dark='#1e2326'
+        background_light='#fdf6e3'
+        background_dark='#2d353b'
+        background_dark_alt='#343f44'
+        titlebar_light='#f4f0d9'
+        titlebar_dark='#272e33'
+        ;;
+      -Catppuccin)
+        background_light='#eff1f5'
+        background_dark='#292c3c'
+        background_darker='#303446'
+        titlebar_light='#e6e9ef'
+        titlebar_dark='#24273a'
         ;;
     esac
   fi
@@ -331,7 +400,109 @@ make_assets() {
   cp -r "${SRC_DIR}/assets/metacity-1/assets${window}"                                       "${THEME_DIR}/metacity-1/assets"
   cp -r "${SRC_DIR}/assets/metacity-1/thumbnail${ELSE_DARK:-}.png"                           "${THEME_DIR}/metacity-1/thumbnail.png"
 
-  cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${scheme}${window}/"*.png              "${THEME_DIR}/xfwm4"
-  cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${scheme}${window}-hdpi/"*.png         "${THEME_DIR}-hdpi/xfwm4"
-  cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${scheme}${window}-xhdpi/"*.png        "${THEME_DIR}-xhdpi/xfwm4"
+  cp -r "${SRC_DIR}/assets/xfwm4/svg/assets${ELSE_LIGHT:-}${window}/"*.svg                   "${THEME_DIR}/xfwm4"
+  cp -r "${SRC_DIR}/assets/xfwm4/svg/assets${ELSE_LIGHT:-}${window}-hdpi/"*.svg              "${THEME_DIR}-hdpi/xfwm4"
+  cp -r "${SRC_DIR}/assets/xfwm4/svg/assets${ELSE_LIGHT:-}${window}-xhdpi/"*.svg             "${THEME_DIR}-xhdpi/xfwm4"
+  cp -r "${SRC_DIR}/assets/xfwm4/xpm/assets/"*.xpm                                           "${THEME_DIR}/xfwm4"
+  cp -r "${SRC_DIR}/assets/xfwm4/xpm/assets-hdpi/"*.xpm                                      "${THEME_DIR}-hdpi/xfwm4"
+  cp -r "${SRC_DIR}/assets/xfwm4/xpm/assets-xhdpi/"*.xpm                                     "${THEME_DIR}-xhdpi/xfwm4"
+
+  if [[ "$normal" == "true" ]] ; then
+    mv -f "${THEME_DIR}/xfwm4/button-active-Normal.xpm"                                      "${THEME_DIR}/xfwm4/button-active.xpm"
+    mv -f "${THEME_DIR}-hdpi/xfwm4/button-active-Normal.xpm"                                 "${THEME_DIR}-hdpi/xfwm4/button-active.xpm"
+    mv -f "${THEME_DIR}-xhdpi/xfwm4/button-active-Normal.xpm"                                "${THEME_DIR}-xhdpi/xfwm4/button-active.xpm"
+    mv -f "${THEME_DIR}/xfwm4/button-inactive-Normal.xpm"                                    "${THEME_DIR}/xfwm4/button-inactive.xpm"
+    mv -f "${THEME_DIR}-hdpi/xfwm4/button-inactive-Normal.xpm"                               "${THEME_DIR}-hdpi/xfwm4/button-inactive.xpm"
+    mv -f "${THEME_DIR}-xhdpi/xfwm4/button-inactive-Normal.xpm"                              "${THEME_DIR}-xhdpi/xfwm4/button-inactive.xpm"
+  fi
+
+  case "$scheme" in
+    '')
+      button_close="#fd5f51"
+      button_max="#38c76a"
+      button_min="#fdbe04"
+      ;;
+    -Nord)
+      button_close="#bf616a"
+      button_max="#a3be8c"
+      button_min="#ebcb8b"
+      ;;
+    -Gruvbox)
+      button_close="#cc241d"
+      button_max="#98971a"
+      button_min="#d79921"
+      ;;
+    -Dracula)
+      if [[ "$color" == '-Light' ]]; then
+        button_close="#ed5d5d"
+        button_max="#43db68"
+        button_min="#e3d93b"
+      else
+        button_close="#f44d4d"
+        button_max="#4be772"
+        button_min="#e8f467"
+      fi
+      ;;
+    -Catppuccin)
+      if [[ "$color" == '-Light' ]]; then
+        button_close="#e64553"
+        button_max="#40a02b"
+        button_min="#df8e1d"
+      else
+        button_close="#ea999c"
+        button_max="#a6d189"
+        button_min="#e5c890"
+      fi
+      ;;
+    -Everforest)
+      if [[ "$color" == '-Light' ]]; then
+        button_close="#e67e80"
+        button_max="#93ac6c"
+        button_min="#d6b77a"
+      else
+        button_close="#ff9c9e"
+        button_max="#b6cf8f"
+        button_min="#eacb8e"
+      fi
+      ;;
+  esac
+
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}/xfwm4/close-active.svg"
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}/xfwm4/close-prelight.svg"
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}/xfwm4/close-pressed.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}/xfwm4/maximize-active.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}/xfwm4/maximize-prelight.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}/xfwm4/maximize-pressed.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}/xfwm4/maximize-toggled-active.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}/xfwm4/maximize-toggled-prelight.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}/xfwm4/maximize-toggled-pressed.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}/xfwm4/hide-active.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}/xfwm4/hide-prelight.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}/xfwm4/hide-pressed.svg"
+
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}-hdpi/xfwm4/close-active.svg"
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}-hdpi/xfwm4/close-prelight.svg"
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}-hdpi/xfwm4/close-pressed.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-hdpi/xfwm4/maximize-active.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-hdpi/xfwm4/maximize-prelight.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-hdpi/xfwm4/maximize-pressed.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-hdpi/xfwm4/maximize-toggled-active.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-hdpi/xfwm4/maximize-toggled-prelight.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-hdpi/xfwm4/maximize-toggled-pressed.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}-hdpi/xfwm4/hide-active.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}-hdpi/xfwm4/hide-prelight.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}-hdpi/xfwm4/hide-pressed.svg"
+
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}-xhdpi/xfwm4/close-active.svg"
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}-xhdpi/xfwm4/close-prelight.svg"
+  sed -i "s/#fd5f51/${button_close}/g"                                          "${THEME_DIR}-xhdpi/xfwm4/close-pressed.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/maximize-active.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/maximize-prelight.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/maximize-pressed.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/maximize-toggled-active.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/maximize-toggled-prelight.svg"
+  sed -i "s/#38c76a/${button_max}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/maximize-toggled-pressed.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/hide-active.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/hide-prelight.svg"
+  sed -i "s/#fdbe04/${button_min}/g"                                            "${THEME_DIR}-xhdpi/xfwm4/hide-pressed.svg"
 }

build.sh

@@ -35,6 +35,8 @@ for color in "${_COLOR_VARIANTS[@]}"; do
   echo "==> Generating the 3.0 gtk${color}.css..."
   sassc $SASSC_OPT src/main/gtk-4.0/gtk${color}.{scss,css}
   echo "==> Generating the 4.0 gtk${color}.css..."
+  sassc $SASSC_OPT src/main/libadwaita/libadwaita${color}.{scss,css}
+  echo "==> Generating the libadwaita libadwaita${color}.css..."
   sassc $SASSC_OPT src/main/gnome-shell/gnome-shell${color}.{scss,css}
   echo "==> Generating the gnome-shell${color}.css..."
   sassc $SASSC_OPT src/main/cinnamon/cinnamon${color}.{scss,css}

gtkrc.sh

@@ -13,65 +13,82 @@ make_gtkrc() {
   local GTKRC_DIR="${SRC_DIR}/main/gtk-2.0"
   local THEME_DIR="${1}/${2}${3}${4}${5}${6}"
 
-  if [[ "${color}" != '-Dark' ]]; then
   case "$theme" in
     '')
-        theme_color='#3c84f7'
+      theme_color_dark='#3c84f7'
+      theme_color_light='#5b9bf8'
       ;;
     -Purple)
-        theme_color='#AB47BC'
+      theme_color_dark='#AB47BC'
+      theme_color_light='#BA68C8'
       ;;
     -Pink)
-        theme_color='#EC407A'
+      theme_color_dark='#EC407A'
+      theme_color_light='#F06292'
       ;;
     -Red)
-        theme_color='#E53935'
+      theme_color_dark='#E53935'
+      theme_color_light='#F44336'
       ;;
     -Orange)
-        theme_color='#F57C00'
+      theme_color_dark='#F57C00'
+      theme_color_light='#FB8C00'
       ;;
     -Yellow)
-        theme_color='#FBC02D'
+      theme_color_dark='#FBC02D'
+      theme_color_light='#FFD600'
       ;;
     -Green)
-        theme_color='#4CAF50'
+      theme_color_dark='#4CAF50'
+      theme_color_light='#66BB6A'
       ;;
     -Teal)
-        theme_color='#009688'
+      theme_color_dark='#009688'
+      theme_color_light='#4DB6AC'
       ;;
     -Grey)
-        theme_color='#464646'
+      theme_color_dark='#464646'
+      theme_color_light='#DDDDDD'
       ;;
   esac
 
   if [[ "$scheme" == '-Nord' ]]; then
     case "$theme" in
       '')
-          theme_color='#5e81ac'
+        theme_color_dark='#5e81ac'
+        theme_color_light='#89a3c2'
         ;;
       -Purple)
-          theme_color='#b57daa'
+        theme_color_dark='#b57daa'
+        theme_color_light='#c89dbf'
         ;;
       -Pink)
-          theme_color='#cd7092'
+        theme_color_dark='#cd7092'
+        theme_color_light='#dc98b1'
         ;;
       -Red)
-          theme_color='#c35b65'
+        theme_color_dark='#c35b65'
+        theme_color_light='#d4878f'
         ;;
       -Orange)
-          theme_color='#d0846c'
+        theme_color_dark='#d0846c'
+        theme_color_light='#dca493'
         ;;
       -Yellow)
-          theme_color='#e4b558'
+        theme_color_dark='#e4b558'
+        theme_color_light='#eac985'
         ;;
       -Green)
-          theme_color='#82ac5d'
+        theme_color_dark='#82ac5d'
+        theme_color_light='#a0c082'
         ;;
       -Teal)
-          theme_color='#83b9b8'
+        theme_color_dark='#63a6a5'
+        theme_color_light='#83b9b8'
         ;;
       -Grey)
-          theme_color='#3a4150'
+        theme_color_dark='#3a4150'
+        theme_color_light='#d9dce3'
         ;;
     esac
   fi
@@ -79,155 +96,81 @@ make_gtkrc() {
   if [[ "$scheme" == '-Dracula' ]]; then
     case "$theme" in
       '')
-          theme_color='#a679ec'
+        theme_color_dark='#a679ec'
+        theme_color_light='#bd93f9'
         ;;
       -Purple)
-          theme_color='#a679ec'
+        theme_color_dark='#a679ec'
+        theme_color_light='#bd93f9'
         ;;
       -Pink)
-          theme_color='#f04cab'
+        theme_color_dark='#f04cab'
+        theme_color_light='#ff79c6'
         ;;
       -Red)
-          theme_color='#f44d4d'
+        theme_color_dark='#f44d4d'
+        theme_color_light='#ff5555'
         ;;
       -Orange)
-          theme_color='#f8a854'
+        theme_color_dark='#f8a854'
+        theme_color_light='#ffb86c'
         ;;
       -Yellow)
-          theme_color='#e8f467'
+        theme_color_dark='#e8f467'
+        theme_color_light='#f1fa8c'
         ;;
       -Green)
-          theme_color='#4be772'
+        theme_color_dark='#4be772'
+        theme_color_light='#50fa7b'
         ;;
       -Teal)
-          theme_color='#20eed9'
+        theme_color_dark='#20eed9'
+        theme_color_light='#50fae9'
         ;;
       -Grey)
-          theme_color='#3c3f51'
-          ;;
-      esac
-    fi
-    if [[ "$scheme" == "-Everforest" ]]; then
-      case "$theme" in
-        '')
-          theme_color='#7fbbb3'
-          ;;
-        -Purple)
-          theme_color='#cb8eab'
-          ;;
-        -Pink)
-          theme_color='#b16286'
-          ;;
-        -Red)
-          theme_color='#db7375'
-          ;;
-        -Orange)
-          theme_color='#db8d6a'
-          ;;
-        -Yellow)
-          theme_color='#d0b174'
-          ;;
-        -Green)
-          theme_color='#9cb575'
-          ;;
-        -Teal)
-          theme_color='#78b587'
-          ;;
-        -Grey)
-          theme_color='#7A8478'
-      esac
-    fi
-  else
-    case "$theme" in
-      '')
-        theme_color='#5b9bf8'
-        ;;
-      -Purple)
-        theme_color='#BA68C8'
-        ;;
-      -Pink)
-        theme_color='#F06292'
-        ;;
-      -Red)
-        theme_color='#F44336'
-        ;;
-      -Orange)
-        theme_color='#FB8C00'
-        ;;
-      -Yellow)
-        theme_color='#FFD600'
-        ;;
-      -Green)
-        theme_color='#66BB6A'
-        ;;
-      -Teal)
-        theme_color='#4DB6AC'
-        ;;
-      -Grey)
-        theme_color='#DDDDDD'
-        ;;
-    esac
-
-    if [[ "$scheme" == '-Nord' ]]; then
-      case "$theme" in
-        '')
-          theme_color='#89a3c2'
-          ;;
-        -Purple)
-          theme_color='#c89dbf'
-          ;;
-        -Pink)
-          theme_color='#dc98b1'
-          ;;
-        -Red)
-          theme_color='#d4878f'
-          ;;
-        -Orange)
-          theme_color='#dca493'
-          ;;
-        -Yellow)
-          theme_color='#eac985'
-          ;;
-        -Green)
-          theme_color='#a0c082'
-          ;;
-        -Teal)
-          theme_color='#83b9b8'
-          ;;
-        -Grey)
-          theme_color='#d9dce3'
+        theme_color_dark='#3c3f51'
+        theme_color_light='#d9dae3'
         ;;
     esac
   fi
 
-    if [[ "$scheme" == '-Dracula' ]]; then
+  if [[ "$scheme" == '-Gruvbox' ]]; then
     case "$theme" in
       '')
-          theme_color='#bd93f9'
+        theme_color_dark='#458588'
+        theme_color_light='#83a598'
         ;;
       -Purple)
-          theme_color='#bd93f9'
+        theme_color_dark='#ab62b1'
+        theme_color_light='#d386cd'
         ;;
       -Pink)
-          theme_color='#ff79c6'
+        theme_color_dark='#b16286'
+        theme_color_light='#d3869b'
         ;;
       -Red)
-          theme_color='#ff5555'
+        theme_color_dark='#cc241d'
+        theme_color_light='#fb4934'
         ;;
       -Orange)
-          theme_color='#ffb86c'
+        theme_color_dark='#d65d0e'
+        theme_color_light='#fe8019'
         ;;
       -Yellow)
-          theme_color='#f1fa8c'
+        theme_color_dark='#d79921'
+        theme_color_light='#fabd2f'
         ;;
       -Green)
-          theme_color='#50fa7b'
+        theme_color_dark='#98971a'
+        theme_color_light='#b8bb26'
         ;;
       -Teal)
-          theme_color='#50fae9'
+        theme_color_dark='#689d6a'
+        theme_color_light='#8ec07c'
         ;;
       -Grey)
-          theme_color='#d9dae3'
+        theme_color_dark='#3c3836'
+        theme_color_light='#a89984'
         ;;
     esac
   fi
@@ -235,34 +178,83 @@ make_gtkrc() {
   if [[ "$scheme" == '-Everforest' ]]; then
     case "$theme" in
       '')
-          theme_color='#3A94c5'
+        theme_color_dark='#3a94c5'
+        theme_color_light='#7fbbb3'
         ;;
       -Purple)
-          theme_color='#bd93f9'
+        theme_color_dark='#df69ba'
+        theme_color_light='#D699B6'
         ;;
       -Pink)
-          theme_color='#DF69ba'
+        theme_color_dark='#b16286'
+        theme_color_light='#d3869b'
         ;;
       -Red)
-          theme_color='#f85552'
+        theme_color_dark='#f85552'
+        theme_color_light='#E67E80'
         ;;
       -Orange)
-          theme_color='#F57D26'
+        theme_color_dark='#f57d26'
+        theme_color_light='#E69875'
         ;;
       -Yellow)
-          theme_color='#DFA000'
+        theme_color_dark='#dfa000'
+        theme_color_light='#DBBC7F'
         ;;
       -Green)
-          theme_color='#8da101'
+        theme_color_dark='#8da101'
+        theme_color_light='#A7C080'
         ;;
       -Teal)
-          theme_color='#35a77c'
+        theme_color_dark='#35a77c'
+        theme_color_light='#83C092'
         ;;
       -Grey)
-          theme_color='#708089'
+        theme_color_dark='#414b50'
+        theme_color_light='#e6e2cc'
         ;;
     esac
   fi
+
+  if [[ "$scheme" == '-Catppuccin' ]]; then
+    case "$theme" in
+      '')
+        theme_color_dark='#1e66f5'
+        theme_color_light='#8caaee'
+        ;;
+      -Purple)
+        theme_color_dark='#8839ef'
+        theme_color_light='#ca9ee6'
+        ;;
+      -Pink)
+        theme_color_dark='#ea76cb'
+        theme_color_light='#f4b8e4'
+        ;;
+      -Red)
+        theme_color_dark='#e64553'
+        theme_color_light='#ea999c'
+        ;;
+      -Orange)
+        theme_color_dark='#fe640b'
+        theme_color_light='#fe8019'
+        ;;
+      -Yellow)
+        theme_color_dark='#df8e1d'
+        theme_color_light='#ef9f76'
+        ;;
+      -Green)
+        theme_color_dark='#40a02b'
+        theme_color_light='#a6d189'
+        ;;
+      -Teal)
+        theme_color_dark='#179299'
+        theme_color_light='#81c8be'
+        ;;
+      -Grey)
+        theme_color_dark='#5c5f77'
+        theme_color_light='#ccd0da'
+        ;;
+    esac
   fi
 
   if [[ "$blackness" == 'true' ]]; then
@@ -291,6 +283,14 @@ make_gtkrc() {
         titlebar_light='#f0f1f4'
         titlebar_dark='#020203'
         ;;
+      -Gruvbox)
+        background_light='#f9f5d7'
+        background_dark='#0f0e0e'
+        background_darker='#121110'
+        background_alt='#211f1e'
+        titlebar_light='#fbf1c7'
+        titlebar_dark='#0d0907'
+        ;;
       -Everforest)
         background_light='#fffbef'
         background_dark='#1e2326'
@@ -299,6 +299,14 @@ make_gtkrc() {
         titlebar_light='#f2efdf'
         titlebar_dark='#020203'
         ;;
+      -Catppuccin)
+        background_light='#eff1f5'
+        background_dark='#181825'
+        background_darker='#1e1e2e'
+        background_alt='#232634'
+        titlebar_light='#e6e9ef'
+        titlebar_dark='#11111b'
+        ;;
     esac
   else
     case "$scheme" in
@@ -326,13 +334,29 @@ make_gtkrc() {
         titlebar_light='#f0f1f4'
         titlebar_dark='#1f2029'
         ;;
+      -Gruvbox)
+        background_light='#f9f5d7'
+        background_dark='#282524'
+        background_darker='#3c3836'
+        background_alt='#504945'
+        titlebar_light='#fbf1c7'
+        titlebar_dark='#242220'
+        ;;
       -Everforest)
-        background_light='#fffbef'
-        background_dark='#232A2E'
-        background_darker='#343F44'
-        background_alt='#3D484D'
-        background_light='#edeada'
-        background_dark='#1e2326'
+        background_light='#fdf6e3'
+        background_dark='#2d353b'
+        background_darker='#343f44'
+        background_alt='#414b50'
+        titlebar_light='#f4f0d9'
+        titlebar_dark='#272e33'
+        ;;
+      -Catppuccin)
+        background_light='#eff1f5'
+        background_dark='#292c3c'
+        background_darker='#303446'
+        background_alt='#4c4f69'
+        titlebar_light='#e6e9ef'
+        titlebar_dark='#24273a'
         ;;
     esac
   fi
@@ -343,11 +367,11 @@ make_gtkrc() {
   sed -i "s/#464646/${background_alt}/g"                                        "${THEME_DIR}/gtk-2.0/gtkrc"
 
   if [[ "${color}" == '-Dark' ]]; then
-    sed -i "s/#5b9bf8/${theme_color}/g"                                         "${THEME_DIR}/gtk-2.0/gtkrc"
+    sed -i "s/#5b9bf8/${theme_color_light}/g"                                   "${THEME_DIR}/gtk-2.0/gtkrc"
     sed -i "s/#3C3C3C/${background_darker}/g"                                   "${THEME_DIR}/gtk-2.0/gtkrc"
     sed -i "s/#242424/${titlebar_dark}/g"                                       "${THEME_DIR}/gtk-2.0/gtkrc"
   else
-    sed -i "s/#3c84f7/${theme_color}/g"                                         "${THEME_DIR}/gtk-2.0/gtkrc"
+    sed -i "s/#3c84f7/${theme_color_dark}/g"                                    "${THEME_DIR}/gtk-2.0/gtkrc"
     sed -i "s/#F2F2F2/${titlebar_light}/g"                                      "${THEME_DIR}/gtk-2.0/gtkrc"
   fi
 }

install.sh

@@ -15,8 +15,14 @@ scheme=
 window=
 
 # Destination directory
-if [ "$UID" -eq "$ROOT_UID" ]; then
+if [[ "$UID" -eq "$ROOT_UID" ]]; then
   DEST_DIR="/usr/share/themes"
+elif [[ -n "$XDG_DATA_HOME" ]]; then
+  DEST_DIR="$XDG_DATA_HOME/themes"
+elif [[ -d "$HOME/.themes" ]]; then
+  DEST_DIR="$HOME/.themes"
+elif [[ -d "$HOME/.local/share/themes" ]]; then
+  DEST_DIR="$HOME/.local/share/themes"
 else
   DEST_DIR="$HOME/.themes"
 fi
@@ -25,14 +31,16 @@ SASSC_OPT="-M -t expanded"
 
 THEME_NAME=Colloid
 THEME_VARIANTS=('' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey')
-SCHEME_VARIANTS=('' '-Nord' '-Dracula' '-Gruvbox' '-Everforest')
+SCHEME_VARIANTS=('' '-Nord' '-Dracula' '-Gruvbox' '-Everforest' '-Catppuccin')
 COLOR_VARIANTS=('' '-Light' '-Dark')
 SIZE_VARIANTS=('' '-Compact')
 
 if [[ "$(command -v gnome-shell)" ]]; then
-  gnome-shell --version
+  echo && gnome-shell --version
   SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
-  if [[ "${SHELL_VERSION:-}" -ge "46" ]]; then
+  if [[ "${SHELL_VERSION:-}" -ge "47" ]]; then
+    GS_VERSION="47-0"
+  elif [[ "${SHELL_VERSION:-}" -ge "46" ]]; then
     GS_VERSION="46-0"
   elif [[ "${SHELL_VERSION:-}" -ge "44" ]]; then
     GS_VERSION="44-0"
@@ -45,7 +53,7 @@ if [[ "$(command -v gnome-shell)" ]]; then
   fi
 else
   echo "'gnome-shell' not found, using styles for last gnome-shell version available."
-  GS_VERSION="46-0"
+  GS_VERSION="47-0"
 fi
 
 usage() {
@@ -63,18 +71,22 @@ OPTIONS:
 
   -s, --size VARIANT      Specify size variant [standard|compact] (Default: standard variant)
 
-  -l, --libadwaita        Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme
-
-  -r, --remove,
-  -u, --uninstall         Uninstall/Remove installed themes or links
+  -l, --libadwaita        Install specify gtk-4.0 theme into config folder ($HOME/.config/gtk-4.0) for all gtk4 apps use this theme
+                          Default ColorSchemes theme will follow the system style (light/dark mode switch), all ColorSchemes versions not support this !
+                          Options for default ColorSchemes:
+                          1. system                      Default option (using system colors for light/dark mode switching)
+                          2. fixed                       Using fixed theme colors (that will break light/dark mode switch)
 
   --tweaks                Specify versions for tweaks
-                          1. [nord|dracula|gruvbox|everforest|all]  Nord|Dracula|gruvbox|everforet|all ColorSchemes version
+                          1. [nord|dracula|gruvbox|everforest|catppuccin|all]  (Nord/Dracula/Gruvbox/Everforet/Catppuccin/all) ColorSchemes version
                           2. black                       Blackness color version
                           3. rimless                     Remove the 1px border about windows and menus
                           4. normal                      Normal windows button style like gnome default theme (titlebuttons: max/min/close)
                           5. float                       Floating gnome-shell panel style
 
+  -r, --remove,
+  -u, --uninstall         Uninstall/Remove installed themes or links
+
   -h, --help              Show help
 EOF
 }
@@ -93,7 +105,7 @@ install() {
 
   local THEME_DIR="${1}/${2}${3}${4}${5}${6}"
 
-  [[ -d "${THEME_DIR}" ]] && rm -rf "${THEME_DIR}"
+  [[ -d "${THEME_DIR}" ]] && rm -rf "${THEME_DIR}"{'','-hdpi','-xhdpi'}
 
   echo "Installing '${THEME_DIR}'..."
 
@@ -110,7 +122,7 @@ install() {
   echo "[X-GNOME-Metatheme]" >>                                                              "${THEME_DIR}/index.theme"
   echo "GtkTheme=${2}${3}${4}${5}${6}" >>                                                    "${THEME_DIR}/index.theme"
   echo "MetacityTheme=${2}${3}${4}${5}${6}" >>                                               "${THEME_DIR}/index.theme"
-  echo "IconTheme=Tela-circle${ELSE_DARK:-}" >>                                              "${THEME_DIR}/index.theme"
+  echo "IconTheme=Colloid${3}${6}${4}" >>                                                    "${THEME_DIR}/index.theme"
   echo "CursorTheme=${2}-cursors" >>                                                         "${THEME_DIR}/index.theme"
   echo "ButtonLayout=close,minimize,maximize:menu" >>                                        "${THEME_DIR}/index.theme"
 
@@ -138,12 +150,12 @@ install() {
   cd "${THEME_DIR}/metacity-1" && ln -sf metacity-theme-3.xml metacity-theme-1.xml && ln -sf metacity-theme-3.xml metacity-theme-2.xml
 
   mkdir -p                                                                                   "${THEME_DIR}/xfwm4"
-  cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}"                                       "${THEME_DIR}/xfwm4/themerc"
+  cp -r "${SRC_DIR}/main/xfwm4/themerc"                                                      "${THEME_DIR}/xfwm4/themerc"
   mkdir -p                                                                                   "${THEME_DIR}-hdpi/xfwm4"
-  cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}"                                       "${THEME_DIR}-hdpi/xfwm4/themerc"
+  cp -r "${SRC_DIR}/main/xfwm4/themerc"                                                      "${THEME_DIR}-hdpi/xfwm4/themerc"
   sed -i "s/button_offset=6/button_offset=9/"                                                "${THEME_DIR}-hdpi/xfwm4/themerc"
   mkdir -p                                                                                   "${THEME_DIR}-xhdpi/xfwm4"
-  cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}"                                       "${THEME_DIR}-xhdpi/xfwm4/themerc"
+  cp -r "${SRC_DIR}/main/xfwm4/themerc"                                                      "${THEME_DIR}-xhdpi/xfwm4/themerc"
   sed -i "s/button_offset=6/button_offset=12/"                                               "${THEME_DIR}-xhdpi/xfwm4/themerc"
 
   mkdir -p                                                                                   "${THEME_DIR}/plank"
@@ -165,7 +177,7 @@ while [[ $# -gt 0 ]]; do
     -d|--dest)
       dest="${2}"
       if [[ ! -d "${dest}" ]]; then
-        echo "Destination directory does not exist. Let's make a new one..."
+        echo -e "\nDestination directory does not exist. Let's make a new one..."
         mkdir -p ${dest}
       fi
       shift 2
@@ -181,6 +193,27 @@ while [[ $# -gt 0 ]]; do
     -l|--libadwaita)
       libadwaita="true"
       shift
+      for type in "${@}"; do
+        case "${type}" in
+          system)
+            echo -e "\nUse system default colors for light/dark mode switch."
+            shift
+            ;;
+          fixed)
+            colortype='fixed'
+            echo -e "\nUse fixed theme colors but that will break light/dark mode switch."
+            shift
+            ;;
+          -*|--*)
+            break
+            ;;
+          *)
+            echo -e "\nERROR: Unrecognized type variant '$1'."
+            echo -e "\nTry '$0 --help' for more information."
+            exit 1
+            ;;
+        esac
+      done
       ;;
     -c|--color)
       shift
@@ -205,8 +238,8 @@ while [[ $# -gt 0 ]]; do
             break
             ;;
           *)
-            echo "ERROR: Unrecognized color variant '$1'."
-            echo "Try '$0 --help' for more information."
+            echo -e "\nERROR: Unrecognized color variant '$1'."
+            echo -e "\nTry '$0 --help' for more information."
             exit 1
             ;;
         esac
@@ -261,8 +294,8 @@ while [[ $# -gt 0 ]]; do
             break
             ;;
           *)
-            echo "ERROR: Unrecognized theme variant '$1'."
-            echo "Try '$0 --help' for more information."
+            echo -e "\nERROR: Unrecognized theme variant '$1'."
+            echo -e "\nTry '$0 --help' for more information."
             exit 1
             ;;
         esac
@@ -285,8 +318,8 @@ while [[ $# -gt 0 ]]; do
             break
             ;;
           *)
-            echo "ERROR: Unrecognized size variant '${1:-}'."
-            echo "Try '$0 --help' for more information."
+            echo -e "\nERROR: Unrecognized size variant '${1:-}'."
+            echo -e "\nTry '$0 --help' for more information."
             exit 1
             ;;
         esac
@@ -299,25 +332,31 @@ while [[ $# -gt 0 ]]; do
           nord)
             colorscheme='true'
             schemes+=("${SCHEME_VARIANTS[1]}")
-            echo -e "Nord ColorScheme version! ..."
+            echo -e "\nNord ColorScheme version! ..."
             shift
             ;;
           dracula)
             colorscheme='true'
             schemes+=("${SCHEME_VARIANTS[2]}")
-            echo -e "Dracula ColorScheme version! ..."
+            echo -e "\nDracula ColorScheme version! ..."
             shift
             ;;
           gruvbox)
             colorscheme='true'
             schemes+=("${SCHEME_VARIANTS[3]}")
-            echo -e "Gruvbox ColorScheme version! ..."
+            echo -e "\nGruvbox ColorScheme version! ..."
             shift
             ;;
           everforest)
             colorscheme='true'
             schemes+=("${SCHEME_VARIANTS[4]}")
-            echo -e "Everforest ColorScheme version! ..."
+            echo -e "\nEverforest ColorScheme version! ..."
+            shift
+            ;;
+          catppuccin)
+            colorscheme='true'
+            schemes+=("${SCHEME_VARIANTS[5]}")
+            echo -e "\nCatppuccin ColorScheme version! ..."
             shift
             ;;
           all)
@@ -327,31 +366,31 @@ while [[ $# -gt 0 ]]; do
             ;;
           black)
             blackness="true"
-            echo -e "Blackness version! ..."
+            echo -e "\nBlackness version! ..."
             shift
             ;;
           rimless)
             rimless="true"
-            echo -e "Rimless version! ..."
+            echo -e "\nRimless version! ..."
             shift
             ;;
           normal)
             normal="true"
             window="-Normal"
-            echo -e "Normal window button version! ..."
+            echo -e "\nNormal window button version! ..."
             shift
             ;;
           float)
             float="true"
-            echo -e "Install Floating Gnome-Shell Panel version! ..."
+            echo -e "\nInstall Floating Gnome-Shell Panel version! ..."
             shift
             ;;
           -*)
             break
             ;;
           *)
-            echo "ERROR: Unrecognized tweaks variant '$1'."
-            echo "Try '$0 --help' for more information."
+            echo -e "\nERROR: Unrecognized tweaks variant '$1'."
+            echo -e "\nTry '$0 --help' for more information."
             exit 1
             ;;
         esac
@@ -362,8 +401,8 @@ while [[ $# -gt 0 ]]; do
       exit 0
       ;;
     *)
-      echo "ERROR: Unrecognized installation option '$1'."
-      echo "Try '$0 --help' for more information."
+      echo -e "\nERROR: Unrecognized installation option '$1'."
+      echo -e "\nTry '$0 --help' for more information."
       exit 1
       ;;
   esac
@@ -400,12 +439,14 @@ install_package() {
     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 sassc
     elif has_command apt-get; then
       sudo apt-get install sassc
     elif has_command dnf; then
       sudo dnf install sassc
-    elif has_command dnf; then
-      sudo dnf install sassc
+    elif has_command yum; then
+      sudo yum install sassc
     elif has_command pacman; then
       sudo pacman -S --noconfirm sassc
     fi
@@ -435,12 +476,19 @@ color_schemes() {
       -Everforest)
         scheme_color='everforest'
         ;;
+      -Catppuccin)
+        scheme_color='catppuccin'
+        ;;
     esac
     sed -i "/\@import/s/color-palette-default/color-palette-${scheme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss"
     sed -i "/\$colorscheme:/s/default/${scheme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss"
   fi
 }
 
+color_type() {
+  sed -i "/\$colortype:/s/system/fixed/" "${SRC_DIR}/sass/_tweaks-temp.scss"
+}
+
 blackness_color() {
   sed -i "/\$blackness:/s/false/true/" "${SRC_DIR}/sass/_tweaks-temp.scss"
 }
@@ -463,7 +511,13 @@ gnome_shell_version() {
   sed -i "/\widgets/s/40-0/${GS_VERSION}/" "${SRC_DIR}/sass/gnome-shell/_common-temp.scss"
 
   if [[ "${GS_VERSION}" == '3-28' ]]; then
-    sed -i "/\extensions/s/40-0/${GS_VERSION}/" "${SRC_DIR}/sass/gnome-shell/_common-temp.scss"
+    sed -i "/\extensions/s/40-0/3-28/" "${SRC_DIR}/sass/gnome-shell/_common-temp.scss"
+  elif [[ "${GS_VERSION}" -ge '46-0' ]]; then
+    sed -i "/\extensions/s/40-0/46-0/" "${SRC_DIR}/sass/gnome-shell/_common-temp.scss"
+  fi
+
+  if [[ "${SHELL_VERSION:-}" -ge "47" ]]; then
+    sed -i "/\gnome_version/s/default/new/" "${SRC_DIR}/sass/_tweaks-temp.scss"
   fi
 }
 
@@ -512,6 +566,10 @@ theme_tweaks() {
     compact_size
   fi
 
+  if [[ "$colortype" = "fixed" ]] ; then
+    color_type
+  fi
+
   if [[ "$colorscheme" = "true" ]] ; then
     color_schemes
   fi
@@ -533,8 +591,8 @@ theme_tweaks() {
   fi
 }
 
-uninstall_link() {
-  rm -rf "${HOME}/.config/gtk-4.0/"{assets,windows-assets,gtk.css,gtk-dark.css}
+uninstall_libadwaita() {
+  rm -rf "${HOME}/.config/gtk-4.0/"{assets,windows-assets,gtk.css,gtk-dark.css,gtk-Light.css,gtk-Dark.css}
 }
 
 link_libadwaita() {
@@ -549,7 +607,7 @@ link_libadwaita() {
 
   rm -rf "${HOME}/.config/gtk-4.0/"{assets,gtk.css,gtk-dark.css}
 
-  echo -e "\nLink '$THEME_DIR/gtk-4.0' to '${HOME}/.config/gtk-4.0' for libadwaita..."
+  echo -e "\nLink '${THEME_DIR}/gtk-4.0' to '${HOME}/.config/gtk-4.0' for libadwaita...\n"
 
   mkdir -p                                                                      "${HOME}/.config/gtk-4.0"
   ln -sf "${THEME_DIR}/gtk-4.0/assets"                                          "${HOME}/.config/gtk-4.0/assets"
@@ -557,6 +615,31 @@ link_libadwaita() {
   ln -sf "${THEME_DIR}/gtk-4.0/gtk-dark.css"                                    "${HOME}/.config/gtk-4.0/gtk-dark.css"
 }
 
+libadwaita_theme() {
+  local dest="${1}"
+  local name="${2}"
+  local theme="${3}"
+  local color="${4}"
+  local size="${5}"
+  local scheme="${6}"
+
+  theme_tweaks
+
+  rm -rf "${HOME}/.config/gtk-4.0/"{assets,gtk.css,gtk-dark.css}
+
+  echo -e "\nInstalling ${2}${3}${4}${5}${6} theme into '${HOME}/.config/gtk-4.0' for libadwaita..."
+
+  mkdir -p                                                                      "${HOME}/.config/gtk-4.0"
+  cp -r "${SRC_DIR}/assets/gtk/assets"                                          "${HOME}/.config/gtk-4.0"
+  cp -r "${SRC_DIR}/assets/gtk/symbolics/"*'.svg'                               "${HOME}/.config/gtk-4.0/assets"
+
+  if [[ "$colorscheme" = "true" || "$blackness" = "true" || "$colortype" = "fixed" ]] ; then
+    sassc $SASSC_OPT "${SRC_DIR}/main/libadwaita/libadwaita${color}.scss"       "${HOME}/.config/gtk-4.0/gtk.css"
+  else
+    sassc $SASSC_OPT "${SRC_DIR}/main/libadwaita/libadwaita-Light.scss"         "${HOME}/.config/gtk-4.0/gtk.css"
+  fi
+}
+
 link_theme() {
   for theme in "${themes[@]}"; do
     for color in "${lcolors[@]}"; do
@@ -569,33 +652,12 @@ link_theme() {
   done
 }
 
-clean() {
-  local dest="${1}"
-  local name="${2}"
-  local theme="${3}"
-  local color="${4}"
-  local size="${5}"
-  local scheme="${6}"
-  local screen="${7}"
-
-  local THEME_DIR="${1}/${2}${3}${4}${5}${6}${7}"
-
-  if [[ ${theme} == '' && ${color} == '' && ${size} == '' && ${scheme} == '' ]]; then
-    cleantheme='none'
-  elif [[ -d ${THEME_DIR} ]]; then
-    rm -rf ${THEME_DIR}
-    echo -e "Find: ${THEME_DIR} ! removing it ..."
-  fi
-}
-
-clean_theme() {
-  for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do
-    for color in '' '-light' '-dark'; do
-      for size in '' '-compact'; do
-        for scheme in '' '-nord' '-dracula' '-gruvbox' '-everforest'; do
-          for screen in '' '-hdpi' '-xhdpi'; do
-            clean "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${theme}" "${color}" "${size}" "${scheme}" "${screen}"
-          done
+install_libadwaita() {
+  for theme in "${themes[@]}"; do
+    for color in "${lcolors[@]}"; do
+      for size in "${sizes[@]}"; do
+        for scheme in "${schemes[@]}"; do
+          libadwaita_theme "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$scheme"
         done
       done
     done
@@ -634,33 +696,63 @@ uninstall() {
 
   local THEME_DIR="${1}/${2}${3}${4}${5}${6}"
 
+  if [[ "$uninstall" == 'true' ]]; then
+    type='Uninstall'
+  else
+    type='Clean'
+  fi
+
   if [[ -d "${THEME_DIR}" ]]; then
-    echo -e "Uninstall ${THEME_DIR}... "
-    rm -rf "${THEME_DIR}"
+    echo -e "${type} ${THEME_DIR}... "
+    rm -rf "${THEME_DIR}"{'','-hdpi','-xhdpi'}
   fi
 }
 
 uninstall_theme() {
-  for theme in "${themes[@]}"; do
-    for color in "${colors[@]}"; do
-      for size in "${sizes[@]}"; do
+  for theme in "${THEME_VARIANTS[@]}"; do
+    for color in "${COLOR_VARIANTS[@]}"; do
+      for size in "${SIZE_VARIANTS[@]}"; do
+        for scheme in "${SCHEME_VARIANTS[@]}"; do
           uninstall "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$scheme"
         done
       done
     done
+  done
+}
+
+clean_theme() {
+  if [[ "$UID" != "$ROOT_UID" ]]; then
+    if [[ "$DEST_DIR" == "$HOME/.themes" ]]; then
+      local dest="$HOME/.local/share/themes"
+    elif [[ "$DEST_DIR" == "$XDG_DATA_HOME/themes" || "$DEST_DIR" == "$HOME/.local/share/themes" ]]; then
+      local dest="$HOME/.themes"
+    fi
+
+    for theme in "${themes[@]}"; do
+      for color in "${colors[@]}"; do
+        for size in "${sizes[@]}"; do
+          for scheme in "${schemes[@]}"; do
+            uninstall "${dest}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$scheme"
+          done
+        done
+      done
+    done
+  fi
 }
 
 if [[ "$uninstall" == 'true' ]]; then
   if [[ "$libadwaita" == 'true' ]]; then
-    echo -e "\nUninstall ${HOME}/.config/gtk-4.0 links ..."
-    uninstall_link
+    echo -e "\nUninstall libadwaita theme from ${HOME}/.config/gtk-4.0 ..."
+    uninstall_libadwaita
   else
-    echo && uninstall_theme && uninstall_link
+    echo && uninstall_theme && uninstall_libadwaita
   fi
 else
-  install_package && tweaks_temp && gnome_shell_version && install_theme
+  install_package && tweaks_temp
+  gnome_shell_version && echo && clean_theme && install_theme
+
   if [[ "$libadwaita" == 'true' ]]; then
-    uninstall_link && link_theme
+    uninstall_libadwaita && install_libadwaita
   fi
 fi
 

release/make-release.sh

@@ -0,0 +1,51 @@
+#! /bin/bash
+
+THEME_DIR=$(cd $(dirname $0) && pwd)
+
+THEME_NAME=Colloid
+
+_THEME_VARIANTS=('' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey')
+_SCHEME_VARIANTS=('' '-Nord' '-Dracula' '-Gruvbox' '-Everforest' '-Catppuccin')
+_COLOR_VARIANTS=('' '-Light' '-Dark')
+_SIZE_VARIANTS=('' '-Compact')
+
+if [ ! -z "${COLOR_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _COLOR_VARIANTS <<< "${COLOR_VARIANTS:-}"
+fi
+
+if [ ! -z "${SCHEME_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _SCHEME_VARIANTS <<< "${SCHEME_VARIANTS:-}"
+fi
+
+if [ ! -z "${THEME_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _THEME_VARIANTS <<< "${THEME_VARIANTS:-}"
+fi
+
+if [ ! -z "${SIZE_VARIANTS:-}" ]; then
+  IFS=', ' read -r -a _SIZE_VARIANTS <<< "${SIZE_VARIANTS:-}"
+fi
+
+Tar_themes() {
+  for scheme in "${_SCHEME_VARIANTS[@]}"; do
+    rm -rf ${THEME_NAME}${scheme}.tar
+    rm -rf ${THEME_NAME}${scheme}.tar.xz
+  done
+
+  for scheme in "${_SCHEME_VARIANTS[@]}"; do
+    tar -Jcvf ${THEME_NAME}${theme}${scheme}.tar.xz ${THEME_NAME}{'','-Purple','-Pink','-Red','-Orange','-Yellow','-Green','-Teal','-Grey'}{'','-Light','-Dark'}${scheme}
+  done
+}
+
+Clear_theme() {
+  for theme in "${_THEME_VARIANTS[@]}"; do
+    for color in "${_COLOR_VARIANTS[@]}"; do
+      for scheme in "${_SCHEME_VARIANTS[@]}"; do
+        rm -rf ${THEME_NAME}${theme}${color}${scheme}{'','-hdpi','-xhdpi'}
+      done
+    done
+  done
+}
+
+cd .. && ./install.sh -d $THEME_DIR --tweaks all -t all
+cd $THEME_DIR && Tar_themes && Clear_theme
+