diff --git a/Jellyfin.Plugin.Seasonals/Configuration/configPage.html b/Jellyfin.Plugin.Seasonals/Configuration/configPage.html
index d1b566e..5ef6d9d 100644
--- a/Jellyfin.Plugin.Seasonals/Configuration/configPage.html
+++ b/Jellyfin.Plugin.Seasonals/Configuration/configPage.html
@@ -395,47 +395,6 @@
                         </details>
                         <hr style="max-width: 800px; margin: 1em 0;">
 
-                        <details>
-                            <summary>Underwater</summary>
-                            <div class="checkboxContainer checkboxContainer-withDescription">
-                                <label class="emby-checkbox-label">
-                                    <input id="EnableUnderwater" name="EnableUnderwater" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Underwater Seasonal</span>
-                                </label>
-                                <div class="fieldDescription">Enable the Underwater theme (fishes, bubbles, seaweed).</div>
-                            </div>
-                            <div class="checkboxContainer">
-                                <label class="emby-checkbox-label">
-                                    <input id="EnableUnderwaterLightRays" name="EnableUnderwaterLightRays" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Light Rays (God Rays)</span>
-                                </label>
-                            </div>
-                            <div class="inputContainer">
-                                <label class="inputLabel" for="UnderwaterSymbolCountMobile">Symbol Count (Mobile)</label>
-                                <input is="emby-input" type="number" id="UnderwaterSymbolCountMobile" name="UnderwaterSymbolCountMobile" />
-                                <div class="fieldDescription">Amount of sea creatures on mobile. Minimum 0. Warning: High values may affect performance.</div>
-                            </div>
-                            <div class="checkboxContainer checkboxContainer-withDescription">
-                                <label class="emby-checkbox-label">
-                                    <input id="EnableRandomUnderwater" name="EnableRandomUnderwater" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Additional Random Symbols</span>
-                                </label>
-                            </div>
-                            <div class="checkboxContainer checkboxContainer-withDescription">
-                                <label class="emby-checkbox-label">
-                                    <input id="EnableRandomUnderwaterMobile" name="EnableRandomUnderwaterMobile" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Additional Random Symbols on Mobile</span>
-                                </label>
-                            </div>
-                            <div class="checkboxContainer checkboxContainer-withDescription">
-                                <label class="emby-checkbox-label">
-                                    <input id="EnableDifferentDurationUnderwater" name="EnableDifferentDurationUnderwater" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Different Duration</span>
-                                </label>
-                            </div>
-                        </details>
-                        <hr style="max-width: 800px; margin: 1em 0;">
-
                         <details>
                             <summary>Hearts</summary>
                             <div class="checkboxContainer checkboxContainer-withDescription">
@@ -818,30 +777,31 @@
                             <div class="inputContainer">
                                 <label class="inputLabel" for="SportsSymbolCount">Symbol Count</label>
                                 <input is="emby-input" type="number" id="SportsSymbolCount" name="SportsSymbolCount" />
-                                <div class="fieldDescription">Number of additional symbols displayed (if enabled).</div>
-                            </div>
-                            <div class="inputContainer">
-                                <label class="inputLabel" for="SportsSymbolCountMobile">Symbol Count (Mobile)</label>
-                                <input is="emby-input" type="number" id="SportsSymbolCountMobile" name="SportsSymbolCountMobile" />
-                                <div class="fieldDescription">Amount of symbols on mobile. Minimum 0. Warning: High values may affect performance.</div>
+                                <div class="fieldDescription">Number of bouncing sports balls visible at once.</div>
                             </div>
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
                                     <input id="EnableDifferentDurationSports" name="EnableDifferentDurationSports" type="checkbox" is="emby-checkbox" />
                                     <span>Enable Different Duration</span>
                                 </label>
+                                <div class="fieldDescription">Randomize the bouncing speed of each ball.</div>
                             </div>
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
                                     <input id="EnableTrophy" name="EnableTrophy" type="checkbox" is="emby-checkbox" />
                                     <span>Enable Trophy</span>
                                 </label>
-                                <div class="fieldDescription">Enable the flying trophy animation.</div>
+                                <div class="fieldDescription">Show a flying trophy animation.</div>
                             </div>
                             <div class="inputContainer">
                                 <label class="inputLabel" for="TurfColor">Turf Color</label>
                                 <input is="emby-input" type="color" id="TurfColor" name="TurfColor" value="#228b22" />
