diff --git a/resources/screen-common.less b/resources/screen-common.less
index 748da74..33ba040 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -404,20 +404,32 @@ div.magnify a {
  * /resources/src/mediawiki.skinning/elements.css and modified a bit
  * @see https://phabricator.wikimedia.org/T177142
  */
-code {
+
+.screenplay,
+code,
+tt,
+kbd,
+pre,
+samp {
+	font-family: @fonts-mono;
+}
+
+code,
+pre,
+.mw-code {
 	color: #000;
-	background-color: @base80;
-	border: 1px solid @base30;
-	border-radius: 2px;
+	background-color: @base90;
+	border: 1px solid @base70;
+}
+
+code {
 	padding: 1px 4px;
 }
 
 pre,
 .mw-code {
-	color: #000;
-	background-color: @base80;
-	border: 1px solid @base30;
 	padding: 1em;
+	border-bottom-width: 0.2em;
 	/* Wrap lines in overflow. T2260, T103780 */
 	white-space: pre-wrap;
 }
diff --git a/resources/themes/wikimedia.less b/resources/themes/wikimedia.less
index b60c8fb..8a4f35d 100644
--- a/resources/themes/wikimedia.less
+++ b/resources/themes/wikimedia.less
@@ -34,6 +34,7 @@
 // Fonts are chosen for consistent metrics, not necessarily overall prettiness.
 @fonts: 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Lato', 'Liberation Sans', 'Noto Sans', 'Helvetica Neue', 'Helvetica', sans-serif;
 @fonts-secondary: 'Linux Libertine', 'Times New Roman', 'Liberation Serif', 'Nimbus Roman', 'Noto Serif', 'Times', serif;
+@fonts-mono: 'Liberation Mono', 'Menlo', 'Consolas', 'Monaco', 'Noto Mono', 'Nimbus Mono L', monospace;
 
 @border: 0.2em;
 @radius: 0.2em;