diff --git a/layouts/_default/_markup/render-codeblock.atom.xml b/layouts/_default/_markup/render-codeblock.atom.xml
index e2c1bda3..77b7b9d6 100644
--- a/layouts/_default/_markup/render-codeblock.atom.xml
+++ b/layouts/_default/_markup/render-codeblock.atom.xml
@@ -1,3 +1,14 @@
-{{ $result := transform.HighlightCodeBlock . (merge .Options (dict "noclasses" true "style" "github")) }}
+{{ $context := . }}
+
+{{ $options := dict }}
+{{ $overrides := dict "noclasses" true }}
+
+{{ with $context.Options }}
+    {{ $options = merge $overrides . }}
+{{ else }}
+    {{ $options = $overrides }}
+{{ end }}
+
+{{ $result := transform.HighlightCodeBlock $context $options }}
 
 {{ $result.Wrapped }}
diff --git a/layouts/_default/_markup/render-codeblock.rss.xml b/layouts/_default/_markup/render-codeblock.rss.xml
index e2c1bda3..77b7b9d6 100644
--- a/layouts/_default/_markup/render-codeblock.rss.xml
+++ b/layouts/_default/_markup/render-codeblock.rss.xml
@@ -1,3 +1,14 @@
-{{ $result := transform.HighlightCodeBlock . (merge .Options (dict "noclasses" true "style" "github")) }}
+{{ $context := . }}
+
+{{ $options := dict }}
+{{ $overrides := dict "noclasses" true }}
+
+{{ with $context.Options }}
+    {{ $options = merge $overrides . }}
+{{ else }}
+    {{ $options = $overrides }}
+{{ end }}
+
+{{ $result := transform.HighlightCodeBlock $context $options }}
 
 {{ $result.Wrapped }}
diff --git a/layouts/shortcodes/paige/code.xml b/layouts/shortcodes/paige/code.xml
new file mode 100644
index 00000000..7ab568c8
--- /dev/null
+++ b/layouts/shortcodes/paige/code.xml
@@ -0,0 +1,20 @@
+{{ $content := .InnerDeindent | strings.TrimLeft "\f\n\r\v" | strings.TrimRight "\f\n\r\t\v " }}
+{{ $lang := .Get 0 | default (.Get "lang") | default "plaintext" }}
+{{ $options := .Get "options" }}
+{{ $unescape := .Get "unescape" }}
+
+{{ if not $content }}
+    {{ errorf "layouts/shortcodes/paige/code.xml: no content" }}
+{{ end }}
+
+{{ if $options }}
+    {{ $options = printf "%s,noclasses=true" $options }}
+{{ else }}
+    {{ $options = "noclasses=true" }}
+{{ end }}
+
+{{ if $unescape }}
+    {{ $content = htmlUnescape $content }}
+{{ end }}
+
+<div class="paige-shortcode-code">{{ highlight $content $lang $options }}</div>