diff --git a/public/dark.css b/public/dark.css
index 821e0b7..25c6d5b 100644
--- a/public/dark.css
+++ b/public/dark.css
@@ -1,9 +1,3 @@
-#darkmode {
-  display: none;
-}
-#undarkmode {
-  display: block;
-}
 body {
   background-color: #262626;
   color: #ddd;
diff --git a/public/style.css b/public/style.css
index d24d000..5b106a2 100644
--- a/public/style.css
+++ b/public/style.css
@@ -433,7 +433,7 @@ form.nsfw div {
   border-left: 2px solid #c5c1ad;
   padding: 0 8px;
 }
-.dark .buttons a, .buttons a, .buttons > form input, .comment .buttons form input {
+.buttons a, .buttons > form input, .comment .buttons form input {
   text-decoration: none;
   color: #888;
   display: inline-block;
@@ -1022,162 +1022,6 @@ form.create input[type=file], form.create select {
   max-width: 500px;
   font-size: 13px;
 }
-body.dark {
-  background-color: #262626;
-  color: #ddd;
-}
-.dark a {
-  color: #8cb3d9;
-}
-.dark input[type=text], .dark input[type=password], .dark textarea {
-  background-color: #333;
-  color: #fff;
-  border-color: #4d4d4d
-}
-.dark .side input[type=text] {
-  border-color: gray;
-}
-.dark .post .rank {
-  color: #646464;
-}
-.dark .post .score {
-  color: #646464;
-}
-.dark .score form.link-btn input {
-  color: #646464;
-}
-.dark .post.distinguished .title a:visited {
-  color: #228822;
-  font-weight: bold;
-}
-.dark .title a {
-  color: #dedede;
-}
-.dark .title a:visited, .dark .title.visited a {
-  color: #a6a6a6 !important;
-}
-.dark .message b {
-  color: #ddd;
-}
-.dark .meta {
-  color: #b4b4b4;
-}
-.dark .comment {
-  border-color: #333;
-}
-.dark .comment .comment,
-.dark .comment .comment .comment .comment,
-.dark .comment .comment .comment .comment .comment .comment,
-.dark .comment .comment .comment .comment .comment .comment .comment .comment,
-.dark .comment .comment .comment .comment .comment .comment .comment .comment .comment .comment {
- background-color:#161616;
-}
-.dark .comment,
-.dark .comment .comment .comment,
-.dark .comment .comment .comment .comment .comment,
-.dark .comment .comment .comment .comment .comment .comment .comment,
-.dark .comment .comment .comment .comment .comment .comment .comment .comment .comment {
- background-color: #121212;
-}
-.dark .preview h3 {
-  background-color: #333;
-  border-color: #333;
-  color: #ccc;
-}
-.dark .meta a {
-  color: #6a98af;
-}
-.dark #mycommunities a {
-  color: #8cb3d9;
-}
-.dark #mycommunities a:hover {
-  background-color: #3e3e3e;
-}
-.dark #settingspopup, .dark #mycommunities {
-  background-color: #262626;
-}
-.dark .expando .md {
-  background-color: #373737;
-  color: #ddd;
-  border-color: #666;
-}
-.dark .side .stats {
-  background-color: #393939;
-  border-color: #666;
-}
-.dark .create a div {
-  background-color: #444444;
-  border: 0;
-}
-.dark .create a div:hover {
-  background-color: #333333;
-}
-.dark .create a {
-  color: white;
-}
-.dark .create a:hover{
-  color: #0cbe30;
-}
-.dark .create input[type=submit],
-.dark .search .query input,
-.dark .create input[type=file],
-.dark .create select {
-  color: #fff;
-  border: 1px outset gray;
-  background-color: #4d4d4d;
-}
-.dark .moderators a {
-  color: #6a98af;
-}
-.dark .community .description {
-  background-color: #333;
-  color: #ddd;
-  border-color: #777;
-}
-.dark nav {
-  background-color: #696969;
-}
-.dark nav .communities {
-  background-color: #cccccc;
-}
-.dark nav .communities a {
-  color: #000;
-}
-.dark nav .communities a.more {
-  background-color: #cccccc;
-}
-.dark nav .title, .dark nav > span {
-  color: #ececec;
-}
-.dark nav ul a {
-  background-color: #262626;
-  color: #ddd;
-}
-.dark nav .selected a {
-  color: #d25a32;
-  border-bottom: 1px solid #262626;
-}
-.dark nav .right {
-  background-color: #333333;
-}
-.dark nav .right a, .dark nav .right input[type=submit]{
-  color: #dadada;
-}
-.dark .commentmenu .selected, .dark .menu .selected {
-  color: #ddd !important;
-}
-.dark .commentmenu a, .dark .menu {
-  color: #6a98af;
-}
-.dark .warning {
-  background-color: #544400;
-}
-.dark .highlight{
-  background-color: #4c4c4c;
-}
-.dark form.create div {
-  background-color: #181818
-}
 #undarkmode {
   display: none;
 }