-                                <div class="fieldDescription">Color for the grass/turf overlay at the bottom.</div>
+                                <div class="fieldDescription">Color of the grass/turf strip at the bottom.</div>
+                            </div>
+                            <div class="inputContainer">
+                                <label class="inputLabel" for="SportsConfettiColors">Confetti Colors (comma-separated hex)</label>
+                                <input is="emby-input" type="text" id="SportsConfettiColors" name="SportsConfettiColors" />
+                                <div class="fieldDescription">Colors used for the confetti burst. Example: #000000,#FF0000,#FFCC00</div>
                             </div>
                             <div class="inputContainer">
                                 <label class="inputLabel">Enabled Sports Balls</label>
@@ -1091,7 +1051,7 @@
                             <div class="inputContainer">
                                 <label class="inputLabel" for="EurovisionSymbolCount">Symbol Count</label>
                                 <input is="emby-input" type="number" id="EurovisionSymbolCount" name="EurovisionSymbolCount" />
-                                <div class="fieldDescription">Number of additional dancing music notes (if enabled).</div>
+                                <div class="fieldDescription">Number of dancing music notes on screen.</div>
                             </div>
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
@@ -1175,12 +1135,7 @@
                             <div class="inputContainer">
                                 <label class="inputLabel" for="PrideHeartSize">Heart Size (rem)</label>
                                 <input is="emby-input" type="number" id="PrideHeartSize" name="PrideHeartSize" step="0.1" />
-                                <div class="fieldDescription">Base size of the Pride hearts (default 2).</div>
-                            </div>
-                            <div class="inputContainer">
-                                <label class="inputLabel" for="PrideConfettiCount">Confetti Count</label>
-                                <input is="emby-input" type="number" id="PrideConfettiCount" name="PrideConfettiCount" />
-                                <div class="fieldDescription">Number of falling rainbow confetti pieces.</div>
+                                <div class="fieldDescription">Base size of the Pride hearts (default 1.5).</div>
                             </div>
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
@@ -1745,13 +1700,12 @@
 
                         // Eurovision
 
-                        document.querySelector('#EnableEurovision').checked = config.Eurovision.EnableEurovision;
-                        document.querySelector('#EurovisionSymbolCount').value = config.Eurovision.SymbolCount;
-                        document.querySelector('#EurovisionSymbolCountMobile').value = config.Eurovision.SymbolCountMobile;
-                        document.querySelector('#EnableDifferentDurationEurovision').checked = config.Eurovision.EnableDifferentDuration;
-                        document.querySelector('#EnableColorfulNotes').checked = config.Eurovision.EnableColorfulNotes;
-                        document.querySelector('#EurovisionColors').value = config.Eurovision.EurovisionColors;
-                        document.querySelector('#EurovisionGlowSize').value = config.Eurovision.EurovisionGlowSize;
+                        document.querySelector('#EnableEurovision').checked = config.Eurovision.EnableEurovision !== false;
+                        document.querySelector('#EurovisionSymbolCount').value = config.Eurovision.SymbolCount !== undefined ? config.Eurovision.SymbolCount : 25;
+                        document.querySelector('#EnableDifferentDurationEurovision').checked = config.Eurovision.EnableDifferentDuration !== false;
+                        document.querySelector('#EnableColorfulNotes').checked = config.Eurovision.EnableColorfulNotes !== false;
+                        document.querySelector('#EurovisionColors').value = config.Eurovision.EurovisionColors || '#ff0026ff,#17a6ffff,#32d432ff,#FFD700,#f0821bff,#f826f8ff';
+                        document.querySelector('#EurovisionGlowSize').value = config.Eurovision.EurovisionGlowSize !== undefined ? config.Eurovision.EurovisionGlowSize : 2;
 
                         // Fireworks
 
@@ -1780,11 +1734,9 @@
 
                         // Matrix
 
