diff --git a/src/css/apps/components/shell/taskbar/calendar.css b/src/css/apps/components/shell/taskbar/calendar.css
index 2cc98383c..c8a21a93d 100644
--- a/src/css/apps/components/shell/taskbar/calendar.css
+++ b/src/css/apps/components/shell/taskbar/calendar.css
@@ -28,9 +28,9 @@
   pointer-events: none !important;
 }
 
-#arcShell div.taskbar div.calendar-popup > div {
+#arcShell div.taskbar div.calendar-popup>div {
   border-radius: 10px;
-  box-shadow: 0 2px 5px 2px #0002;
+  box-shadow: var(--secondary-box-shadow);
   outline: var(--shell-component-outline) 1px solid;
   outline-offset: -1px;
   background-color: var(--shell-component-bg);
@@ -119,6 +119,7 @@
 #arcShell div.taskbar div.calendar-popup div.calendar div.day p.day-number:hover {
   background-color: var(--button-glass-bg);
 }
+
 #arcShell div.taskbar div.calendar-popup div.calendar div.day.today p.day-number {
   background-color: var(--accent-light);
   color: var(--win-bg) !important;
@@ -186,6 +187,7 @@
 #arcShell div.taskbar div.calendar-popup div.buttons button.today:hover {
   background-color: var(--button-glass-bg);
 }
+
 #arcShell div.taskbar div.calendar-popup div.buttons button.today:active {
   background-color: var(--button-glass-active-bg);
-}
+}
\ No newline at end of file
diff --git a/src/css/apps/user/settings/page/account.css b/src/css/apps/user/settings/page/account.css
index 17f5b8421..7ab1d183f 100755
--- a/src/css/apps/user/settings/page/account.css
+++ b/src/css/apps/user/settings/page/account.css
@@ -39,6 +39,11 @@
   translate: 0 -50%;
   z-index: 0;
   filter: blur(40px);
+
+  .theme-light & {
+    opacity: .2;
+  }
+
 }
 
 #systemSettings div.container.account div.centered-layout {
@@ -82,7 +87,7 @@
   overflow: hidden;
 }
 
-#systemSettings div.change-menu div.inner > span {
+#systemSettings div.change-menu div.inner>span {
   width: 30px;
   height: 30px;
   line-height: 30px;
@@ -126,7 +131,7 @@
   background-color: transparent;
 }
 
-#systemSettings div.container.account div.header h1.account-name > span {
+#systemSettings div.container.account div.header h1.account-name>span {
   border-bottom: transparent 1px solid;
 }
 
@@ -146,6 +151,7 @@
 #systemSettings div.container.account div.header h1.account-name:hover button {
   opacity: 1;
 }
+
 #systemSettings div.container.account div.header h1.account-name.editing button {
   color: var(--clr-green-fg);
 }
@@ -154,4 +160,4 @@
   opacity: 1;
   font-weight: bold;
   margin-top: 20px;
-}
+}
\ No newline at end of file
diff --git a/src/css/window.css b/src/css/window.css
index 963fb97ed..8e63b3ffa 100755
--- a/src/css/window.css
+++ b/src/css/window.css
@@ -84,7 +84,7 @@ div.window:not(.core).fullscreen div.titlebar {
   display: none !important;
 }
 
-div.window:not(.core).fullscreen > div.body {
+div.window:not(.core).fullscreen>div.body {
   height: 100vh !important;
   border-top: none !important;
   border-radius: 0 !important;
@@ -94,11 +94,11 @@ div.window:not(.core):not(.glass).focused {
   background-color: var(--glass-bg);
 }
 
-div.window:not(.core):not(.glass).focused > div.titlebar {
+div.window:not(.core):not(.glass).focused>div.titlebar {
   backdrop-filter: blur(var(--blur));
 }
 
-div.window:not(.core):not(.glass) > div.body {
+div.window:not(.core):not(.glass)>div.body {
   background-color: var(--win-bg);
 }
 
@@ -131,6 +131,7 @@ div.window:not(.core).visible:not(.closing) {
   scale: 1;
   margin-top: 0;
 }
+
 /* 
 div.window:not(.core).resizable {
   resize: both;
@@ -144,6 +145,14 @@ div.window.overlay.glass {
 div.window:not(.core) a {
   color: var(--accent-light);
   text-underline-offset: 2px;
+
+  .theme-light & {
+    /*
+       * Uses the calculated result if available,
+       * otherwise, uses uglier dark accent color.
+       */
+    color: var(--accent-suggested-end, var(--accent-dark));
+  }
 }
 
 div.window:not(.core) div.resizer {
@@ -196,4 +205,4 @@ div.window.minimized.no-shell {
   left: unset !important;
   transform: none !important;
   translate: none !important;
-}
+}
\ No newline at end of file
diff --git a/src/css/window/button.css b/src/css/window/button.css
index e7bc08b83..2dde914d5 100755
--- a/src/css/window/button.css
+++ b/src/css/window/button.css
@@ -12,16 +12,16 @@ div.window div.body button:not(.reset) {
   text-align: center;
 }
 
-div.window:not(.core) > div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link) {
+div.window:not(.core)>div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link) {
   outline: var(--button-glass-bg) 1px solid;
   outline-offset: -1px;
 }
 
-div.window:not(.core) > div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link):hover {
+div.window:not(.core)>div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link):hover {
   background-color: var(--button-glass-hover-bg);
 }
 
-div.window:not(.core) > div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link):active {
+div.window:not(.core)>div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link):active {
   background-color: var(--button-glass-active-bg);
 }
 
@@ -43,6 +43,15 @@ div.window div.body button:not(.reset).link {
   text-underline-offset: 2px;
   width: fit-content;
   border-radius: 0;
+
+  .theme-light & {
+    /*
+     * Uses the calculated result if available,
+     * otherwise, uses uglier dark accent color.
+     */
+    color: var(--accent-suggested-end, var(--accent-dark));
+  }
+
 }
 
 div.window div.body button:not(.reset):disabled {
@@ -88,26 +97,26 @@ div.window div.body button:not(.reset).suggested:active {
   filter: brightness(0.8);
 }
 
-div.window.glass > div.body button:not(.reset):not(.suggested):not(.menu-item):not(.no-glass) {
+div.window.glass>div.body button:not(.reset):not(.suggested):not(.menu-item):not(.no-glass) {
   background-color: var(--button-glass-bg, #fff1);
 }
 
-div.window.glass > div.body button:not(.reset):not(.suggested):not(.menu-item):not(.no-glass):hover {
+div.window.glass>div.body button:not(.reset):not(.suggested):not(.menu-item):not(.no-glass):hover {
   background-color: var(--button-glass-hover-bg, #fff3);
 }
 
-div.window.glass > div.body button:not(.reset):not(.suggested):not(.menu-item):not(.no-glass):active {
+div.window.glass>div.body button:not(.reset):not(.suggested):not(.menu-item):not(.no-glass):active {
   background-color: var(--button-glass-active-bg, #0005);
 }
 
-div.window:not(.core) > div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link).lucide {
+div.window:not(.core)>div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link).lucide {
   background-color: transparent;
 }
 
-div.window:not(.core) > div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link).lucide:hover {
+div.window:not(.core)>div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link).lucide:hover {
   background-color: var(--button-glass-bg);
 }
 
-div.window:not(.core) > div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link).lucide:active {
+div.window:not(.core)>div.body button:not(.reset):not(.no-glass):not(.suggested):not(.link).lucide:active {
   background-color: var(--button-glass-active-bg);
-}
+}
\ No newline at end of file