diff --git a/sw5e-dark.css b/sw5e-dark.css
index ea2714f0..dfc9cdf7 100644
--- a/sw5e-dark.css
+++ b/sw5e-dark.css
@@ -234,13 +234,14 @@ body.dark-theme .dice-roll .dice-total.fumble {
   box-shadow: 0 0 12px rgba(232, 17, 17, 0.5);
 }
 body.dark-theme #chat-controls .roll-type-select {
-  background: #363636;
+  background: #4f4f4f;
+  color: #FFFFFF;
 }
 body.dark-theme #chat-controls label {
   color: white;
 }
 body.dark-theme #chat-form textarea {
-  background: #363636;
+  background: #4f4f4f;
 }
 body.dark-theme #combat #combat-round {
   color: #E81111;
diff --git a/sw5e-light.css b/sw5e-light.css
index ba40918b..eefaf31b 100644
--- a/sw5e-light.css
+++ b/sw5e-light.css
@@ -56,7 +56,7 @@ body.light-theme input[type="time"],
 body.light-theme select,
 body.light-theme textarea {
   border: 1px solid #828282;
-  color: #FFFFFF;
+  color: #1C1C1C;
 }
 body.light-theme input[type="text"]:hover,
 body.light-theme input[type="number"]:hover,
@@ -83,7 +83,7 @@ body.light-theme input[type="date"]::placeholder,
 body.light-theme input[type="time"]::placeholder,
 body.light-theme select::placeholder,
 body.light-theme textarea::placeholder {
-  color: #FFFFFF;
+  color: #1C1C1C;
   opacity: 0.5;
 }
 body.light-theme input[type="text"] ::-ms-input-placeholder,
@@ -94,7 +94,7 @@ body.light-theme input[type="time"] ::-ms-input-placeholder,
 body.light-theme select ::-ms-input-placeholder,
 body.light-theme textarea ::-ms-input-placeholder {
   /* Microsoft Edge */
-  color: #FFFFFF;
+  color: #1C1C1C;
   opacity: 0.5;
 }
 body.light-theme button,
@@ -235,13 +235,13 @@ body.light-theme .dice-roll .dice-total.fumble {
 }
 body.light-theme #chat-controls .roll-type-select {
   background: #4f4f4f;
+  color: #FFFFFF;
 }
 body.light-theme #chat-controls label {
   color: #1C1C1C;
 }
 body.light-theme #chat-form textarea {
   background: #4f4f4f;
-  color: #FFFFFF;
 }
 body.light-theme #combat #combat-round {
   color: #c40f0f;
@@ -298,7 +298,7 @@ body.light-theme .sidebar-tab .directory-header .header-search i.fa-search {
   color: #0d99cc;
 }
 body.light-theme .sidebar-tab .directory-header .header-search input {
-  background: white;
+  background: #4f4f4f;
 }
 body.light-theme .sidebar-tab .subdirectory {
   background: white;
@@ -777,4 +777,3 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.notes section > input {
 body.light-theme .sw5e.sheet.actor.npc .swalt-sheet header .experience {
   color: #4f4f4f;
 }
-