diff --git a/layouts/shortcodes/columns.html b/layouts/shortcodes/columns.html
index ce92aee..5d1636f 100644
--- a/layouts/shortcodes/columns.html
+++ b/layouts/shortcodes/columns.html
@@ -1,7 +1,7 @@
 <div class="gdoc-columns flex flex-wrap">
   {{ range split .Inner "<--->" }}
   <div class="gdoc-columns__content gdoc-markdown--nested flex-even">
-    {{ . | markdownify }}
+    {{ . | $.Page.RenderString }}
   </div>
   {{ end }}
 </div>
diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html
index c2540bc..0ab3d2a 100644
--- a/layouts/shortcodes/expand.html
+++ b/layouts/shortcodes/expand.html
@@ -6,6 +6,6 @@
   </label>
   <input id="{{ $id }}-{{ .Ordinal }}" type="checkbox" class="gdoc-expand__control hidden" />
   <div class="gdoc-markdown--nested gdoc-expand__content">
-    {{ .Inner | markdownify }}
+    {{ .Inner | $.Page.RenderString }}
   </div>
 </div>
diff --git a/layouts/shortcodes/hint.html b/layouts/shortcodes/hint.html
index 5506853..1b1c0c9 100644
--- a/layouts/shortcodes/hint.html
+++ b/layouts/shortcodes/hint.html
@@ -1,3 +1,3 @@
 <blockquote class="gdoc-hint {{ .Get 0 }}">
-  {{ .Inner | markdownify }}
+  {{ .Inner | $.Page.RenderString }}
 </blockquote>
diff --git a/layouts/shortcodes/include.html b/layouts/shortcodes/include.html
index 17540da..0a9df6f 100644
--- a/layouts/shortcodes/include.html
+++ b/layouts/shortcodes/include.html
@@ -1,7 +1,7 @@
 {{$file := .Get "file"}}
 <div class="gdoc-include">
 {{- if eq (.Get "markdown") "true" -}}
-{{- $file | readFile | markdownify -}}
+{{- $file | readFile | $.Page.RenderString -}}
 {{- else if (.Get "language") -}}
 {{- highlight ($file | readFile) (.Get "language") (default "linenos=table" (.Get "options")) -}}
 {{- else -}}
diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html
index fb9965a..2b666f5 100644
--- a/layouts/shortcodes/tabs.html
+++ b/layouts/shortcodes/tabs.html
@@ -10,7 +10,7 @@
       {{ $tab.Name }}
     </label>
     <div class="gdoc-markdown--nested gdoc-tabs__content">
-      {{ .Content | markdownify }}
+      {{ .Content | $.Page.RenderString }}
     </div>
   {{ end }}
 </div>