diff --git a/web/static/css/bulma-dark-theme.css b/web/static/css/bulma-dark-theme.css
index 89018db..7198c11 100644
--- a/web/static/css/bulma-dark-theme.css
+++ b/web/static/css/bulma-dark-theme.css
@@ -1,4 +1,9 @@
 /* Forced dark theme for Bulma (custom created for nonshy) */
+
+/* nonshy custom overrides */
+@import url("dark-theme.css");
+
+/* Copied from bulma.css - original dark theme styles */
 :root {
     --bulma-white-on-scheme-l: 100%;
     --bulma-white-on-scheme: hsla(var(--bulma-white-h), var(--bulma-white-s), var(--bulma-white-on-scheme-l), 1);
diff --git a/web/static/css/dark-theme.css b/web/static/css/dark-theme.css
new file mode 100644
index 0000000..d4c6829
--- /dev/null
+++ b/web/static/css/dark-theme.css
@@ -0,0 +1,46 @@
+/* Custom nonshy color overrides for Bulma's dark theme */
+
+/* nonshy custom overrides */
+.has-background-primary-light {
+    background-color: rgba(28, 166, 76, 0.25) !important;
+}
+
+.has-background-success-light, .has-background-success {
+    background-color: rgba(19, 71, 37, 0.685) !important
+}
+
+.has-background-warning-light, .has-background-warning, .nonshy-navbar-notification-tag.is-warning {
+    background-color: rgb(100, 90, 41) !important;
+}
+
+.has-background-link-light {
+    background-color: rgba(15, 129, 204, 0.25) !important;
+}
+
+.has-text-dark {
+    /* note: this css file otherwise didn't override this, dark's always dark, brighten it! */
+    color: #b5b5b5 !important;
+}
+
+a.has-text-dark:focus,
+a.has-text-dark:hover {
+    color: #d5d5d5 !important;
+}
+
+.modal-background {
+    background-color: rgba(0, 0, 0, 0.86) !important;
+}
+
+/* Tag color overrides */
+.tag.is-grey {
+    background-color: #3f3f3f;
+    color: #eee;
+}
+.tag.is-danger.is-light {
+    background-color: #500;
+    color: #FCC;
+}
+.tag.is-warning {
+    background-color: #550;
+    color: #FFC;
+}
diff --git a/web/static/css/nonshy-prefers-dark.css b/web/static/css/nonshy-prefers-dark.css
new file mode 100644
index 0000000..1480129
--- /dev/null
+++ b/web/static/css/nonshy-prefers-dark.css
@@ -0,0 +1,5 @@
+/* Custom nonshy color overrides for Bulma's dark theme
+   (prefers-dark edition) */
+@media (prefers-color-scheme: dark) {
+    @import url("dark-theme.css");
+}
\ No newline at end of file
diff --git a/web/templates/account/dashboard.html b/web/templates/account/dashboard.html
index c5d1bff..28e9727 100644
--- a/web/templates/account/dashboard.html
+++ b/web/templates/account/dashboard.html
@@ -269,7 +269,7 @@
             <div class="column">
                 <div class="card" id="notifications">
                     <header class="card-header has-background-warning">
-                        <p class="card-header-title has-text-dark">Notifications</p>
+                        <p class="card-header-title">Notifications</p>
                     </header>
 
                     <div class="card-content">
diff --git a/web/templates/base.html b/web/templates/base.html
index 9d40254..3c03cbc 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -13,6 +13,8 @@
     <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}}
     <link rel="stylesheet" href="/static/fontawesome-free-6.1.2-web/css/all.css">
     <link rel="stylesheet" href="/static/css/theme.css?build={{.BuildHash}}">
diff --git a/web/templates/forum/board_index.html b/web/templates/forum/board_index.html
index 1d2eaa0..f37ec3b 100644
--- a/web/templates/forum/board_index.html
+++ b/web/templates/forum/board_index.html
@@ -5,10 +5,8 @@
         <div class="hero-body">
             <div class="container">
                 <h1 class="title">
-                    <a href="/f/{{.Forum.Fragment}}" class="has-text-light">
-                        <span class="icon mr-4"><i class="fa fa-comments"></i></span>
-                        <span>{{.Forum.Title}}</span>
-                    </a>
+                    <span class="icon mr-4"><i class="fa fa-comments"></i></span>
+                    <span>{{.Forum.Title}}</span>
                 </h1>
             </div>
         </div>
