diff --git a/theme-switcher b/theme-switcher
index cffc985..fa0a86f 100644
--- a/theme-switcher
+++ b/theme-switcher
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Set the directory path where icons are stored
-icons=/usr/share/tromjaro-theme-switcher/icons
+declare -r icons_dir=/usr/share/tromjaro-theme-switcher/icons
 
 set_icon_theme() {
 	# Change icon theme in XFCE
@@ -9,12 +9,15 @@ set_icon_theme() {
 }
 
 enable_dark_panels() {
-	# Enable dark panels
-	xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s true
+	# Enable dark panels if not already enabled
+	[ "$(xfconf-query -c xfce4-panel -p /panels/dark-mode)" != 'true' ] &&
+		xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s true &&
+		panel_notification=" with dark panels"
 }
 
 set_theme() {
-	local theme="Colloid-$1"
+	local -r theme="$1"
+	unset panel_notification
 
 	# Set the icon theme and panel color according to the chosen theme
 	case "$theme" in
@@ -24,7 +27,6 @@ set_theme() {
 		*)
 			set_icon_theme 'zafiro'
 			enable_dark_panels
-			panel_notification=" with dark panels"
 		;;
 	esac
 
@@ -32,53 +34,30 @@ set_theme() {
 	xfconf-query -c xsettings -p /Net/ThemeName -n -t string -s "$theme"
 
 	# Send notification about the theme change
-	notify-send "$theme theme$panel_notification was enabled"
+	notify-send 'Theme Switcher' "$theme theme$panel_notification was enabled"
 }
 
 # Export functions to make them available inside yad
 export -f set_icon_theme enable_dark_panels set_theme
 
-# 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 7 \
---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.png"!'Grey-Dark':FBTN "set_theme 'Grey-Dark'" \
---field=!"$icons/Colloid-Grey-Dark-Nord.png"!'Grey-Dark-Nord':FBTN "set_theme 'Grey-Dark-Nord'" \
---field=!"$icons/Colloid-Grey-Dark-Gruvbox.png"!'Grey-Dark-Gruvbox':FBTN "set_theme 'Grey-Dark-Gruvbox'" \
---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.png"!'Pink-Dark':FBTN "set_theme 'Pink-Dark'" \
---field=!"$icons/Colloid-Pink-Dark-Nord.png"!'Pink-Dark-Nord':FBTN "set_theme 'Pink-Dark-Nord'" \
---field=!"$icons/Colloid-Pink-Dark-Gruvbox.png"!'Pink-Dark-Gruvbox':FBTN "set_theme 'Pink-Dark-Gruvbox'" \
---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.png"!'Green-Dark':FBTN "set_theme 'Green-Dark'" \
---field=!"$icons/Colloid-Green-Dark-Nord.png"!'Green-Dark-Nord':FBTN "set_theme 'Green-Dark-Nord'" \
---field=!"$icons/Colloid-Dark-Gruvbox.png"!'Dark-Gruvbox':FBTN "set_theme 'Dark-Gruvbox'" \
---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.png"!'Orange-Dark':FBTN "set_theme 'Orange-Dark'" \
---field=!"$icons/Colloid-Orange-Dark-Nord.png"!'Orange-Dark-Nord':FBTN "set_theme 'Orange-Dark-Nord'" \
---field=!"$icons/Colloid-Orange-Dark-Gruvbox.png"!'Orange-Dark-Gruvbox':FBTN "set_theme 'Orange-Dark-Gruvbox'" \
---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.png"!'Purple-Dark':FBTN "set_theme 'Purple-Dark'" \
---field=!"$icons/Colloid-Purple-Dark-Nord.png"!'Purple-Dark-Nord':FBTN "set_theme 'Purple-Dark-Nord'" \
---field=!"$icons/Colloid-Purple-Dark-Gruvbox.png"!'Purple-Dark-Gruvbox':FBTN "set_theme 'Purple-Dark-Gruvbox'" \
---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.png"!'Yellow-Dark':FBTN "set_theme 'Yellow-Dark'" \
---field=!"$icons/Colloid-Yellow-Dark-Nord.png"!'Yellow-Dark-Nord':FBTN "set_theme 'Yellow-Dark-Nord'" \
---field=!"$icons/Colloid-Yellow-Dark-Gruvbox.png"!'Yellow-Dark-Gruvbox':FBTN "set_theme 'Yellow-Dark-Gruvbox'" \
---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.png"!'Teal-Dark':FBTN "set_theme 'Teal-Dark'" \
---field=!"$icons/Colloid-Teal-Dark-Nord.png"!'Teal-Dark-Nord (default)':FBTN "set_theme 'Teal-Dark-Nord'" \
---field=!"$icons/Colloid-Dark-Nord.png"!'Dark-Nord':FBTN "set_theme 'Dark-Nord'"
+# A collection of tooltips that appear when you hover over a theme button
+declare -r themes_tooltip=('Grey-Light' 'Grey' 'Grey-Nord' 'Grey-Dark' 'Grey-Dark-Nord' 'Grey-Dark-Gruvbox' 'Pink-Light' 'Pink' 'Pink-Nord' 'Pink-Dark' 'Pink-Dark-Nord' 'Pink-Dark-Gruvbox' 'Green-Light' 'Green' 'Green-Nord' 'Green-Dark' 'Green-Dark-Nord' 'Dark-Gruvbox' 'Orange-Light' 'Orange' 'Orange-Nord' 'Orange-Dark' 'Orange-Dark-Nord' 'Orange-Dark-Gruvbox' 'Purple-Light' 'Purple' 'Purple-Nord' 'Purple-Dark' 'Purple-Dark-Nord' 'Purple-Dark-Gruvbox' 'Yellow-Light' 'Yellow' 'Yellow-Nord' 'Yellow-Dark' 'Yellow-Dark-Nord' 'Yellow-Dark-Gruvbox' 'Teal-Light' 'Teal' 'Teal-Nord' 'Teal-Dark' 'Teal-Dark-Nord (default)' 'Dark-Nord')
+
+# Build the command line arguments we need to pass to yad to display the theme buttons
+build_cmdline_args() {
+	for tooltip in "${themes_tooltip[@]}"; do
+		# Stripping the text after space gives you the theme name
+		local theme="Colloid-${tooltip% *}"
+		local theme_icon_path="$icons_dir/$theme.png"
+		printf '%s\n' "--field=!$theme_icon_path!$tooltip:BTN" "set_theme '$theme'"
+	done
+}
+
+# Save those arguments to an array named cmdline_args
+readarray -t cmdline_args < <(build_cmdline_args)
+
+# Display 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 7 --css='button:focus:not(:hover) { box-shadow: none; }' \
+	"${cmdline_args[@]}"