diff --git a/views/about.pug b/views/about.pug
index aba4be0..1bf9c17 100644
--- a/views/about.pug
+++ b/views/about.pug
@@ -3,7 +3,7 @@ html
   head
     title about - teddit
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     .container
       .content
diff --git a/views/includes/head.pug b/views/includes/head.pug
index 3d497b3..19c0854 100644
--- a/views/includes/head.pug
+++ b/views/includes/head.pug
@@ -1,3 +1,5 @@
+if(user_preferences.theme === 'auto')
+  link(rel="stylesheet", type="text/css", href="/css/dark.css", media="(prefers-color-scheme: dark)")
 if(user_preferences.theme === 'dark')
   link(rel="stylesheet", type="text/css", href="/css/dark.css")
 if(user_preferences.theme === 'sepia')
diff --git a/views/index.pug b/views/index.pug
index a5c5db1..0768728 100644
--- a/views/index.pug
+++ b/views/index.pug
@@ -3,7 +3,7 @@ html
   head
     title teddit
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     if json === null
       h2 error
diff --git a/views/post.pug b/views/post.pug
index e88fa74..83f723c 100644
--- a/views/post.pug
+++ b/views/post.pug
@@ -3,7 +3,7 @@ html
   head
     title #{cleanTitle(post.title)} : #{subreddit}
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     if post === null
       h1 Error occured
diff --git a/views/preferences.pug b/views/preferences.pug
index 9d173a7..4d1169a 100644
--- a/views/preferences.pug
+++ b/views/preferences.pug
@@ -3,7 +3,7 @@ html
   head
     title preferences - teddit
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     .container
       .content
@@ -14,17 +14,25 @@ html
             label(for="theme") Theme: 
               select(id="theme", name="theme")
                 if(!user_preferences.theme || user_preferences.theme == '')
+                  option(value="auto") Auto
                   option(value="", selected="selected") White
                   option(value="dark") Dark
                   option(value="sepia") Sepia
                 if(user_preferences.theme === 'dark')
+                  option(value="auto") Auto
                   option(value="") White
                   option(value="dark", selected="selected") Dark
                   option(value="sepia") Sepia
                 if(user_preferences.theme === 'sepia')
+                  option(value="auto") Auto
                   option(value="") White
                   option(value="dark") Dark
                   option(value="sepia", selected="selected") Sepia
+                if(user_preferences.theme === 'auto')
+                  option(value="auto", selected="selected") Auto
+                  option(value="") White
+                  option(value="dark") Dark
+                  option(value="sepia") Sepia
           .setting
             label(for="flairs") Show flairs: 
               if(!user_preferences.flairs || user_preferences.flairs == 'true')
diff --git a/views/privacypolicy.pug b/views/privacypolicy.pug
index 803a70c..20bf2f9 100644
--- a/views/privacypolicy.pug
+++ b/views/privacypolicy.pug
@@ -3,7 +3,7 @@ html
   head
     title privacy policy - teddit
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     .container
       .content
diff --git a/views/search.pug b/views/search.pug
index 1abaab7..bb2ace4 100644
--- a/views/search.pug
+++ b/views/search.pug
@@ -6,7 +6,7 @@ html
     else
       title search results for #{q}
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     #search.sr.search-page
       form(action="/r/" + subreddit + "/search", method="GET")
diff --git a/views/subreddit.pug b/views/subreddit.pug
index 08b81bc..683b003 100644
--- a/views/subreddit.pug
+++ b/views/subreddit.pug
@@ -3,7 +3,7 @@ html
   head
     title /r/#{subreddit}
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     -
       let show_nsfw_warning = false;
diff --git a/views/subreddits_explore.pug b/views/subreddits_explore.pug
index fe23008..9823a1f 100644
--- a/views/subreddits_explore.pug
+++ b/views/subreddits_explore.pug
@@ -3,7 +3,7 @@ html
   head
     title subreddits - explore
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     if json === null
       h1 Error occured
diff --git a/views/user.pug b/views/user.pug
index 6a6c65e..94c3b6c 100644
--- a/views/user.pug
+++ b/views/user.pug
@@ -3,7 +3,7 @@ html
   head
     title overview for #{data.username}
     include includes/head.pug
-  body(class=""+ user_preferences.theme +"")
+  body(class=""+ (user_preferences.theme === 'auto' ? 'dark' : user_preferences.theme) + "")
     include includes/topbar.pug
     if user === null
       h1 Error occured