diff --git a/web/templates/partials/themes.html b/web/templates/partials/themes.html
index 0299c71..7611aa6 100644
--- a/web/templates/partials/themes.html
+++ b/web/templates/partials/themes.html
@@ -34,14 +34,25 @@ section.hero {
         }
 
         {{if eq $cardLightness "light"}}
-        div.box, .container div.card-content, table.table, table.table strong {
-            background-color: #fff;
+        div.box, .container div.card-content, table.table, table.table strong, td {
+            background-color: #fff !important;
+            color: #4a4a4a !important;
+        }
+        aside.menu ul.menu-list li a {
+            background-color: #ccc !important;
+            color: #4a4a4a !important;
+        }
+        blockquote, pre, code {
+            background-color: #ccc !important;
             color: #4a4a4a;
         }
         div.tag {
             background-color: #ccc;
             color: #4a4a4a;
         }
+        strong {
+            color: #4a4a4a;
+        }
 
         /* More text color overrides (h1's etc. look light on prefers-dark color schemes) */
         .container div.card-content .content * {
@@ -56,14 +67,25 @@ section.hero {
             }
         }
         {{else if eq $cardLightness "dark"}}
-        div.box, .container div.card-content, table.table, table.table strong {
-            background-color: #4a4a4a;
+        div.box, .container div.card-content, table.table, table.table strong, td {
+            background-color: #4a4a4a !important;
+            color: #f5f5f5 !important;
+        }
+        aside.menu ul.menu-list li a {
+            background-color: #1a1a1a !important;
+            color: #f5f5f5 !important;
+        }
+        blockquote, pre, code {
+            background-color: #1a1a1a !important;
             color: #f5f5f5;
         }
         div.tag {
             background-color: #333;
             color: #f5f5f5;
         }
+        strong {
+            color: #f5f5f5;
+        }
 
         /* More text color overrides (h1's etc. look dark on prefers-light color schemes) */
         .container div.card-content .content * {