diff --git a/databases/templates/databases/deleteDatabase.html b/databases/templates/databases/deleteDatabase.html
index 1645e24a6..a3d0d5e7e 100644
--- a/databases/templates/databases/deleteDatabase.html
+++ b/databases/templates/databases/deleteDatabase.html
@@ -92,7 +92,7 @@
     .form-control:focus {
         outline: none;
         border-color: var(--danger-text, #dc3545);
-        box-shadow: 0 0 0 3px var(--danger-bg, rgba(220,53,69,0.1));
+        box-shadow: 0 0 0 3px var(--danger-shadow, rgba(220,53,69,0.1));
     }
     
     /* Windows selectbox fixes */
@@ -101,7 +101,7 @@
         -webkit-appearance: none;
         -moz-appearance: none;
         appearance: none;
-        background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%232f3640' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
+        background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23475569' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
         background-repeat: no-repeat;
         background-position: right 12px center;
         background-size: 20px;
@@ -130,8 +130,8 @@
     
     /* Website selector card */
     .website-selector-card {
-        background: var(--danger-bg, #fff5f5);
-        border: 1px solid var(--danger-border, #ffdddd);
+        background: var(--bg-secondary, #fff5f5);
+        border: 1px solid var(--border-color, #ffdddd);
         border-radius: 10px;
         padding: 20px;
         margin-bottom: 25px;
diff --git a/manageSSL/templates/manageSSL/manageSSL.html b/manageSSL/templates/manageSSL/manageSSL.html
index dc7313245..d8556de79 100644
--- a/manageSSL/templates/manageSSL/manageSSL.html
+++ b/manageSSL/templates/manageSSL/manageSSL.html
@@ -77,7 +77,7 @@
     }
     
     .form-container {
-        background: var(--bg-light, #fafbff);
+        background: var(--bg-secondary, #fafbff);
         border: 1px solid var(--border-color, #e8e9ff);
         border-radius: 8px;
         padding: 25px;
@@ -119,7 +119,7 @@
         -webkit-appearance: none;
         -moz-appearance: none;
         appearance: none;
-        background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%232f3640' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
+        background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23475569' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
         background-repeat: no-repeat;
         background-position: right 12px center;
         background-size: 20px;
@@ -132,7 +132,7 @@
     /* Windows-specific fixes */
     @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
         select.form-control {
-            color: #2f3640 !important;
+            color: var(--text-primary, #2f3640) !important;
             background-color: var(--bg-secondary, white) !important;
         }
     }
diff --git a/packages/templates/packages/deletePackage.html b/packages/templates/packages/deletePackage.html
index cbbcdb4c1..d2e6a6e46 100644
--- a/packages/templates/packages/deletePackage.html
+++ b/packages/templates/packages/deletePackage.html
@@ -101,7 +101,7 @@
         -webkit-appearance: none;
         -moz-appearance: none;
         appearance: none;
-        background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%232f3640' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
+        background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23475569' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
         background-repeat: no-repeat;
         background-position: right 12px center;
         background-size: 20px;
@@ -130,8 +130,8 @@
     
     /* Package selector card */
     .package-selector-card {
-        background: var(--bg-danger-light, #fff5f5);
-        border: 1px solid var(--border-danger-light, #ffdddd);
+        background: var(--bg-secondary, #fff5f5);
+        border: 1px solid var(--border-color, #ffdddd);
         border-radius: 10px;
         padding: 20px;
         margin-bottom: 25px;
diff --git a/websiteFunctions/templates/websiteFunctions/deleteWebsite.html b/websiteFunctions/templates/websiteFunctions/deleteWebsite.html
index 6d290f40c..9c92a0c8f 100644
--- a/websiteFunctions/templates/websiteFunctions/deleteWebsite.html
+++ b/websiteFunctions/templates/websiteFunctions/deleteWebsite.html
@@ -68,7 +68,7 @@
         display: block;
         font-size: 13px;
         font-weight: 600;
-        color: #64748b;
+        color: var(--text-secondary, #64748b);
         margin-bottom: 8px;
         text-transform: uppercase;
         letter-spacing: 0.5px;
@@ -91,7 +91,7 @@
         -moz-appearance: none;
         appearance: none;
         background-color: var(--bg-secondary, white);
-        background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23dc3545' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
+        background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23475569' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
         background-repeat: no-repeat;
         background-position: right 10px center;
         background-size: 20px;
@@ -129,7 +129,7 @@
     .form-control:focus {
         outline: none;
         border-color: var(--danger-color, #dc3545);
-        box-shadow: 0 0 0 3px rgba(220,53,69,0.1);
+        box-shadow: 0 0 0 3px var(--danger-shadow, rgba(220,53,69,0.1));
     }
     
     /* Specific focus styles for select */
@@ -140,8 +140,8 @@
     
     /* Website selector card */
     .website-selector-card {
-        background: var(--danger-bg-light, #fff5f5);
-        border: 1px solid var(--danger-border-light, #ffdddd);
+        background: var(--bg-secondary, #fff5f5);
+        border: 1px solid var(--border-color, #ffdddd);
         border-radius: 10px;
         padding: 20px;
         margin-bottom: 25px;