diff --git a/README.md b/README.md
index 259cf5e..fdbab56 100644
--- a/README.md
+++ b/README.md
@@ -756,7 +756,7 @@ Add a search form for the site, [see more above](#search).
 
 ### Wrapper
 
-A simple, but useful, shortcode to wrap content in a div with a class. The content will be run through "markdownify".
+A simple, but useful, shortcode to wrap content in a div with a class. The content can use markdown.
 
 ```
 {{< wrapper class-name-you-want >}}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 2767a28..7294327 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -46,8 +46,8 @@
 {{ partial "footer.html" . }}
 {{ else -}}
 {{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}}
-<p>{{ with site.Copyright }}{{ . | markdownify }}{{ else }}<span>© {{ site.Title }}</span>{{ end }}</p>
-{{ with $.Param "footer" }}<p>{{ . | markdownify }}</p>{{ end }}
+<p>{{ with site.Copyright }}{{ . | site.Home.RenderString }}{{ else }}<span>© {{ site.Title }}</span>{{ end }}</p>
+{{ with $.Param "footer" }}<p>{{ . | site.Home.RenderString }}</p>{{ end }}
 {{ if $.Param "poweredby" }}<p>Powered by <a href="https://gohugo.io/">Hugo</a> and the <a href="https://github.com/frjo/hugo-theme-zen">Zen theme</a>.</p>{{ end }}
 {{ end -}}
 </footer>
diff --git a/layouts/shortcodes/audio.html b/layouts/shortcodes/audio.html
index c4592dc..a69fbe5 100644
--- a/layouts/shortcodes/audio.html
+++ b/layouts/shortcodes/audio.html
@@ -36,6 +36,6 @@
 <source src="{{ $src }}" {{ with $type }}type="{{ . }}"{{ end }}>
 </audio>
 {{ with $caption -}}
-<figcaption>{{ . | markdownify }}</figcaption>
+<figcaption>{{ . | .Page.RenderString }}</figcaption>
 {{ end -}}
 </figure>
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index 32e3648..16cfe27 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -100,8 +100,8 @@
 {{ if or $title $caption $attr -}}
 <figcaption>
 {{ with $title }}<strong>{{ . }}</strong><br>{{ end -}}
-{{- $caption | markdownify }}{{ if and $caption $attr }} {{ end -}}
-{{ with $attrlink }}<a href="{{ . }}">{{ end }}{{ $attr | markdownify }}{{ if $attrlink }}</a>{{ end -}}
+{{- $caption | .Page.RenderString }}{{ if and $caption $attr }} {{ end -}}
+{{ with $attrlink }}<a href="{{ . }}">{{ end }}{{ $attr | .Page.RenderString }}{{ if $attrlink }}</a>{{ end -}}
 </figcaption>
 {{ end -}}
 </figure>
diff --git a/layouts/shortcodes/svg.html b/layouts/shortcodes/svg.html
index c7bb54f..2fc4861 100644
--- a/layouts/shortcodes/svg.html
+++ b/layouts/shortcodes/svg.html
@@ -59,7 +59,7 @@
 {{- if $link }}</a>{{ end }}
 {{ if $caption -}}
 <figcaption>
-{{ $caption | markdownify -}}
+{{ $caption | .Page.RenderString -}}
 </figcaption>
 </figure>
 {{ end -}}
diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html
index 558c110..30f78f2 100644
--- a/layouts/shortcodes/video.html
+++ b/layouts/shortcodes/video.html
@@ -62,6 +62,6 @@
 <source src="{{ $src }}" {{ with $type }}type="{{ . }}"{{ end }}>
 </video>
 {{ with $caption -}}
-<figcaption>{{ . | markdownify }}</figcaption>
+<figcaption>{{ . | .Page.RenderString }}</figcaption>
 {{ end -}}
 </figure>