-                        document.querySelector('#EnableMatrix').checked = config.Matrix.EnableMatrix;
-                        document.querySelector('#MatrixSymbolCount').value = config.Matrix.SymbolCount;
-                        document.querySelector('#MatrixSymbolCountMobile').value = config.Matrix.SymbolCountMobile;
+                        document.querySelector('#EnableMatrix').checked = config.Matrix.EnableMatrix !== false;
+                        document.querySelector('#MatrixSymbolCount').value = config.Matrix.SymbolCount !== undefined ? config.Matrix.SymbolCount : 25;
                         document.querySelector('#MatrixChars').value = config.Matrix.MatrixChars !== undefined ? config.Matrix.MatrixChars : '0123456789';
-                        document.querySelector('#EnableDifferentDurationMatrix').checked = config.Matrix.EnableDifferentDuration;
                         document.querySelector('#EnableMatrixBackground').checked = config.Matrix.EnableMatrixBackground !== undefined ? config.Matrix.EnableMatrixBackground : false;
 
                         // Olympia
@@ -1876,57 +1828,50 @@
                         document.querySelector('#EnableDifferentDurationSpooky').checked = config.Spooky.EnableDifferentDuration !== false;
 
                         // Sports
-
-                        if (!config.Sports) config.Sports = { EnableSports: true, SymbolCount: 25, EnableRandomSymbols: true, EnableRandomSymbolsMobile: false, EnableDifferentDuration: true };
-                        
-                        // Load Checkboxes
                         const savedBallsString = config.Sports.SportsBalls || 'football,basketball,tennis,volleyball';
                         const savedBalls = savedBallsString.split(',');
                         document.querySelector('#EnableSports').checked = config.Sports.EnableSports !== false;
                         document.querySelector('#EnableDifferentDurationSports').checked = config.Sports.EnableDifferentDuration !== false;
-                        document.querySelector('#SportsSymbolCount').value = config.Sports.SymbolCount || 25;
-                        document.querySelector('#SportsSymbolCountMobile').value = config.Sports.SymbolCountMobile || 10;
+                        document.querySelector('#SportsSymbolCount').value = config.Sports.SymbolCount !== undefined ? config.Sports.SymbolCount : 5;
                         document.querySelector('#TurfColor').value = config.Sports.TurfColor || '#228b22';
-                        document.querySelector('#EnableTrophy').checked = config.Sports.EnableTrophy !== false;
+                        document.querySelector('#SportsConfettiColors').value = config.Sports.ConfettiColors || '#000000,#FF0000,#FFCC00';
+                        document.querySelector('#EnableTrophy').checked = config.Sports.EnableTrophy === true;
                         document.querySelectorAll('.sport-ball-cb').forEach(cb => {
-
-                        // Spring
-
-                        document.querySelector('#EnableSpring').checked = config.Spring.EnableSpring;
-                        document.querySelector('#EnableSpringSunbeams').checked = config.Spring.EnableSpringSunbeams !== undefined ? config.Spring.EnableSpringSunbeams : true;
-                        document.querySelector('#SpringPollenCount').value = config.Spring.PollenCount;
-                        document.querySelector('#SpringSunbeamCount').value = config.Spring.SunbeamCount;
-                        document.querySelector('#SpringBirdCount').value = config.Spring.BirdCount !== undefined ? config.Spring.BirdCount : 3;
-                        document.querySelector('#SpringButterflyCount').value = config.Spring.ButterflyCount !== undefined ? config.Spring.ButterflyCount : 2;
-                        document.querySelector('#SpringBeeCount').value = config.Spring.BeeCount !== undefined ? config.Spring.BeeCount : 1;
-                        document.querySelector('#SpringLadybugCount').value = config.Spring.LadybugCount !== undefined ? config.Spring.LadybugCount : 1;
-                        document.querySelector('#SpringSymbolCountMobile').value = config.Spring.SymbolCountMobile !== undefined ? config.Spring.SymbolCountMobile : 5;
-                        // Storm
-
-                        document.querySelector('#EnableStorm').checked = config.Storm.EnableStorm;
-                        document.querySelector('#StormRaindropCount').value = config.Storm.RaindropCount;
-                        document.querySelector('#StormRaindropCountMobile').value = config.Storm.RaindropCountMobile;
-                        document.querySelector('#StormRainSpeed').value = config.Storm.RainSpeed;
-                        document.querySelector('#StormEnableLightning').checked = config.Storm.EnableLightning;
-
-                        // Summer
-
-                        document.querySelector('#EnableSummer').checked = config.Summer.EnableSummer;
-                        document.querySelector('#SummerBubbleCount').value = config.Summer.BubbleCount;
-                        document.querySelector('#SummerDustCount').value = config.Summer.DustCount;
-                        document.querySelector('#SummerSymbolCountMobile').value = config.Summer.SymbolCountMobile;
-                        document.querySelector('#EnableDifferentDurationSummer').checked = config.Summer.EnableDifferentDuration;
-
-                        // Support for both new category string and legacy filename strings
                             cb.checked = savedBalls.some(b => b === cb.value || b.startsWith(cb.value + '_'));
                         });
 
