Form updates

src/pages/homepage/components/SettingsButton/SettingsButton.tsx

@@ -247,8 +247,15 @@ function SettingsButton() {
 												color: 'var(--mantine-color-primary-0)',
 											}}
 											onClick={() => {
-												setCurrentThemePlaylist('All');
-												handleThemeChange(allThemes, true);
+												const themeList = JSON.parse(
+													themePlaylistData?.find(
+														(t: ThemePlaylist) => t?.name === currentThemePlaylist,
+													)?.themeList ?? '[]',
+												);
+												const filteredThemes = allThemes.filter((t: Theme) =>
+													themeList.includes(t.id),
+												);
+												handleThemeChange(filteredThemes, false);
 											}}
 										>
 											<FaDice />