diff --git a/CSS/themes/lidarr/aquamarine.css b/CSS/themes/lidarr/aquamarine.css
index 1b39ede8..5adb9028 100644
--- a/CSS/themes/lidarr/aquamarine.css
+++ b/CSS/themes/lidarr/aquamarine.css
@@ -12,17 +12,17 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* LIDARR AQUAMARINE THEME */
-@import url(https://gilbn.github.io/theme.park/CSS/themes/lidarr/lidarr-base.css);
+@import url(https://gflix.app/theme.park/CSS/themes/lidarr/lidarr-base.css);
 :root {
   --main-bg-color: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
 
-  --calendar-Downloading: 122 67 182;
-  --calendar-Downloaded: 39 194 76;
-  --calendar-Unreleased: 93 156 236;
-  --calendar-Partial: 255, 165, 0;  
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Missing: 240 80 80; 
+  --calendar-downloading: 122 67 182;
+  --calendar-downloaded: 39 194 76;
+  --calendar-unreleased: 93 156 236;
+  --calendar-partial: 255, 165, 0;  
+  --calendar-unmonitored: 173 173 173;
+  --calendar-missing: 240 80 80; 
 
   --button-color: #009688;
   --button-color-hover: #12afa0;
@@ -37,5 +37,5 @@
     
   --text:#eee;
   --text-hover: #fff;
-  --text-muted: #b6b0b0;
+  --text-muted: #999;
 }
\ No newline at end of file
diff --git a/CSS/themes/lidarr/dark.css b/CSS/themes/lidarr/dark.css
index 9061a5b9..4f32dd71 100644
--- a/CSS/themes/lidarr/dark.css
+++ b/CSS/themes/lidarr/dark.css
@@ -17,12 +17,12 @@
   --main-bg-color: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
 
-  --calendar-Downloading: 122 67 182;
-  --calendar-Downloaded: 39 194 76;
-  --calendar-Unreleased: 93 156 236;
-  --calendar-Partial: 255, 165, 0;  
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Missing: 240 80 80; 
+  --calendar-downloading: 122 67 182;
+  --calendar-downloaded: 39 194 76;
+  --calendar-unreleased: 93 156 236;
+  --calendar-partial: 255, 165, 0;  
+  --calendar-unmonitored: 173 173 173;
+  --calendar-missing: 240 80 80; 
 
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
diff --git a/CSS/themes/lidarr/hotline.css b/CSS/themes/lidarr/hotline.css
index 9b2c841d..b3fba05f 100644
--- a/CSS/themes/lidarr/hotline.css
+++ b/CSS/themes/lidarr/hotline.css
@@ -17,12 +17,12 @@
   --main-bg-color: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(ellipse at top, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
 
-  --calendar-Downloading: 122 67 182;
-  --calendar-Downloaded: 39 194 76;
-  --calendar-Unreleased: 93 156 236;
-  --calendar-Partial: 255, 165, 0;  
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Missing: 240 80 80;  
+  --calendar-downloading: 122 67 182;
+  --calendar-downloaded: 39 194 76;
+  --calendar-unreleased: 93 156 236;
+  --calendar-partial: 255, 165, 0;  
+  --calendar-unmonitored: 173 173 173;
+  --calendar-missing: 240 80 80; 
 
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
diff --git a/CSS/themes/lidarr/lidarr-base.css b/CSS/themes/lidarr/lidarr-base.css
index 056743db..232fc2dd 100644
--- a/CSS/themes/lidarr/lidarr-base.css
+++ b/CSS/themes/lidarr/lidarr-base.css
@@ -635,103 +635,89 @@ div[class*='EnhancedSelectInputOption']:hover {
 
 /*Title*/
 
-.PageJumpBarItem-jumpBarItem-3F58I:hover {
+[class*="PageJumpBarItem-jumpBarItem-"]:hover {
     color: #fff;
     background: hsla(0, 0%, 100%, .08);
 }
 
 /*Posters*/
-.AddListMoviePoster-title-2qKvg {
-    background-color: rgba(255, 255, 255, 0.08);
-    color: #fff;
-}
+
 
 /* MASS EDITOR */
 
 /* FOOTER */
-.PageContentFooter-contentFooter-3ODMj {
+[class*="PageContentFooter-contentFooter-"] {
     border: none;
     background-color: rgba(0, 0, 0, .25);
     color: #FFF;
 }
 
-/* SEASON PASS */
-
-.SeasonPassSeason-season-2FWuT {
-    border: none;
-    background-color: rgba(0, 0, 0, .25) !important;
-}
-
-.SeasonPassSeason-allEpisodes-1zGja {
-    background-color: #5cb85c;
-}
-
 /* CALENDAR */
-.CalendarEvent-downloaded-2vSrJ {
+[class*="CalendarEvent-downloaded-"] {
     background: rgb(var(--calendar-available) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-downloaded-2vSrJ:hover {
+[class*="CalendarEvent-downloaded-"]:hover {
     background: rgb(var(--calendar-available) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-missing-1y6vZ {
+[class*="CalendarEvent-missing-"] {
     background: rgb(var(--calendar-missing) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-missing-1y6vZ:hover {
-    background: rgb(var(--calendar-missing) / .5) !important;
+[class*="CalendarEvent-missing-"]:hover {
+    background: rgba(var(--calendar-missing) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-unreleased-mSAoI {
-    background: rgb(var(--calendar-Unaired) / .7) !important;
+[class*="CalendarEvent-unreleased-"] {
+    background: rgb(var(--calendar-unaired) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-unreleased-mSAoI:hover {
-    background: rgb(var(--calendar-Unaired) / .5) !important;
+[class*="CalendarEvent-unreleased-"]:hover {
+    background: rgb(var(--calendar-unaired) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-unmonitored-Zvc-m {
-    background: rgb(var(--calendar-Unmonitored) / .7) !important;
+[class*="CalendarEvent-unmonitored-"] {
+    background: rgb(var(--calendar-unmonitored) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-unmonitored-Zvc-m:hover {
-    background: rgb(var(--calendar-Unmonitored) / .5) !important;
+[class*="CalendarEvent-unmonitored-"]:hover {
+    background: rgb(var(--calendar-unmonitored) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-downloading-1kwSO {
-    background: rgb(var(--calendar-Downloading) / .7) !important;
+[class*="CalendarEvent-downloading-"] {
+    background: rgb(var(--calendar-downloading) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-downloading-1kwSO:hover {
-    background: rgb(var(--calendar-Downloading) / .5) !important;
+[class*="CalendarEvent-downloading-"]:hover {
+    background: rgb(var(--calendar-downloading) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.DayOfWeek-dayOfWeek-1iw4D {
+[class*="DayOfWeek-dayOfWeek-"] {
     background-color: hsla(0, 0%, 100%, .08);
 }
 
-.CalendarDay-dayOfMonth-2CzdW {
+[class*="CalendarDay-dayOfMonth-"] {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     background-color: rgba(0, 0, 0, .25);
 }
 
-.CalendarDay-isToday-1rFJO {
+[class*="CalendarDay-isToday-"] {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
-.CalendarDay-day-2TMXA,
-.CalendarDays-days-girjM {
+[class*="CalendarDay-day-"],
+[class*="CalendarDays-days-"] {
     -webkit-box-flex: 1;
     -webkit-flex: 1 0 14.28%;
     flex: 1 0 14.28%;
@@ -742,42 +728,19 @@ div[class*='EnhancedSelectInputOption']:hover {
     border-right: 1px solid hsla(0, 0%, 100%, .08);
 }
 
-.CalendarEvent-movieTitle-2-WAP,
-.CalendarEvent-episodeInfo-IWdbW,
-.CalendarEvent-airTime-3Wzho {
-    color: #ffffff !important;
+[class*="CalendarEvent-event-"] {
+    border-bottom: 1px solid transparent;
 }
 
-.CalendarEvent-movieInfo-2LF5- {
-    color: #eee;
-}
-
-.CalendarEvent-event-3Uyb9 {
-    border-bottom: none !important;
-}
-
-.CalendarEventGroup-eventGroup-gWPtK {
+[class*="CalendarEventGroup-eventGroup-"] {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08) !important;
 }
 
-.CalendarEventGroup-movieTitle-ThqKe {
-    color: #ffffff !important;
-}
-
-.CalendarEventGroup-airTime-1Z6G9 {
-    color: #eee;
-}
-
-.CalendarEventGroup-episodeInfo-vfg0M {
-    color: #eee;
-}
-
 /* calendar agenda */
-.AgendaEvent-event-2a83A:hover {
+[class*="AgendaEvent-event-"]:hover {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
-
 /* SETTINGS */
 [class*="PageContentBody-innerContentBody-"] [class*="Link-to-"] {
     color: #fff;
@@ -788,15 +751,15 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 /* MEDIA MANGEMENT */
-.NamingOption-small-2nxIl {
+[class*="NamingOption-small-"] {
     border: 1px solid transparent;
 }
 
-.NamingOption-token-1y5bz {
+[class*="NamingOption-token-"] {
     background-color: rgba(255, 255, 255, 0.15);
 }
 
-.NamingOption-example-RNR6x {
+[class*="NamingOption-example-"] {
     background-color: rgba(255, 255, 255, 0.25);
 }
 
diff --git a/CSS/themes/lidarr/organizr-dark.css b/CSS/themes/lidarr/organizr-dark.css
index c16b9666..2af090b6 100644
--- a/CSS/themes/lidarr/organizr-dark.css
+++ b/CSS/themes/lidarr/organizr-dark.css
@@ -17,12 +17,12 @@
   --main-bg-color: #1f1f1f;
   --modal-bg-color: #1b1b1b;
 
-  --calendar-Downloading: 122 67 182;
-  --calendar-Downloaded: 39 194 76;
-  --calendar-Unreleased: 93 156 236;
-  --calendar-Partial: 255, 165, 0;  
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Missing: 240 80 80;  
+  --calendar-downloading: 122 67 182;
+  --calendar-downloaded: 39 194 76;
+  --calendar-unreleased: 93 156 236;
+  --calendar-partial: 255, 165, 0;  
+  --calendar-unmonitored: 173 173 173;
+  --calendar-missing: 240 80 80; 
 
   --button-color: #2cabe3;
   --button-color-hover: rgb(44 171 227 / .8);
diff --git a/CSS/themes/lidarr/plex.css b/CSS/themes/lidarr/plex.css
index 2326a723..a1e8fba9 100644
--- a/CSS/themes/lidarr/plex.css
+++ b/CSS/themes/lidarr/plex.css
@@ -17,12 +17,12 @@
   --main-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;
   --modal-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-dark2.png") center center/cover no-repeat fixed;
 
-  --calendar-Downloading: 122 67 182;
-  --calendar-Downloaded: 39 194 76;
-  --calendar-Unreleased: 93 156 236;
-  --calendar-Partial: 255, 165, 0;  
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Missing: 240 80 80; 
+  --calendar-downloading: 122 67 182;
+  --calendar-downloaded: 39 194 76;
+  --calendar-unreleased: 93 156 236;
+  --calendar-partial: 255, 165, 0;  
+  --calendar-unmonitored: 173 173 173;
+  --calendar-missing: 240 80 80; 
 
   --button-color: #cc7b19;
   --button-color-hover: #e59029;
diff --git a/CSS/themes/lidarr/space-gray.css b/CSS/themes/lidarr/space-gray.css
index 2dc5888d..d24a0afc 100644
--- a/CSS/themes/lidarr/space-gray.css
+++ b/CSS/themes/lidarr/space-gray.css
@@ -17,12 +17,12 @@
   --main-bg-color:  radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient( ellipse at top,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
 
-  --calendar-Downloading: 122 67 182;
-  --calendar-Downloaded: 39 194 76;
-  --calendar-Unreleased: 93 156 236;
-  --calendar-Partial: 255, 165, 0;  
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Missing: 240 80 80;
+  --calendar-downloading: 122 67 182;
+  --calendar-downloaded: 39 194 76;
+  --calendar-unreleased: 93 156 236;
+  --calendar-partial: 255, 165, 0;  
+  --calendar-unmonitored: 173 173 173;
+  --calendar-missing: 240 80 80; 
 
   --button-color: #607D8B;
   --button-color-hover: #81a6b7;
diff --git a/CSS/themes/radarr/aquamarine.css b/CSS/themes/radarr/aquamarine.css
index eb10f42d..55289733 100644
--- a/CSS/themes/radarr/aquamarine.css
+++ b/CSS/themes/radarr/aquamarine.css
@@ -12,21 +12,30 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* RADARR AQUAMARINE THEME */
-@import url(https://gilbn.github.io/theme.park/CSS/themes/radarr/radarr-base.css);
+@import url(https://gflix.app/theme.park/CSS/themes/radarr/radarr-base.css);
 :root {
   --main-bg-color: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
   
   --calendar-in-cinemas: 53, 197, 244;
-  --calendar-Downloading: 122 67 182; 
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Unaired: 93 156 236;  
+  --calendar-downloading: 122 67 182; 
+  --calendar-unmonitored: 173 173 173;
+  --calendar-unaired: 93 156 236;  
   --calendar-missing: 240 80 80;
   --calendar-available: 39 194 76;
 
   --button-color: #009688;
   --button-color-hover: #12afa0;
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+
   --accent-color:  #009688;
   --accent-color-hover: #12afa0;
   --queue-color: #009688;
+  --link-color: #0ed2bf;
+  --link-color-hover: #fff;
+    
+  --text:#eee;
+  --text-hover: #fff;
+  --text-muted: #999;
 }
diff --git a/CSS/themes/radarr/dark.css b/CSS/themes/radarr/dark.css
index 87ceee20..ffeb69a2 100644
--- a/CSS/themes/radarr/dark.css
+++ b/CSS/themes/radarr/dark.css
@@ -18,9 +18,9 @@
   --modal-bg-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
 
   --calendar-in-cinemas: 53, 197, 244;
-  --calendar-Downloading: 122 67 182; 
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Unaired: 93 156 236;  
+  --calendar-downloading: 122 67 182; 
+  --calendar-unmonitored: 173 173 173;
+  --calendar-unaired: 93 156 236;  
   --calendar-missing: 240 80 80;
   --calendar-available: 39 194 76;
 
diff --git a/CSS/themes/radarr/hotline.css b/CSS/themes/radarr/hotline.css
index ac5b1a85..17273c7b 100644
--- a/CSS/themes/radarr/hotline.css
+++ b/CSS/themes/radarr/hotline.css
@@ -18,9 +18,9 @@
   --modal-bg-color: radial-gradient(ellipse at top, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
 
   --calendar-in-cinemas: 53, 197, 244;
-  --calendar-Downloading: 122 67 182; 
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Unaired: 93 156 236;  
+  --calendar-downloading: 122 67 182; 
+  --calendar-unmonitored: 173 173 173;
+  --calendar-unaired: 93 156 236;  
   --calendar-missing: 240 80 80;
   --calendar-available: 39 194 76;
 
diff --git a/CSS/themes/radarr/organizr-dark.css b/CSS/themes/radarr/organizr-dark.css
index 221ad402..647715c7 100644
--- a/CSS/themes/radarr/organizr-dark.css
+++ b/CSS/themes/radarr/organizr-dark.css
@@ -18,15 +18,24 @@
   --modal-bg-color: #1b1b1b;
 
   --calendar-in-cinemas: 53, 197, 244;
-  --calendar-Downloading: 122 67 182; 
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Unaired: 93 156 236;  
+  --calendar-downloading: 122 67 182; 
+  --calendar-unmonitored: 173 173 173;
+  --calendar-unaired: 93 156 236;  
   --calendar-missing: 240 80 80;
   --calendar-available: 39 194 76;
 
   --button-color: #2cabe3;
   --button-color-hover: rgb(44 171 227 / .8);
+  --button-text: #eee;
+  --button-text-hover: #fff;
+
   --accent-color:  #2cabe3;
   --accent-color-hover: white;
   --queue-color: #2cabe3;
+  --link-color: #2cabe3;
+  --link-color-hover: #fff;
+    
+  --text:#96a2b4;
+  --text-hover: #fff;
+  --text-muted: #999;
   }
\ No newline at end of file
diff --git a/CSS/themes/radarr/plex.css b/CSS/themes/radarr/plex.css
index d41f94d4..b4942281 100644
--- a/CSS/themes/radarr/plex.css
+++ b/CSS/themes/radarr/plex.css
@@ -18,9 +18,9 @@
   --modal-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-dark2.png") center center/cover no-repeat fixed;
 
   --calendar-in-cinemas: 53, 197, 244;
-  --calendar-Downloading: 122 67 182; 
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Unaired: 93 156 236;  
+  --calendar-downloading: 122 67 182; 
+  --calendar-unmonitored: 173 173 173;
+  --calendar-unaired: 93 156 236;  
   --calendar-missing: 240 80 80;
   --calendar-available: 39 194 76;
 
diff --git a/CSS/themes/radarr/radarr-base.css b/CSS/themes/radarr/radarr-base.css
index e444384a..2b680aff 100644
--- a/CSS/themes/radarr/radarr-base.css
+++ b/CSS/themes/radarr/radarr-base.css
@@ -233,6 +233,7 @@ a:hover {
 [class*="MovieIndexPoster-controls-"] {
     background-color: #000 !important;
 }
+
 /* OVERVIEW PAGE */
 
 [class*="MovieIndexOverviews-container-"],
@@ -317,7 +318,7 @@ a:hover {
     background-color: rgba(0, 0, 0, 0.25);
 }
 
-[class*="ExtraFileTable-container-"]{
+[class*="ExtraFileTable-container-"] {
     border: 1px solid transparent;
     background-color: rgba(0, 0, 0, .25);
 }
@@ -364,7 +365,7 @@ a:hover {
     background-color: var(--accent-color);
 }
 
-[class*="Label-info-"]{
+[class*="Label-info-"] {
     border-color: var(--accent-color);
     background-color: var(--accent-color);
     color: #fff;
@@ -414,6 +415,7 @@ a:hover {
     opacity: .5;
     color: var(--text);
 }
+
 [class*="PageToolbarButton-toolbarButton-"][class*="PageToolbarButton-isDisabled-"]:hover,
 [class*="PageToolbarButton-isDisabled-"]:hover {
     color: var(--text) !important;
@@ -472,6 +474,7 @@ a:hover {
 [class*="OverlayScroller-thumb-"] {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
+
 [class*="OverlayScroller-thumb-"] :hover {
     background-color: rgba(255, 255, 255, 0.25) !important;
 }
@@ -539,6 +542,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 [class*="PageContentBody-innerContentBody-"] {
     color: var(--text);
 }
+
 /* SEARCH RESULTS */
 [class*="AddNewMovieSearchResult-searchResult-"],
 [class*="AddNewMovieSearchResult-underlay-"] {
@@ -582,6 +586,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 [class*="VirtualTableRow-row-"]:hover {
     background-color: rgba(255, 255, 255, 0.08);
 }
+
 /* Drop down menu/button*/
 [class*="ImportMovieSelectMovie-button-"] {
     border: none !important;
@@ -614,114 +619,103 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 /*Title*/
-.AddListMovieOverview-link-3_RaH {
+[class*="AddListMovieOverview-link-"] {
     color: #eee;
 }
 
-.AddListMovieOverview-link-3_RaH:hover {
+[class*="AddListMovieOverview-link-"]:hover {
     color: #fff;
 }
 
-.AddListMovieOverview-content-2dBtg:hover {
+[class*="AddListMovieOverview-content-"]:hover {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
-.PageJumpBarItem-jumpBarItem-3F58I:hover {
+[class*="PageJumpBarItem-jumpBarItem-"]:hover {
     color: #fff;
     background: hsla(0, 0%, 100%, .08);
 }
 
 /*Posters*/
-.AddListMoviePoster-title-2qKvg {
+[class*="AddListMoviePoster-title-"] {
     background-color: rgba(255, 255, 255, 0.08);
     color: #fff;
 }
 
 /* MASS EDITOR */
 /* FOOTER */
-.PageContentFooter-contentFooter-3ODMj {
+[class*="PageContentFooter-contentFooter-"] {
     border: none;
     background-color: rgba(0, 0, 0, .25);
     color: #FFF;
 }
 
-/* SEASON PASS */
-
-.SeasonPassSeason-season-2FWuT {
-    border: none;
-    background-color: rgba(0, 0, 0, .25) !important;
-}
-
-.SeasonPassSeason-allEpisodes-1zGja {
-    background-color: #5cb85c;
-}
-
 /* CALENDAR */
-.CalendarEvent-downloaded-2vSrJ {
+[class*="CalendarEvent-downloaded-"] {
     background: rgb(var(--calendar-available) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-downloaded-2vSrJ:hover {
+[class*="CalendarEvent-downloaded-"]:hover {
     background: rgb(var(--calendar-available) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-missing-1y6vZ {
+[class*="CalendarEvent-missing-"] {
     background: rgb(var(--calendar-missing) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-missing-1y6vZ:hover {
-    background: rgb(var(--calendar-missing) / .5) !important;
+[class*="CalendarEvent-missing-"]:hover {
+    background: rgba(var(--calendar-missing) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-unreleased-mSAoI {
-    background: rgb(var(--calendar-Unaired) / .7) !important;
+[class*="CalendarEvent-unreleased-"] {
+    background: rgb(var(--calendar-unaired) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-unreleased-mSAoI:hover {
-    background: rgb(var(--calendar-Unaired) / .5) !important;
+[class*="CalendarEvent-unreleased-"]:hover {
+    background: rgb(var(--calendar-unaired) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-unmonitored-Zvc-m {
-    background: rgb(var(--calendar-Unmonitored) / .7) !important;
+[class*="CalendarEvent-unmonitored-"] {
+    background: rgb(var(--calendar-unmonitored) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-unmonitored-Zvc-m:hover {
-    background: rgb(var(--calendar-Unmonitored) / .5) !important;
+[class*="CalendarEvent-unmonitored-"]:hover {
+    background: rgb(var(--calendar-unmonitored) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-downloading-1kwSO {
-    background: rgb(var(--calendar-Downloading) / .7) !important;
+[class*="CalendarEvent-downloading-"] {
+    background: rgb(var(--calendar-downloading) / .7) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent-downloading-1kwSO:hover {
-    background: rgb(var(--calendar-Downloading) / .5) !important;
+[class*="CalendarEvent-downloading-"]:hover {
+    background: rgb(var(--calendar-downloading) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.DayOfWeek-dayOfWeek-1iw4D {
+[class*="DayOfWeek-dayOfWeek-"] {
     background-color: hsla(0, 0%, 100%, .08);
 }
 
-.CalendarDay-dayOfMonth-2CzdW {
+[class*="CalendarDay-dayOfMonth-"] {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     background-color: rgba(0, 0, 0, .25);
 }
 
-.CalendarDay-isToday-1rFJO {
+[class*="CalendarDay-isToday-"] {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
-.CalendarDay-day-2TMXA,
-.CalendarDays-days-girjM {
+[class*="CalendarDay-day-"],
+[class*="CalendarDays-days-"] {
     -webkit-box-flex: 1;
     -webkit-flex: 1 0 14.28%;
     flex: 1 0 14.28%;
@@ -732,38 +726,38 @@ div[class*='EnhancedSelectInputOption']:hover {
     border-right: 1px solid hsla(0, 0%, 100%, .08);
 }
 
-.CalendarEvent-movieTitle-2-WAP,
-.CalendarEvent-episodeInfo-IWdbW,
-.CalendarEvent-airTime-3Wzho {
+[class*="CalendarEvent-movieTitle-"],
+[class*="CalendarEvent-episodeInfo-"],
+[class*="CalendarEvent-airTime-"] {
     color: #ffffff !important;
 }
 
-.CalendarEvent-movieInfo-2LF5- {
+[class*="CalendarEvent-movieInfo-"] {
     color: #eee;
 }
 
-.CalendarEvent-event-3Uyb9 {
-    border-bottom: none !important;
+[class*="CalendarEvent-event-"] {
+    border-bottom: 1px solid transparent;
 }
 
-.CalendarEventGroup-eventGroup-gWPtK {
+[class*="CalendarEventGroup-eventGroup-"] {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08) !important;
 }
 
-.CalendarEventGroup-movieTitle-ThqKe {
+[class*="CalendarEventGroup-movieTitle-"] {
     color: #ffffff !important;
 }
 
-.CalendarEventGroup-airTime-1Z6G9 {
+[class*="CalendarEventGroup-airTime-"] {
     color: #eee;
 }
 
-.CalendarEventGroup-episodeInfo-vfg0M {
+[class*="CalendarEventGroup-episodeInfo-"] {
     color: #eee;
 }
 
 /* calendar agenda */
-.AgendaEvent-event-2a83A:hover {
+[class*="AgendaEvent-event-"]:hover {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
@@ -778,15 +772,15 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 /* MEDIA MANGEMENT */
-.NamingOption-small-2nxIl {
+[class*="NamingOption-small-"] {
     border: 1px solid transparent;
 }
 
-.NamingOption-token-1y5bz {
+[class*="NamingOption-token-"] {
     background-color: rgba(255, 255, 255, 0.15);
 }
 
-.NamingOption-example-RNR6x {
+[class*="NamingOption-example-"] {
     background-color: rgba(255, 255, 255, 0.25);
 }
 
diff --git a/CSS/themes/radarr/space-gray.css b/CSS/themes/radarr/space-gray.css
index 799c1d47..61432239 100644
--- a/CSS/themes/radarr/space-gray.css
+++ b/CSS/themes/radarr/space-gray.css
@@ -18,9 +18,9 @@
   --modal-bg-color: radial-gradient( ellipse at top,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
 
   --calendar-in-cinemas: 53, 197, 244;
-  --calendar-Downloading: 122 67 182; 
-  --calendar-Unmonitored: 173 173 173;
-  --calendar-Unaired: 93 156 236;  
+  --calendar-downloading: 122 67 182; 
+  --calendar-unmonitored: 173 173 173;
+  --calendar-unaired: 93 156 236;  
   --calendar-missing: 240 80 80;
   --calendar-available: 39 194 76;
 
diff --git a/CSS/themes/sonarr/aquamarine.css b/CSS/themes/sonarr/aquamarine.css
index becfc0ca..23cffa56 100644
--- a/CSS/themes/sonarr/aquamarine.css
+++ b/CSS/themes/sonarr/aquamarine.css
@@ -16,12 +16,12 @@
   --main-bg-color: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
 
-  --calendar-tv-Unaired-Premiere: 53 197 244;
-  --calendar-tv-Downloading: 122 67 182; 
-  --calendar-tv-Unmonitored: 173 173 173;
-  --calendar-tv-Unaired: 93 156 236;  
+  --calendar-tv-unaired-premiere: 53 197 244;
+  --calendar-tv-downloading: 122 67 182; 
+  --calendar-tv-unmonitored: 173 173 173;
+  --calendar-tv-unaired: 93 156 236;  
   --calendar-tv-missing: 240 80 80;
-  --calendar-tv-On-Air: 255 165 0; 
+  --calendar-tv-on-air: 255 165 0; 
   --calendar-tv-available: 39 194 76;
 
   --button-color: #009688;
@@ -37,4 +37,5 @@
     
   --text:#eee;
   --text-hover: #fff;
+  --text-muted: #999;
 }
\ No newline at end of file
diff --git a/CSS/themes/sonarr/dark.css b/CSS/themes/sonarr/dark.css
index 5f876a74..a016e1a4 100644
--- a/CSS/themes/sonarr/dark.css
+++ b/CSS/themes/sonarr/dark.css
@@ -16,14 +16,14 @@
   --main-bg-color: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
 
-  --calendar-tv-Unaired-Premiere: 53 197 244;
-  --calendar-tv-Downloading: 122 67 182; 
-  --calendar-tv-Unmonitored: 173 173 173;
-  --calendar-tv-Unaired: 93 156 236;  
+  --calendar-tv-unaired-premiere: 53 197 244;
+  --calendar-tv-downloading: 122 67 182; 
+  --calendar-tv-unmonitored: 173 173 173;
+  --calendar-tv-unaired: 93 156 236;  
   --calendar-tv-missing: 240 80 80;
-  --calendar-tv-On-Air: 255 165 0; 
+  --calendar-tv-on-air: 255 165 0; 
   --calendar-tv-available: 39 194 76;
-
+  
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
   --accent-color:  rgba(255, 255, 255, 0.25);
diff --git a/CSS/themes/sonarr/hotline.css b/CSS/themes/sonarr/hotline.css
index 113363aa..dc38626f 100644
--- a/CSS/themes/sonarr/hotline.css
+++ b/CSS/themes/sonarr/hotline.css
@@ -16,14 +16,14 @@
   --main-bg-color: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(ellipse at top, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
 
-  --calendar-tv-Unaired-Premiere: 53 197 244;
-  --calendar-tv-Downloading: 122 67 182; 
-  --calendar-tv-Unmonitored: 173 173 173;
-  --calendar-tv-Unaired: 93 156 236;  
+  --calendar-tv-unaired-premiere: 53 197 244;
+  --calendar-tv-downloading: 122 67 182; 
+  --calendar-tv-unmonitored: 173 173 173;
+  --calendar-tv-unaired: 93 156 236;  
   --calendar-tv-missing: 240 80 80;
-  --calendar-tv-On-Air: 255 165 0; 
+  --calendar-tv-on-air: 255 165 0; 
   --calendar-tv-available: 39 194 76;
-
+  
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
   --accent-color:  #F44336;
diff --git a/CSS/themes/sonarr/organizr-dark.css b/CSS/themes/sonarr/organizr-dark.css
index 0b1509e1..be26d199 100644
--- a/CSS/themes/sonarr/organizr-dark.css
+++ b/CSS/themes/sonarr/organizr-dark.css
@@ -16,14 +16,14 @@
   --main-bg-color: #1f1f1f;
   --modal-bg-color: #1b1b1b;
 
-  --calendar-tv-Unaired-Premiere: 53 197 244;
-  --calendar-tv-Downloading: 122 67 182; 
-  --calendar-tv-Unmonitored: 173 173 173;
-  --calendar-tv-Unaired: 93 156 236;  
+  --calendar-tv-unaired-premiere: 53 197 244;
+  --calendar-tv-downloading: 122 67 182; 
+  --calendar-tv-unmonitored: 173 173 173;
+  --calendar-tv-unaired: 93 156 236;  
   --calendar-tv-missing: 240 80 80;
-  --calendar-tv-On-Air: 255 165 0; 
+  --calendar-tv-on-air: 255 165 0; 
   --calendar-tv-available: 39 194 76;
-
+  
   --button-color: #2cabe3;
   --button-color-hover: rgb(44 171 227 / .8);
   --button-text: #eee;
diff --git a/CSS/themes/sonarr/plex.css b/CSS/themes/sonarr/plex.css
index 0a972842..3d5ea370 100644
--- a/CSS/themes/sonarr/plex.css
+++ b/CSS/themes/sonarr/plex.css
@@ -16,14 +16,14 @@
   --main-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;
   --modal-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-dark2.png") center center/cover no-repeat fixed;
 
-  --calendar-tv-Unaired-Premiere: 53 197 244;
-  --calendar-tv-Downloading: 122 67 182; 
-  --calendar-tv-Unmonitored: 173 173 173;
-  --calendar-tv-Unaired: 93 156 236;  
+  --calendar-tv-unaired-premiere: 53 197 244;
+  --calendar-tv-downloading: 122 67 182; 
+  --calendar-tv-unmonitored: 173 173 173;
+  --calendar-tv-unaired: 93 156 236;  
   --calendar-tv-missing: 240 80 80;
-  --calendar-tv-On-Air: 255 165 0; 
+  --calendar-tv-on-air: 255 165 0; 
   --calendar-tv-available: 39 194 76;
-
+  
   --button-color: #cc7b19;
   --button-color-hover: #e59029;
   --accent-color:  #e5a00d;
diff --git a/CSS/themes/sonarr/sonarr-base.css b/CSS/themes/sonarr/sonarr-base.css
index 4c7fb537..5e2688c7 100644
--- a/CSS/themes/sonarr/sonarr-base.css
+++ b/CSS/themes/sonarr/sonarr-base.css
@@ -23,6 +23,7 @@ body {
 }
 
 /* Froms */
+
 [class*="FormInputHelpText\/helpText\/"] {
     color: var(--text);
 }
@@ -600,7 +601,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 
 /* MASS EDITOR */
 /* FOOTER */
-.PageContentFooter\/contentFooter\/3ODMj {
+[class*="PageContentFooter\/contentFooter\/"] {
     border: none;
     background-color: rgba(0, 0, 0, .25);
     color: #FFF;
@@ -608,98 +609,98 @@ div[class*='EnhancedSelectInputOption']:hover {
 
 /* SEASON PASS */
 
-.SeasonPassSeason\/season\/2FWuT {
+[class*="SeasonPassSeason\/season\/"] {
     border: none;
     background-color: rgba(0, 0, 0, .25) !important;
 }
 
-.SeasonPassSeason\/allEpisodes\/1zGja {
+[class*="SeasonPassSeason\/allEpisodes\/"] {
     background-color: #5cb85c;
 }
 
 /* CALENDAR */
-.CalendarEvent\/downloaded\/2vSrJ {
+[class*="CalendarEvent\/downloaded\/"] {
     background: rgb(var(--calendar-tv-available) / .7) !important;
     border-left-color: transparent !important;
     color: #fff;
 }
 
-.CalendarEvent\/downloaded\/2vSrJ:hover {
+[class*="CalendarEvent\/downloaded\/"]:hover {
     background: rgb(var(--calendar-tv-available) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent\/missing\/1y6vZ {
+[class*="CalendarEvent\/missing\/"] {
     background: rgb(var(--calendar-tv-missing) / .7) !important;
     border-left-color: transparent !important;
     color: #fff;
 }
 
-.CalendarEvent\/missing\/1y6vZ:hover {
+[class*="CalendarEvent\/missing\/"]:hover {
     background: rgb(var(--calendar-tv-missing) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent\/unaired\/3aHdN {
-    background: rgb(var(--calendar-tv-Unaired) / .7) !important;
+[class*="CalendarEvent\/unaired\/"] {
+    background: rgb(var(--calendar-tv-unaired) / .7) !important;
     border-left-color: transparent !important;
     color: #fff;
 }
 
-.CalendarEvent\/unaired\/3aHdN:hover {
-    background: rgb(var(--calendar-tv-Unaired) / .5) !important;
+[class*="CalendarEvent\/unaired\/"]:hover {
+    background: rgb(var(--calendar-tv-unaired) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent\/unmonitored\/Zvc-m {
-    background: rgb(var(--calendar-tv-Unmonitored) / .7) !important;
+[class*="CalendarEvent\/unmonitored\/"] {
+    background: rgb(var(--calendar-tv-unmonitored) / .7) !important;
     border-left-color: transparent !important;
     color: #fff;
 }
 
-.CalendarEvent\/unmonitored\/Zvc-m:hover {
-    background: rgb(var(--calendar-tv-Unmonitored) / .5) !important;
+[class*="CalendarEvent\/unmonitored\/"]:hover {
+    background: rgb(var(--calendar-tv-unmonitored) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent\/onAir\/dwaU_ {
-    background: rgb(var(--calendar-tv-On-Air) / .7) !important;
+[class*="CalendarEvent\/onAir\/"] {
+    background: rgb(var(--calendar-tv-on-air) / .7) !important;
     border-left-color: transparent !important;
     color: #fff;
 }
 
-.CalendarEvent\/onAir\/dwaU_:hover {
-    background: rgb(var(--calendar-tv-On-Air) / .5) !important;
+[class*="CalendarEvent\/onAir\/"]:hover {
+    background: rgb(var(--calendar-tv-on-air) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.CalendarEvent\/downloading\/1kwSO {
-    background: rgb(var(--calendar-tv-Downloading) / .7) !important;
+[class*="CalendarEvent\/downloading\/"] {
+    background: rgb(var(--calendar-tv-downloading) / .7) !important;
     border-left-color: transparent !important;
     color: #fff;
 }
 
-.CalendarEvent\/downloading\/1kwSO:hover {
-    background: rgb(var(--calendar-tv-Downloading) / .5) !important;
+[class*="CalendarEvent\/downloading\/"]:hover {
+    background: rgb(var(--calendar-tv-downloading) / .5) !important;
     border-left-color: transparent !important;
 }
 
-.DayOfWeek\/dayOfWeek\/1iw4D {
+[class*="DayOfWeek\/dayOfWeek\/"] {
     background-color: hsla(0, 0%, 100%, .08);
     color: #fff;
 }
 
-.CalendarDay\/dayOfMonth\/2CzdW {
+[class*="CalendarDay\/dayOfMonth\/"] {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08);
     background-color: rgba(0, 0, 0, .25);
 }
 
-.CalendarDay\/isToday\/1rFJO {
+[class*="CalendarDay\/isToday\/"] {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
-.CalendarDay\/day\/2TMXA,
-.CalendarDays\/days\/girjM {
+[class*="CalendarDay\/day\/"],
+[class*="CalendarDays\/days\/"] {
     -webkit-box-flex: 1;
     -webkit-flex: 1 0 14.28%;
     flex: 1 0 14.28%;
@@ -710,41 +711,41 @@ div[class*='EnhancedSelectInputOption']:hover {
     border-right: 1px solid hsla(0, 0%, 100%, .08);
 }
 
-.CalendarEvent\/seriesTitle\/3sg1o,
-.CalendarEvent\/episodeInfo\/IWdbW,
-.CalendarEvent\/airTime\/3Wzho,
-.Legend\/legend\/tgR0o .LegendItem\/legendItem\/zXNYn {
+[class*="CalendarEvent\/seriesTitle\/"],
+[class*="CalendarEvent\/episodeInfo\/"],
+[class*="CalendarEvent\/airTime\/"],
+[class*="Legend\/legend\/"] [class*="LegendItem\/legendItem\/"] {
     color: #ffffff !important;
 }
 
-.CalendarEvent\/event\/3Uyb9 {
-    border-bottom: none !important;
+[class*="CalendarEvent\/event\/"] {
+    border-bottom: 1px solid transparent;
 }
 
-.CalendarEventGroup\/eventGroup\/gWPtK {
+[class*="CalendarEventGroup\/eventGroup\/"] {
     border-bottom: 1px solid hsla(0, 0%, 100%, .08) !important;
 }
 
-.CalendarEventGroup\/seriesTitle\/ThqKe {
+[class*="CalendarEventGroup\/seriesTitle\/"] {
     color: #ffffff !important;
 }
 
-.CalendarEventGroup\/airTime\/1Z6G9 {
+[class*="CalendarEventGroup\/airTime\/"] {
     color: #eee;
 }
 
-.CalendarEventGroup\/episodeInfo\/vfg0M {
+[class*="CalendarEventGroup\/episodeInfo\/"] {
     color: #eee;
 }
 
 /* calendar agenda */
-.AgendaEvent\/event\/2a83A:hover {
+[class*="AgendaEvent\/event\/"]:hover {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
 /*QUEUE PAGE */
 /* Manual Import*/
-.SelectEpisodeModalContent\/path\/1Okqk {
+[class*="SelectEpisodeModalContent\/path\/"] {
     color: #eee;
 }
 
diff --git a/CSS/themes/sonarr/space-gray.css b/CSS/themes/sonarr/space-gray.css
index a0ad9932..3b85bf93 100644
--- a/CSS/themes/sonarr/space-gray.css
+++ b/CSS/themes/sonarr/space-gray.css
@@ -16,14 +16,14 @@
   --main-bg-color:  radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient( ellipse at top,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
 
-  --calendar-tv-Unaired-Premiere: 53 197 244;
-  --calendar-tv-Downloading: 122 67 182; 
-  --calendar-tv-Unmonitored: 173 173 173;
-  --calendar-tv-Unaired: 93 156 236;  
+  --calendar-tv-unaired-premiere: 53 197 244;
+  --calendar-tv-downloading: 122 67 182; 
+  --calendar-tv-unmonitored: 173 173 173;
+  --calendar-tv-unaired: 93 156 236;  
   --calendar-tv-missing: 240 80 80;
-  --calendar-tv-On-Air: 255 165 0; 
+  --calendar-tv-on-air: 255 165 0; 
   --calendar-tv-available: 39 194 76;
-
+  
   --button-color: #607D8B;
   --button-color-hover: #81a6b7;
   --accent-color: #607D8B;