+                        // Spring
+                        document.querySelector('#EnableSpring').checked = config.Spring.EnableSpring !== false;
+                        document.querySelector('#EnableSpringSunbeams').checked = config.Spring.EnableSpringSunbeams !== false;
+                        document.querySelector('#SpringPollenCount').value = config.Spring.PollenCount !== undefined ? config.Spring.PollenCount : 30;
+                        document.querySelector('#SpringSunbeamCount').value = config.Spring.SunbeamCount !== undefined ? config.Spring.SunbeamCount : 5;
+                        document.querySelector('#SpringBirdCount').value = config.Spring.BirdCount !== undefined ? config.Spring.BirdCount : 3;
+                        document.querySelector('#SpringButterflyCount').value = config.Spring.ButterflyCount !== undefined ? config.Spring.ButterflyCount : 4;
+                        document.querySelector('#SpringBeeCount').value = config.Spring.BeeCount !== undefined ? config.Spring.BeeCount : 2;
+                        document.querySelector('#SpringLadybugCount').value = config.Spring.LadybugCount !== undefined ? config.Spring.LadybugCount : 2;
+                        document.querySelector('#SpringSymbolCountMobile').value = config.Spring.SymbolCountMobile !== undefined ? config.Spring.SymbolCountMobile : 2;
+
+                        // Storm
+                        document.querySelector('#EnableStorm').checked = config.Storm.EnableStorm !== false;
+                        document.querySelector('#StormRaindropCount').value = config.Storm.RaindropCount !== undefined ? config.Storm.RaindropCount : 300;
+                        document.querySelector('#StormRaindropCountMobile').value = config.Storm.RaindropCountMobile !== undefined ? config.Storm.RaindropCountMobile : 150;
+                        document.querySelector('#StormRainSpeed').value = config.Storm.RainSpeed !== undefined ? config.Storm.RainSpeed : 1.0;
+                        document.querySelector('#StormEnableLightning').checked = config.Storm.EnableLightning !== false;
+
+                        // Summer
+                        document.querySelector('#EnableSummer').checked = config.Summer.EnableSummer !== false;
+                        document.querySelector('#SummerBubbleCount').value = config.Summer.BubbleCount !== undefined ? config.Summer.BubbleCount : 30;
+                        document.querySelector('#SummerDustCount').value = config.Summer.DustCount !== undefined ? config.Summer.DustCount : 50;
+                        document.querySelector('#SummerSymbolCountMobile').value = config.Summer.SymbolCountMobile !== undefined ? config.Summer.SymbolCountMobile : 2;
+                        document.querySelector('#EnableDifferentDurationSummer').checked = config.Summer.EnableDifferentDuration !== false;
+
 
                         // Underwater
-
                         document.querySelector('#EnableUnderwater').checked = config.Underwater.EnableUnderwater !== false;
+                        document.querySelector('#EnableUnderwaterLightRays').checked = config.Underwater.EnableLightRays !== false;
                         document.querySelector('#EnableDifferentDurationUnderwater').checked = config.Underwater.EnableDifferentDuration !== false;
-                        document.querySelector('#UnderwaterSeaweedCount').value = config.Underwater.SeaweedCount !== undefined ? config.Underwater.SeaweedCount : 30;
+                        document.querySelector('#UnderwaterSymbolCountMobile').value = config.Underwater.SymbolCountMobile !== undefined ? config.Underwater.SymbolCountMobile : 2;
+                        document.querySelector('#UnderwaterSeaweedCount').value = config.Underwater.SeaweedCount !== undefined ? config.Underwater.SeaweedCount : 50;
                         document.querySelector('#UnderwaterFishCount').value = config.Underwater.FishCount !== undefined ? config.Underwater.FishCount : 15;
                         document.querySelector('#UnderwaterSeahorseCount').value = config.Underwater.SeahorseCount !== undefined ? config.Underwater.SeahorseCount : 3;
                         document.querySelector('#UnderwaterJellyfishCount').value = config.Underwater.JellyfishCount !== undefined ? config.Underwater.JellyfishCount : 3;
