diff --git a/client/build/index.html b/client/build/index.html
index a265085..8b8541e 100644
--- a/client/build/index.html
+++ b/client/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" type="image/png" href="/app-icon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="SkyWatch - Infrastructure monitoring and alerting system"/><link rel="apple-touch-icon" href="/app-icon.png"/><link rel="manifest" href="/manifest.json"/><title>SkyWatch</title><script defer="defer" src="/static/js/main.1e7808e0.js"></script><link href="/static/css/main.67d2dbc4.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
\ No newline at end of file
+<!doctype html><html lang="en" data-theme="dark"><head><meta charset="utf-8"/><link rel="icon" type="image/png" href="/app-icon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="SkyWatch - Infrastructure monitoring and alerting system"/><link rel="apple-touch-icon" href="/app-icon.png"/><link rel="manifest" href="/manifest.json"/><title>SkyWatch</title><script defer="defer" src="/static/js/main.1e7808e0.js"></script><link href="/static/css/main.67d2dbc4.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
\ No newline at end of file
diff --git a/client/public/index.html b/client/public/index.html
index f1eabc6..b5ea0d7 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-theme="dark">
   <head>
     <meta charset="utf-8" />
     <link rel="icon" type="image/png" href="%PUBLIC_URL%/app-icon.png" />
diff --git a/server/index.js b/server/index.js
index 0b0b1f7..84bf60e 100644
--- a/server/index.js
+++ b/server/index.js
@@ -135,7 +135,7 @@ function buildSettingsFromDb(dbSettings = {}) {
     default_sort: dbSettings.default_sort || process.env.DEFAULT_SORT || 'name',
     items_per_page: parseInt(dbSettings.items_per_page || process.env.ITEMS_PER_PAGE) || 20,
     refresh_interval: parseInt(dbSettings.refresh_interval || process.env.REFRESH_INTERVAL) || 5000,
-    theme: dbSettings.theme || process.env.THEME || 'light',
+    theme: dbSettings.theme || process.env.THEME || 'dark',
     incident_failure_threshold: parseInt(dbSettings.incident_failure_threshold || process.env.INCIDENT_FAILURE_THRESHOLD) || 10,
     webhook_template: dbSettings.webhook_template || process.env.WEBHOOK_TEMPLATE || '',
   };
@@ -747,7 +747,7 @@ ESCALATION_HOURS=${escalation_hours || 4}
 DEFAULT_SORT=${default_sort || 'name'}
 ITEMS_PER_PAGE=${items_per_page || 20}
 REFRESH_INTERVAL=${refresh_interval || 5000}
-THEME=${theme || 'light'}
+THEME=${theme || 'dark'}
 INCIDENT_FAILURE_THRESHOLD=${incident_failure_threshold || 10}
 WEBHOOK_TEMPLATE=${webhook_template || ''}
 `;
@@ -782,7 +782,7 @@ WEBHOOK_TEMPLATE=${webhook_template || ''}
     process.env.DEFAULT_SORT = default_sort || 'name';
     process.env.ITEMS_PER_PAGE = String(items_per_page || 20);
     process.env.REFRESH_INTERVAL = String(refresh_interval || 5000);
-    process.env.THEME = theme || 'light';
+    process.env.THEME = theme || 'dark';
     process.env.INCIDENT_FAILURE_THRESHOLD = String(incident_failure_threshold || 10);
     process.env.WEBHOOK_TEMPLATE = webhook_template || '';
 
@@ -814,7 +814,7 @@ WEBHOOK_TEMPLATE=${webhook_template || ''}
       { key: 'items_per_page', value: String(items_per_page || 20) },
       { key: 'refresh_interval', value: String(refresh_interval || 5000) },
       { key: 'auto_cleanup_enabled', value: String(auto_cleanup_enabled || false) },
-      { key: 'theme', value: theme || 'light' },
+      { key: 'theme', value: theme || 'dark' },
       { key: 'incident_failure_threshold', value: String(incident_failure_threshold || 10) },
     ];