diff --git a/src/assets/app.scss b/src/assets/app.scss
index cb72fb9dd..96e1eb2ab 100644
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@@ -1,16 +1,46 @@
 @import "vars.scss";
 @import "node_modules/bootstrap/scss/bootstrap";
 
+html,
+body,
+input,
+.modal-content {
+    background: var(--page-background);
+    color: var(--main-font-color);
+}
+a,
+.table,
+.nav-link {
+    color: var(--main-font-color);
+}
+.nav-pills .nav-link.active,
+.nav-pills .show > .nav-link {
+    color: #0a0a0a;
+}
+
+.nav-link:hover,
+.nav-link:focus {
+    color: #5cdd8b;
+}
+
+.form-control,
+.form-control:focus,
+.form-select,
+.form-select:focus {
+    color: var(--main-font-color);
+    background-color: var(--background-4);
+}
+
 #app {
-    font-family: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol,noto color emoji;
+    font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
+        segoe ui, Roboto, helvetica neue, Arial, noto sans, sans-serif,
+        apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji;
 }
 
 .shadow-box {
     overflow: hidden;
-    box-shadow: 0 15px 70px rgba(0, 0, 0, .1);
+    box-shadow: 0 15px 70px rgba(0, 0, 0, 0.1);
     padding: 10px;
-    border-radius: 10px;
-
     &.big-padding {
         padding: 20px;
     }
@@ -22,10 +52,14 @@
 }
 
 .btn-primary {
-    color: white;
+    // color: white;
+    color: #0a0a0a;
 
-    &:hover, &:active, &:focus, &.active {
-        color: white;
+    &:hover,
+    &:active,
+    &:focus,
+    &.active {
+        color: #0a0a0a;
         background-color: $highlight;
         border-color: $highlight;
     }
@@ -36,3 +70,8 @@
     backdrop-filter: blur(3px);
 }
 
+@media (prefers-color-scheme: dark) {
+    a:hover {
+        color: #7ce8a4;
+    }
+}
diff --git a/src/assets/vars.scss b/src/assets/vars.scss
index 31b0262d8..12b8e3745 100644
--- a/src/assets/vars.scss
+++ b/src/assets/vars.scss
@@ -1,7 +1,27 @@
-$primary: #5CDD8B;
-$danger: #DC3545;
+$primary: #5cdd8b;
+$danger: #dc3545;
 $link-color: #111;
-$border-radius: 50rem;
+$border-radius: .25rem;
 
 $highlight: #7ce8a4;
 $highlight-white: #e7faec;
+
+:root {
+    color-scheme: light dark;
+    // 
+    --page-background: #fafafa;
+    --background-secondary: #d0d3d5;
+    --background-4: #d0d3d5;
+    --background-ternary: #d0d3d5;
+    --main-font-color: #212529;
+}
+
+@media (prefers-color-scheme: dark) {
+    :root {
+        --page-background: #0a0a0a;
+        --background-secondary: #656565;
+        --background-4: #313131;
+        --background-ternary: #a7a7a7;
+        --main-font-color: #e4e4e4;
+    }
+}
\ No newline at end of file
diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue
index 48ffd2926..9e063fb29 100644
--- a/src/components/HeartbeatBar.vue
+++ b/src/components/HeartbeatBar.vue
@@ -159,7 +159,7 @@ export default {
         border-radius: 50rem;
 
         &.empty {
-            background-color: aliceblue;
+            background-color: var(--background-ternary);
         }
 
         &.down {
diff --git a/src/components/Status.vue b/src/components/Status.vue
index c5fec2241..274c0a154 100644
--- a/src/components/Status.vue
+++ b/src/components/Status.vue
@@ -1,5 +1,5 @@
 <template>
-    <span class="badge rounded-pill" :class=" 'bg-' + color ">{{ text }}</span>
+    <span class="badge rounded-pill" :class="'bg-' + color">{{ text }}</span>
 </template>
 
 <script>
@@ -33,7 +33,10 @@ export default {
 </script>
 
 <style scoped>
-    span {
-        width: 45px;
-    }
+span {
+    width: 45px;
+}
+.badge {
+    color: #0a0a0a;
+}
 </style>
diff --git a/src/components/Uptime.vue b/src/components/Uptime.vue
index ad8114fcb..0c3e90e7e 100644
--- a/src/components/Uptime.vue
+++ b/src/components/Uptime.vue
@@ -57,5 +57,7 @@ export default {
 </script>
 
 <style scoped>
-
+.badge{
+    color: #0a0a0a;
+}
 </style>
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index ef116f4c1..8731eb07c 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -8,7 +8,7 @@
 
     <!-- Desktop header -->
     <header class="d-flex flex-wrap justify-content-center py-3 mb-3 border-bottom" v-if="! $root.isMobile">
-        <router-link to="/dashboard" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
+        <router-link to="/dashboard" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-decoration-none">
             <object class="bi me-2 ms-4" width="40" height="40" data="/icon.svg"></object>
             <span class="fs-4 title">Uptime Kuma</span>
         </router-link>
@@ -21,7 +21,7 @@
 
     <!-- Mobile header -->
     <header class="d-flex flex-wrap justify-content-center mt-3 mb-3" v-else>
-        <router-link to="/dashboard" class="d-flex align-items-center  text-dark text-decoration-none">
+        <router-link to="/dashboard" class="d-flex align-items-center text-decoration-none">
             <object class="bi" width="40" height="40" data="/icon.svg"></object>
             <span class="fs-4 title ms-2">Uptime Kuma</span>
         </router-link>
@@ -87,7 +87,7 @@ export default {
     height: 60px;
     width: 100%;
     left: 0;
-    background-color: #fff;
+    background-color: var(--background-secondary);
     box-shadow: 0 15px 47px 0 rgba(0, 0, 0, 0.05), 0 5px 14px 0 rgba(0, 0, 0, 0.05);
     text-align: center;
     white-space: nowrap;
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index c42f27656..8c51c5ce7 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -129,17 +129,19 @@ export default {
         }
 
         &:hover {
-            background-color: $highlight-white;
+            color: var(--main-font-color);
+            background-color: var(--background-4);
         }
 
         &.active {
-            background-color: #cdf8f4;
+            background-color: var(--background-secondary);
         }
     }
 }
 
 .badge {
     min-width: 58px;
+    color: #0a0a0a;
 }
 
 .small-padding {