@@ -1934,11 +1879,21 @@
                         document.querySelector('#UnderwaterCrabCount').value = config.Underwater.CrabCount !== undefined ? config.Underwater.CrabCount : 2;
                         document.querySelector('#UnderwaterStarfishCount').value = config.Underwater.StarfishCount !== undefined ? config.Underwater.StarfishCount : 2;
                         document.querySelector('#UnderwaterShellCount').value = config.Underwater.ShellCount !== undefined ? config.Underwater.ShellCount : 2;
-                        config.Underwater = config.Underwater || {};
-                        document.querySelector('#EnableUnderwaterLightRays').checked = config.Underwater.EnableLightRays !== false;
-                        document.querySelector('#UnderwaterSymbolCount').value = config.Underwater.SymbolCount || 15;
-                        document.querySelector('#UnderwaterSymbolCountMobile').value = config.Underwater.SymbolCountMobile || 5;
-
+                        // Simple Themes
+                        document.querySelector('#EnableFrost').checked = config.Frost.EnableFrost !== false;
+                        document.querySelector('#EnableFilmNoir').checked = config.FilmNoir.EnableFilmNoir !== false;
+                        document.querySelector('#EnableOscar').checked = config.Oscar.EnableOscar !== false;
+                        document.querySelector('#EnableMarioDay').checked = config.MarioDay.EnableMarioDay !== false;
+                        document.querySelector('#LetMarioJump').checked = config.MarioDay.LetMarioJump !== false;
+                        document.querySelector('#EnableStarWars').checked = config.StarWars.EnableStarWars !== false;
+                        document.querySelector('#EnableFriday13').checked = config.Friday13.EnableFriday13 !== false;
+                        document.querySelector('#EnableOktoberfest').checked = config.Oktoberfest.EnableOktoberfest !== false;
+                        document.querySelector('#OktoberfestCount').value = config.Oktoberfest.SymbolCount !== undefined ? config.Oktoberfest.SymbolCount : 25;
+                        document.querySelector('#OktoberfestCountMobile').value = config.Oktoberfest.SymbolCountMobile !== undefined ? config.Oktoberfest.SymbolCountMobile : 10;
+                        document.querySelector('#EnableDifferentDurationOktoberfest').checked = config.Oktoberfest.EnableDifferentDuration !== false;
+                        document.querySelector('#EnableEid').checked = config.Eid.EnableEid !== false;
+                        document.querySelector('#EidLanternCount').value = config.Eid.LanternCount !== undefined ? config.Eid.LanternCount : 8;
+                        document.querySelector('#EidLanternCountMobile').value = config.Eid.LanternCountMobile !== undefined ? config.Eid.LanternCountMobile : 3;
 
                         Dashboard.hideLoadingMsg();
                     });
@@ -1964,22 +1919,7 @@
                         config.Autumn.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationAutumn').checked;
                         config.Autumn.EnableRotation = document.querySelector('#EnableRotation').checked;
 
-                        
-                        // Sports
-                        if (!config.Sports) config.Sports = {};
-                        config.Sports.EnableSports = document.querySelector('#EnableSports').checked;
-                        config.Sports.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationSports').checked;
-                        config.Sports.SymbolCount = parseInt(document.querySelector('#SportsSymbolCount').value);
-                        config.Sports.SymbolCountMobile = parseInt(document.querySelector('#SportsSymbolCountMobile').value);
-                        config.Sports.TurfColor = document.querySelector('#TurfColor').value;
-                        config.Sports.EnableTrophy = document.querySelector('#EnableTrophy').checked;
-                        
-                        // Save Checkboxes
-                        const selectedBalls = Array.from(document.querySelectorAll('.sport-ball-cb'))
-                            .filter(cb => cb.checked)
-                            .map(cb => cb.value);
-                        
-                        config.Sports.SportsBalls = selectedBalls.join(',');
+                        // Sports (saved later to avoid duplicate)
 
                         // Olympia
                         if (!config.Olympia) config.Olympia = {};
