diff --git a/internal/views/static/css/samsa.css b/internal/views/static/css/samsa.css
index f4aef1c..7286bf3 100644
--- a/internal/views/static/css/samsa.css
+++ b/internal/views/static/css/samsa.css
@@ -24,7 +24,7 @@
   --font-mono: "IBM Plex Mono", ui-monospace, monospace;
 }
 
-[data-theme="dark"] {
+@media (prefers-color-scheme: dark) {
   --bg: #0f0f0f;
   --bg-secondary: #1a1a1a;
   --bg-tertiary: #242424;
diff --git a/internal/views/templates/base.html b/internal/views/templates/base.html
index 6fc7cca..7983f14 100644
--- a/internal/views/templates/base.html
+++ b/internal/views/templates/base.html
@@ -1,6 +1,6 @@
 {{define "base"}}
 <!DOCTYPE html>
-<html lang="en" data-theme="light">
+<html lang="en">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -12,7 +12,6 @@
   <link rel="icon" href="/static/img/favicon.svg" type="image/svg+xml">
   <link title="samsa" type="application/opensearchdescription+xml" rel="search" href="/opensearch.xml">
   <meta name="samsa" content="samsa">
-  <script>var s=document.documentElement;s.setAttribute('data-theme',localStorage.getItem('samsa-theme')||'light');</script>
 </head>
 <body>
   <header class="site-header">
diff --git a/internal/views/templates/preferences.html b/internal/views/templates/preferences.html
index 4f7980a..de335a0 100644
--- a/internal/views/templates/preferences.html
+++ b/internal/views/templates/preferences.html
@@ -4,16 +4,12 @@
   <h1 class="preferences-title">Preferences</h1>
 
   <form class="preferences-form" method="POST" action="/preferences">
-    <input type="hidden" name="theme" id="theme-input" value="light">
 
     <section class="pref-section">
       <h2 class="pref-section-title">Appearance</h2>
       <div class="pref-row">
         <label>Theme</label>
-        <div class="theme-buttons">
-          <button type="button" class="theme-btn active" data-theme="light">Light</button>
-          <button type="button" class="theme-btn" data-theme="dark">Dark</button>
-        </div>
+        <span class="theme-info">Follows system preference</span>
       </div>
     </section>
 
@@ -109,29 +105,6 @@
 
 <script>
 (function() {
-  // Theme buttons
-  var themeInput = document.getElementById('theme-input');
-  var themeButtons = document.querySelectorAll('.theme-btn');
-
-  // Load saved theme
-  var savedTheme = localStorage.getItem('samsa-theme') || 'light';
-  themeInput.value = savedTheme;
-  document.querySelectorAll('.theme-btn').forEach(function(btn) {
-    btn.classList.toggle('active', btn.dataset.theme === savedTheme);
-  });
-  document.documentElement.setAttribute('data-theme', savedTheme);
-
-  themeButtons.forEach(function(btn) {
-    btn.addEventListener('click', function() {
-      var theme = btn.dataset.theme;
-      themeInput.value = theme;
-      themeButtons.forEach(function(b) { b.classList.remove('active'); });
-      btn.classList.add('active');
-      document.documentElement.setAttribute('data-theme', theme);
-      localStorage.setItem('samsa-theme', theme);
-    });
-  });
-
   // Load saved engine preferences
   var savedEngines = JSON.parse(localStorage.getItem('samsa-engines') || 'null');
   if (savedEngines) {