diff --git a/templates/frontpage.html b/templates/frontpage.html
index a57593e..42c5f52 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
   <head>
     <title>{{ if and .Community (ne .Community.CommunityView.Community.Title "")}}{{.Community.CommunityView.Community.Title}}{{else if ne .CommunityName ""}}/c/{{.CommunityName}}{{ else if .User}}overview for {{.User.PersonView.Person.Name}}{{else}}{{ host .Host }}{{end}}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
     <link rel="stylesheet" href="/_/static/style.css?v={{ .Version }}">
-    {{ if not .Dark }}
-    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" media="(prefers-color-scheme:dark)">
-    {{ end }}
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    {{- if or (not .Dark) (is .Dark) }}
+    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" {{ if not .Dark }}media="(prefers-color-scheme:dark)"{{ end }}>
+    {{- end }}
   </head>
-  <body {{ if is .Dark }}class="dark"{{end}}>
+  <body>
     <noscript>
       <link rel="stylesheet" href="/_/static/noscript.css?v={{ .Version }}">
     </noscript>
diff --git a/templates/login.html b/templates/login.html
index 36fb67b..c2437a0 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
   <head>
     <title>{{ host .Host }}: sign up or log in</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
     <link rel="stylesheet" href="/_/static/style.css?v={{ .Version }}">
-    {{ if not .Dark }}
-    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" media="(prefers-color-scheme:dark)">
-    {{ end }}
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    {{- if or (not .Dark) (is .Dark) }}
+    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" {{ if not .Dark }}media="(prefers-color-scheme:dark)"{{ end }}>
+    {{- end }}
   </head>
-  <body {{ if is .Dark }}class="dark"{{end}}>
+  <body>
     <nav>
       <div class="communities">
         <a href="/{{.Host}}">home</a>
diff --git a/templates/main.html b/templates/main.html
index 9980490..158d102 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -4,11 +4,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
     <link rel="stylesheet" href="/_/static/style.css?v={{ .Version }}">
-    {{ if not .Dark }}
-    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" media="(prefers-color-scheme:dark)">
-    {{ end }}
+    {{- if or (not .Dark) (is .Dark) }}
+    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" {{ if not .Dark }}media="(prefers-color-scheme:dark)"{{ end }}>
+    {{- end }}
   </head>
-  <body{{ if is .Dark }} class="dark"{{end}}>
+  <body>
     <noscript>
       <link rel="stylesheet" href="/_/static/noscript.css?v={{ .Version }}">
     </noscript>
diff --git a/templates/root.html b/templates/root.html
index ff0d097..74e8ead 100644
--- a/templates/root.html
+++ b/templates/root.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
   <head>
     <title>mlmym</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
     <link rel="stylesheet" href="/_/static/style.css?v=7">
-    {{ if not .Dark }}
-    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" media="(prefers-color-scheme:dark)">
-    {{ end }}
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    {{- if or (not .Dark) (is .Dark) }}
+    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" {{ if not .Dark }}media="(prefers-color-scheme:dark)"{{ end }}>
+    {{- end }}
   </head>
-  <body{{ if .Dark }} class="dark" {{end}}>
+  <body>
     <nav>
       <div class="spacer"></div>
       <span class="title">{{ .Title }}</span>
diff --git a/templates/settings.html b/templates/settings.html
index 97ddb40..1d759cb 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -4,12 +4,12 @@
     <title>{{  host .Host }}: preferences</title>
     <link rel="shortcut icon" href="/{{.Host}}/icon.jpg">
     <link rel="stylesheet" href="/_/static/style.css?v={{ .Version }}">
-    {{ if not .Dark }}
-    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" media="(prefers-color-scheme:dark)">
-    {{ end }}
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    {{- if or (not .Dark) (is .Dark) }}
+    <link rel="stylesheet" href="/_/static/dark.css?v={{ .Version }}" {{ if not .Dark }}media="(prefers-color-scheme:dark)"{{ end }}>
+    {{- end }}
   </head>
-  <body {{ if is .Dark}}class="dark"{{end}}>
+  <body>
     <noscript>
       <link rel="stylesheet" href="/_/static/noscript.css?v={{ .Version }}">
     </noscript>