@@ -1999,21 +1939,7 @@
                         config.Space.RocketCount = parseInt(document.querySelector('#RocketCount').value);
                         config.Space.SymbolCountMobile = parseInt(document.querySelector('#SpaceSymbolCountMobile').value);
 
-                        // Underwater
-                        if (!config.Underwater) config.Underwater = {};
-                        config.Underwater.EnableUnderwater = document.querySelector('#EnableUnderwater').checked;
-                        config.Underwater.EnableUnderwaterLightRays = document.querySelector('#EnableUnderwaterLightRays').checked;
-                        config.Underwater.EnableRandomSymbols = document.querySelector('#EnableRandomSymbolsUnderwater').checked;
-                        config.Underwater.EnableRandomSymbolsMobile = document.querySelector('#EnableRandomSymbolsMobileUnderwater').checked;
-                        config.Underwater.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationUnderwater').checked;
-                        config.Underwater.SeaweedCount = parseInt(document.querySelector('#UnderwaterSeaweedCount').value);
-                        config.Underwater.FishCount = parseInt(document.querySelector('#UnderwaterFishCount').value);
-                        config.Underwater.SeahorseCount = parseInt(document.querySelector('#UnderwaterSeahorseCount').value);
-                        config.Underwater.JellyfishCount = parseInt(document.querySelector('#UnderwaterJellyfishCount').value);
-                        config.Underwater.TurtleCount = parseInt(document.querySelector('#UnderwaterTurtleCount').value);
-                        config.Underwater.CrabCount = parseInt(document.querySelector('#UnderwaterCrabCount').value);
-                        config.Underwater.StarfishCount = parseInt(document.querySelector('#UnderwaterStarfishCount').value);
-                        config.Underwater.ShellCount = parseInt(document.querySelector('#UnderwaterShellCount').value);
+                        // Underwater (saved later)
 
                         // Birthday
                         if (!config.Birthday) config.Birthday = {};
@@ -2142,7 +2068,6 @@
                         // Eurovision
                         config.Eurovision.EnableEurovision = document.querySelector('#EnableEurovision').checked;
                         config.Eurovision.SymbolCount = parseInt(document.querySelector('#EurovisionSymbolCount').value);
-                        config.Eurovision.SymbolCountMobile = parseInt(document.querySelector('#EurovisionSymbolCountMobile').value);
                         config.Eurovision.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationEurovision').checked;
                         config.Eurovision.EnableColorfulNotes = document.querySelector('#EnableColorfulNotes').checked;
                         config.Eurovision.EurovisionColors = document.querySelector('#EurovisionColors').value;
@@ -2151,9 +2076,7 @@
                         // Matrix
                         config.Matrix.EnableMatrix = document.querySelector('#EnableMatrix').checked;
                         config.Matrix.SymbolCount = parseInt(document.querySelector('#MatrixSymbolCount').value);
-                        config.Matrix.SymbolCountMobile = parseInt(document.querySelector('#MatrixSymbolCountMobile').value);
                         config.Matrix.MatrixChars = document.querySelector('#MatrixChars').value;
-                        config.Matrix.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationMatrix').checked;
                         config.Matrix.EnableMatrixBackground = document.querySelector('#EnableMatrixBackground').checked;
 
                         // Pride
@@ -2178,9 +2101,27 @@
                         // Underwater
                         config.Underwater.EnableUnderwater = document.querySelector('#EnableUnderwater').checked;
                         config.Underwater.EnableLightRays = document.querySelector('#EnableUnderwaterLightRays').checked;
-                        config.Underwater.SymbolCount = parseInt(document.querySelector('#UnderwaterSymbolCount').value);
-                        config.Underwater.SymbolCountMobile = parseInt(document.querySelector('#UnderwaterSymbolCountMobile').value);
                         config.Underwater.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationUnderwater').checked;
