diff --git a/CSS/themes/lidarr/aquamarine.css b/CSS/themes/lidarr/aquamarine.css
index 5adb9028..b9c4a2a3 100644
--- a/CSS/themes/lidarr/aquamarine.css
+++ b/CSS/themes/lidarr/aquamarine.css
@@ -12,7 +12,7 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* LIDARR AQUAMARINE THEME */
-@import url(https://gflix.app/theme.park/CSS/themes/lidarr/lidarr-base.css);
+@import url(https://gilbn.github.io/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;
@@ -28,7 +28,7 @@
   --button-color-hover: #12afa0;
   --button-text: #eee;
   --button-text-hover: #FFF;
-
+  
   --accent-color:  #009688;
   --accent-color-hover: #12afa0;
   --queue-color: #009688;
diff --git a/CSS/themes/lidarr/dark.css b/CSS/themes/lidarr/dark.css
index 4f32dd71..5d3158d0 100644
--- a/CSS/themes/lidarr/dark.css
+++ b/CSS/themes/lidarr/dark.css
@@ -26,6 +26,16 @@
 
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+
   --accent-color:  rgba(255, 255, 255, 0.25);
   --accent-color-hover: rgba(255, 255, 255, 0.45);
+  --queue-color: #6b5;
+  --link-color: #ddd;
+  --link-color-hover: #fff;
+
+  --text:#eee;
+  --text-hover: #fff;
+  --text-muted: #999;
   }
\ No newline at end of file
diff --git a/CSS/themes/lidarr/hotline.css b/CSS/themes/lidarr/hotline.css
index b3fba05f..1feb2991 100644
--- a/CSS/themes/lidarr/hotline.css
+++ b/CSS/themes/lidarr/hotline.css
@@ -17,15 +17,26 @@
   --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-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-available: 39 194 76;
+  
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+  
   --accent-color:  #F44336;
   --accent-color-hover: #0b3161;
+  --queue-color: #6b5;
+  --link-color: #ddd;
+  --link-color-hover: #fff;
+    
+  --text:#eee;
+  --text-hover: #fff;
+  --text-muted: #999;
 }
\ No newline at end of file
diff --git a/CSS/themes/lidarr/lidarr-base.css b/CSS/themes/lidarr/lidarr-base.css
index 232fc2dd..6c580ff6 100644
--- a/CSS/themes/lidarr/lidarr-base.css
+++ b/CSS/themes/lidarr/lidarr-base.css
@@ -29,7 +29,7 @@ body {
 }
 
 [class*="FormInputGroup-inputUnit-"] {
-    color: #eee !important;
+    color: var(--text) !important;
 }
 
 /* LINKS */
@@ -114,6 +114,8 @@ a:hover {
     border-bottom: var(--accent-color);
 }
 
