diff --git a/elements/app-hax/app-hax.js b/elements/app-hax/app-hax.js
index 9afae07efe..5f7549d902 100644
--- a/elements/app-hax/app-hax.js
+++ b/elements/app-hax/app-hax.js
@@ -194,7 +194,7 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
       addChildPage: "Add child page",
       clonePage: "Clone page",
       delete: "Delete page",
-      siteSettings: "Site settings",
+      siteSettings: "Site Settings",
       close: "Close",
       settings: "Settings",
       edit: "Edit",
diff --git a/elements/app-hax/locales/app-hax.en.json b/elements/app-hax/locales/app-hax.en.json
index 0f344bccc7..f6148f71d0 100644
--- a/elements/app-hax/locales/app-hax.en.json
+++ b/elements/app-hax/locales/app-hax.en.json
@@ -19,7 +19,7 @@
   "addChildPage": "Add child page",
   "clonePage": "Clone page",
   "delete": "Delete page",
-  "siteSettings": "Site settings",
+  "siteSettings": "Site Settings",
   "close": "Close",
   "settings": "Settings",
   "edit": "Edit",
diff --git a/elements/haxcms-elements/lib/core/haxcms-site-editor-ui.js b/elements/haxcms-elements/lib/core/haxcms-site-editor-ui.js
index e65db06df9..34776d9b36 100644
--- a/elements/haxcms-elements/lib/core/haxcms-site-editor-ui.js
+++ b/elements/haxcms-elements/lib/core/haxcms-site-editor-ui.js
@@ -2483,7 +2483,7 @@ class HAXCMSSiteEditorUI extends HAXCMSThemeParts(
       addChildPage: "Add child page",
       clonePage: "Clone page",
       delete: "Delete page",
-      siteSettings: "Site settings",
+      siteSettings: "Site Settings",
       themeSettings: "Theme settings",
       seoSettings: "SEO settings",
       authorSettings: "Author settings",
diff --git a/elements/haxcms-elements/lib/core/haxcms-site-settings-dashboard.js b/elements/haxcms-elements/lib/core/haxcms-site-settings-dashboard.js
index a27ee28cd4..bd018ba6c3 100644
--- a/elements/haxcms-elements/lib/core/haxcms-site-settings-dashboard.js
+++ b/elements/haxcms-elements/lib/core/haxcms-site-settings-dashboard.js
@@ -70,18 +70,18 @@ class HAXCMSSiteSettingsDashboard extends DDD {
         .advanced-heading {
           display: flex;
           align-items: center;
-          gap: var(--ddd-spacing-3);
+          gap: var(--ddd-spacing-4);
+          margin: 12px 0px;
         }
         .advanced-title {
           margin: 0;
           font-family: var(--ddd-font-navigation);
-          font-size: var(--ddd-font-size-s);
+          font-size: var(--ddd-font-size-m);
           font-weight: var(--ddd-font-weight-bold);
           white-space: nowrap;
         }
         .advanced-rule {
-          border-top: var(--ddd-border-xs) solid
-            var(--ddd-theme-default-limestoneGray);
+          border-top: 6px solid light-dark(black, white);
           height: 0;
           flex: 1;
         }
@@ -91,16 +91,12 @@ class HAXCMSSiteSettingsDashboard extends DDD {
         .dashboard-action {
           width: 100%;
           border-radius: var(--ddd-radius-sm);
-          border: 2px solid var(--ddd-theme-default-limestoneGray);
+          border: 2px solid light-dark(black, white);
           background: light-dark(
             var(--ddd-theme-default-white),
-            var(--ddd-theme-default-coalyGray)
+            var(--ddd-theme-default-black)
           );
-          color: light-dark(
-            var(--ddd-theme-default-coalyGray),
-            var(--ddd-theme-default-white)
-          );
-          font-family: var(--ddd-font-navigation);
+          font-family: var(--ddd-font-primary);
           font-size: var(--ddd-font-size-xs);
           line-height: 1.2;
           cursor: pointer;
@@ -118,10 +114,11 @@ class HAXCMSSiteSettingsDashboard extends DDD {
         }
         .dashboard-action:hover,
         .dashboard-action:focus-visible {
-          border-color: black;
+          border-color: var(--ddd-theme-default-skyBlue);
           box-shadow: var(--ddd-boxShadow-sm);
           transform: translateY(-2px);
           outline: none;
+          color: var(--ddd-theme-default-skyBlue);
         }
         .dashboard-action:disabled {
           cursor: not-allowed;
@@ -135,10 +132,6 @@ class HAXCMSSiteSettingsDashboard extends DDD {
           box-shadow: none;
           transform: none;
         }
-        :host([dark]) .dashboard-action,
-        :host-context(body.dark-mode) .dashboard-action {
-          border-color: var(--ddd-theme-default-white);
-        }
         .dashboard-action.primary {
           min-height: 160px;
           font-size: var(--ddd-font-size-s);
diff --git a/elements/simple-modal/simple-modal.js b/elements/simple-modal/simple-modal.js
index 6c409e7bef..acfe99eb80 100644
--- a/elements/simple-modal/simple-modal.js
+++ b/elements/simple-modal/simple-modal.js
@@ -97,55 +97,70 @@ class SimpleModal extends LitElement {
           display: flex;
           align-items: center;
           justify-content: space-between;
-          background-color: var(
-            --simple-modal-titlebar-background,
-            var(--ddd-theme-default-limestoneLight)
-          );
+          background-color: light-dark(black, var(--ddd-theme-default-coalyGray));
           height: var(--simple-modal-titlebar-height, unset);
           line-height: var(--simple-modal-titlebar-line-height, unset);
-          color: var(
-            --simple-modal-titlebar-color,
-            var(--ddd-theme-default-nittanyNavy)
-          );
-          font-size: var(--ddd-theme-h3-font-size);
+          font-family: var(--ddd-font-navigation);
         }
         #simple-modal-title {
           margin: 0;
-          display: flex;
+          display: inline-flex;
           align-items: center;
           gap: var(--ddd-spacing-2);
           flex-wrap: wrap;
+          line-height: 1;
         }
         .title-inline {
           display: inline-flex;
           align-items: center;
-          gap: var(--ddd-spacing-2);
+          gap: var(--ddd-spacing-1);
           flex-wrap: wrap;
+          color: white;
+           font-family: var(--ddd-font-navigation);
+          font-size: var(--ddd-font-size-m);
+          font-weight: var(--ddd-font-weight-bold);
+        }
+        .title-inline span {
+          transform: translateY(2px);
+          display: inline-block; 
         }
-        .title-icon,
+        .title-icon{
+          --simple-icon-color: currentColor;
+          --simple-icon-width: 40px;
+          --simple-icon-height: 40px;
+          display: inline-flex; 
+          align-items: center;  
+          vertical-align: middle;
+        }
+
+
         .breadcrumb-icon {
           --simple-icon-color: currentColor;
-          --simple-icon-width: var(--ddd-icon-xs, 20px);
-          --simple-icon-height: var(--ddd-icon-xs, 20px);
+          --simple-icon-width: 1em;
+          --simple-icon-height: 1em;
+          display: inline-flex; 
+          align-items: center;  
+          vertical-align: middle;
         }
         .breadcrumbs {
           display: inline-flex;
           align-items: center;
-          gap: var(--ddd-spacing-2);
+          gap: var(--ddd-spacing-1);
           flex-wrap: wrap;
         }
         .breadcrumb-separator {
           display: inline-flex;
           align-items: center;
-          opacity: 0.8;
-          font-size: var(--ddd-font-size-4xs, 12px);
+          font-size: var(--ddd-font-size-xs);
+          color: white;
+          font-family: var(--ddd-font-navigation);
         }
         .breadcrumb-button,
         .breadcrumb-current {
           display: inline-flex;
           align-items: center;
           gap: var(--ddd-spacing-1);
-          color: inherit;
+           color: white;
           font: inherit;
           line-height: inherit;
           border: 0;
@@ -153,6 +168,7 @@ class SimpleModal extends LitElement {
           padding: 0;
           margin: 0;
           text-align: left;
+          font-family: var(--ddd-font-navigation);
         }
         .breadcrumb-button {
           cursor: pointer;
@@ -178,14 +194,17 @@ class SimpleModal extends LitElement {
           min-width: unset;
           text-transform: none;
           background-color: transparent;
-          color: var(
-            --simple-modal-titlebar-color,
-            var(--ddd-theme-default-nittanyNavy)
-          );
+          color: white;
           --simple-icon-width: var(--ddd-icon-sm);
           --simple-icon-height: var(--ddd-icon-sm);
         }
 
+        #close:hover,
+        #close:focus-visible {
+          color: var(--ddd-theme-default-skyBlue);
+          opacity: 0.7;
+        }
+
         #close simple-icon-lite {
           --simple-icon-height: var(
             --simple-modal-titlebar-icon-height,
@@ -208,27 +227,21 @@ class SimpleModal extends LitElement {
             --simple-modal-content-container-color,
             var(--ddd-theme-primary)
           );
-          background-color: var(
-            --simple-modal-content-container-background,
-            var(--ddd-theme-default-white)
-          );
+          background-color: light-dark(white, black);
         }
 
         .buttons {
           padding: 0;
           padding: var(--simple-modal-buttons-padding, 0);
           margin: var(--ddd-spacing-2);
-          background-color: var(--simple-modal-buttons-background);
+          background-color: light-dark(white, black);
         }
 
         .buttons ::slotted(*) {
           padding: 0 var(--ddd-spacing-4) var(--ddd-spacing-4);
           margin: 0;
           color: var(--simple-modal-button-color, --simple-modal-buttons-color);
-          background-color: var(
-            --simple-modal-button-background,
-            --simple-modal-buttons-background
-          );
+          background-color: light-dark(white, black);
         }
         web-dialog {
           --dialog-border-radius: var(--ddd-radius-sm);
@@ -236,10 +249,7 @@ class SimpleModal extends LitElement {
           padding: 0;
         }
         web-dialog::part(dialog) {
-          background-color: light-dark(
-            var(--ddd-accent-6),
-            var(--ddd-primary-4)
-          );
+          background-color: light-dark(white, black);
           min-height: var(--simple-modal-min-height, unset);
           min-width: var(--simple-modal-min-width, unset);
           z-index: var(--simple-modal-z-index, 1000);
@@ -268,7 +278,7 @@ class SimpleModal extends LitElement {
         }
 
         .full {
-          background-color: var(--ddd-theme-default-limestoneLight);
+          background-color: light-dark(white, black);
         }
 
         div.empty {