diff --git a/exampleSite/content/posts/post-with-images/images/feature.jpg b/exampleSite/content/posts/post-with-images/images/feature.jpg
new file mode 100644
index 0000000..a5a17c3
Binary files /dev/null and b/exampleSite/content/posts/post-with-images/images/feature.jpg differ
diff --git a/exampleSite/content/posts/post-with-images/index.md b/exampleSite/content/posts/post-with-images/index.md
index 65d729b..64c0ef5 100644
--- a/exampleSite/content/posts/post-with-images/index.md
+++ b/exampleSite/content/posts/post-with-images/index.md
@@ -8,6 +8,10 @@ tags:
   - Open Source
   - Development
 resources:
+  - name: feature
+    src: "images/feature.jpg"
+    params:
+      credits: "[Angelina Litvin](https://unsplash.com/@linalitvina) on [Unsplash](https://unsplash.com/s/photos/writing)"
   - name: testimage
     src: "images/testimage.jpg"
     title: This is a test image
diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index bd97f27..128dc36 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -51,7 +51,7 @@
             <published>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</published>
             <updated>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
             {{ $desc := .Description | default "" }}
-            {{ $description := (cond (eq "" $desc) "" (printf "<blockquote>%s</blockquote>" ($desc | markdownify))) }}
+            {{ $description := (cond (eq "" $desc) "" (printf "<blockquote>%s</blockquote>" ($desc | $.Page.RenderString))) }}
             {{ printf `<content type="html"><![CDATA[%s%s]]></content>` $description .Content | safeHTML }}
             {{ with .Site.Taxonomies }}
                 {{ range $taxo,$_ := . }} <!-- Defaults taxos: "tags", "categories" -->
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3b68666..991e397 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -10,7 +10,7 @@
                     <img src="{{ $featured.Permalink }}" alt="{{ default $.Title .Params.description }}" >
                 </picture>
                 {{ with $source.Params.credits }}
-                <span>Credits: {{ . | markdownify | safeHTML }}</span>
+                <span>Credits: {{ . | $.Page.RenderString | safeHTML }}</span>
                 {{ end }}
             </div>
             {{ end }}
diff --git a/layouts/shortcodes/columns.html b/layouts/shortcodes/columns.html
index 6c73189..8635c0d 100644
--- a/layouts/shortcodes/columns.html
+++ b/layouts/shortcodes/columns.html
@@ -1,7 +1,7 @@
 <div class="gblog-columns flex flex-wrap">
   {{ range split .Inner "<--->" }}
   <div class="gblog-columns__content gblog-markdown--nested flex-even">
-    {{ . | markdownify }}
+    {{ . | $.Page.RenderString }}
   </div>
   {{ end }}
 </div>
diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html
index fd475d5..d2c8493 100644
--- a/layouts/shortcodes/expand.html
+++ b/layouts/shortcodes/expand.html
@@ -6,6 +6,6 @@
   </label>
   <input id="{{ $id }}-{{ .Ordinal }}" type="checkbox" class="gblog-expand__control hidden" />
   <div class="gblog-markdown--nested gblog-expand__content">
-    {{ .Inner | markdownify }}
+    {{ .Inner | $.Page.RenderString }}
   </div>
 </div>
diff --git a/layouts/shortcodes/hint.html b/layouts/shortcodes/hint.html
index 2ef216b..e93cbc1 100644
--- a/layouts/shortcodes/hint.html
+++ b/layouts/shortcodes/hint.html
@@ -1,3 +1,3 @@
 <blockquote class="gblog-hint {{ .Get 0 }}">
-  {{ .Inner | markdownify }}
+  {{ .Inner | $.Page.RenderString }}
 </blockquote>
diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
index b6b0a12..5976c37 100644
--- a/layouts/shortcodes/img.html
+++ b/layouts/shortcodes/img.html
@@ -31,7 +31,7 @@
             {{ end }}/>
     </a>
     {{ with $caption }}
-    <figcaption>{{ . }}{{ with $source.Params.credits }} ({{ . | markdownify }}){{ end }}</figcaption>
+    <figcaption>{{ . }}{{ with $source.Params.credits }} ({{ . | $.Page.RenderString }}){{ end }}</figcaption>
     {{ end }}
 </figure>
 </div>
diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html
index 7a1e6a2..246238a 100644
--- a/layouts/shortcodes/tabs.html
+++ b/layouts/shortcodes/tabs.html
@@ -10,7 +10,7 @@
       {{ $tab.Name }}
     </label>
     <div class="gblog-markdown--nested gblog-tabs__content">
-      {{ .Content | markdownify }}
+      {{ .Content | $.Page.RenderString }}
     </div>
   {{ end }}
 </div>