+                        config.Underwater.SymbolCountMobile = parseInt(document.querySelector('#UnderwaterSymbolCountMobile').value);
+                        config.Underwater.SeaweedCount = parseInt(document.querySelector('#UnderwaterSeaweedCount').value);
+                        config.Underwater.FishCount = parseInt(document.querySelector('#UnderwaterFishCount').value);
+                        config.Underwater.SeahorseCount = parseInt(document.querySelector('#UnderwaterSeahorseCount').value);
+                        config.Underwater.JellyfishCount = parseInt(document.querySelector('#UnderwaterJellyfishCount').value);
+                        config.Underwater.TurtleCount = parseInt(document.querySelector('#UnderwaterTurtleCount').value);
+                        config.Underwater.CrabCount = parseInt(document.querySelector('#UnderwaterCrabCount').value);
+                        config.Underwater.StarfishCount = parseInt(document.querySelector('#UnderwaterStarfishCount').value);
+                        config.Underwater.ShellCount = parseInt(document.querySelector('#UnderwaterShellCount').value);
+
+                        // Sports
+                        if (!config.Sports) config.Sports = {};
+                        config.Sports.EnableSports = document.querySelector('#EnableSports').checked;
+                        config.Sports.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationSports').checked;
+                        config.Sports.SymbolCount = parseInt(document.querySelector('#SportsSymbolCount').value);
+                        config.Sports.TurfColor = document.querySelector('#TurfColor').value;
+                        config.Sports.ConfettiColors = document.querySelector('#SportsConfettiColors').value;
+                        config.Sports.EnableTrophy = document.querySelector('#EnableTrophy').checked;
+                        config.Sports.SportsBalls = Array.from(document.querySelectorAll('.sport-ball-cb'))
+                            .filter(cb => cb.checked).map(cb => cb.value).join(',');
 
                         // Simple Themes (just on/off toggles)
                         config.Frost.EnableFrost = document.querySelector('#EnableFrost').checked;
@@ -2190,6 +2131,9 @@
                         config.MarioDay.LetMarioJump = document.querySelector('#LetMarioJump').checked;
                         config.StarWars.EnableStarWars = document.querySelector('#EnableStarWars').checked;
                         config.Oktoberfest.EnableOktoberfest = document.querySelector('#EnableOktoberfest').checked;
+                        config.Oktoberfest.SymbolCount = parseInt(document.querySelector('#OktoberfestCount').value);
+                        config.Oktoberfest.SymbolCountMobile = parseInt(document.querySelector('#OktoberfestCountMobile').value);
+                        config.Oktoberfest.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationOktoberfest').checked;
                         config.Friday13.EnableFriday13 = document.querySelector('#EnableFriday13').checked;
                                                 if (!config.Eid) config.Eid = {};
                         config.Eid.EnableEid = document.querySelector('#EnableEid').checked;
@@ -2197,10 +2141,6 @@
                         config.Eid.LanternCountMobile = parseInt(document.querySelector('#EidLanternCountMobile').value);
 
 
-                        config.Santa.MinSantaRestTime = parseFloat(document.querySelector('#MinSantaRestTime').value);
-                        config.Santa.MaxPresentFallSpeed = parseFloat(document.querySelector('#MaxPresentFallSpeed').value);
-                        config.Santa.MinPresentFallSpeed = parseFloat(document.querySelector('#MinPresentFallSpeed').value);
-
                         // Easter
                         config.Easter.EnableEaster = document.querySelector('#EnableEaster').checked;
                         config.Easter.EggCount = parseInt(document.querySelector('#EasterEggCount').value);
@@ -2248,10 +2188,9 @@
                         config.EarthDay.EnableEarthDay = document.querySelector('#EnableEarthDay').checked;
                         config.EarthDay.VineCount = parseInt(document.querySelector('#EarthDayVineCount').value);
 
-                        // Eurovision
+                        // Eurovision (second pass - deduplicated)
                         config.Eurovision.EnableEurovision = document.querySelector('#EnableEurovision').checked;
                         config.Eurovision.SymbolCount = parseInt(document.querySelector('#EurovisionSymbolCount').value);
-                        config.Eurovision.SymbolCountMobile = parseInt(document.querySelector('#EurovisionSymbolCountMobile').value);
                         config.Eurovision.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationEurovision').checked;
                         config.Eurovision.EnableColorfulNotes = document.querySelector('#EnableColorfulNotes').checked;
                         config.Eurovision.EurovisionColors = document.querySelector('#EurovisionColors').value;
@@ -2264,37 +2203,6 @@
                         config.Birthday.ConfettiCount = parseInt(document.querySelector('#BirthdayConfettiCount').value);
                         config.Birthday.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationBirthday').checked;
 
