diff --git a/less/update/components/sidebar-themes.less b/less/update/components/sidebar-themes.less
index e36d3f35..324ac1a9 100644
--- a/less/update/components/sidebar-themes.less
+++ b/less/update/components/sidebar-themes.less
@@ -95,8 +95,8 @@
 }
 #chat-controls {
   .roll-type-select {
-    background: #4f4f4f;
-	color: #FFFFFF;
+    background: #a9a9a9;
+	color: #1C1C1C;
   }
   label {
     color: @bodyFontColor;
@@ -104,7 +104,8 @@
  
 }
 #chat-form  textarea {
-  background: #4f4f4f;
+  background: #a9a9a9;
+  color: #1C1C1C;
 
 }
 
diff --git a/sw5e-light.css b/sw5e-light.css
index 45e809c9..d57967f0 100644
--- a/sw5e-light.css
+++ b/sw5e-light.css
@@ -65,7 +65,7 @@ body.light-theme input[type="date"]:hover,
 body.light-theme input[type="time"]:hover,
 body.light-theme select:hover,
 body.light-theme textarea:hover {
-  border-color: #a9a9a9;
+  border-color: #4f4f4f;
 }
 body.light-theme input[type="text"]:focus,
 body.light-theme input[type="number"]:focus,
@@ -234,14 +234,15 @@ body.light-theme .dice-roll .dice-total.fumble {
   box-shadow: 0 0 12px rgba(196, 15, 15, 0.5);
 }
 body.light-theme #chat-controls .roll-type-select {
-  background: #4f4f4f;
-  color: #FFFFFF;
-}
-body.light-theme #chat-controls label {
+  background: #a9a9a9;
   color: #1C1C1C;
 }
+body.light-theme #chat-controls label {
+  color: #c40f0f;
+}
 body.light-theme #chat-form textarea {
-  background: #4f4f4f;
+  background: #a9a9a9;
+  color: #1C1C1C;
 }
 body.light-theme #combat #combat-round {
   color: #c40f0f;
@@ -251,7 +252,7 @@ body.light-theme #combat #combat-round .encounters h4 {
   color: #c40f0f;
 }
 body.light-theme #combat #combat-round .encounters a {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme #combat #combat-round .encounters a:hover {
   color: #c40f0f;
@@ -266,7 +267,7 @@ body.light-theme #combat #combat-tracker li.combatant h4 {
   color: #1C1C1C;
 }
 body.light-theme #combat #combat-tracker li.combatant .roll {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme #combat #combat-tracker li.combatant .roll:hover {
   color: #c40f0f;
@@ -278,7 +279,7 @@ body.light-theme #combat #combat-tracker li.combatant .combatant-control.active
   color: #363636;
 }
 body.light-theme #combat #combat-tracker li.combatant .token-resource {
-  color: #a9a9a9;
+  color: #4f4f4f;
   border-right: 1px solid #828282;
 }
 body.light-theme #combat #combat-tracker li.combatant.active {
@@ -320,7 +321,7 @@ body.light-theme .sidebar-tab .directory-list .folder > .folder-header h3 > i {
   color: #0d99cc;
 }
 body.light-theme .sidebar-tab .directory-list .folder > .folder-header a {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme .sidebar-tab .directory-list .folder > .folder-header a:hover {
   color: #c40f0f;
@@ -559,7 +560,7 @@ body.light-theme .sw5e.sheet .window-content select {
 }
 body.light-theme .sw5e.sheet .window-content input:hover,
 body.light-theme .sw5e.sheet .window-content select:hover {
-  border-color: #a9a9a9;
+  border-color: #4f4f4f;
 }
 body.light-theme .sw5e.sheet .window-content input:focus,
 body.light-theme .sw5e.sheet .window-content select:focus {
@@ -592,7 +593,7 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet header h1.character-name input[t
   color: #c40f0f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet header .level-experience .xpbar {
-  border: 1px solid #a9a9a9;
+  border: 1px solid #4f4f4f;
   background-color: #afc6d6;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet header .level-experience .xpbar .bar {
@@ -600,11 +601,11 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet header .level-experience .xpbar
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet header .summary input,
 body.light-theme .sw5e.sheet.actor .swalt-sheet header .summary .proficiency {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet header .attributes .attribute-value,
 body.light-theme .sw5e.sheet.actor .swalt-sheet header .attributes .attribute-value input {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet header .attributes .attribute-value .value-separator {
   color: #828282;
@@ -627,17 +628,17 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet header .attributes footer.initia
   border-color: #c40f0f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet nav.sheet-navigation .item {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet nav.sheet-navigation .item.active {
   color: #c40f0f;
   border-bottom-color: #c40f0f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet nav.sheet-navigation .item.active:hover {
-  background: rgba(169, 169, 169, 0.1);
+  background: rgba(79, 79, 79, 0.1);
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet nav.sheet-navigation .item:hover {
-  background: rgba(169, 169, 169, 0.1);
+  background: rgba(79, 79, 79, 0.1);
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab .filter-list .filter-item {
   border-bottom: 2px solid #828282;
@@ -669,7 +670,7 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab .group-list ol li.item h4 {
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab .group-list li.item .item-name .item-image::before,
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab .group-list ol li.item .item-name .item-image::before {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab .group-list li.item .item-name.rollable:hover .item-image:hover::before,
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab .group-list ol li.item .item-name.rollable:hover .item-image:hover::before {
@@ -694,7 +695,7 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .scor
   color: #c40f0f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .scores li .ability-score {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .scores li .ability-modifiers .ability-mod,
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .scores li .ability-modifiers .ability-save {
@@ -710,7 +711,7 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .skil
   color: #c40f0f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources nav button {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources nav button.active {
   color: #c40f0f;
@@ -720,7 +721,7 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resource
   background: rgba(196, 15, 15, 0.1);
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources nav button:hover {
-  background: rgba(169, 169, 169, 0.1);
+  background: rgba(79, 79, 79, 0.1);
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits .trait-selector i.fas {
   color: #c40f0f;
@@ -734,7 +735,7 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resource
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.resources .resource-items .resource .attribute-value,
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.resources .resource-items .resource .attribute-value input {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.resources .resource-items .resource .attribute-value .value-separator {
   color: #828282;
@@ -775,5 +776,5 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.notes section > input {
   border-bottom: 2px solid #0d99cc;
 }
 body.light-theme .sw5e.sheet.actor.npc .swalt-sheet header .experience {
-  color: #a9a9a9;
+  color: #4f4f4f;
 }