diff --git a/theme-switcher b/theme-switcher
index 90b64ed..b51f925 100644
--- a/theme-switcher
+++ b/theme-switcher
@@ -1,60 +1,101 @@
 #!/bin/bash
+
+# Set the directory path where icons are stored
 icons=/usr/share/tromjaro-theme-switcher/icons
 
 set_icon_theme() {
-    # Change icon theme in XFCE
-    xfconf-query -c xsettings -p /Net/IconThemeName -n -t string -s "$1"
+	# Change icon theme in XFCE
+	xfconf-query -c xsettings -p /Net/IconThemeName -n -t string -s "$1"
+}
+
+enable_dark_panels() {
+	# Enable dark panels
+	xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s true
+}
+
+disable_dark_panels() {
+	# Disable dark panels
+	xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s false
 }
 
 set_theme() {
-    if [ "${1##*-}" = 'Light' ]; then
-        yad --image "dialog-question" --title '' --buttons-layout=center --text-align=center --button='DARK':1 --button='LIGHT':0 --text "Select the panels theme\n\nNote: dark panels may result in light icons over a light theme"
-        case $? in
-            1)
-                # Enable dark panels
-                xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s true
-                # Use the dark icon theme
-                set_icon_theme zafiro-dark
-                ;;
-            0)
-                # Disable dark panels
-                xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s false
-                # Use the light icon theme
-                set_icon_theme zafiro
-                ;;
-            *) exit ;;
-        esac
-    else
-        # Use the dark icon theme
-        set_icon_theme zafiro-dark
-    fi
-    # Change the main theme to the chosen one
-    xfconf-query -c xsettings -p /Net/ThemeName -n -t string -s "Skeuos-$1"
-    xfconf-query -c xfwm4 -p /general/theme -n -t string -s "Skeuos-$1-XFWM"
-    gsettings set org.gnome.desktop.interface gtk-theme "Skeuos-$1"
-    notify-send "Skeuos-$1 theme was enabled"
+	local theme="Colloid-$1"
+
+	case "$theme" in
+		*'-Dark-Gruvbox')
+			set_icon_theme 'zafiro-dark'
+			disable_dark_panels
+		;;
+		*'-Dark-Nord')
+			set_icon_theme 'zafiro-dark'
+			enable_dark_panels
+		;;
+		*'-Nord')
+			set_icon_theme 'zafiro'
+			enable_dark_panels
+		;;
+		*'-Dark')
+			set_icon_theme 'zafiro-dark'
+			disable_dark_panels
+		;;
+		*'-Light')
+			set_icon_theme 'zafiro'
+			disable_dark_panels
+		;;
+		*)
+			set_icon_theme 'zafiro'
+			enable_dark_panels
+		;;
+	esac
+
+	# Change the main theme to the chosen one
+	xfconf-query -c xsettings -p /Net/ThemeName -n -t string -s "$theme"
+        xfconf-query -c xfwm4 -p /general/theme -n -t string -s "$theme"
+	notify-send "$theme theme was enabled"
 }
 
-export -f set_icon_theme set_theme
+# Export functions to make them available inside yad
+export -f set_icon_theme set_theme enable_dark_panels disable_dark_panels
 
