diff --git a/static/app.js b/static/app.js
index e4a2d05..ed9be3a 100644
--- a/static/app.js
+++ b/static/app.js
@@ -28,7 +28,7 @@ function formatDKKShort(value) {
 
 function getThemeColors() {
   const theme = document.documentElement.getAttribute('data-theme');
-  const isDark = theme === 'tokyo';
+  const isDark = theme === 'macchiato';
   return {
     isDark,
     textColor: isDark ? '#e8f4ff' : '#1a1d22',
@@ -663,7 +663,7 @@ document.addEventListener('click', (e) => {
 (() => {
   function currentSystemTheme() {
     return window.matchMedia('(prefers-color-scheme: dark)').matches
-      ? 'tokyo'
+      ? 'macchiato'
       : 'light';
   }
   const btn = document.getElementById('theme-toggle');
@@ -671,7 +671,7 @@ document.addEventListener('click', (e) => {
     btn.addEventListener('click', () => {
       const current =
         document.documentElement.getAttribute('data-theme') || 'light';
-      const next = current === 'light' ? 'tokyo' : 'light';
+      const next = current === 'light' ? 'macchiato' : 'light';
       document.documentElement.setAttribute('data-theme', next);
       localStorage.setItem('poc-theme', next);
 
diff --git a/static/index.html b/static/index.html
index d9f35f1..b7803d4 100644
--- a/static/index.html
+++ b/static/index.html
@@ -8,7 +8,7 @@
   <script>
     (function () {
       var stored = localStorage.getItem('poc-theme');
-      var theme = stored || (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'tokyo' : 'light');
+      var theme = stored || (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'macchiato' : 'light');
       document.documentElement.setAttribute('data-theme', theme);
     })();
   </script>
diff --git a/static/style.css b/static/style.css
index e18fcf6..0201aff 100644
--- a/static/style.css
+++ b/static/style.css
@@ -3,34 +3,63 @@
 :root,
 [data-theme="light"] {
   --bg: #f4f1ec;
-  --bg-panel: rgba(255, 253, 250, 0.72);
-  --nav-bg: rgba(244, 241, 236, 0.6);
+  --bg-panel: rgba(255, 253, 250, 0.85);
+  --nav-bg: rgba(255, 253, 250, 0.92);
   --ink: #1a1d22;
   --ink-muted: #595f68;
   --ink-dim: #9299a2;
   --accent: #2c5a7a;
   --border: rgba(26, 29, 34, 0.1);
   --danger: #a03030;
-  --danger-soft: rgba(160, 48, 48, 0.08);
-  --danger-text: #a03030;
   --input-bg: rgba(26, 29, 34, 0.04);
   --surface-hover: rgba(26, 29, 34, 0.04);
 }
 
-[data-theme="tokyo"] {
-  --bg: #07070d;
-  --bg-panel: rgba(20, 22, 35, 0.85);
-  --nav-bg: rgba(7, 7, 13, 0.65);
-  --ink: #e8f4ff;
-  --ink-muted: #a3b3cc;
-  --ink-dim: #7886a0;
-  --accent: #64dcff;
-  --border: rgba(100, 220, 255, 0.25);
-  --danger: #d93d3d;
-  --danger-soft: rgba(217, 61, 61, 0.16);
-  --danger-text: #ffd1d1;
-  --input-bg: rgba(100, 220, 255, 0.08);
-  --surface-hover: rgba(100, 220, 255, 0.1);
+[data-theme="macchiato"] {
+  --bg: #181926;
+  --bg-panel: #24273a;
+  --nav-bg: rgba(36, 39, 58, 0.65);
+  --ink: #cad3f5;
+  --ink-muted: #a5adcb;
+  --ink-dim: #8087a2;
+  --accent: #8aadf4;
+  --border: rgba(165, 173, 203, 0.15);
+  --danger: #ed8796;
+  --input-bg: rgba(138, 173, 244, 0.08);
+  --surface-hover: rgba(138, 173, 244, 0.12);
+}
+
+[data-theme="macchiato"] .nav-brand {
+  color: #cad3f5;
+  text-shadow: 0 0 8px rgba(138, 173, 244, 0.25);
+}
+
+[data-theme="macchiato"] .apply-btn {
+  box-shadow: 0 0 10px rgba(138, 173, 244, 0.3);
+}
+
+[data-theme="macchiato"] .theme-toggle {
+  background: #24273a;
+  border-color: rgba(138, 173, 244, 0.4);
+  box-shadow:
+    0 0 10px rgba(138, 173, 244, 0.4),
+    0 0 25px rgba(138, 173, 244, 0.2);
+  animation: neon-breathe-toggle 4s ease-in-out infinite;
+}
+
+@keyframes neon-breathe-toggle {
+  0%, 100% {
+    box-shadow:
+      0 0 10px rgba(138, 173, 244, 0.5),
+      0 0 25px rgba(138, 173, 244, 0.3),
+      0 0 50px rgba(116, 150, 230, 0.2);
+  }
+  50% {
+    box-shadow:
+      0 0 15px rgba(138, 173, 244, 0.6),
+      0 0 35px rgba(138, 173, 244, 0.4),
+      0 0 70px rgba(116, 150, 230, 0.25);
+  }
 }
 
 html { scroll-behavior: smooth; }
@@ -123,11 +152,6 @@ nav {
   padding-top: 2px;
 }
 
-[data-theme="tokyo"] .nav-brand {
-  color: #e8f4ff;
-  text-shadow: 0 0 8px rgba(100, 220, 255, 0.3);
-}
-
 /* ---- Main ---- */
 .page-body {
   flex: 1;
@@ -330,9 +354,12 @@ nav {
   letter-spacing: 0.08em;
   text-transform: uppercase;
   cursor: pointer;
-  transition: opacity 0.2s;
+  transition: opacity 0.2s, box-shadow 0.2s;
+}
+.apply-btn:hover { 
+  opacity: 0.85;
+  box-shadow: 0 0 8px rgba(138, 173, 244, 0.4);
 }
-.apply-btn:hover { opacity: 0.85; }
 
 /* ---- Charts ---- */
 .charts-grid {
@@ -385,17 +412,11 @@ nav {
 }
 .theme-toggle:hover { transform: scale(1.08); }
 [data-theme="light"] .theme-toggle {
-  background: linear-gradient(135deg, #07070d 0%, #64dcff 100%);
+  background: linear-gradient(135deg, #24273a 0%, #8aadf4 100%);
   border-color: rgba(26, 29, 34, 0.2);
 }
-[data-theme="tokyo"] .theme-toggle {
-  background: #f4f1ec;
-  border-color: rgba(100, 220, 255, 0.4);
-  box-shadow:
-    0 0 10px rgba(100, 220, 255, 0.5),
-    0 0 25px rgba(100, 220, 255, 0.3);
-}
 
+/* ---- Responsive ---- */
 @media (max-width: 820px) {
   .charts-grid {
     grid-template-columns: 1fr;