diff --git a/CSS/themes/bazarr/bazarr-base.css b/CSS/themes/bazarr/bazarr-base.css
index 8ecc9864..52c67772 100644
--- a/CSS/themes/bazarr/bazarr-base.css
+++ b/CSS/themes/bazarr/bazarr-base.css
@@ -96,6 +96,11 @@ a:hover {
     color: var(--text-hover);
 }
 
+h1, h2, h3, h4, h5, h6,
+.custom-control-label,label,.modal-header {
+    color: var(--text-hover);
+}
+
 /* Form Stuff */
 
 .header-container input[type=text] {
@@ -133,7 +138,7 @@ a:hover {
 .form-control[readonly] {
     background-color: rgb(255 255 255 / 15%);
     opacity: .7;
-    color: var(--text);
+    color: #fff;
     border: 1px solid rgb(255 255 255 / 15%);
 }
 
@@ -290,6 +295,9 @@ a:hover {
     background-color: transparent;
     border-top: 1px solid rgba(255, 255, 255, .1);
 }
+hr {
+    border-top: 1px solid rgb(255 255 255 / 10%);
+}
 
 
 .card {
diff --git a/CSS/themes/lidarr/lidarr-base.css b/CSS/themes/lidarr/lidarr-base.css
index 1263ed68..e5384aeb 100644
--- a/CSS/themes/lidarr/lidarr-base.css
+++ b/CSS/themes/lidarr/lidarr-base.css
@@ -110,7 +110,7 @@ a:hover {
 /* MODAL */
 [class*="ModalHeader-modalHeader-"] {
     background: var(--modal-bg-color);
-    color: #fff;
+    color: var(--text-hover);
     border-bottom: rgb(var(--accent-color));
 }
 
@@ -417,7 +417,7 @@ a:hover {
 }
 
 [class*="Label-default-"] [class*="IconButton-button-"],
-[class*="Label-default-"] [class*="IconButton-button-"]:hover  {
+[class*="Label-small-"] [class*="IconButton-button-"]:hover {
     color: var(--label-text-color);
 }
 
@@ -678,7 +678,7 @@ input:focus:-ms-input-placeholder {
 /* IMPORT */
 
 [class*="FieldSet-legend-"] {
-    color: #FFF;
+    color: var(--text-hover);
     border-bottom: 1px solid rgb(var(--accent-color));
 }
 
@@ -803,6 +803,14 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+[class*="FormLabel-large-"] {
+    color: var(--text-hover);
+}
+
+[class*="FormLabel-isAdvanced-"] {
+    color: #ff902b;
+}
+
 /* MEDIA MANAGEMENT - FILE NAME TOKENS */
 [class*="NamingOption-small-"] {
     border: 1px solid transparent;
diff --git a/CSS/themes/prowlarr/prowlarr-base.css b/CSS/themes/prowlarr/prowlarr-base.css
index 66cfdfd3..77c295ce 100644
--- a/CSS/themes/prowlarr/prowlarr-base.css
+++ b/CSS/themes/prowlarr/prowlarr-base.css
@@ -110,7 +110,7 @@ a:hover {
 /* MODAL */
 [class*="ModalHeader-modalHeader-"] {
     background: var(--modal-bg-color);
-    color: #fff;
+    color: var(--text-hover);
     border-bottom: var(--accent-color);
 }
 
@@ -631,7 +631,7 @@ input:focus:-ms-input-placeholder {
 /* IMPORT */
 
 [class*="FieldSet-legend-"] {
-    color: #FFF;
+    color: var(--text-hover);
     border-bottom: 1px solid var(--accent-color);
 }
 
@@ -822,6 +822,14 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+[class*="FormLabel-large-"] {
+    color: var(--text-hover);
+}
+
+[class*="FormLabel-isAdvanced-"] {
+    color: #ff902b;
+}
+
 /* MEDIA MANAGEMENT - FILE NAME TOKENS */
 [class*="NamingOption-small-"] {
     border: 1px solid transparent;
diff --git a/CSS/themes/radarr/radarr-base.css b/CSS/themes/radarr/radarr-base.css
index 91ad913f..d1d20965 100644
--- a/CSS/themes/radarr/radarr-base.css
+++ b/CSS/themes/radarr/radarr-base.css
@@ -110,7 +110,7 @@ a:hover {
 /* MODAL */
 [class*="ModalHeader-modalHeader-"] {
     background: var(--modal-bg-color);
-    color: #fff;
+    color: var(--text-hover);
     border-bottom: rgb(var(--accent-color));
 }
 
@@ -362,7 +362,8 @@ a:hover {
     color: var(--text);
 }
 
-[class*="Label-default-"] [class*="IconButton-button-"]  {
+[class*="Label-default-"] [class*="IconButton-button-"],
+[class*="Label-small-"] [class*="IconButton-button-"]:hover  {
     color: var(--label-text-color);
 }
 
@@ -637,7 +638,7 @@ input:focus:-ms-input-placeholder {
 /* IMPORT */
 
 [class*="FieldSet-legend-"] {
-    color: #FFF;
+    color: var(--text-hover);
     border-bottom: 1px solid rgb(var(--accent-color));
 }
 
@@ -679,7 +680,7 @@ input:focus:-ms-input-placeholder {
 [class*="DiscoverMoviePoster-title-"],
 [class*="DiscoverMoviePosterInfo-info-"] {
     background-color: rgba(255, 255, 255, 0.08);
-    color: var(--text);
+    color: var(--text-hover);
 }
 
 /*Title*/
@@ -831,6 +832,14 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+[class*="FormLabel-large-"] {
+    color: var(--text-hover);
+}
+
+[class*="FormLabel-isAdvanced-"] {
+    color: #ff902b;
+}
+
 /* MEDIA MANAGEMENT - FILE NAME TOKENS */
 [class*="NamingOption-small-"] {
     border: 1px solid transparent;
diff --git a/CSS/themes/readarr/readarr-base.css b/CSS/themes/readarr/readarr-base.css
index 2f74b860..9c0cf099 100644
--- a/CSS/themes/readarr/readarr-base.css
+++ b/CSS/themes/readarr/readarr-base.css
@@ -110,7 +110,7 @@ a:hover {
 /* MODAL */
 [class*="ModalHeader-modalHeader-"] {
     background: var(--modal-bg-color);
-    color: #fff;
+    color: var(--text-hover);
     border-bottom: rgb(var(--accent-color));
 }
 
@@ -412,7 +412,8 @@ a:hover {
     color: var(--text);
 }
 
-[class*="Label-default-"] [class*="IconButton-button-"]  {
+[class*="Label-default-"] [class*="IconButton-button-"],
+[class*="Label-small-"] [class*="IconButton-button-"]:hover  {
     color: var(--label-text-color);
 }
 
@@ -679,7 +680,7 @@ input:focus:-ms-input-placeholder {
 /* IMPORT */
 
 [class*="FieldSet-legend-"] {
-    color: #FFF;
+    color: var(--text-hover);
     border-bottom: 1px solid rgb(var(--accent-color));
 }
 
@@ -804,6 +805,14 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+[class*="FormLabel-large-"] {
+    color: var(--text-hover);
+}
+
+[class*="FormLabel-isAdvanced-"] {
+    color: #ff902b;
+}
+
 /* MEDIA MANAGEMENT - FILE NAME TOKENS */
 [class*="NamingOption-small-"] {
     border: 1px solid transparent;
diff --git a/CSS/themes/sonarr/sonarr-base.css b/CSS/themes/sonarr/sonarr-base.css
index e5664726..5bbf3f7b 100644
--- a/CSS/themes/sonarr/sonarr-base.css
+++ b/CSS/themes/sonarr/sonarr-base.css
@@ -112,7 +112,7 @@ a:hover {
 /* MODAL */
 [class*="ModalHeader-modalHeader-"] {
     background: var(--modal-bg-color);
-    color: #fff;
+    color: var(--text-hover);
     border-bottom: rgb(var(--accent-color));
 }
 
@@ -381,11 +381,17 @@ a:hover {
     color: var(--text);
 }
 
-[class*="IconButton-button-"]:hover {
+[class*="IconButton-button-"]:hover,
+[class*="Label-small-"] [class*="IconButton-button-"]{
     background-color: transparent;
     color: var(--label-text-color);
 }
 
+[class*="SeriesIndexPoster-action-"] .fa-search:hover{
+    background-color: transparent;
+    color: var(--label-text-color) !important;
+}
+
 [class*="SeriesDetailsSeason-left-"] [class*="IconButton-button-"]:hover,
 [class*="SeriesDetails-seriesNavigationButton-"]:hover,
 [class*="SeriesDetails-monitorToggleButton-"]:hover {
@@ -641,7 +647,7 @@ input:focus:-ms-input-placeholder {
 /* IMPORT */
 
 [class*="FieldSet-legend-"] {
-    color: #FFF;
+    color: var(--text-hover);
     border-bottom: 1px solid rgb(var(--accent-color));
 }
 
@@ -830,7 +836,7 @@ input:focus:-ms-input-placeholder {
 }
 
 [class*="FormLabel-large-"] {
-    color: #fff
+    color: var(--text-hover);
 }
 
 [class*="FormLabel-isAdvanced-"] {