-yad --no-buttons --center --keep-icon-size --use-interp --title 'TROMjaro Theme Switcher' --text-align=center --text "A Theme Switcher for TROMjaro's default theme-set (Skeuos) and icon-set (Zafiro)." --form --columns 5 \
---field=!"$icons/Blue-Dark.png"!'Blue-Dark':FBTN "set_theme 'Blue-Dark'" \
---field=!"$icons/Violet-Dark.png"!'Violet-Dark':FBTN "set_theme 'Violet-Dark'" \
---field=!"$icons/Blue-Light.png"!'Blue-Light':FBTN "set_theme 'Blue-Light'" \
---field=!"$icons/Violet-Light.png"!'Violet-Light':FBTN "set_theme 'Violet-Light'" \
---field=!"$icons/Teal-Dark.png"!'Teal-Dark':FBTN "set_theme 'Teal-Dark'" \
---field=!"$icons/Orange-Dark.png"!'Orange-Dark':FBTN "set_theme 'Orange-Dark'" \
---field=!"$icons/Teal-Light.png"!'Teal-Light':FBTN "set_theme 'Teal-Light'" \
---field=!"$icons/Orange-Light.png"!'Orange-Light':FBTN "set_theme 'Orange-Light'" \
---field=!"$icons/Green-Dark.png"!'Green-Dark (default)':FBTN "set_theme 'Green-Dark'" \
---field=!"$icons/Brown-Dark.png"!'Brown-Dark':FBTN "set_theme 'Brown-Dark'" \
---field=!"$icons/Green-Light.png"!'Green-Light':FBTN "set_theme 'Green-Light'" \
---field=!"$icons/Brown-Light.png"!'Brown-Light':FBTN "set_theme 'Brown-Light'" \
---field=!"$icons/Magenta-Dark.png"!'Magenta-Dark':FBTN "set_theme 'Magenta-Dark'" \
---field=!"$icons/Yellow-Dark.png"!'Yellow-Dark':FBTN "set_theme 'Yellow-Dark'" \
---field=!"$icons/Magenta-Light.png"!'Magenta-Light':FBTN "set_theme 'Magenta-Light'" \
---field=!"$icons/Yellow-Light.png"!'Yellow-Light':FBTN "set_theme 'Yellow-Light'" \
---field=!"$icons/Red-Dark.png"!'Red-Dark':FBTN "set_theme 'Red-Dark'" \
---field=!"$icons/Grey-Dark.png"!'Grey-Dark':FBTN "set_theme 'Grey-Dark'" \
---field=!"$icons/Red-Light.png"!'Red-Light':FBTN "set_theme 'Red-Light'" \
---field=!"$icons/Grey-Light.png"!'Grey-Light':FBTN "set_theme 'Grey-Light'"
+# The GUI interface using yad
+yad --no-buttons --center --keep-icon-size --use-interp --title 'TROMjaro Theme Switcher' --text-align=center --text "A Theme Switcher for TROMjaro's default theme-set (Colloid) and icon-set (Zafiro)." --form --columns 8 \
+--field=!"$icons/Colloid-Grey-Dark.png"!'Grey-Dark':FBTN "set_theme 'Grey-Dark'" \
+--field=!"$icons/Colloid-Grey-Light.png"!'Grey-Light':FBTN "set_theme 'Grey-Light'" \
+--field=!"$icons/Colloid-Grey.png"!'Grey':FBTN "set_theme 'Grey'" \
+--field=!"$icons/Colloid-Grey-Nord.png"!'Grey-Nord':FBTN "set_theme 'Grey-Nord'" \
+--field=!"$icons/Colloid-Grey-Dark-Nord.png"!'Grey-Dark-Nord':FBTN "set_theme 'Grey-Dark-Nord'" \
+--field=!"$icons/Colloid-Pink-Dark.png"!'Pink-Dark':FBTN "set_theme 'Pink-Dark'" \
+--field=!"$icons/Colloid-Pink-Light.png"!'Pink-Light':FBTN "set_theme 'Pink-Light'" \
+--field=!"$icons/Colloid-Pink.png"!'Pink':FBTN "set_theme 'Pink'" \
+--field=!"$icons/Colloid-Pink-Nord.png"!'Pink-Nord':FBTN "set_theme 'Pink-Nord'" \
+--field=!"$icons/Colloid-Pink-Dark-Nord.png"!'Pink-Dark-Nord':FBTN "set_theme 'Pink-Dark-Nord'" \
+--field=!"$icons/Colloid-Green-Dark.png"!'Green-Dark':FBTN "set_theme 'Green-Dark'" \
+--field=!"$icons/Colloid-Green-Light.png"!'Green-Light':FBTN "set_theme 'Green-Light'" \
+--field=!"$icons/Colloid-Green.png"!'Green':FBTN "set_theme 'Green'" \
+--field=!"$icons/Colloid-Green-Nord.png"!'Green-Nord':FBTN "set_theme 'Green-Nord'" \
+--field=!"$icons/Colloid-Green-Dark-Nord.png"!'Green-Dark-Nord':FBTN "set_theme 'Green-Dark-Nord'" \
+--field=!"$icons/Colloid-Orange-Dark.png"!'Orange-Dark':FBTN "set_theme 'Orange-Dark'" \
+--field=!"$icons/Colloid-Orange-Light.png"!'Orange-Light':FBTN "set_theme 'Orange-Light'" \
+--field=!"$icons/Colloid-Orange.png"!'Orange':FBTN "set_theme 'Orange'" \
+--field=!"$icons/Colloid-Orange-Nord.png"!'Orange-Nord':FBTN "set_theme 'Orange-Nord'" \
+--field=!"$icons/Colloid-Orange-Dark-Nord.png"!'Orange-Dark-Nord':FBTN "set_theme 'Orange-Dark-Nord'" \
+--field=!"$icons/Colloid-Purple-Dark.png"!'Purple-Dark':FBTN "set_theme 'Purple-Dark'" \
+--field=!"$icons/Colloid-Purple-Light.png"!'Purple-Light':FBTN "set_theme 'Purple-Light'" \
+--field=!"$icons/Colloid-Purple.png"!'Purple':FBTN "set_theme 'Purple'" \
+--field=!"$icons/Colloid-Purple-Nord.png"!'Purple-Nord':FBTN "set_theme 'Purple-Nord'" \
+--field=!"$icons/Colloid-Purple-Dark-Nord.png"!'Purple-Dark-Nord':FBTN "set_theme 'Purple-Dark-Nord'" \
+--field=!"$icons/Colloid-Teal-Dark.png"!'Teal-Dark':FBTN "set_theme 'Teal-Dark'" \
+--field=!"$icons/Colloid-Teal-Light.png"!'Teal-Light':FBTN "set_theme 'Teal-Light'" \
+--field=!"$icons/Colloid-Teal.png"!'Teal':FBTN "set_theme 'Teal'" \
+--field=!"$icons/Colloid-Teal-Nord.png"!'Teal-Nord':FBTN "set_theme 'Teal-Nord'" \
+--field=!"$icons/Colloid-Teal-Dark-Nord.png"!'Teal-Dark-Nord':FBTN "set_theme 'Teal-Dark-Nord'" \
+--field=!"$icons/Colloid-Yellow-Dark.png"!'Yellow-Dark':FBTN "set_theme 'Yellow-Dark'" \
+--field=!"$icons/Colloid-Yellow-Light.png"!'Yellow-Light':FBTN "set_theme 'Yellow-Light'" \
+--field=!"$icons/Colloid-Yellow.png"!'Yellow':FBTN "set_theme 'Yellow'" \
+--field=!"$icons/Colloid-Yellow-Nord.png"!'Yellow-Nord':FBTN "set_theme 'Yellow-Nord'" \
+--field=!"$icons/Colloid-Yellow-Dark-Nord.png"!'Yellow-Dark-Nord':FBTN "set_theme 'Yellow-Dark-Nord'" \
+--field=!"$icons/Colloid-Dark-Gruvbox.png"!'Dark-Gruvbox':FBTN "set_theme 'Dark-Gruvbox'" \
+--field=!"$icons/Colloid-Grey-Dark-Gruvbox.png"!'Grey-Dark-Gruvbox':FBTN "set_theme 'Grey-Dark-Gruvbox'" \
+--field=!"$icons/Colloid-Yellow-Dark-Gruvbox.png"!'Yellow-Dark-Gruvbox':FBTN "set_theme 'Yellow-Dark-Gruvbox'" \
+--field=!"$icons/Colloid-Pink-Dark-Gruvbox.png"!'Pink-Dark-Gruvbox':FBTN "set_theme 'Pink-Dark-Gruvbox'" \
+--field=!"$icons/Colloid-Dark-Nord.png"!'Dark-Nord':FBTN "set_theme 'Dark-Nord'"