diff --git a/views/login.php b/views/login.php
index ac19a3f..aeccc6f 100644
--- a/views/login.php
+++ b/views/login.php
@@ -6,10 +6,11 @@
     <title><?php echo APP_NAME; ?> - Login</title>
     <script src="https://cdn.tailwindcss.com"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
+    <?php $themeSection = 'head'; include __DIR__ . '/partials/theme.php'; ?>
 </head>
-<body class="bg-gray-100 min-h-screen flex items-center justify-center">
-    <div class="bg-white p-8 rounded-lg shadow-md w-full max-w-md">
-        <h1 class="text-3xl font-bold text-gray-800 mb-6 text-center"><?php echo APP_NAME; ?></h1>
+<body class="theme-page min-h-screen flex items-center justify-center">
+    <div class="theme-surface p-8 rounded-lg shadow-md w-full max-w-md">
+        <h1 class="text-3xl font-bold theme-text mb-6 text-center"><?php echo APP_NAME; ?></h1>
         
         <?php if (isset($_SESSION['error'])): ?>
             <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded mb-4">
@@ -25,9 +26,9 @@
         
         <form method="POST" action="<?php echo url('/login'); ?>" class="space-y-4">
             <div>
-                <label for="password" class="block text-sm font-medium text-gray-700 mb-1">Password</label>
+                <label for="password" class="block text-sm font-medium theme-text mb-1">Password</label>
                 <input type="password" id="password" name="password" required autofocus
-                       class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+                       class="w-full px-3 py-2 border border-gray-300 theme-input theme-border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
                        placeholder="Enter your password">
             </div>
             
@@ -37,5 +38,6 @@
             </button>
         </form>
     </div>
+    <?php $themeSection = 'body'; include __DIR__ . '/partials/theme.php'; ?>
 </body>
 </html>
diff --git a/views/setup.php b/views/setup.php
index 86b5ccc..6dbc672 100644
--- a/views/setup.php
+++ b/views/setup.php
@@ -6,10 +6,11 @@
     <title><?php echo APP_NAME; ?> - Setup</title>
     <script src="https://cdn.tailwindcss.com"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
+    <?php $themeSection = 'head'; include __DIR__ . '/partials/theme.php'; ?>
 </head>
-<body class="bg-gray-100 min-h-screen flex items-center justify-center">
-    <div class="bg-white p-8 rounded-lg shadow-md w-full max-w-md">
-        <h1 class="text-3xl font-bold text-gray-800 mb-6 text-center"><?php echo APP_NAME; ?> Setup</h1>
+<body class="theme-page min-h-screen flex items-center justify-center">
+    <div class="theme-surface p-8 rounded-lg shadow-md w-full max-w-md">
+        <h1 class="text-3xl font-bold theme-text mb-6 text-center"><?php echo APP_NAME; ?> Setup</h1>
         
         <?php if (isset($_SESSION['error'])): ?>
             <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded mb-4">
@@ -54,16 +55,16 @@
         <?php else: ?>
             <form method="POST" action="<?php echo url('/setup'); ?>" class="space-y-4">
                 <div>
-                    <label for="password" class="block text-sm font-medium text-gray-700 mb-1">Create Password</label>
+                    <label for="password" class="block text-sm font-medium theme-text-muted mb-1">Create Password</label>
                     <input type="password" id="password" name="password" required
-                           class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+                           class="w-full px-3 py-2 border border-gray-300 theme-input theme-border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
                            placeholder="Enter password (min 6 characters)">
                 </div>
                 
                 <div>
-                    <label for="confirm_password" class="block text-sm font-medium text-gray-700 mb-1">Confirm Password</label>
+                    <label for="confirm_password" class="block text-sm font-medium theme-text-muted mb-1">Confirm Password</label>
                     <input type="password" id="confirm_password" name="confirm_password" required
-                           class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+                           class="w-full px-3 py-2 border border-gray-300 theme-input theme-border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
                            placeholder="Confirm password">
                 </div>
                 
@@ -74,5 +75,6 @@
             </form>
         <?php endif; ?>
     </div>
+    <?php $themeSection = 'body'; include __DIR__ . '/partials/theme.php'; ?>
 </body>
 </html>
