diff --git a/templates/base.html b/templates/base.html
index 84f50ca..ec014c5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,7 +15,7 @@
 	<body class="
 		{% if prefs.layout != "" %}{{ prefs.layout }}{% endif %}
 		{% if prefs.wide == "on" %} wide{% endif %}
-		{% if prefs.theme == "light" %} light{% endif %}">
+		{% if prefs.theme != "" %} {{ prefs.theme }}{% endif %}">
 		<!-- NAVIGATION BAR -->
 		<nav>
 			<p id="logo">
diff --git a/templates/settings.html b/templates/settings.html
index fcc6da9..e6f5d3a 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -14,7 +14,7 @@
 		<div id="theme">
 			<label for="theme">Theme:</label>
 			<select name="theme"> 
-				{% call utils::options(prefs.theme, ["dark", "light"], "dark") %}
+				{% call utils::options(prefs.theme, ["system", "dark", "light"], "system") %}
 			</select>
 		</div>
 		<p>Interface</p>
