diff --git a/README.md b/README.md
index ca2c6a0..bd5b8d3 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Run this command to install `WhiteSur` into `gtk-4.0 configuration folder` ($HOM
 ./install.sh -l -c Light       # install light theme for libadwaita
 ```
 
-### Connect WhiteSur theme to Flatpak
+### Connect WhiteSur theme to Flatpak (Snap not support)
 Parameter: `--flatpak` `-F`
 
 Example: `./tweaks.sh -F`
@@ -255,9 +255,6 @@ Usage:  `./tweaks.sh [OPTIONS...]`
   -F, --flatpak
  Connect 'WhiteSur' theme to Flatpak.
 
-  -s, --snap
- Connect 'WhiteSur' theme the currently installed snap apps.
-
   -d, --dash-to-dock
  Fixed Dash to Dock theme issue.
 
diff --git a/install.sh b/install.sh
index 537ab61..d93b6e6 100755
--- a/install.sh
+++ b/install.sh
@@ -13,7 +13,7 @@
 ###############################################################################
 
 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
-source "${REPO_DIR}/lib-install.sh"
+source "${REPO_DIR}/shell/lib-install.sh"
 
 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")
diff --git a/release/WhiteSur-Dark-3-38.tar.xz b/release/WhiteSur-Dark-3-38.tar.xz
index 1f2b67e..843d4ca 100644
Binary files a/release/WhiteSur-Dark-3-38.tar.xz and b/release/WhiteSur-Dark-3-38.tar.xz differ
diff --git a/release/WhiteSur-Dark-42-0.tar.xz b/release/WhiteSur-Dark-42-0.tar.xz
index 370a08f..748a6e6 100644
Binary files a/release/WhiteSur-Dark-42-0.tar.xz and b/release/WhiteSur-Dark-42-0.tar.xz differ
diff --git a/release/WhiteSur-Dark-solid-3-38.tar.xz b/release/WhiteSur-Dark-solid-3-38.tar.xz
index 752a76e..eede40d 100644
Binary files a/release/WhiteSur-Dark-solid-3-38.tar.xz and b/release/WhiteSur-Dark-solid-3-38.tar.xz differ
diff --git a/release/WhiteSur-Dark-solid-42-0.tar.xz b/release/WhiteSur-Dark-solid-42-0.tar.xz
index 97c3e44..f88f51b 100644
Binary files a/release/WhiteSur-Dark-solid-42-0.tar.xz and b/release/WhiteSur-Dark-solid-42-0.tar.xz differ
diff --git a/release/WhiteSur-Light-3-38.tar.xz b/release/WhiteSur-Light-3-38.tar.xz
index 1ccf559..e668cf7 100644
Binary files a/release/WhiteSur-Light-3-38.tar.xz and b/release/WhiteSur-Light-3-38.tar.xz differ
diff --git a/release/WhiteSur-Light-42-0.tar.xz b/release/WhiteSur-Light-42-0.tar.xz
index 1ba648d..560a619 100644
Binary files a/release/WhiteSur-Light-42-0.tar.xz and b/release/WhiteSur-Light-42-0.tar.xz differ
diff --git a/release/WhiteSur-Light-solid-3-38.tar.xz b/release/WhiteSur-Light-solid-3-38.tar.xz
index c04d4fc..6290371 100644
Binary files a/release/WhiteSur-Light-solid-3-38.tar.xz and b/release/WhiteSur-Light-solid-3-38.tar.xz differ
diff --git a/release/WhiteSur-Light-solid-42-0.tar.xz b/release/WhiteSur-Light-solid-42-0.tar.xz
index 82c09e1..4a36394 100644
Binary files a/release/WhiteSur-Light-solid-42-0.tar.xz and b/release/WhiteSur-Light-solid-42-0.tar.xz differ
diff --git a/lib-core.sh b/shell/lib-core.sh
similarity index 100%
rename from lib-core.sh
rename to shell/lib-core.sh
diff --git a/lib-flatpak.sh b/shell/lib-flatpak.sh
similarity index 100%
rename from lib-flatpak.sh
rename to shell/lib-flatpak.sh
diff --git a/lib-install.sh b/shell/lib-install.sh
similarity index 98%
rename from lib-install.sh
rename to shell/lib-install.sh
index a0abd96..491b211 100755
--- a/lib-install.sh
+++ b/shell/lib-install.sh
@@ -8,8 +8,8 @@
 #                                VARIABLES                                    #
 ###############################################################################
 
-source "${REPO_DIR}/lib-core.sh"
-source "${REPO_DIR}/lib-flatpak.sh"
+source "${REPO_DIR}/shell/lib-core.sh"
+source "${REPO_DIR}/shell/lib-flatpak.sh"
 WHITESUR_SOURCE+=("lib-install.sh")
 
 ###############################################################################
@@ -826,21 +826,21 @@ disconnect_flatpak() {
   done
 }
 
-connect_snap() {
-  sudo snap install whitesur-gtk-theme
+#connect_snap() {
+#  sudo snap install whitesur-gtk-theme
 
-  for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do
-    sudo snap connect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
-    sudo snap connect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
-  done
-}
+#  for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do
+#    sudo snap connect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
+#    sudo snap connect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
+#  done
+#}
 
-disconnect_snap() {
-  for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do
-    sudo snap disconnect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
-    sudo snap disconnect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
-  done
-}
+#disconnect_snap() {
+#  for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do
+#    sudo snap disconnect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes"
+#    sudo snap disconnect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes"
+#  done
+#}
 
 #########################################################################
 #                               GTK BASE                                #
diff --git a/src/assets/gnome-shell/icons/scalable/status/carousel-arrow-back-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/carousel-arrow-back-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/scalable/status/carousel-arrow-back-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/actions/carousel-arrow-back-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/scalable/status/carousel-arrow-next-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/carousel-arrow-next-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/scalable/status/carousel-arrow-next-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/actions/carousel-arrow-next-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/scalable/actions/carousel-arrow-previous-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/carousel-arrow-previous-symbolic.svg
new file mode 100644
index 0000000..85ad3ae
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/carousel-arrow-previous-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 13.167969 1.035156 c -0.386719 0.089844 -0.722657 0.328125 -0.9375 0.664063 l -6 9.5 c -0.308594 0.488281 -0.308594 1.113281 0 1.601562 l 6 9.5 c 0.445312 0.699219 1.371093 0.910157 2.070312 0.464844 c 0.699219 -0.441406 0.90625 -1.367187 0.464844 -2.066406 l -5.492187 -8.699219 l 5.492187 -8.699219 c 0.441406 -0.699219 0.234375 -1.625 -0.464844 -2.070312 c -0.335937 -0.210938 -0.742187 -0.28125 -1.132812 -0.195313 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/dark-mode-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/dark-mode-symbolic.svg
new file mode 100644
index 0000000..03cc55a
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/dark-mode-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z" fill="#5d656b" fill-rule="evenodd" stop-color="#000000"/>
+ <path d="m8 2a6 6 0 0 0-6 6 6 6 0 0 0 6 6v-12z" fill="#5d656b" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/preview-close-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/preview-close-symbolic.svg
new file mode 100644
index 0000000..34f0823
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/preview-close-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="24px" viewBox="0 0 24 24" width="24px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 7 6 c -0.265625 0 -0.519531 0.105469 -0.707031 0.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 l 4.292969 4.292969 l -4.292969 4.292969 c -0.390625 0.390625 -0.390625 1.023437 0 1.414062 s 1.023437 0.390625 1.414062 0 l 4.292969 -4.292969 l 4.292969 4.292969 c 0.390625 0.390625 1.023437 0.390625 1.414062 0 s 0.390625 -1.023437 0 -1.414062 l -4.292969 -4.292969 l 4.292969 -4.292969 c 0.390625 -0.390625 0.390625 -1.023437 0 -1.414062 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 s -0.519531 0.105469 -0.707031 0.292969 l -4.292969 4.292969 l -4.292969 -4.292969 c -0.1875 -0.1875 -0.441406 -0.292969 -0.707031 -0.292969 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/record-screen-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/record-screen-symbolic.svg
new file mode 100644
index 0000000..4f91ee6
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/record-screen-symbolic.svg
@@ -0,0 +1,5 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9 7a1.0001 1.0001 0 0 0-0.70703 0.29297l-0.70703 0.70703h-1.5859a1.0001 1.0001 0 0 0-1 1v6a1.0001 1.0001 0 0 0 1 1h9a1.0001 1.0001 0 0 0 1-1v-6a1.0001 1.0001 0 0 0-1-1h-1.5859l-0.70703-0.70703a1.0001 1.0001 0 0 0-0.70703-0.29297h-3zm0 1h3l1 1h2v6h-9v-6h2l1-1z" color="#000000" fill="#5d656b" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m10.5 9a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5zm0 1a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5z" fill="#5d656b" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m1 0a1.0001 1.0001 0 0 0-1 1v5a1.0001 1.0001 0 0 0 1 1h6a1.0001 1.0001 0 0 0 1-1v-0.61133l1.6836 0.56055a1.0001 1.0001 0 0 0 1.3164-0.94922v-3a1.0001 1.0001 0 0 0-1.3164-0.94922l-1.6836 0.56055v-0.61133a1.0001 1.0001 0 0 0-1-1h-6zm0 1h6v2l3-1v3l-3-1v2h-6v-5z" color="#000000" fill="#5d656b" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/screencast-recorded-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/screencast-recorded-symbolic.svg
new file mode 100644
index 0000000..b766366
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/screencast-recorded-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6 8.0116a1.0001 1.0001 0 0 0-1 1v5a1.0001 1.0001 0 0 0 1 1h6a1.0001 1.0001 0 0 0 1-1v-0.61133l1.6836 0.56055a1.0001 1.0001 0 0 0 1.3164-0.94922v-3a1.0001 1.0001 0 0 0-1.3164-0.94922l-1.6836 0.56055v-0.61133a1.0001 1.0001 0 0 0-1-1zm0 1h6v2l3-1v3l-3-1v2h-6z" color="#000000" fill="#5d656b" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m2 1c-1.108 0-2 0.892-2 2v7c0 1.108 0.892 2 2 2h2v-1h-2c-0.554 0-1-0.446-1-1v-7c0-0.554 0.446-1 1-1h10c0.554 0 1 0.446 1 1v4h1v-4c0-1.108-0.892-2-2-2h-10z" fill="#5d656b" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/screenshot-recorded-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/screenshot-recorded-symbolic.svg
new file mode 100644
index 0000000..2f9e593
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/screenshot-recorded-symbolic.svg
@@ -0,0 +1,5 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9 7a1.0001 1.0001 0 0 0-0.70703 0.29297l-0.70703 0.70703h-1.5859a1.0001 1.0001 0 0 0-1 1v6a1.0001 1.0001 0 0 0 1 1h9a1.0001 1.0001 0 0 0 1-1v-6a1.0001 1.0001 0 0 0-1-1h-1.5859l-0.70703-0.70703a1.0001 1.0001 0 0 0-0.70703-0.29297h-3zm0 1h3l1 1h2v6h-9v-6h2z" color="#000000" fill="#5d656b" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m10.5 9a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5zm0 1a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5z" fill="#5d656b" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m2 1c-1.108 0-2 0.892-2 2v7c0 1.108 0.892 2 2 2h2v-1h-2c-0.554 0-1-0.446-1-1v-7c0-0.554 0.446-1 1-1h10c0.554 0 1 0.446 1 1v4h1v-4c0-1.108-0.892-2-2-2z" fill="#5d656b" fill-rule="evenodd" stop-color="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-area-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-area-symbolic.svg
new file mode 100644
index 0000000..6cf5870
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-area-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 3.5 2 c -1.929688 0.007812 -3.4921875 1.570312 -3.5 3.5 c 0 1.386719 0.820312 2.59375 2 3.15625 v 3.34375 h 2 v -3.035156 c 1.53125 -0.230469 2.734375 -1.433594 2.964844 -2.964844 h 2.035156 v -2 h -2.34375 c -0.578125 -1.21875 -1.808594 -1.996094 -3.15625 -2 z m 25 0 c -1.347656 0.003906 -2.578125 0.78125 -3.15625 2 h -2.34375 v 2 h 2.035156 c 0.230469 1.53125 1.433594 2.734375 2.964844 2.964844 v 3.035156 h 2 v -3.34375 c 1.21875 -0.578125 1.996094 -1.808594 2 -3.15625 c 0 -1.921875 -1.578125 -3.5 -3.5 -3.5 z m -25 2 c 0.839844 0 1.5 0.660156 1.5 1.5 s -0.660156 1.5 -1.5 1.5 s -1.5 -0.660156 -1.5 -1.5 s 0.660156 -1.5 1.5 -1.5 z m 7.5 0 v 2 h 4 v -2 z m 6 0 v 2 h 4 v -2 z m 11.5 0 c 0.839844 0 1.5 0.660156 1.5 1.5 s -0.660156 1.5 -1.5 1.5 s -1.5 -0.660156 -1.5 -1.5 s 0.660156 -1.5 1.5 -1.5 z m -26.5 10 v 4 h 2 v -4 z m 26 0 v 4 h 2 v -4 z m -26 6 v 3.34375 c -1.21875 0.578125 -1.99609375 1.808594 -2 3.15625 c 0 1.921875 1.578125 3.5 3.5 3.5 c 1.347656 -0.003906 2.578125 -0.78125 3.15625 -2 h 2.34375 v -2 h -2.035156 c -0.230469 -1.53125 -1.433594 -2.734375 -2.964844 -2.964844 v -3.035156 z m 26 0 v 3.035156 c -1.53125 0.230469 -2.734375 1.433594 -2.964844 2.964844 h -2.035156 v 2 h 2.34375 c 0.578125 1.21875 1.808594 1.996094 3.15625 2 c 1.921875 0 3.5 -1.578125 3.5 -3.5 c -0.003906 -1.347656 -0.78125 -2.578125 -2 -3.15625 v -3.34375 z m -24.5 5 c 0.839844 0 1.5 0.660156 1.5 1.5 s -0.660156 1.5 -1.5 1.5 s -1.5 -0.660156 -1.5 -1.5 s 0.660156 -1.5 1.5 -1.5 z m 25 0 c 0.839844 0 1.5 0.660156 1.5 1.5 s -0.660156 1.5 -1.5 1.5 s -1.5 -0.660156 -1.5 -1.5 s 0.660156 -1.5 1.5 -1.5 z m -17.5 1 v 2 h 4 v -2 z m 6 0 v 2 h 4 v -2 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-display-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-display-symbolic.svg
new file mode 100644
index 0000000..b8b3f4a
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-display-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 4 4 c -1.660156 0 -3 1.339844 -3 3 v 14 c 0 1.660156 1.339844 3 3 3 h 10 v 3 h -3 c -1.09375 -0.003906 -2 0.90625 -2 2 h 14 c 0 -1.09375 -0.910156 -2 -2 -2 h -3 v -3 h 10 c 1.660156 0 3 -1.339844 3 -3 v -14 c 0 -1.660156 -1.339844 -3 -3 -3 z m 0 2 h 24 c 0.554688 0 1 0.445312 1 1 v 14 c 0 0.554688 -0.445312 1 -1 1 h -24 c -0.554688 0 -1 -0.445312 -1 -1 v -14 c 0 -0.554688 0.445312 -1 1 -1 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-show-pointer-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-show-pointer-symbolic.svg
new file mode 100644
index 0000000..36fab00
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-show-pointer-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 2.953125 1.074219 l 2.417969 13.210937 l 3.238281 -2.398437 l 2.054687 2.648437 c 1.03125 1.433594 3.148438 -0.210937 2.011719 -1.5625 l -2.015625 -2.59375 l 2.984375 -2.175781 z m 0 0" fill="#2e3436"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-window-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-window-symbolic.svg
new file mode 100644
index 0000000..b667bed
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/actions/screenshot-ui-window-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="32px" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 3 3 c -1.644531 0 -3 1.355469 -3 3 v 14 c 0 1.644531 1.355469 3 3 3 h 4 v 3 c 0 1.644531 1.351562 3 3 3 h 18.996094 c 1.644531 0 3 -1.355469 3 -3 v -14 c 0 -1.644531 -1.355469 -3 -3 -3 h -4 v -3 c 0 -1.644531 -1.355469 -3 -3 -3 z m 0 2 h 18.996094 c 0.570312 0 1 0.429688 1 1 v 3 h -12.996094 c -1.648438 0 -3 1.355469 -3 3 v 9 h -4 c -0.570312 0 -1 -0.429688 -1 -1 v -14 c 0 -0.570312 0.429688 -1 1 -1 z m 7 6 h 18.996094 c 0.570312 0 1 0.429688 1 1 v 14 c 0 0.570312 -0.429688 1 -1 1 h -18.996094 c -0.574219 0 -1 -0.429688 -1 -1 v -14 c 0 -0.570312 0.425781 -1 1 -1 z m 0 0" fill="#241f31"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/keyboard-caps-lock-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/keyboard-caps-lock-symbolic.svg
new file mode 100644
index 0000000..2a046de
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/keyboard-caps-lock-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 2-7.5 8h4.5v5h6v-5h4.5l-7.5-8zm0 1.4629 5.1914 5.5371h-3.1914v5h-4v-5h-3.1914l5.1914-5.5371zm-3 14.537v3h6v-3h-6zm1 1h4v1h-4v-1z" fill="#4d4d4d"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/keyboard-layout-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/keyboard-layout-symbolic.svg
new file mode 100644
index 0000000..245a496
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/keyboard-layout-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 3v19h2v-8h4.3828l0.72266 1.4453c0.16797 0.33984 0.51562 0.55469 0.89453 0.55469h7c0.55078 0 1-0.44922 1-1v-9c0-0.55078-0.44922-1-1-1h-5.3828l-0.72266-1.4453c-0.16797-0.33984-0.51562-0.55469-0.89453-0.55469zm2 1h6l1 2h6v9h-7l-1-2h-5z" fill="#4d4d4d"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/keyboard-shift-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/keyboard-shift-symbolic.svg
new file mode 100644
index 0000000..e7c64f9
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/keyboard-shift-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="24px" height="24px" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12 4-7.5 8h4.5v7h6v-7h4.5l-7.5-8zm0 1.4629 5.1914 5.5371h-3.1914v7h-4v-7h-3.1914l5.1914-5.5371z" fill="#4d4d4d"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/no-events-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/no-events-symbolic.svg
new file mode 100644
index 0000000..5af005d
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/no-events-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="64px" height="64px" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect x="44" y="36" width="14" height="8" fill="#bbbbbb" opacity=".35"/>
+ <path d="m14 2c-6.648 0-12 5.352-12 12v36c0 6.648 5.352 12 12 12h36c6.648 0 12-5.352 12-12v-36c0-6.648-5.352-12-12-12h-36zm0 20h6v10h-14v-2c0-4.432 3.568-8 8-8zm10 0h16v10h-16v-10zm20 0h6c4.432 0 8 3.568 8 8v2h-14v-10zm-38 14h14v8h-14v-8zm18 0h16v8h-16v-8zm20 0h14v8h-14v-8zm-38 12h14v10h-6c-4.432 0-8-3.568-8-8v-2zm18 0h16v10h-16v-10zm20 0h14v2c0 4.432-3.568 8-8 8h-6v-10z" fill="#bbbbbb"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/no-notifications-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/no-notifications-symbolic.svg
new file mode 100644
index 0000000..cd3778a
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/no-notifications-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="64" height="64" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m32 2a4 4 0 0 0-3.976 4.4 19.952 19.952 0 0 0-16.024 19.6v18l-8 8v2h56v-2l-8-8v-14.52a16 16 0 0 1-4 0.504v15.704l4 4.312h-40l4-4.312v-19.688a16 16 0 0 1 16-16c0.176 4e-3 0.348 0.012 0.52 0.024a16 16 0 0 1 2.964-5.968 4 4 0 0 0-3.484-2.056zm-6.92 56a8 8 0 0 0 6.92 4 8 8 0 0 0 6.912-4z" fill="#bbbbbb" stroke-width="4"/>
+ <path d="m60 14a12 12 0 0 1-24 0 12 12 0 1 1 24 0z" fill="#bbbbbb" stroke-width="4"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/screen-privacy-disabled-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/screen-privacy-disabled-symbolic.svg
new file mode 100644
index 0000000..f41809d
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/screen-privacy-disabled-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1 1.0039c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h5v1s-2e-6 1-1 1v1h6v-1c-1 0-1-1-1-1v-1h3.7109l-1.0039-1.0039h-9.293l4.6465-4.6465-0.70703-0.70703-5.3535 5.3535h-0.5c-0.375 0-0.46875-0.28125-0.49219-0.42188l5.6387-5.6387-0.70703-0.70703-4.9395 4.9395v-1.4141l4.2324-4.2324-0.70898-0.70898-3.5234 3.5254v-1.4141l2.8164-2.8184-0.70703-0.70703-2.1094 2.1113v-2.0137s1e-6 -0.5 0.5-0.5h1.207l-0.99609-0.99609h-0.71094zm2.125 0 1.3984 1.3984 0.4043-0.40234h1.4141l-1.1113 1.1094 0.70898 0.70898 1.8184-1.8184h1.4141l-2.5254 2.5254 0.70703 0.70703 3.2324-3.2324h1.4141l-3.9395 3.9395 0.70703 0.70703 4.6465-4.6465h1.0859s0.5 1e-6 0.5 0.5v9c0 0.5-0.5 0.5-0.5 0.5h-0.37891l0.99219 0.99219c0.49928-0.056842 0.88672-0.4733 0.88672-0.98828v-10c0-0.554-0.446-1-1-1h-11.875z" fill="#5d656b" opacity=".35"/>
+ <rect transform="rotate(45)" x=".31371" y="-.5" width="22" height="1" fill="#5d656b" fill-rule="evenodd" stroke-width=".60372"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/screen-privacy-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/screen-privacy-symbolic.svg
new file mode 100644
index 0000000..dc0c03c
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/screen-privacy-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1 1.0039c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h5v1s-1e-6 1-1 1v1h6v-1c-1 0-1-1-1-1v-1h5c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-14zm0.5 0.99609h2.0137l-2.5137 2.5137v-2.0137s5e-7 -0.5 0.5-0.5zm3.4277 0h1.4141l-5.3418 5.3418v-1.4141l3.9277-3.9277zm2.8301 0h1.4141l-8.1719 8.1719v-1.4141l6.7578-6.7578zm2.8281 0h1.4141l-10 10h-0.5c-0.375 0-0.46875-0.28125-0.49219-0.42188l9.5781-9.5781zm2.8281 0h1.0859s0.5 5e-7 0.5 0.5v9c0 0.5-0.5 0.5-0.5 0.5h-11.086l10-10z" fill="#5d656b"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/stop-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/stop-symbolic.svg
new file mode 100644
index 0000000..256276a
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/stop-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 4 4 h 8 v 8 h -8 z m 0 0" fill="#2e3436"/></svg>
diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
index af479f4..53d0e00 100644
--- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml
+++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
@@ -20,21 +20,39 @@
     <file>assets/view-app-grid.svg</file>
     <file>assets/background.png</file>
     <file>icons/scalable/actions/color-pick.svg</file>
-    <file>icons/scalable/status/eye-not-looking-symbolic.svg</file>
-    <file>icons/scalable/status/eye-open-negative-filled-symbolic.svg</file>
-    <file>icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg</file>
-    <file>icons/scalable/status/keyboard-enter-symbolic.svg</file>
-    <file>icons/scalable/status/keyboard-hide-symbolic.svg</file>
-    <file>icons/scalable/status/keyboard-layout-filled-symbolic.svg</file>
-    <file>icons/scalable/status/keyboard-shift-filled-symbolic.svg</file>
-    <file>icons/scalable/status/message-indicator-symbolic.svg</file>
-    <file>icons/scalable/status/window-close-symbolic.svg</file>
-    <file>icons/scalable/status/carousel-arrow-back-symbolic.svg</file>
-    <file>icons/scalable/status/carousel-arrow-next-symbolic.svg</file>
+    <file>icons/scalable/actions/carousel-arrow-next-symbolic.svg</file>
+    <file>icons/scalable/actions/carousel-arrow-previous-symbolic.svg</file>
+    <file>icons/scalable/actions/carousel-arrow-back-symbolic.svg</file>
+    <file>icons/scalable/actions/dark-mode-symbolic.svg</file>
     <file>icons/scalable/actions/pointer-double-click-symbolic.svg</file>
     <file>icons/scalable/actions/pointer-drag-symbolic.svg</file>
     <file>icons/scalable/actions/pointer-primary-click-symbolic.svg</file>
     <file>icons/scalable/actions/pointer-secondary-click-symbolic.svg</file>
+    <file>icons/scalable/actions/preview-close-symbolic.svg</file>
+    <file>icons/scalable/actions/screenshot-ui-area-symbolic.svg</file>
+    <file>icons/scalable/actions/screenshot-ui-display-symbolic.svg</file>
+    <file>icons/scalable/actions/screenshot-ui-show-pointer-symbolic.svg</file>
+    <file>icons/scalable/actions/screenshot-ui-window-symbolic.svg</file>
+    <file>icons/scalable/actions/record-screen-symbolic.svg</file>
+    <file>icons/scalable/actions/screencast-recorded-symbolic.svg</file>
+    <file>icons/scalable/actions/screenshot-recorded-symbolic.svg</file>
+    <file>icons/scalable/status/eye-not-looking-symbolic.svg</file>
+    <file>icons/scalable/status/eye-open-negative-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-caps-lock-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-enter-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-hide-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-layout-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-layout-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-shift-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-shift-filled-symbolic.svg</file>
+    <file>icons/scalable/status/message-indicator-symbolic.svg</file>
+    <file>icons/scalable/status/no-events-symbolic.svg</file>
+    <file>icons/scalable/status/no-notifications-symbolic.svg</file>
+    <file>icons/scalable/status/screen-privacy-disabled-symbolic.svg</file>
+    <file>icons/scalable/status/screen-privacy-symbolic.svg</file>
+    <file>icons/scalable/status/stop-symbolic.svg</file>
+    <file>icons/scalable/status/window-close-symbolic.svg</file>
     <file>gnome-shell.css</file>
     <file alias="gdm.css">gnome-shell.css</file>
     <file alias="gdm3.css">gnome-shell.css</file>
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index dadb290..8aecea9 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -15,7 +15,6 @@ $panel_height: $menuitem_size;
   @if $scale != 'default' {
     @include fontsize($base_font_size * 2 - 2);
     height: $panel_height * 2 !important;
-    box-shadow: 0 10px 32px rgba(black, 0.05) !important;
 
     .panel-button {
       -natural-hpadding: $container_padding * 2 + 4px !important;
@@ -126,8 +125,12 @@ $panel_height: $menuitem_size;
     .unlock-screen &,
     .login-screen &,
     .lock-screen & {
-      color: $panel_fg;
-      &:focus, &:hover, &:active { color: $panel_fg; }
+      &, &:focus, &:hover, &:active { color: $panel_fg; }
+    }
+
+    .login-screen &,
+    .lock-screen & {
+      box-shadow: none;
     }
 
     &.clock-display {
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index 85601fa..dc4e2ff 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -186,25 +186,6 @@ $popop_menuitem_radius: $wm_radius - 4px;
   &:rtl { text-align: left; }
 }
 
-// separator
-.popup-separator-menu-item {
-  background: none;
-  border: none;
-  padding-top: 0 !important;
-  padding-bottom: 0 !important;
-
-  .popup-separator-menu-item-separator {
-    height: 1px; //not really the whole box
-    margin: 0;
-    background-color: $borders_color;
-
-    .popup-sub-menu & { //submenu separators
-      margin: 0 32px 0 0;
-      height: 1px;
-    }
-  }
-}
-
 // desktop background menu
 .background-menu {
   -boxpointer-gap: $base_margin;
diff --git a/src/sass/gnome-shell/common/_scrollbars.scss b/src/sass/gnome-shell/common/_scrollbars.scss
index 2c800f8..3e3ca52 100644
--- a/src/sass/gnome-shell/common/_scrollbars.scss
+++ b/src/sass/gnome-shell/common/_scrollbars.scss
@@ -1,8 +1,8 @@
 /* Scrollbars */
 
 StScrollView {
-  &.vfade { -st-vfade-offset: 32px; }
-  &.hfade { -st-hfade-offset: 32px; }
+  &.vfade { -st-vfade-offset: 68px; }
+  &.hfade { -st-hfade-offset: 68px; }
 }
 
 StScrollBar {
diff --git a/src/sass/gnome-shell/widgets-3-28/_popovers.scss b/src/sass/gnome-shell/widgets-3-28/_popovers.scss
index d71a17c..b074f5e 100644
--- a/src/sass/gnome-shell/widgets-3-28/_popovers.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_popovers.scss
@@ -4,6 +4,25 @@
   &:rtl { padding-right: 0; padding-left: 1.5em; }
 }
 
+// separator
+.popup-separator-menu-item {
+  background: none;
+  border: none;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+
+  .popup-separator-menu-item-separator {
+    height: 1px; //not really the whole box
+    margin: 0;
+    background-color: $borders_color;
+
+    .popup-sub-menu & { //submenu separators
+      margin: 0 32px 0 0;
+      height: 1px;
+    }
+  }
+}
+
 // system status popover menu
 .aggregate-menu {
   .popup-sub-menu .popup-menu-item > :first-child {
diff --git a/src/sass/gnome-shell/widgets-40-0/_popovers.scss b/src/sass/gnome-shell/widgets-40-0/_popovers.scss
index d71a17c..b074f5e 100644
--- a/src/sass/gnome-shell/widgets-40-0/_popovers.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_popovers.scss
@@ -4,6 +4,25 @@
   &:rtl { padding-right: 0; padding-left: 1.5em; }
 }
 
+// separator
+.popup-separator-menu-item {
+  background: none;
+  border: none;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+
+  .popup-separator-menu-item-separator {
+    height: 1px; //not really the whole box
+    margin: 0;
+    background-color: $borders_color;
+
+    .popup-sub-menu & { //submenu separators
+      margin: 0 32px 0 0;
+      height: 1px;
+    }
+  }
+}
+
 // system status popover menu
 .aggregate-menu {
   .popup-sub-menu .popup-menu-item > :first-child {
diff --git a/src/sass/gnome-shell/widgets-42-0/_app-grid.scss b/src/sass/gnome-shell/widgets-42-0/_app-grid.scss
index 0b40a40..9ef2daf 100644
--- a/src/sass/gnome-shell/widgets-42-0/_app-grid.scss
+++ b/src/sass/gnome-shell/widgets-42-0/_app-grid.scss
@@ -56,22 +56,22 @@
     width: 24px;
     height: 24px;
     border-radius: $circular_radius;
-    color: $light_fg_color;
+    color: $light_alt_fg_color;
     // background-color: $light_fill_color;
   }
 
   &:insensitive > StIcon {
-    backround-color: transparent !important;
-    color: transparent !important;
+    background-color: $light_fill_color;
+    color: $light_alt_disabled_fg_color;
   }
 
   &:hover > StIcon {
-   backround-color: $light_divider_color !important;
-   color: $light_fg_color !important;
+   background-color: $light_divider_color;
+   color: $light_fg_color;
   }
 
   &:active > StIcon {
-   backround-color: $light_track_color !important;
-   color: $light_fg_color !important;
+   background-color: $light_track_color;
+   color: $light_fg_color;
   }
 }
diff --git a/src/sass/gnome-shell/widgets-42-0/_popovers.scss b/src/sass/gnome-shell/widgets-42-0/_popovers.scss
index 1b45b05..122ebad 100644
--- a/src/sass/gnome-shell/widgets-42-0/_popovers.scss
+++ b/src/sass/gnome-shell/widgets-42-0/_popovers.scss
@@ -6,7 +6,32 @@
 
 // separator
 .popup-separator-menu-item {
-  margin: 6px 32px;
+  border: none !important;
+
+  &:ltr { margin-right: $base_padding; }
+  &:rtl { margin-left: $base_padding; }
+
+  .popup-separator-menu-item-separator {
+    height: 1px; //not really the whole box
+    background-color: $borders_color;
+  }
+
+  .popup-menu-ornament {
+    width: 0 !important;
+  }
+
+  // separators in submenus
+  .popup-sub-menu & {
+    background-color: transparent;
+
+    // account for ornament
+    &:ltr { margin-right: 2.5em; }
+    &:rtl { margin-left: 2.5em; }
+
+    .popup-separator-menu-item-separator {
+      background-color: $borders_color;
+    }
+  }
 }
 
 // system status popover menu
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index e598398..9835c0b 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -4895,15 +4895,13 @@ shortcuts-section { margin: 20px; }
 //
 
 window {
-  border-width: 0;
-  outline-color: $highlight_color;
-  outline-offset: -1px;
-  outline-style: solid;
-  outline-width: 1px;
+  border: none;
 
   &.csd {
     transition: $shadow_transition;
     border-radius: $wm_radius;
+    outline: 1px solid $highlight_color;
+    outline-offset: -1px;
     box-shadow: 0 3px 3px 0 $wm_shadow,
                 0 8px 8px 0 $wm_shadow,
                 0 16px 16px 0 $wm_shadow,
@@ -4919,32 +4917,36 @@ window {
                   $wm_outline;
     }
 
-    &.popup {
-      border-radius: $mn_radius;
-      box-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 8px 15px rgba(0, 0, 0, 0.08), $wm_outline;
-    }
-
     &.dialog.message {
       border-radius: $wm_radius;
     }
 
-    .solid-csd & {
-      border: 1px solid $header_border;
+    &.tiled,
+    &.tiled-top,
+    &.tiled-left,
+    &.tiled-right,
+    &.tiled-bottom {
       border-radius: 0;
-      margin: 0;
-      background-color: $header_bg;
+      outline: none;
+    }
+
+    &.maximized,
+    &.fullscreen {
+      border-radius: 0;
+      outline: none;
       box-shadow: none;
+      transition: none;
     }
   }
 
-  &.maximized,
-  &.fullscreen,
-  &:backdrop {
-    outline-width: 0;
+  &.solid-csd {
+    border: 1px solid $header_border;
+    border-radius: 0;
+    margin: 0;
+    background-color: $header_bg;
+    box-shadow: none;
   }
 
-  &.popup { box-shadow: none; }
-
   // server-side decorations as used by mutter
   &.ssd { box-shadow: 0 0 0 1px $wm_shadow; } //just doing borders, wm draws actual shadows
 }
diff --git a/tweaks.sh b/tweaks.sh
index 063726a..ac8b21b 100755
--- a/tweaks.sh
+++ b/tweaks.sh
@@ -13,7 +13,7 @@
 ###############################################################################
 
 readonly REPO_DIR="$(dirname "$(readlink -m "${0}")")"
-source "${REPO_DIR}/lib-install.sh"
+source "${REPO_DIR}/shell/lib-install.sh"
 
 # Customization, default values
 colors=("${COLOR_VARIANTS[@]}")
@@ -39,7 +39,7 @@ usage() {
   helpify "-e, --edit-firefox"  ""                                                  "Edit '${THEME_NAME}' theme for Firefox settings and also connect the theme to the current Firefox profiles" ""
 
   helpify "-F, --flatpak"       ""                                                  "Connect '${THEME_NAME}' theme to Flatpak"                                    ""
-  helpify "-s, --snap"          ""                                                  "Connect '${THEME_NAME}' theme the currently installed snap apps"             ""
+  #helpify "-s, --snap"          ""                                                  "Connect '${THEME_NAME}' theme the currently installed snap apps"             ""
   helpify "-d, --dash-to-dock"  ""                                                  "Fixed Dash to Dock theme issue"                                              ""
 
   helpify "-r, --remove, --revert" ""                                               "Revert to the original themes, do the opposite things of install and connect" ""
@@ -118,13 +118,13 @@ while [[ $# -gt 0 ]]; do
         prompt -e "'${1}' ERROR: There's no Flatpak installed in your system"
         has_any_error="true"
       fi; shift ;;
-    -s|--snap)
-      snap="true";
+#    -s|--snap)
+#      snap="true";
 
-      if ! has_command snap; then
-        prompt -e "'${1}' ERROR: There's no Snap installed in your system"
-        has_any_error="true"
-      fi; shift ;;
+#      if ! has_command snap; then
+#        prompt -e "'${1}' ERROR: There's no Snap installed in your system"
+#        has_any_error="true"
+#      fi; shift ;;
     -g|--gdm)
       gdm="true"; full_sudo "${1}"
       showapps_normal="true" # use normal showapps icon
@@ -187,11 +187,11 @@ finalize_argument_parsing
 if [[ "${uninstall}" == 'true' ]]; then
   prompt -w "REMOVAL: Non file-related parameters will be ignored. \n"
 
-  if [[ "${snap}" == 'true' ]]; then
-    prompt -i "Disconnecting '${name}' theme from your installed snap apps... \n"
-    disconnect_snap
-    prompt -s "Done! '${name}' theme has been disconnected from your snap apps."; echo
-  fi
+#  if [[ "${snap}" == 'true' ]]; then
+#    prompt -i "Disconnecting '${name}' theme from your installed snap apps... \n"
+#    disconnect_snap
+#    prompt -s "Done! '${name}' theme has been disconnected from your snap apps."; echo
+#  fi
 
   if [[ "${flatpak}" == 'true' ]]; then
     prompt -i "Disconnecting '${name}' theme from your Flatpak... \n"
@@ -263,7 +263,7 @@ else
   fi
 fi
 
-if [[ "${firefox}" == "false" && "${edit_firefox}" == "false" && "${flatpak}" == "false" && "${snap}" == "false" && "${gdm}" == "false" && "${dash_to_dock}" == "false" && "${libadwaita}" == "false" ]]; then
+if [[ "${firefox}" == "false" && "${edit_firefox}" == "false" && "${flatpak}" == "false" && "${gdm}" == "false" && "${dash_to_dock}" == "false" && "${libadwaita}" == "false" ]]; then
   prompt -e "Oops... there's nothing to tweak..."
   prompt -i "HINT: Don't forget to define which component to tweak, e.g. '--gdm'"
   prompt -i "HINT: Run ./tweaks.sh -h for help!..."; echo