diff --git a/theme-switcher b/theme-switcher
index b51f925..fa543b3 100644
--- a/theme-switcher
+++ b/theme-switcher
@@ -22,21 +22,8 @@ set_theme() {
 	local theme="Colloid-$1"
 
 	case "$theme" in
-		*'-Dark-Gruvbox')
+		*'-Dark-Gruvbox'|*'-Dark'|*'-Dark-Nord')
 			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'
@@ -45,13 +32,14 @@ set_theme() {
 		*)
 			set_icon_theme 'zafiro'
 			enable_dark_panels
+			panel_notification=" with 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"
+	xfconf-query -c xfwm4 -p /general/theme -n -t string -s "$theme"
+	notify-send "$theme theme$panel_notification was enabled"
 }
 
 # Export functions to make them available inside yad
@@ -88,7 +76,7 @@ yad --no-buttons --center --keep-icon-size --use-interp --title 'TROMjaro Theme
 --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-Teal-Dark-Nord.png"!'Teal-Dark-Nord (default)':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'" \