diff --git a/packages/tauri-app/src-tauri/tauri.conf.json b/packages/tauri-app/src-tauri/tauri.conf.json
index b19ced83..b263485c 100644
--- a/packages/tauri-app/src-tauri/tauri.conf.json
+++ b/packages/tauri-app/src-tauri/tauri.conf.json
@@ -22,7 +22,9 @@
         "center": true,
         "resizable": true,
         "fullscreen": false,
-        "decorations": true
+        "decorations": true,
+        "theme": "Dark",
+        "backgroundColor": "#1a1a1a"
       }
     ],
     "security": {
diff --git a/packages/ui/src/lib/theme.tsx b/packages/ui/src/lib/theme.tsx
index 96b59551..e88f4829 100644
--- a/packages/ui/src/lib/theme.tsx
+++ b/packages/ui/src/lib/theme.tsx
@@ -21,14 +21,11 @@ function applyTheme(dark: boolean) {
 export function ThemeProvider(props: { children: JSX.Element }) {
   const systemPrefersDark = window.matchMedia("(prefers-color-scheme: dark)")
   const { themePreference, setThemePreference } = useConfig()
-  const [isDark, setIsDarkSignal] = createSignal(false)
+  const [isDark, setIsDarkSignal] = createSignal(true)
 
   const resolveDarkTheme = () => {
-    const preference = themePreference()
-    if (preference === "system") {
-      return systemPrefersDark.matches
-    }
-    return preference === "dark"
+    themePreference()
+    return true
   }
 
   const applyResolvedTheme = () => {
@@ -42,11 +39,8 @@ export function ThemeProvider(props: { children: JSX.Element }) {
   })
 
   onMount(() => {
-    const handleSystemThemeChange = (event: MediaQueryListEvent) => {
-      if (themePreference() === "system") {
-        setIsDarkSignal(event.matches)
-        applyTheme(event.matches)
-      }
+    const handleSystemThemeChange = () => {
+      applyResolvedTheme()
     }
 
     systemPrefersDark.addEventListener("change", handleSystemThemeChange)
@@ -56,12 +50,12 @@ export function ThemeProvider(props: { children: JSX.Element }) {
     }
   })
 
-  const setTheme = (dark: boolean) => {
-    setThemePreference(dark ? "dark" : "light")
+  const setTheme = (_dark: boolean) => {
+    setThemePreference("dark")
   }
 
   const toggleTheme = () => {
-    setTheme(!isDark())
+    setTheme(true)
   }
 
   return <ThemeContext.Provider value={{ isDark, toggleTheme, setTheme }}>{props.children}</ThemeContext.Provider>
diff --git a/packages/ui/src/renderer/index.html b/packages/ui/src/renderer/index.html
index 1de75287..e84c6c3f 100644
--- a/packages/ui/src/renderer/index.html
+++ b/packages/ui/src/renderer/index.html
@@ -6,30 +6,18 @@
     <title>CodeNomad</title>
     <style>
       :root {
-        color-scheme: light dark;
+        color-scheme: dark;
       }
-      /* html,
+      html,
       body {
-        background-color: #ffffff;
-        color: #1a1a1a;
+        background-color: #1a1a1a;
+        color: #e0e0e0;
       }
-      @media (prefers-color-scheme: dark) { */
-        html,
-        body {
-          background-color: #1a1a1a;
-          color: #e0e0e0;
-        }
-      /* } */
     </style>
     <script>
       ;(function () {
         try {
-          const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
-          // if (prefersDark) {
-            document.documentElement.setAttribute('data-theme', 'dark')
-          // } else {
-          //   document.documentElement.removeAttribute('data-theme')
-          // }
+          document.documentElement.setAttribute('data-theme', 'dark')
         } catch (error) {
           console.warn('Failed to apply initial theme', error)
         }
diff --git a/packages/ui/src/renderer/loading.html b/packages/ui/src/renderer/loading.html
index 19b3eef6..32112d85 100644
--- a/packages/ui/src/renderer/loading.html
+++ b/packages/ui/src/renderer/loading.html
@@ -7,12 +7,7 @@
     <script>
       ;(function () {
         try {
-          const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
-          if (prefersDark) {
-            document.documentElement.setAttribute('data-theme', 'dark')
-          } else {
-            document.documentElement.setAttribute('data-theme', 'light')
-          }
+          document.documentElement.setAttribute('data-theme', 'dark')
         } catch (error) {
           console.warn('Failed to apply initial theme', error)
         }