-                        // Sports
-                        config.Sports.EnableSports = document.querySelector('#EnableSports').checked;
-                        config.Sports.SymbolCount = parseInt(document.querySelector('#SportsSymbolCount').value);
-                        config.Sports.SymbolCountMobile = parseInt(document.querySelector('#SportsSymbolCountMobile').value);
-                        config.Sports.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationSports').checked;
-
-                        // Olympia
-                        config.Olympia.EnableOlympia = document.querySelector('#EnableOlympia').checked;
-                        config.Olympia.SymbolCount = parseInt(document.querySelector('#OlympiaSymbolCount').value);
-                        config.Olympia.SymbolCountMobile = parseInt(document.querySelector('#OlympiaSymbolCountMobile').value);
-                        config.Olympia.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationOlympia').checked;
-
-                        // Pride
-                        config.Pride.EnablePride = document.querySelector('#EnablePride').checked;
-                        config.Pride.HeartCount = parseInt(document.querySelector('#PrideHeartCount').value);
-                        config.Pride.HeartSize = parseFloat(document.querySelector('#PrideHeartSize').value);
-                        config.Pride.ColorHeader = document.querySelector('#PrideColorHeader').checked;
-
-                        // Rain
-                        config.Rain.EnableRain = document.querySelector('#EnableRain').checked;
-                        config.Rain.RaindropCount = parseInt(document.querySelector('#RaindropCount').value);
-                        config.Rain.RaindropCountMobile = parseInt(document.querySelector('#RaindropCountMobile').value);
-                        config.Rain.RainSpeed = parseFloat(document.querySelector('#RainSpeed').value);
-
-                        // Storm
-                        config.Storm.EnableStorm = document.querySelector('#EnableStorm').checked;
-                        config.Storm.RaindropCount = parseInt(document.querySelector('#StormRaindropCount').value);
-                        config.Storm.RaindropCountMobile = parseInt(document.querySelector('#StormRaindropCountMobile').value);
-                        config.Storm.RainSpeed = parseFloat(document.querySelector('#StormRainSpeed').value);
-                        config.Storm.EnableLightning = document.querySelector('#StormEnableLightning').checked;
-
                         ApiClient.updatePluginConfiguration(SeasonalsConfigPage.pluginUniqueId, config).then(function (result) {
                             Dashboard.processPluginConfigurationUpdateResult(result);
                         });
diff --git a/Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj b/Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj
index d8cadb9..301ee0f 100644
--- a/Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj
+++ b/Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj
@@ -12,7 +12,7 @@
     <!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
     <Title>Jellyfin Seasonals Plugin</Title>
     <Authors>CodeDevMLH</Authors>
-    <Version>2.0.0.4</Version>
+    <Version>2.0.0.5</Version>
     <RepositoryUrl>https://github.com/CodeDevMLH/Jellyfin-Seasonals</RepositoryUrl>
   </PropertyGroup>
 
diff --git a/manifest.json b/manifest.json
index 524f66b..6436718 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
     "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/Jellyfin-Seasonals-Plugin/raw/branch/main/logo.png",
     "versions": [
       {
-        "version": "2.0.0.4",
+        "version": "2.0.0.5",
         "changelog": "- feat: add new themes:\n- birthday (ballons, computer mouse interactive)\n- earthday\n- Eid al-Fitr (sugar feast/ramadan)\n- eurovision\n- Film Noir filter\n- Friday the 13\n- frost\n- Mario Day\n- Matrix\n- Oktoberfest\n- Olympia\n- Oscar Awards\n- Pride\n- Rain\n- Spooky\n- Sports (many selectable balls of ball games like handball, football (soccer) or tennis)\n- StarWars Day\n- Storm (Epilepsy Warning!!!, Thunderstorm)\n- refactored spring (new lawn with flowers), easter (new easter bunny, new lawn with flowers and ester eggs), halloween (add spiders (computer mouse sensitive), add mice, add fog) \n- fix: many improvements and bug fixes e.g. changed top to translate/transform for performance reasons",
         "targetAbi": "10.11.0.0",
         "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/Jellyfin-Seasonals-Plugin/releases/download/v2.0.0.4/Jellyfin.Plugin.Seasonals.zip",