diff --git a/web/templates/forum/index.html b/web/templates/forum/index.html
index 7e5487e..0affced 100644
--- a/web/templates/forum/index.html
+++ b/web/templates/forum/index.html
@@ -83,21 +83,21 @@
 
                             <div>
                                 {{if .Explicit}}
-                                <span class="tag is-danger is-light has-text-dark">
+                                <span class="tag is-danger is-light">
                                     <span class="icon"><i class="fa fa-fire"></i></span>
                                     <span>Explicit</span>
                                 </span>
                                 {{end}}
 
                                 {{if .Privileged}}
-                                <span class="tag is-warning is-light has-text-dark">
+                                <span class="tag is-warning is-light">
                                     <span class="icon"><i class="fa fa-peace"></i></span>
                                     <span>Privileged</span>
                                 </span>
                                 {{end}}
 
                                 {{if .PermitPhotos}}
-                                <span class="tag is-grey has-text-dark">
+                                <span class="tag is-grey">
                                     <span class="icon"><i class="fa fa-camera"></i></span>
                                     <span>Photos</span>
                                 </span>
diff --git a/web/templates/forum/thread.html b/web/templates/forum/thread.html
index b563cd6..9373a65 100644
--- a/web/templates/forum/thread.html
+++ b/web/templates/forum/thread.html
@@ -5,10 +5,8 @@
         <div class="hero-body">
             <div class="container">
                 <h1 class="title">
-                    <a href="/f/{{.Forum.Fragment}}" class="has-text-light">
-                        <span class="icon mr-4"><i class="fa fa-comments"></i></span>
-                        <span>{{.Forum.Title}}</span>
-                    </a>
+                    <span class="icon mr-4"><i class="fa fa-comments"></i></span>
+                    <span>{{.Forum.Title}}</span>
                 </h1>
             </div>
         </div>
diff --git a/web/templates/index.html b/web/templates/index.html
index 152aabd..b89a996 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -107,7 +107,7 @@
                 <div class="card-content p-2">
                     <ul class="menu-list">
                         <li>
-                            <a href="/messages"{{if .NavUnreadMessages}} class="has-text-warning-dark"{{end}}>
+                            <a href="/messages"{{if .NavUnreadMessages}} class="has-text-warning"{{end}}>
                                 <span class="icon"><i class="fa fa-envelope"></i></span>
                                 {{if .NavUnreadMessages}}
                                     <span>{{.NavUnreadMessages}} New Message{{Pluralize64 .NavUnreadMessages}}!</span>
@@ -117,7 +117,7 @@
                             </a>
                         </li>
                         <li>
-                            <a href="/friends{{if .NavFriendRequests}}?view=requests{{end}}"{{if .NavFriendRequests}} class="has-text-warning-dark"{{end}}>
+                            <a href="/friends{{if .NavFriendRequests}}?view=requests{{end}}"{{if .NavFriendRequests}} class="has-text-warning"{{end}}>
                                 <span class="icon"><i class="fa fa-user-group"></i></span>
                                 {{if .NavFriendRequests}}
                                     <span>{{.NavFriendRequests}} Friend Request{{Pluralize64 .NavFriendRequests}}!</span>
@@ -127,7 +127,7 @@
                             </a>
                         </li>
                         <li>
-                            <a href="/me{{if .NavUnreadNotifications}}?view=requests{{end}}"{{if .NavUnreadNotifications}} class="has-text-warning-dark"{{end}}>
+                            <a href="/me{{if .NavUnreadNotifications}}?view=requests{{end}}"{{if .NavUnreadNotifications}} class="has-text-warning"{{end}}>
                                 <span class="icon"><i class="fa {{if .NavUnreadNotifications}}fa-bell{{else}}fa-home-user{{end}}"></i></span>
                                 {{if .NavUnreadNotifications}}
                                     <span>{{.NavUnreadNotifications}} New Notification{{Pluralize64 .NavUnreadNotifications}}!</span>
diff --git a/web/templates/photo/permalink.html b/web/templates/photo/permalink.html
index 6d9cc93..08329dd 100644
--- a/web/templates/photo/permalink.html
+++ b/web/templates/photo/permalink.html
@@ -178,7 +178,7 @@
                 </p>
             </header>
 
-            <div class="card-content">
+            <div class="card-content px-4">
                 <form action="/comments" method="POST">
                     {{InputCSRF}}
                     <input type="hidden" name="table_name" value="photos">