diff --git a/module/admin/ui/index.html.php b/module/admin/ui/index.html.php
index 7c5066c381..6bce19dfe1 100755
--- a/module/admin/ui/index.html.php
+++ b/module/admin/ui/index.html.php
@@ -73,7 +73,7 @@ $buildUsed = function(int $amount, string $unit = ''): array
     (
         $amount ? span
         (
-            setClass('bg-lighter rounded-md text-lg mx-1 px-1 py-0.5'),
+            setClass('bg-gray-100 rounded-md text-lg mx-1 px-1 py-0.5'),
             $amount
         ) : null,
         $amount ? $unit : ''
diff --git a/module/build/ui/view.html.php b/module/build/ui/view.html.php
index 2c7d946ccf..c09f320b24 100644
--- a/module/build/ui/view.html.php
+++ b/module/build/ui/view.html.php
@@ -39,7 +39,7 @@ detailHeader
         (
             btn
             (
-                setClass('ghost text-primary bg-light bg-opacity-50'),
+                setClass('ghost text-primary bg-gray-200 bg-opacity-50'),
                 entityLabel
                 (
                     set::entityID($build->id),
diff --git a/module/execution/css/create.ui.css b/module/execution/css/create.ui.css
index 686de17f9f..2494bce4d5 100644
--- a/module/execution/css/create.ui.css
+++ b/module/execution/css/create.ui.css
@@ -5,7 +5,7 @@
 #copyExecutionModal .copy-title {min-width: 130px;}
 #copyExecutionModal .pickerProject {flex: 0 1 30%;}
 #copyExecutionModal .execution-block {flex: 0 1 30%; padding: 20px 10px; margin: 4px 12px; overflow: hidden;}
-#copyExecutions div.bg-lighter {width: 100%;}
+#copyExecutions div.bg-gray-100 {width: 100%;}
 #copyExecutions .btn:hover {--tw-ring-color: var(--color-primary-500);}
 #copyExecutions .btn:before {background: none;}
 #copyExecutions .btn.primary-outline {background-color: var(--color-primary-50);}
diff --git a/module/execution/js/taskkanban.ui.js b/module/execution/js/taskkanban.ui.js
index 969ea55590..a7af227cf7 100644
--- a/module/execution/js/taskkanban.ui.js
+++ b/module/execution/js/taskkanban.ui.js
@@ -187,7 +187,7 @@ window.getItem = function(info)
     let beginAndEnd = '';
     let assignLink  = '';
     let assignedTo  = '';
-    let avatar      = "<span class='avatar rounded-full size-xs ml-1 bg-lighter text-canvas' title='" + noAssigned + "'><i class='icon icon-person'></i></span>";
+    let avatar      = "<span class='avatar rounded-full size-xs ml-1 bg-gray-100 text-canvas' title='" + noAssigned + "'><i class='icon icon-person'></i></span>";
 
     if(begin < '1970-01-01' && end > '1970-01-01')
     {
diff --git a/module/kanban/ui/create.html.php b/module/kanban/ui/create.html.php
index c6a81f1a60..293ed65593 100644
--- a/module/kanban/ui/create.html.php
+++ b/module/kanban/ui/create.html.php
@@ -335,7 +335,7 @@ else
 {
     $kanbanList[] = div
         (
-            setClass('inline-flex items-center w-full bg-lighter h-12 mt-2 mb-8'),
+            setClass('inline-flex items-center w-full bg-gray-100 h-12 mt-2 mb-8'),
             icon('exclamation-sign icon-2x pl-2 text-warning'),
             span
             (
diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php
index da28f17315..28bd4d2a8a 100644
--- a/module/project/ui/create.html.php
+++ b/module/project/ui/create.html.php
@@ -96,7 +96,7 @@ else
 {
     $copyProjectsBox[] = div
     (
-        setClass('inline-flex items-center w-full bg-lighter h-12 mt-2 mb-8'),
+        setClass('inline-flex items-center w-full bg-gray-100 h-12 mt-2 mb-8'),
         icon('exclamation-sign icon-2x pl-2 text-warning'),
         span
         (
diff --git a/module/repo/ui/ajaxgeteditorcontent.html.php b/module/repo/ui/ajaxgeteditorcontent.html.php
index 6bf3209e9c..3f8cec4282 100644
--- a/module/repo/ui/ajaxgeteditorcontent.html.php
+++ b/module/repo/ui/ajaxgeteditorcontent.html.php
@@ -106,14 +106,14 @@ $logWg = div
     div
     (
         set::className('action-btn pull-right'),
-        div(set::className('btn btn-close pull-right ghost text-black bg-light bg-opacity-50'), icon('close')),
+        div(set::className('btn btn-close pull-right ghost text-black bg-gray-200 bg-opacity-50'), icon('close')),
         !empty($dropMenus) ? dropdown
         (
             set::arrow(false),
             set::staticMenu(true),
             btn
             (
-                setClass('ghost text-black bg-light bg-opacity-50'),
+                setClass('ghost text-black bg-gray-200 bg-opacity-50'),
                 set::icon('ellipsis-v rotate-90')
             ),
             set::items