+[class*="Modal-large-"],
+[class*="Modal-modal-"],
 [class*="ModalContent-modalContent-"] {
     background: var(--modal-bg-color);
     color: var(--text);
@@ -193,16 +195,36 @@ a:hover {
 [class*="ImportArtistSelectArtist-results-"]::-webkit-scrollbar-thumb {
     background-color: rgba(255, 255, 255, 0.25);
 }
+
 /* MINI RIGHT SCROLL BAR */
 [class*="OverlayScroller-thumb-"],
-[class*="ImportArtistSelectArtist-results-"]::-webkit-scrollbar-thumb {
+[class*="ImportArtistSelectArtist-results-"]::-webkit-scrollbar-thumb,
+[class*="Scroller-scroller-"]::-webkit-scrollbar-thumb {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
+
 [class*="OverlayScroller-thumb-"]:hover,
-[class*="ImportArtistSelectArtist-results-"]::-webkit-scrollbar-thumb:hover {
+[class*="ImportArtistSelectArtist-results-"]::-webkit-scrollbar-thumb:hover,
+[class*="Scroller-scroller-"]::-webkit-scrollbar-thumb:hover {
     background-color: rgba(255, 255, 255, 0.25) !important;
 }
 
+/* ADD NEW */
+div[class*='EnhancedSelectInputOption'] {
+    background-color: #1e1e1e;
+    color: #fff;
+}
+
+div[class*='EnhancedSelectInputOption']:hover {
+    background-color: rgba(255, 255, 255, 0.08);
+    color: #fff;
+}
+
+[class*="EnhancedSelectInput-options-"] {
+    border: 1px solid #1e1e1e;
+    border-radius: 4px;
+    background-color: #1e1e1e;
+}
 
 /* SIDE MENU */
 [class*="PageSidebar-sidebarContainer-"] {
@@ -244,6 +266,7 @@ a:hover {
 [class*="ArtistIndexPoster-controls-"] {
     background-color: #000 !important;
 }
+
 /* OVERVIEW PAGE */
 
 /* OVERVIEW PAGE */
@@ -337,6 +360,7 @@ a:hover {
     border: none;
     background-color: rgba(0, 0, 0, .25);
 }
+
 [class*="ArtistIndexProgressBar-progress-"] {
     background-color: hsla(0, 0%, 100%, .08);
 }
@@ -359,11 +383,11 @@ a:hover {
 }
 
 [class*="Tooltip-bottom-"][class*="Tooltip-default-"] {
-    border-bottom-color: #eee;
+    border-bottom-color: var(--text);
 }
 
 [class*="Tooltip-right-"][class*="Tooltip-default-"] {
-    border-right-color: #eee;
+    border-right-color: var(--text);
 }
 
 [class*="EpisodeTitleLink-link-"]:hover {
@@ -385,7 +409,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;
@@ -431,6 +455,7 @@ a:hover {
     opacity: .5;
     color: var(--text);
 }
+
 [class*="PageToolbarButton-toolbarButton-"][class*="PageToolbarButton-isDisabled-"]:hover,
 [class*="PageToolbarButton-isDisabled-"]:hover {
     color: var(--text) !important;
@@ -610,7 +635,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 /* IMPORT NEW ARTIST */
 /* Drop down menu/button*/
 [class*="ImportArtistSelectArtist-button-"] {
-    border: none; 
+    border: none;
     background-color: rgba(0, 0, 0, 0.25) !important;
     color: #fff;
 }
@@ -750,7 +775,7 @@ div[class*='EnhancedSelectInputOption']:hover {
     color: var(--text);
 }
 
-/* MEDIA MANGEMENT */
+/* MEDIA MANAGEMENT - FILE NAME TOKENS */
 [class*="NamingOption-small-"] {
     border: 1px solid transparent;
 }
@@ -759,104 +784,146 @@ div[class*='EnhancedSelectInputOption']:hover {
     background-color: rgba(255, 255, 255, 0.15);
 }
 
+[class*="NamingOption-token-"] {
+    background-color: rgba(255, 255, 255, 0.15);
+}
+
 [class*="NamingOption-example-"] {
     background-color: rgba(255, 255, 255, 0.25);
 }
 
+[class*="NamingOption-option-"] {
+    border: 1px solid transparent;
+}
+
+[class*="NamingOption-option-"]:hover [class*="NamingOption-token-"] {
+    background-color: rgba(255, 255, 2550, 0.25);
+}
+
+[class*="NamingOption-option-"]:hover [class*="NamingOption-example-"] {
+    background-color: rgba(255, 255, 2550, 0.35);
+}
+
 /* PROFILES */
-.Card-card-1iGZk,
-.QualityProfiles-addQualityProfile-2U2Io {
+[class*="Card-card-"],
+[class*="QualityProfiles-addQualityProfile-"] {
     background-color: rgba(0, 0, 0, .45);
     box-shadow: 0 0 10px 1px #000000;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
-.Card-card-1iGZk:hover {
-    color: white;
+[class*="Card-card-"]:hover {
+    color: var(--text-hover);
 }
 
-.QualityProfiles-center-1iiKm,
-.LanguageProfiles-center-7EV_2,
-.ReleaseProfiles-center-114Qx {
+[class*="QualityProfiles-center-"],
+[class*="LanguageProfiles-center-"],
+[class*="ReleaseProfiles-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
-.QualityProfileItem-qualityProfileItem-VFp-W,
-.QualityProfileItemGroup-qualityProfileItemGroup-2U1l5,
-.LanguageProfileItem-languageProfileItem-18XGg {
+[class*="QualityProfileItem-qualityProfileItem-"],
+[class*="QualityProfileItemGroup-qualityProfileItemGroup-"],
+[class*="LanguageProfileItem-languageProfileItem-"] {
     border: none;
     background-color: rgba(0, 0, 0, .25);
     color: #FFF;
 }
 
-.QualityProfileItemGroup-qualityProfileItemGroup-2U1l5.QualityProfileItemGroup-editGroups-2KzDp {
+[class*="QualityProfileItemGroup-qualityProfileItemGroup-"][class*="QualityProfileItemGroup-editGroups-"] {
     background: rgba(0, 0, 0, 0.25);
 }
 
-.KeyValueListInputItem-keyInput-3YYEs,
-.KeyValueListInputItem-valueInput-3zlQA {
+[class*="KeyValueListInputItem-keyInput-"],
+[class*="KeyValueListInputItem-valueInput-"] {
     border: none;
     background: transparent;
     color: white;
 }
 
-.QualityProfileFormatItem-qualityProfileFormatItem-19XrK {
+[class*="QualityProfileFormatItem-qualityProfileFormatItem-"] {
     border: 1px solid transparent;
     background: rgba(0, 0, 0, .25);
 }
 
 /* PROFILES */
-.Indexers-center-11Csq {
+[class*="Indexers-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
+}
+
+[class*="Card-card-"],
+[class*="QualityProfiles-addQualityProfile-"] {
+    background-color: rgba(0, 0, 0, .45);
+    box-shadow: 0 0 10px 1px #000000;
+    color: var(--text);
+}
+
+[class*="QualityProfiles-center-"],
+[class*="LanguageProfiles-center-"],
+[class*="MetadataProfiles-center-"],
+[class*="RootFolders-center-"] {
+    background-color: transparent;
+    border: none;
+    color: var(--text);
+}
+
+[class*="Indexers-center-"],
+[class*="Restrictions-center-"],
+[class*="DownloadClients-center-"],
+[class*="ImportLists-center-"],
+[class*="Notifications-center-"] {
+    display: inline-block;
+    padding: 15px 20px 15px;
+    border-radius: 4px;
 }
 
 /* DOWNLOAD CLIENTS */
-.DownloadClients-center-FvACx {
+[class*="DownloadClients-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
 /* CONNECTIONS */
-.Notifications-center-8iwmy {
+[class*="Notifications-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
 /* LISTS */
-.ImportLists-center-17Qdu {
+[class*="ImportLists-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
 /* LOG */
-.Alert-info-1J8mE {
+[class*="Alert-info-"] {
     border-color: transparent;
     background-color: rgba(0, 0, 0, 0.25);
     color: #FFC107;
 }
 
 /* INDEXER */
-.Restrictions-center-3ngzk {
+[class*="Restrictions-center-"] {
     border: 1px solid transparent;
     background-color: transparent;
 }
 
 /* LISTS */
-.NetImports-center-3otL- {
+[class*="NetImports-center-"] {
     border: 1px solid transparent;
     background-color: transparent;
 }
 
 /* CUSTOM FORMAT */
-.CustomFormats-center-1w6Bw,
-.EditCustomFormatModalContent-center-3QU87 {
+[class*="CustomFormats-center-"],
+[class*="EditCustomFormatModalContent-center-"] {
     border: 1px solid transparent;
     background-color: transparent;
 }
@@ -865,7 +932,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 
 .panel-body {
     background-color: rgba(0, 0, 0, 0.25);
-    color: white;
+    color: var(--text);
 }
 
 .panel-header {
@@ -873,376 +940,66 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 .forgot-password {
-    color: #eee !important;
+    color: var(--text) !important;
 }
 
 /* Custom filter */
-.FilterBuilderRow-filterRow-1ozij:hover {
+[class*="FilterBuilderRow-filterRow-"]:hover {
     background-color: transparent;
 }
 
-.CustomFilter-customFilter-zBSMd:hover {
+[class*="CustomFilter-customFilter-"]:hover {
     background-color: hsla(0, 0%, 100%, .08);
 }
 
-.SelectMovieModalContent-path-32FI- {
-    color: #eee;
+[class*="SelectMovieModalContent-path-"] {
+    color: var(--text);
 }
 
 /* -------------------------LIDARR STUFF------------------------------*/
 
-/* Buttons */
-
-.Button-default-2uiHU {
-    color: #FFF;
-    background-color: var(--button-color);
-    border-color: transparent;
-}
-
-.Button-default-2uiHU:hover {
-    border-color: transparent;
-    background-color: var(--button-color-hover) !important;
-    color: #fff;
-}
-
-.Button-primary-1F1YL {
-    border-color: transparent;
-    background-color: var(--button-color);
-    color: #fff;
-}
-
-.Button-primary-1F1YL:hover {
-    border-color: transparent;
-    background-color: var(--button-color-hover) !important;
-    color: #fff;
-}
-
-.Button-success-36KsU {
-    border-color: var(--button-color);
-    background-color: var(--button-color);
-    color: #fff;
-}
-
-.Button-success-36KsU:hover {
-    border-color: var(--button-color-hover);
-    background-color: var(--button-color-hover);
-    color: #fff;
-}
-
-
-
-/* Popup modal */
-.Modal-large-I2McN,
-.Modal-modal-3oHjA,
-.ModalContent-modalContent-1B9AX {
-    background-color: #282828;
-    color: #FFF;
-}
-
-.ModalHeader-modalHeader-P3MTG,
-.ModalFooter-modalFooter-3izCM {
-    background-color: #323232;
-    color: #FFF;
-}
-
-.ModalContent-closeButton-37Puk:hover {
-    color: #fff;
-}
-
-.ModalFooter-modalFooter-3izCM a:first-child,
-.ModalFooter-modalFooter-3izCM button:first-child {
-    background-color: #656565 !important;
-    border-color: transparent;
-}
-
-.ModalFooter-modalFooter-3izCM a:first-child,
-.ModalFooter-modalFooter-3izCM button:first-child:hover {
-    margin-left: 0;
-    background-color: hsla(0, 0%, 100%, .3) !important;
-    color: white;
-    border-bottom-color: transparent;
-}
-
-.Button-default-1X0nf {
-    border-color: transparent;
-    background-color: #656565;
-    color: #FFF;
-}
-
-.Button-default-1X0nf:hover {
-    border-color: transparent;
-    background-color: hsla(0, 0%, 100%, .3) !important;
-    color: #fff;
-}
-
-.Button-primary-1F1YL {
-    border-color: transparent;
-}
-
-.Button-primary-1F1YL:hover {
-    border-color: transparent;
-}
-
-/* Main Menu Header */
-.PageHeader-header-1lnFT {
-    background-color: rgba(0, 0, 0, .7);
-}
-
-.PageToolbar-toolbar-1oL_w {
-    background-color: rgba(0, 0, 0, .25);
-    color: hsla(0, 0%, 100%, .7);
-}
-
-.PageHeader-donate-3Lk-h {
-    color: #c4273c !important;
-}
-
-.PageToolbarButton-toolbarButton-3b5EM:hover {
-    color: #FFF;
-}
-
-/* Sidebar */
-@media only screen and (max-width: 768px) {
-    .PageSidebar-sidebar-2UXc0 {
-        background: rgba(0, 0, 0, .25);
-        background-image: var(--main-bg-color);
-        background-repeat: repeat, no-repeat;
-        background-attachment: fixed, fixed;
-        background-position: center center, center center;
-        background-size: auto, cover;
-        -webkit-background-size: auto, cover;
-        -moz-background-size: auto, cover;
-        -o-background-size: auto, cover;
-    }
-}
-
-.PageSidebar-sidebarContainer-2kLcI {
-    background: transparent;
-}
-
-.PageSidebarItem-isActiveLink-1JpOZ {
-    color: hsla(0, 0%, 100%, .7) !important;
-}
-
-.PageSidebarItem-isActiveItem-34xgs {
-    border-left: 3px solid hsla(0, 0%, 100%, .08);
-}
-
-.PageSidebar-sidebar-2UXc0 {
-    background-color: rgba(0, 0, 0, .25);
-}
-
-.PageSidebarItem-isActiveParentLink-2qgS5 {
-    background-color: rgba(0, 0, 0, 0);
-}
-
-.PageSidebarItem-isActiveParentLink-2qgS5:hover {
-    background-color: hsla(0, 0%, 100%, .08);
-}
-
-.PageSidebarItem-link-2ron8:hover,
-.PageSidebarItem-link-2ron8:focus {
-    color: #FFF !important;
-    background-color: hsla(0, 0%, 100%, .08);
-    text-decoration: none;
-}
-
-.PageSidebarItem-link-2ron8 {
-    color: hsla(0, 0%, 100%, .7) !important;
-}
-
-
-
-
-
-/* BANNER PAGE */
-.ArtistIndexBanner-title-dKZ3c {
-    background-color: rgba(0, 0, 0, .25);
-}
-
-/* Table view*/
-.VirtualTableRow-row-2osBd:hover {
-    background-color: rgba(0, 0, 0, .25);
-}
-
-.VirtualTableRow-row-2osBd:hover,
-.ArtistIndexHeader-sortName-3sIoX:hover,
-.ArtistIndexHeader-artistType-1bUEX:hover,
-.ArtistIndexHeader-trackCount-2fAYt:hover,
-.ArtistIndexHeader-qualityProfileId-33lgF:hover,
-.ArtistIndexHeader-languageProfileId-F8uCr:hover,
-.ArtistIndexHeader-metadataProfileId-258c_:hover,
-.ArtistIndexHeader-nextAlbum-2P-CJ:hover,
-.ArtistIndexHeader-lastAlbum-18Y9w:hover,
-.ArtistIndexHeader-added-z5UiU:hover,
-.ArtistIndexHeader-genres-3YVsn:hover,
-.ArtistIndexHeader-albumCount-1CnIC:hover,
-.ArtistIndexHeader-trackProgress-5psBe:hover,
-.ArtistIndexHeader-latestAlbum-KzyAA:hover,
-.ArtistIndexHeader-actions-KjYeY:hover {
+[class*="ArtistIndexHeader-sortName-"]:hover,
+[class*="ArtistIndexHeader-artistType-"]:hover,
+[class*="ArtistIndexHeader-trackCount-"]:hover,
+[class*="ArtistIndexHeader-qualityProfileId-"]:hover,
+[class*="ArtistIndexHeader-languageProfileId-"]:hover,
+[class*="ArtistIndexHeader-metadataProfileId-"]:hover,
+[class*="ArtistIndexHeader-nextAlbum-"]:hover,
+[class*="ArtistIndexHeader-lastAlbum-"]:hover,
+[class*="ArtistIndexHeader-added-"]:hover,
+[class*="ArtistIndexHeader-genres-"]:hover,
+[class*="ArtistIndexHeader-albumCount-"]:hover,
+[class*="ArtistIndexHeader-trackProgress-"]:hover,
+[class*="ArtistIndexHeader-latestAlbum-"]:hover,
+[class*="ArtistIndexHeader-actions-"]:hover {
     background-color: rgba(0, 0, 0, .25);
     color: #FFF;
 }
 
-/* Table options*/
-.TableOptionsColumn-column-2H7ic {
-    background: rgba(0, 0, 0, .25);
-    color: #FFF;
-    border: none;
-}
-
 /* Fix rating border*/
-.ArtistIndexRow-ratings-nqXPx {
-    border-top: 1px solid #eee !important;
+[class*="ArtistIndexRow-ratings-"] {
+    border-top: 1px solid var(--text) !important;
 }
 
 /* ALBUM STUDIO */
-.AlbumStudioAlbum-album-mOsjl,
-.AlbumStudioAlbum-tracks-14O0r {
+[class*="AlbumStudioAlbum-albumType-"],
+[class*="AlbumStudioAlbum-album-"],
+[class*="AlbumStudioAlbum-tracks-"] {
     border: none;
     background-color: rgba(0, 0, 0, 0.25);
     color: #fff;
 }
 
-.AlbumStudioAlbum-albumType-3QdT4,
-.AlbumStudioAlbum-tracks-14O0r {
-    padding: 0 4px;
-    background-color: rgba(0, 0, 0, 0.25);
-    color: #fff;
-}
-
-.AlbumStudioAlbum-missingWanted-1jEbu {
+[class*="AlbumStudioAlbum-missingWanted-"] {
     background-color: #f05050;
 }
 
-.AlbumStudioAlbum-allTracks-1KGPc {
+[class*="AlbumStudioAlbum-allTracks-"] {
     background-color: #0b8750;
 }
 
-/* CALENDAR */
-.CalendarDay-day-2TMXA,
-.CalendarDays-days-girjM {
-    -webkit-box-flex: 1;
-    -webkit-flex: 1 0 14.28%;
-    flex: 1 0 14.28%;
-    overflow: hidden;
-    min-height: 70px;
-    border-bottom: 1px solid hsla(0, 0%, 100%, .08);
-    border-left: 1px solid hsla(0, 0%, 100%, .08);
-    border-right: 1px solid hsla(0, 0%, 100%, .08);
-}
-
-.CalendarDay-dayOfMonth-2CzdW {
-    border-bottom: 1px solid hsla(0, 0%, 100%, .08);
-    background-color: rgba(0, 0, 0, .25);
-}
-
-.DayOfWeek-dayOfWeek--jS1P {
-    background-color: hsla(0, 0%, 100%, .08);
-}
-
-.CalendarDay-isToday-1rFJO {
-    background-color: hsla(0, 0%, 100%, .08) !important;
-}
-
-/* SETTINGS */
-/* TEXT */
-.Settings-summary-1BIsi {
-    color: #fff;
-}
-
-/* MEDIA MANAGEMENT */
-/* DROPDOWNS SELECT */
-div[class*='EnhancedSelectInputOption'] { 
-    background-color: #1e1e1e;
-    color: #fff;
-    }
-    div[class*='EnhancedSelectInputOption']:hover { 
-    background-color: rgba(255, 255, 255, 0.08);
-    color: #fff;
-    }
-    .EnhancedSelectInput-options-3yy65 {
-    border: 1px solid #1e1e1e;
-    border-radius: 4px;
-    background-color: #1e1e1e;
-    }
-/* FILE NAME TOKENS */
-.NamingOption-token-1y5bz {
-    background-color: rgba(255, 255, 255, 0.15);
-}
-
-.NamingOption-option-giCGd {
-    border: 1px solid transparent;
-}
-
-.NamingOption-example-RNR6x {
-    background-color: rgba(255, 255, 255, 0.25);
-}
-
-.NamingOption-option-giCGd:hover .NamingOption-token-1y5bz {
-    background-color: rgba(255, 255, 2550, 0.25);
-}
-
-.NamingOption-option-giCGd:hover .NamingOption-example-RNR6x {
-    background-color: rgba(255, 255, 2550, 0.35);
-}
-
-/* PROFILES/INDEXERS/DL-CLIENTS/IMPORT-LIST/CONNECTIONS */
-.Card-card-SvrkG {
-    background-color: rgba(0, 0, 0, .25);
-    box-shadow: 0 0 10px 1px #000000;
-    color: #fff;
-}
-
-.LanguageProfileItem-languageProfileItem-18XGg {
-    border: none;
-    background: rgba(0, 0, 0, 0.25);
-}
-
-.QualityProfiles-addQualityProfile-2q4Re {
-    background-color: rgba(0, 0, 0, .25);
-    border: none;
-    color: #c2c6c8;
-}
-
-.QualityProfiles-center-3qTb_,
-.LanguageProfiles-center-18sh2,
-.MetadataProfiles-center-dOatB,
-.Indexers-center-3HUez,
-.Restrictions-center-3cS8T,
-.DownloadClients-center-30cx9,
-.ImportLists-center-17Qdu,
-.Notifications-center-13jM2,
-.RootFolders-center-XcFPy {
-    background-color: transparent;
-    border: none;
-    color: #c2c6c8;
-}
-
-.Indexers-center-3HUez,
-.Restrictions-center-3cS8T,
-.DownloadClients-center-30cx9,
-.ImportLists-center-17Qdu,
-.Notifications-center-13jM2 {
-    display: inline-block;
-    padding: 15px 20px 15px;
-    border-radius: 4px;
-}
-
 /* CONNECTIONS */
-.Label-danger-1rVtt.Label-outline-2ZP8n {
+[class*="Label-danger-"][class*="Label-outline-"] {
     color: #FFF;
     background-color: #f05050;
-}
-
-/* EDIT QUALITY PROFILES */
-.QualityProfileItem-qualityProfileItem-VFp-W,
-.QualityProfileItemGroup-qualityProfileItemGroup-2U1l5 {
-    border: none;
-    background-color: rgba(0, 0, 0, .25);
-    color: #FFF;
-}
-
-.QualityProfileItemGroup-qualityProfileItemGroup-2U1l5.QualityProfileItemGroup-editGroups-2KzDp {
-    background: rgba(0, 0, 0, 0.25);
 }
\ No newline at end of file
diff --git a/CSS/themes/lidarr/plex.css b/CSS/themes/lidarr/plex.css
index a1e8fba9..9df72468 100644
--- a/CSS/themes/lidarr/plex.css
+++ b/CSS/themes/lidarr/plex.css
@@ -26,6 +26,16 @@
 
   --button-color: #cc7b19;
   --button-color-hover: #e59029;
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+
   --accent-color:  #e5a00d;
   --accent-color-hover: #ffc107;
+  --queue-color: #27c24c;
+  --link-color: #e5a00d;
+  --link-color-hover: #fff;
+    
+  --text:#eee;
+  --text-hover: #fff;
+  --text-muted: #999;
   }
\ No newline at end of file
diff --git a/CSS/themes/lidarr/space-gray.css b/CSS/themes/lidarr/space-gray.css
index d24a0afc..b624fde5 100644
--- a/CSS/themes/lidarr/space-gray.css
+++ b/CSS/themes/lidarr/space-gray.css
@@ -26,6 +26,16 @@
 
   --button-color: #607D8B;
   --button-color-hover: #81a6b7;
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+
   --accent-color: #607D8B;
   --accent-color-hover: #81a6b7;
+  --queue-color: #81a6b7;
+  --link-color: #81a6b7;
+  --link-color-hover: #fff;
+    
+  --text:#eee;
+  --text-hover: #fff;
+  --text-muted: #999;
 }
\ No newline at end of file
diff --git a/CSS/themes/radarr/aquamarine.css b/CSS/themes/radarr/aquamarine.css
index 55289733..dace22ad 100644
--- a/CSS/themes/radarr/aquamarine.css
+++ b/CSS/themes/radarr/aquamarine.css
@@ -12,7 +12,7 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* RADARR AQUAMARINE THEME */
-@import url(https://gflix.app/theme.park/CSS/themes/radarr/radarr-base.css);
+@import url(https://gilbn.github.io/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;
diff --git a/CSS/themes/radarr/dark.css b/CSS/themes/radarr/dark.css
index ffeb69a2..3d848d60 100644
--- a/CSS/themes/radarr/dark.css
+++ b/CSS/themes/radarr/dark.css
@@ -26,7 +26,16 @@
 
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+
   --accent-color:  rgba(255, 255, 255, 0.25);
   --accent-color-hover: rgba(255, 255, 255, 0.45);
   --queue-color: #6b5;
+  --link-color: #ddd;
+  --link-color-hover: #fff;
+    
+  --text:#eee;
+  --text-hover: #fff;
+  --text-muted: #999;
   }
\ No newline at end of file
diff --git a/CSS/themes/radarr/hotline.css b/CSS/themes/radarr/hotline.css
index 17273c7b..c69c2b97 100644
--- a/CSS/themes/radarr/hotline.css
+++ b/CSS/themes/radarr/hotline.css
@@ -26,7 +26,16 @@
 
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+  
   --accent-color:  #F44336;
   --accent-color-hover: #0b3161;
   --queue-color: #6b5;
+  --link-color: #ddd;
+  --link-color-hover: #fff;
+    
+  --text:#eee;
+  --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 b4942281..288e6c46 100644
--- a/CSS/themes/radarr/plex.css
+++ b/CSS/themes/radarr/plex.css
@@ -26,7 +26,16 @@
 
   --button-color: #cc7b19;
   --button-color-hover: #e59029;
+  --button-text: #eee;
+  --button-text-hover: #fff;
+
   --accent-color:  #e5a00d;
   --accent-color-hover: #ffc107;
   --queue-color: #27c24c;
+  --link-color: #e5a00d;
+  --link-color-hover: #fff;
+    
+  --text:#eee;
+  --text-hover: #fff;
+  --text-muted: #999;
   }
\ No newline at end of file
diff --git a/CSS/themes/radarr/radarr-base.css b/CSS/themes/radarr/radarr-base.css
index 2b680aff..f172c160 100644
--- a/CSS/themes/radarr/radarr-base.css
+++ b/CSS/themes/radarr/radarr-base.css
@@ -29,7 +29,7 @@ body {
 }
 
 [class*="FormInputGroup-inputUnit-"] {
-    color: #eee !important;
+    color: var(--text) !important;
 }
 
 /* LINKS */
@@ -339,11 +339,11 @@ a:hover {
 }
 
 [class*="Tooltip-bottom-"][class*="Tooltip-default-"] {
-    border-bottom-color: #eee;
+    border-bottom-color: var(--text);
 }
 
 [class*="Tooltip-right-"][class*="Tooltip-default-"] {
-    border-right-color: #eee;
+    border-right-color: var(--text);
 }
 
 [class*="EpisodeTitleLink-link-"]:hover {
@@ -475,7 +475,7 @@ a:hover {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
-[class*="OverlayScroller-thumb-"] :hover {
+[class*="OverlayScroller-thumb-"]:hover {
     background-color: rgba(255, 255, 255, 0.25) !important;
 }
 
@@ -620,7 +620,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 
 /*Title*/
 [class*="AddListMovieOverview-link-"] {
-    color: #eee;
+    color: var(--text);
 }
 
 [class*="AddListMovieOverview-link-"]:hover {
@@ -733,7 +733,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 [class*="CalendarEvent-movieInfo-"] {
-    color: #eee;
+    color: var(--text);
 }
 
 [class*="CalendarEvent-event-"] {
@@ -749,11 +749,11 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 [class*="CalendarEventGroup-airTime-"] {
-    color: #eee;
+    color: var(--text);
 }
 
 [class*="CalendarEventGroup-episodeInfo-"] {
-    color: #eee;
+    color: var(--text);
 }
 
 /* calendar agenda */
@@ -761,7 +761,6 @@ div[class*='EnhancedSelectInputOption']:hover {
     background-color: hsla(0, 0%, 100%, .08) !important;
 }
 
-
 /* SETTINGS */
 [class*="PageContentBody-innerContentBody-"] [class*="Link-to-"] {
     color: #fff;
@@ -771,7 +770,7 @@ div[class*='EnhancedSelectInputOption']:hover {
     color: var(--text);
 }
 
-/* MEDIA MANGEMENT */
+/* MEDIA MANAGEMENT - FILE NAME TOKENS */
 [class*="NamingOption-small-"] {
     border: 1px solid transparent;
 }
@@ -780,104 +779,120 @@ div[class*='EnhancedSelectInputOption']:hover {
     background-color: rgba(255, 255, 255, 0.15);
 }
 
+[class*="NamingOption-token-"] {
+    background-color: rgba(255, 255, 255, 0.15);
+}
+
 [class*="NamingOption-example-"] {
     background-color: rgba(255, 255, 255, 0.25);
 }
 
+[class*="NamingOption-option-"] {
+    border: 1px solid transparent;
+}
+
+[class*="NamingOption-option-"]:hover [class*="NamingOption-token-"] {
+    background-color: rgba(255, 255, 2550, 0.25);
+}
+
+[class*="NamingOption-option-"]:hover [class*="NamingOption-example-"] {
+    background-color: rgba(255, 255, 2550, 0.35);
+}
+
 /* PROFILES */
-.Card-card-1iGZk,
-.QualityProfiles-addQualityProfile-2U2Io {
+[class*="Card-card-"],
+[class*="QualityProfiles-addQualityProfile-"] {
     background-color: rgba(0, 0, 0, .45);
     box-shadow: 0 0 10px 1px #000000;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
-.Card-card-1iGZk:hover {
-    color: white;
+[class*="Card-card-"]:hover {
+    color: var(--text-hover);
 }
 
-.QualityProfiles-center-1iiKm,
-.LanguageProfiles-center-7EV_2,
-.ReleaseProfiles-center-114Qx {
+[class*="QualityProfiles-center-"],
+[class*="LanguageProfiles-center-"],
+[class*="ReleaseProfiles-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
-.QualityProfileItem-qualityProfileItem-VFp-W,
-.QualityProfileItemGroup-qualityProfileItemGroup-2U1l5,
-.LanguageProfileItem-languageProfileItem-18XGg {
+[class*="QualityProfileItem-qualityProfileItem-"],
+[class*="QualityProfileItemGroup-qualityProfileItemGroup-"],
+[class*="LanguageProfileItem-languageProfileItem-"] {
     border: none;
     background-color: rgba(0, 0, 0, .25);
     color: #FFF;
 }
 
-.QualityProfileItemGroup-qualityProfileItemGroup-2U1l5.QualityProfileItemGroup-editGroups-2KzDp {
+[class*="QualityProfileItemGroup-qualityProfileItemGroup-"][class*="QualityProfileItemGroup-editGroups-"] {
     background: rgba(0, 0, 0, 0.25);
 }
 
-.KeyValueListInputItem-keyInput-3YYEs,
-.KeyValueListInputItem-valueInput-3zlQA {
+[class*="KeyValueListInputItem-keyInput-"],
+[class*="KeyValueListInputItem-valueInput-"] {
     border: none;
     background: transparent;
     color: white;
 }
 
-.QualityProfileFormatItem-qualityProfileFormatItem-19XrK {
+[class*="QualityProfileFormatItem-qualityProfileFormatItem-"] {
     border: 1px solid transparent;
     background: rgba(0, 0, 0, .25);
 }
 
 /* PROFILES */
-.Indexers-center-11Csq {
+[class*="Indexers-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
 /* DOWNLOAD CLIENTS */
-.DownloadClients-center-FvACx {
+[class*="DownloadClients-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
 /* CONNECTIONS */
-.Notifications-center-8iwmy {
+[class*="Notifications-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
 /* LISTS */
-.ImportLists-center-17Qdu {
+[class*="ImportLists-center-"] {
     background-color: transparent;
     border: none;
-    color: #c2c6c8;
+    color: var(--text);
 }
 
 /* LOG */
-.Alert-info-1J8mE {
+[class*="Alert-info-"] {
     border-color: transparent;
     background-color: rgba(0, 0, 0, 0.25);
     color: #FFC107;
 }
 
 /* INDEXER */
-.Restrictions-center-3ngzk {
+[class*="Restrictions-center-"] {
     border: 1px solid transparent;
     background-color: transparent;
 }
 
 /* LISTS */
-.NetImports-center-3otL- {
+[class*="NetImports-center-"] {
     border: 1px solid transparent;
     background-color: transparent;
 }
 
 /* CUSTOM FORMAT */
-.CustomFormats-center-1w6Bw,
-.EditCustomFormatModalContent-center-3QU87 {
+[class*="CustomFormats-center-"],
+[class*="EditCustomFormatModalContent-center-"] {
     border: 1px solid transparent;
     background-color: transparent;
 }
@@ -886,7 +901,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 
 .panel-body {
     background-color: rgba(0, 0, 0, 0.25);
-    color: white;
+    color: var(--text);
 }
 
 .panel-header {
@@ -894,18 +909,18 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 .forgot-password {
-    color: #eee !important;
+    color: var(--text) !important;
 }
 
 /* Custom filter */
-.FilterBuilderRow-filterRow-1ozij:hover {
+[class*="FilterBuilderRow-filterRow-"]:hover {
     background-color: transparent;
 }
 
-.CustomFilter-customFilter-zBSMd:hover {
+[class*="CustomFilter-customFilter-"]:hover {
     background-color: hsla(0, 0%, 100%, .08);
 }
 
-.SelectMovieModalContent-path-32FI- {
-    color: #eee;
+[class*="SelectMovieModalContent-path-"] {
+    color: var(--text);
 }
\ No newline at end of file
diff --git a/CSS/themes/radarr/space-gray.css b/CSS/themes/radarr/space-gray.css
index 61432239..38ce3b5f 100644
--- a/CSS/themes/radarr/space-gray.css
+++ b/CSS/themes/radarr/space-gray.css
@@ -26,7 +26,16 @@
 
   --button-color: #607D8B;
   --button-color-hover: #81a6b7;
+  --button-text: #eee;
+  --button-text-hover: #fff;
+  
   --accent-color: #607D8B;
   --accent-color-hover: #81a6b7;
   --queue-color: #81a6b7;
+  --link-color: #81a6b7;
+  --link-color-hover: #fff;
+    
+  --text:#eee;
+  --text-hover: #fff;
+  --text-muted: #999;
 }
diff --git a/CSS/themes/sonarr/aquamarine.css b/CSS/themes/sonarr/aquamarine.css
index 23cffa56..a0db9c5e 100644
--- a/CSS/themes/sonarr/aquamarine.css
+++ b/CSS/themes/sonarr/aquamarine.css
@@ -11,7 +11,7 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* SONARR AQUAMARINE THEME */
-@import url(https://gflix.app/theme.park/CSS/themes/sonarr/sonarr-base.css);
+@import url(https://gilbn.github.io/theme.park/CSS/themes/sonarr/sonarr-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;
diff --git a/CSS/themes/sonarr/dark.css b/CSS/themes/sonarr/dark.css
index a016e1a4..81454fd3 100644
--- a/CSS/themes/sonarr/dark.css
+++ b/CSS/themes/sonarr/dark.css
@@ -1,3 +1,4 @@
+
 /*    dP   dP                                                                  dP        */
 /*    88   88                                                                  88        */
 /*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
@@ -26,6 +27,9 @@
   
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+
   --accent-color:  rgba(255, 255, 255, 0.25);
   --accent-color-hover: rgba(255, 255, 255, 0.45);
   --queue-color: #6b5;
@@ -34,4 +38,5 @@
     
   --text:#eee;
   --text-hover: #fff;
+  --text-muted: #999;
   }
\ No newline at end of file
diff --git a/CSS/themes/sonarr/hotline.css b/CSS/themes/sonarr/hotline.css
index dc38626f..5f468ba1 100644
--- a/CSS/themes/sonarr/hotline.css
+++ b/CSS/themes/sonarr/hotline.css
@@ -26,6 +26,9 @@
   
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
+  --button-text: #eee;
+  --button-text-hover: #FFF;
+  
   --accent-color:  #F44336;
   --accent-color-hover: #0b3161;
   --queue-color: #6b5;
@@ -34,4 +37,5 @@
     
   --text:#eee;
   --text-hover: #fff;
+  --text-muted: #999;
 }
\ No newline at end of file
diff --git a/CSS/themes/sonarr/organizr-dark.css b/CSS/themes/sonarr/organizr-dark.css
index be26d199..7b9ebe5f 100644
--- a/CSS/themes/sonarr/organizr-dark.css
+++ b/CSS/themes/sonarr/organizr-dark.css
@@ -11,7 +11,7 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* SONARR ORGANIZR-DARK THEME */
-@import url(https://gflix.app/theme.park/CSS/themes/sonarr/sonarr-base.css);
+@import url(https://gilbn.github.io/theme.park/CSS/themes/sonarr/sonarr-base.css);
 :root {
   --main-bg-color: #1f1f1f;
   --modal-bg-color: #1b1b1b;
diff --git a/CSS/themes/sonarr/plex.css b/CSS/themes/sonarr/plex.css
index 3d5ea370..8321abaa 100644
--- a/CSS/themes/sonarr/plex.css
+++ b/CSS/themes/sonarr/plex.css
@@ -26,6 +26,9 @@
   
   --button-color: #cc7b19;
   --button-color-hover: #e59029;
+  --button-text: #eee;
+  --button-text-hover: #fff;
+
   --accent-color:  #e5a00d;
   --accent-color-hover: #ffc107;
   --queue-color: #27c24c;
@@ -34,4 +37,5 @@
     
   --text:#eee;
   --text-hover: #fff;
+  --text-muted: #999;
   }
\ No newline at end of file
diff --git a/CSS/themes/sonarr/sonarr-base.css b/CSS/themes/sonarr/sonarr-base.css
index 5e2688c7..dd6b5047 100644
--- a/CSS/themes/sonarr/sonarr-base.css
+++ b/CSS/themes/sonarr/sonarr-base.css
@@ -29,7 +29,7 @@ body {
 }
 
 [class*="FormInputGroup\/inputUnit\/"] {
-    color: #eee !important;
+    color: var(--text) !important;
 }
 
 /* LINKS */
@@ -132,7 +132,7 @@ a:hover {
 }
 
 /* SONARR SPECIFIC */
- /* NOTE calendar modal popup */
+/* NOTE calendar modal popup */
 [class*="EpisodeSummary\/infoTitle\/"],
 [class*="EpisodeDetailsModalContent\/tab\/"],
 [class*="DescriptionListItemTitle\/title\/"] {
@@ -187,6 +187,7 @@ a:hover {
 [class*="SeriesSearchInput\/sectionTitle\/"] {
     color: #fff;
 }
+
 [class*="SeriesSearchInput\/containerOpen\/"] [class*="SeriesSearchInput\/seriesContainer\/"] {
     border: none !important;
     background: var(--modal-bg-color);
@@ -201,9 +202,11 @@ a:hover {
 [class*="SeriesSearchInput\/seriesContainer\/"]::-webkit-scrollbar-thumb {
     background-color: rgba(255, 255, 255, 0.25) !important;
 }
+
 [class*="Scroller\/scroller\/"]::-webkit-scrollbar-thumb {
     background-color: hsla(0, 0%, 100%, .08);
 }
+
 [class*="Scroller\/scroller\/"]::-webkit-scrollbar-thumb:hover {
     background-color: rgba(255, 255, 255, 0.25);
 }
@@ -248,6 +251,7 @@ a:hover {
 [class*="SeriesIndexPoster\/controls\/"] {
     background-color: #000 !important;
 }
+
 /* OVERVIEW PAGE */
 
 [class*="SeriesIndexOverviews\/container\/"],
@@ -281,7 +285,7 @@ a:hover {
 
 /* SHOW PAGE */
 [class*="SeriesDetailsSeason\/season\/"],
-[class*="SeriesDetailsSeason\/collapseButtonContainer\/"]{
+[class*="SeriesDetailsSeason\/collapseButtonContainer\/"] {
     border: none !important;
     background-color: rgba(0, 0, 0, .25) !important;
 }
@@ -410,6 +414,7 @@ a:hover {
     opacity: .5;
     color: var(--text);
 }
+
 [class*="PageToolbarButton\/toolbarButton\/"][class*="PageToolbarButton\/isDisabled\/"]:hover,
 [class*="PageToolbarButton\/isDisabled\/"]:hover {
     color: var(--text) !important;
@@ -426,6 +431,7 @@ a:hover {
 [class*="MenuButton\/menuButton\/"]:hover {
     color: var(--text-hover);
 }
+
 /* POSTERS */
 [class*="SeriesIndexPoster\/title\/"],
 [class*="SeriesIndexPoster\/nextAiring\/"],
@@ -434,12 +440,6 @@ a:hover {
     color: var(--text);
 }
 
-/* HOVEL LABELS */
-[class*="Label\/default\/"] {
-    border-color: #1b1b1b;
-    background-color: #1b1b1b;
-}
-
 /* SERIES TOP HEADER DROPDOWN */
 [class*="MenuItem\/menuItem\/"],
 [class*="MenuContent\/menuContent\/"] {
@@ -477,6 +477,7 @@ a:hover {
 [class*="ImportSeriesSelectSeries\/results\/"]::-webkit-scrollbar-thumb:hover {
     background-color: rgba(255, 255, 255, 0.25) !important;
 }
+
 /* ADD NEW */
 div[class*='EnhancedSelectInputOption'] {
     background-color: #1e1e1e;
@@ -731,11 +732,11 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 [class*="CalendarEventGroup\/airTime\/"] {
-    color: #eee;
+    color: var(--text);
 }
 
 [class*="CalendarEventGroup\/episodeInfo\/"] {
-    color: #eee;
+    color: var(--text);
 }
 
 /* calendar agenda */
@@ -746,11 +747,11 @@ div[class*='EnhancedSelectInputOption']:hover {
 /*QUEUE PAGE */
 /* Manual Import*/
 [class*="SelectEpisodeModalContent\/path\/"] {
-    color: #eee;
+    color: var(--text);
 }
 
 /* SETTINGS */
-[class*="PageContentBody\/innerContentBody"] [class*="Link\/to"]{
+[class*="PageContentBody\/innerContentBody"] [class*="Link\/to"] {
     color: #fff;
 }
 
@@ -758,72 +759,76 @@ div[class*='EnhancedSelectInputOption']:hover {
     color: var(--text);
 }
 
-.FormLabel\/large\/3Sn9u {
+[class*="FormLabel\/large\/"] {
     color: #fff
 }
 
-.FormLabel\/isAdvanced\/1glHh {
+[class*="FormLabel\/isAdvanced\/"] {
     color: #ff902b;
 }
 
 /* MEDIA MANAGEMENT - FILE NAME TOKENS */
-.NamingOption\/option\/giCGd {
+[class*="NamingOption\/option\/"] {
     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);
 }
 
-.NamingOption\/option\/giCGd:hover .NamingOption\/token\/1y5bz {
+[class*="NamingOption\/option\/"]:hover [class*="NamingOption\/token\/"] {
     background-color: rgba(255, 255, 2550, 0.25);
 }
 
-.NamingOption\/option\/giCGd:hover .NamingOption\/example\/RNR6x {
+[class*="NamingOption\/option\/"]:hover [class*="NamingOption\/example\/"] {
     background-color: rgba(255, 255, 2550, 0.35);
 }
 
 /* PROFILES */
-.Card\/card\/1iGZk,
-.QualityProfiles\/addQualityProfile\/2U2Io {
+[class*="Card\/card\/"],
+[class*="QualityProfiles\/addQualityProfile\/"] {
     background-color: rgba(0, 0, 0, .45);
     box-shadow: 0 0 10px 1px #000000;
     color: var(--text);
 }
 
-.QualityProfiles\/center\/1iiKm,
-.LanguageProfiles\/center\/7EV_2,
-.ReleaseProfiles\/center\/114Qx {
+[class*="Card\/card\/"] {
+    color: var(--text-hover);
+}
+
+[class*="QualityProfiles\/center\/"],
+[class*="LanguageProfiles\/center\/"],
+[class*="ReleaseProfiles\/center\/"] {
     background-color: transparent;
     border: none;
     color: var(--text);
 }
 
-.QualityProfileItem\/qualityProfileItem\/VFp-W,
-.QualityProfileItemGroup\/qualityProfileItemGroup\/2U1l5,
-.LanguageProfileItem\/languageProfileItem\/18XGg {
+[class*="QualityProfileItem\/qualityProfileItem\/"],
+[class*="QualityProfileItemGroup\/qualityProfileItemGroup\/"],
+[class*="LanguageProfileItem\/languageProfileItem\/"] {
     border: none;
     background-color: rgba(0, 0, 0, .25);
     color: #FFF;
 }
 
-.QualityProfileItemGroup\/qualityProfileItemGroup\/2U1l5.QualityProfileItemGroup\/editGroups\/2KzDp {
+[class*="QualityProfileItemGroup\/qualityProfileItemGroup\/"][class*="QualityProfileItemGroup\/editGroups\/"] {
     background: rgba(0, 0, 0, 0.25);
 }
 
-.KeyValueListInputItem\/keyInput\/3YYEs,
-.KeyValueListInputItem\/valueInput\/3zlQA {
+[class*="KeyValueListInputItem\/keyInput\/"],
+[class*="KeyValueListInputItem\/valueInput\/"] {
     border: none;
     background: transparent;
     color: white;
 }
 
 /* PROFILES */
-.Indexers\/center\/11Csq {
+[class*="Indexers\/center\/"] {
     background-color: transparent;
     border: none;
     color: var(--text);
@@ -832,28 +837,28 @@ div[class*='EnhancedSelectInputOption']:hover {
 /* INDEXERS */
 
 /* DOWNLOAD CLIENTS */
-.DownloadClients\/center\/FvACx {
+[class*="DownloadClients\/center\/"] {
     background-color: transparent;
     border: none;
     color: var(--text);
 }
 
 /*INPORT LISTS */
-.ImportLists\/center\/17Qdu {
+[class*="ImportLists\/center\/"] {
     background-color: transparent;
     border: none;
     color: var(--text);
 }
 
 /* CONNECTIONS */
-.Notifications\/center\/8iwmy {
+[class*="Notifications\/center\/"] {
     background-color: transparent;
     border: none;
     color: var(--text);
 }
 
 /* LOG */
-.Alert\/info\/1J8mE {
+[class*="Alert\/info\/"] {
     border-color: transparent;
     background-color: rgba(0, 0, 0, 0.25);
     color: #FFC107;
@@ -863,7 +868,7 @@ div[class*='EnhancedSelectInputOption']:hover {
 
 .panel-body {
     background-color: rgba(0, 0, 0, 0.25);
-    color: white;
+    color: var(--text);
 }
 
 .panel-header {
@@ -871,29 +876,26 @@ div[class*='EnhancedSelectInputOption']:hover {
 }
 
 .forgot-password {
-    color: #eee !important;
+    color: var(--text) !important;
 }
 
 /* Custom filter */
-.FilterBuilderRow\/filterRow\/1ozij:hover {
+[class*="FilterBuilderRow\/filterRow\/"]:hover {
     background-color: transparent;
 }
 
-.CustomFilter\/customFilter\/zBSMd:hover {
+[class*="CustomFilter\/customFilter\/"]:hover {
     background-color: hsla(0, 0%, 100%, .08);
 }
 
-
 /* Scene information */
-.ReleaseSceneIndicator\/levelNone\/k-rVx {
+[class*="ReleaseSceneIndicator\/levelNone\/"] {
     border-color: var(--text);
     color: var(--text);
     opacity: 1;
 }
 
-.ReleaseSceneIndicator\/levelMapped\/3i7w4 {
+[class*="ReleaseSceneIndicator\/levelMapped\/"] {
     border-color: var(--text);
-    ;
     color: var(--text);
-    ;
 }
\ No newline at end of file
diff --git a/CSS/themes/sonarr/space-gray.css b/CSS/themes/sonarr/space-gray.css
index 3b85bf93..5b00db6f 100644
--- a/CSS/themes/sonarr/space-gray.css
+++ b/CSS/themes/sonarr/space-gray.css
@@ -26,6 +26,9 @@
   
   --button-color: #607D8B;
   --button-color-hover: #81a6b7;
+  --button-text: #eee;
+  --button-text-hover: #fff;
+  
   --accent-color: #607D8B;
   --accent-color-hover: #81a6b7;
   --queue-color: #81a6b7;
@@ -34,4 +37,5 @@
     
   --text:#eee;
   --text-hover: #fff;
+  --text-muted: #999;
 }