diff --git a/web/templates/base.html b/web/templates/base.html
index 8233c30..7da61c2 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -13,11 +13,13 @@
     <link rel="stylesheet" type="text/css" href="/static/css/bulma-no-dark-mode.min.css?build={{.BuildHash}}">
     {{- else if eq .WebsiteTheme "dark" -}}
     <link rel="stylesheet" type="text/css" href="/static/css/bulma-dark-theme.css?build={{.BuildHash}}">
-    {{- else -}}
-    <link rel="stylesheet" type="text/css" href="/static/css/nonshy-prefers-dark.css?build={{.BuildHash}}">
     {{- end -}}
 
+    <!-- nonshy bulma theme overrides -->
     <link rel="stylesheet" href="/static/css/theme.css?build={{.BuildHash}}">
+    {{- if or (eq .WebsiteTheme "dark") (ne .WebsiteTheme "light") -}}
+    <link rel="stylesheet" type="text/css" href="/static/css/dark-theme.css" {{if ne .WebsiteTheme "dark"}}media="(prefers-color-scheme: dark)"{{end}}>
+    {{- end -}}
 
 <!-- User theme hue -->
 {{- if and .LoggedIn (.CurrentUser.GetProfileField "website-theme-hue") }}