13 files changed, 62 insertions, 26 deletions
diff --git a/web/assets/themes/blurple-dark.css b/web/assets/themes/blurple-dark.css
index 2899ecf24..5f0deca88 100644
--- a/web/assets/themes/blurple-dark.css
+++ b/web/assets/themes/blurple-dark.css
@@ -3,6 +3,9 @@
   theme-description: Official dark blurple theme
 */
 
+/* Use dark code highlights. */
+@import url("../dist/_prism-dark.css");
+
 :root {
   /* Define our nice blurple palette */
   --blurple1: #ebe6f8;
diff --git a/web/assets/themes/blurple-light.css b/web/assets/themes/blurple-light.css
index eb45ffb30..2d6624771 100644
--- a/web/assets/themes/blurple-light.css
+++ b/web/assets/themes/blurple-light.css
@@ -3,6 +3,9 @@
   theme-description: Official light blurple theme
 */
 
+/* Use light code highlights. */
+@import url("../dist/_prism-light.css");
+
 :root {
   /* Define our nice blurple palette */
   --blurple1: #ebe6f8;
@@ -90,8 +93,8 @@ html, body {
 /* Code snippets */
 pre, pre[class*="language-"],
 code, code[class*="language-"] {
-	background-color: var(--blurple7);
-  color: var(--blurple2);
+	background-color: var(--blurple1);
+  color: var(--blurple7);
 }
 
 /* Block quotes */
diff --git a/web/assets/themes/brutalist-auto.css b/web/assets/themes/brutalist-auto.css
index 080360c87..0e1d127ec 100644
--- a/web/assets/themes/brutalist-auto.css
+++ b/web/assets/themes/brutalist-auto.css
@@ -4,7 +4,7 @@
 */
 
 /* Default to brutalist theme */
-@import url("brutalist.css");
+@import url("brutalist-dark.css");
 
 @import url("brutalist.css") screen and (prefers-color-scheme: light);
 @import url("brutalist-dark.css") screen and (prefers-color-scheme: dark);
diff --git a/web/assets/themes/brutalist-dark.css b/web/assets/themes/brutalist-dark.css
index 9be12ba92..496d1dff5 100644
--- a/web/assets/themes/brutalist-dark.css
+++ b/web/assets/themes/brutalist-dark.css
@@ -3,6 +3,9 @@
   theme-description: (Pseudo-)monochrome brutality (dark version)
 */
 
+/* Use dark code highlights. */
+@import url("../dist/_prism-dark.css");
+
 :root {
   /* Define our color palette, two whole colors, wow! */
   --almost-black: #06170e;
@@ -34,6 +37,7 @@
   /* Used around statuses + other items */
   --double-border: 0.5rem double var(--almost-white);
   --dashed-border: 0.1rem dashed var(--almost-white);
+  --thick-dashed-border: 0.2rem dashed var(--almost-white);
   --single-border: 0.2rem solid var(--almost-white);
 
   /* Override some border stuff */
@@ -98,7 +102,6 @@ html, body {
 .status .text .content pre,
 .status .text .content code {
   background: var(--almost-black);
-  color: var(--almost-white);
 }
 
 /* Block quotes */
@@ -136,14 +139,14 @@ html, body {
 
 /* Make show more/less buttons more legible */
 .button {
-  background-color: var(--almost-white);
-  color: var(--almost-black);
-  border: var(--dashed-border);
+  background-color: var(--almost-black);
+  color: var(--almost-white);
+  border: var(--single-border);
 }
 .button:hover {
   background-color: var(--almost-black);
   color: var(--almost-white);
-  border: var(--dashed-border);
+  border: var(--thick-dashed-border);
 }
 
 /*
diff --git a/web/assets/themes/brutalist.css b/web/assets/themes/brutalist.css
index e183ee50c..a4bbd4dde 100644
--- a/web/assets/themes/brutalist.css
+++ b/web/assets/themes/brutalist.css
@@ -3,6 +3,9 @@
   theme-description: (Pseudo-)monochrome brutality
 */
 
+/* Use light code highlights. */
+@import url("../dist/_prism-light.css");
+
 :root {
   /* Define our color palette, two whole colors, wow! */
   --almost-black: #06170e;
@@ -34,6 +37,7 @@
   /* Used around statuses + other items */
   --double-border: 0.5rem double var(--almost-black);
   --dashed-border: 0.1rem dashed var(--almost-black);
+  --thick-dashed-border: 0.2rem dashed var(--almost-black);
   --single-border: 0.2rem solid var(--almost-black);
 
   /* Override some border stuff */
@@ -92,14 +96,13 @@ html, body {
 /* Code snippets */
 .status .text .content pre,
 .status .text .content code {
-  background: var(--almost-black);
-  color: var(--almost-white);
+  background: var(--almost-white);
 }
 
 /* Block quotes */
 .status .text .content blockquote {
-  background-color: var(--almost-black);
-  color: var(--almost-white);
+  background-color: var(--almost-white);
+  color: var(--almost-black);
 }
 
 /* Polls */
@@ -131,14 +134,14 @@ html, body {
 
 /* Make show more/less buttons more legible */
 .button {
-  background-color: var(--almost-black);
-  color: var(--almost-white);
-  border: var(--dashed-border);
+  background-color: var(--almost-white);
+  color: var(--almost-black);
+  border: var(--single-border);
 }
 .button:hover {
   background-color: var(--almost-white);
   color: var(--almost-black);
-  border: var(--dashed-border);
+  border: var(--thick-dashed-border);
 }
 
 /*
diff --git a/web/assets/themes/hacker-dark.css b/web/assets/themes/hacker-dark.css
index c01f4b075..b4982eaea 100644
--- a/web/assets/themes/hacker-dark.css
+++ b/web/assets/themes/hacker-dark.css
@@ -3,6 +3,9 @@
   theme-description: Dark gray and green monospace theme
 */
 
+/* Use dark code highlights. */
+@import url("../dist/_prism-dark.css");
+
 :root {
   /* Define our cool hacker color palette, I'm in. */
   --dark-gray: #1b1b1b;
diff --git a/web/assets/themes/hacker-light.css b/web/assets/themes/hacker-light.css
index 4c20587bc..845eda7b0 100644
--- a/web/assets/themes/hacker-light.css
+++ b/web/assets/themes/hacker-light.css
@@ -3,6 +3,9 @@
   theme-description: Light gray and green monospace theme
 */
 
+/* Use light code highlights. */
+@import url("../dist/_prism-light.css");
+
 :root {
   /* Define our cool hacker color palette, I'm in. */
   --dark-gray: #1b1b1b;
@@ -125,8 +128,8 @@ button, .button,
 /* Code snippets */
 pre, pre[class*="language-"],
 code, code[class*="language-"] {
-  background: var(--dark-gray);
-  color: var(--whiteish);
+  background: var(--whiteish);
+  color: var(--dark-gray);
 }
 
 /* Block quotes */
diff --git a/web/assets/themes/programmer-socks-dark.css b/web/assets/themes/programmer-socks-dark.css
index 2e1b566ed..0eebcc5b3 100644
--- a/web/assets/themes/programmer-socks-dark.css
+++ b/web/assets/themes/programmer-socks-dark.css
@@ -3,6 +3,9 @@
   theme-description: Dark gray and pink theme
 */
 
+/* Use dark code highlights. */
+@import url("../dist/_prism-dark.css");
+
 :root {
   /* Define our cool hacker color palette, I'm in. */
   --dark-gray: #1b1b1b;
diff --git a/web/assets/themes/programmer-socks-light.css b/web/assets/themes/programmer-socks-light.css
index 6a3d6cbb2..581c9cab1 100644
--- a/web/assets/themes/programmer-socks-light.css
+++ b/web/assets/themes/programmer-socks-light.css
@@ -3,6 +3,9 @@
   theme-description: Light gray and pink theme
 */
 
+/* Use light code highlights. */
+@import url("../dist/_prism-light.css");
+
 :root {
   /* Define our cool hacker color palette, I'm in. */
   --dark-gray: #1b1b1b;
@@ -125,8 +128,8 @@ button, .button,
 /* Code snippets */
 pre, pre[class*="language-"],
 code, code[class*="language-"] {
-  background: var(--dark-gray);
-  color: var(--whiteish);
+  background: var(--whiteish);
+  color: var(--dark-gray);
 }
 
 /* Block quotes */
diff --git a/web/assets/themes/soft.css b/web/assets/themes/soft.css
index 01a8729f7..218ae4347 100644
--- a/web/assets/themes/soft.css
+++ b/web/assets/themes/soft.css
@@ -3,6 +3,9 @@
   theme-description: Pastel pink and blue with dark magenta trim
 */
 
+/* Use light code highlights. */
+@import url("../dist/_prism-light.css");
+
 :root {
   /* Define our palette */
   --soft-pink: rgb(255, 199, 234);
@@ -134,8 +137,8 @@ html, body {
 /* Code snippets */
 pre, pre[class*="language-"],
 code, code[class*="language-"] {
-	background-color: var(--gray1);
-  color: white;
+	background-color: white;
+  color: var(--gray1);
 }
 
 /* Block quotes */
diff --git a/web/assets/themes/solarized-dark.css b/web/assets/themes/solarized-dark.css
index 5e010258f..471100069 100644
--- a/web/assets/themes/solarized-dark.css
+++ b/web/assets/themes/solarized-dark.css
@@ -27,6 +27,9 @@
   THE SOFTWARE.
 */
 
+/* Use dark code highlights. */
+@import url("../dist/_prism-dark.css");
+
 :root {
   /* Define solarized palette */
   --base03:    #002b36; /* Background. */
diff --git a/web/assets/themes/solarized-light.css b/web/assets/themes/solarized-light.css
index 2cd421be5..05863ccb0 100644
--- a/web/assets/themes/solarized-light.css
+++ b/web/assets/themes/solarized-light.css
@@ -27,6 +27,9 @@
   THE SOFTWARE.
 */
 
+/* Use light code highlights. */
+@import url("../dist/_prism-light.css");
+
 :root {
   /* Define solarized palette */
   --base3:     #fdf6e3; /* Background. */
@@ -135,8 +138,8 @@ html, body {
 /* Code snippets */
 pre, pre[class*="language-"],
 code, code[class*="language-"] {
-  background-color: black;
-  color: #93a1a1;
+  background-color: #93a1a1;
+  color: black;
 }
 
 /* Block quotes */
diff --git a/web/assets/themes/sunset-light.css b/web/assets/themes/sunset-light.css
index a37fa7fb7..8f2e54b97 100644
--- a/web/assets/themes/sunset-light.css
+++ b/web/assets/themes/sunset-light.css
@@ -3,6 +3,9 @@
   theme-description: Official light orange/yellow theme.
 */
 
+/* Use light code highlights. */
+@import url("../dist/_prism-light.css");
+
 :root {
   /* Define our palette */
   --eggshell: #fff6eb;
@@ -96,8 +99,8 @@ html, body {
 /* Code snippets */
 pre, pre[class*="language-"],
 code, code[class*="language-"] {
-  background-color: var(--eggplant4);
-  color: var(--white1);
+  background-color: var(--white1);
+  color: var(--eggplant4);
 }
 
 /* Block quotes */