diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte
index 503674b..8d7ee22 100644
--- a/src/routes/_layout.svelte
+++ b/src/routes/_layout.svelte
@@ -32,7 +32,7 @@
   {/if}
   <link
     rel="stylesheet"
-    href={`/themes/${(config["status-website"] || {}).theme || "light"}.css`}
+    href={`/themes/${(config["status-website"] || {}).theme || "dark"}.css`}
   />
   {#if config['status-website'].css}
     {@html `<style>${config['status-website'].css}</style>`}
diff --git a/static/themes/dark.css b/static/themes/dark.css
index b74d299..3f11979 100644
--- a/static/themes/dark.css
+++ b/static/themes/dark.css
@@ -1,15 +1,74 @@
-.dark body {
+body {
   background-color: #001716;
   color: #f0ffff;
 }
-.dark article {
+
+code {
+  color: #555;
+  background-color: #f0f0f0;
+}
+
+article {
   background-color: #002b29;
+  border-color: rgba(0, 0, 0, 0.1);
 }
 
-.dark article {
+article.down {
+  border-left-color: #e74c3c;
   background-color: #700000;
 }
+article.degraded {
+  border-left-color: #f39c12 !important;
+  background-color: #ffdfad;
+}
+article.up {
+  border-left-color: #2ecc71;
+}
+article.good {
+  background-color: #dcffeb;
+  color: #003300;
+}
+
+.tag {
+  color: #fff;
+}
+.tag.closed,
+.tag.up {
+  background-color: #16a085;
+}
+.tag.open,
+.tag.down {
+  background-color: #c0392b;
+}
+.tag.degraded {
+  background-color: #f39c12 !important;
+}
 
-.dark nav {
+.changed + section .data {
+  background-color: #fdcb6e;
+}
+
+.live-status article {
+  background-color: #002b29;
+}
+
+nav {
+  border-bottom-color: rgba(0, 0, 0, 0.1);
   background-color: #002b29;
 }
+
+[aria-current] {
+  border-bottom-color: #3498db;
+}
+
+a.error-button {
+  border-color: rgba(0, 0, 0, 0.25);
+  background-color: #01a3a4;
+  color: #002b29;
+}
+
+.submit-button {
+  background-color: #01a3a4;
+  color: #002b29;
+  border-color: transparent;
+}