diff --git a/Client/src/Pages/Settings/index.css b/Client/src/Pages/Settings/index.css
index ebf065a7e..0b525bbac 100644
--- a/Client/src/Pages/Settings/index.css
+++ b/Client/src/Pages/Settings/index.css
@@ -45,7 +45,7 @@
 }
 .edit-team-form__wrapper.compact {
   margin-top: 30px;
-  color: var(--env-var-color-16);
+  color: var(--env-var-color-29);
 }
 .edit-profile-form__wrapper input,
 .edit-password-form__wrapper input,
@@ -70,13 +70,13 @@
   margin-left: auto;
 }
 .MuiBox-root > .announcement-tile {
-  border-color: var(--env-var-color-14);
-  background-color: var(--lighter-env-var-color-14);
+  border-color: var(--env-var-color-27);
+  background-color: var(--lighter-env-var-color-27);
 }
 .MuiBox-root > .announcement-tile .announcement-content-body,
 .MuiBox-root > .announcement-tile .announcement-close svg {
-  color: var(--env-var-color-15);
-  fill: var(--env-var-color-15) !important;
+  color: var(--env-var-color-28);
+  fill: var(--env-var-color-28) !important;
 }
 
 #org-name-flex-container .Mui-disabled {
@@ -96,7 +96,7 @@
 }
 .edit-team-form__wrapper td {
   font-size: (--env-var-font-size-medium);
-  color: var(--env-var-color-16);
+  color: var(--env-var-color-29);
 }
 
 #select-actions,
diff --git a/Client/src/index.css b/Client/src/index.css
index dc1b6188d..88972486e 100644
--- a/Client/src/index.css
+++ b/Client/src/index.css
@@ -3,9 +3,9 @@
   line-height: 1.5;
   font-weight: 400;
 
-  /* color-scheme: light dark;
+  color-scheme: light dark;
   color: rgba(255, 255, 255, 0.87);
-  background-color: #242424; */
+  background-color: #242424;
 
   font-synthesis: none;
   text-rendering: optimizeLegibility;
@@ -28,10 +28,11 @@
   --env-var-color-11: #5d6b98;
   --env-var-color-12: #182230;
   --env-var-color-13: #f9fafb;
-  --env-var-color-14: #fecf60;
-  --lighter-env-var-color-14: rgba(254, 207, 96, 0.1);
-  --env-var-color-15: #f79009;
-  --env-var-color-16: #667085;
+
+  --env-var-color-27: #fecf60;
+  --lighter-env-var-color-27: rgba(254, 207, 96, 0.1);
+  --env-var-color-28: #f79009;
+  --env-var-color-29: #667085;
 
   --env-var-radius-1: 4px;
   --env-var-radius-2: 8px;