diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
new file mode 100644
index 0000000..9dcb7c1
--- /dev/null
+++ b/layouts/_default/_markup/render-image.html
@@ -0,0 +1 @@
+<a href="#{{ .Destination | md5 }}-lightbox"><img src="{{ .Destination | safeURL }}" alt="{{ .Text }}" {{ with .Title}} title="{{ . }}"{{ end }} /></a>
\ No newline at end of file
diff --git a/layouts/_default/list.jsonfeed.json b/layouts/_default/list.jsonfeed.json
index c016cf3..2c65060 100644
--- a/layouts/_default/list.jsonfeed.json
+++ b/layouts/_default/list.jsonfeed.json
@@ -26,7 +26,7 @@
             "id": "{{ .Permalink }}",
             "url": "{{ .Permalink }}",
             "title": {{ .Title | jsonify }},
-            "content_html": {{ .Content | jsonify }},
+            "content_html": {{ partial "cleanedContent.json" . }},
             "summary": {{ .Summary | jsonify }},
             "date_published": {{ dateFormat "2006-01-02T15:04:05-07:00" .Date | jsonify }},
             "date_modified": {{ dateFormat "2006-01-02T15:04:05-07:00" .Lastmod | jsonify }},
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index d65c283..33deff7 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -28,7 +28,7 @@
       <link>{{ .Permalink }}</link>
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
       <guid>{{ .Permalink }}</guid>
-      <description>{{ .Content | html }}</description>
+      <description>{{ partial "cleanedContent.xml" . }}</description>
     </item>
     {{ end }}
   </channel>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 95508ff..6f67ef8 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -17,6 +17,11 @@
 			<p><audio controls	preload="metadata" style="width: 100%;"><source src="{{ . }}"/></audio></p>
 			{{ end }}
 			{{ .Content }}
+			{{ range $i, $image := .Params.images }}
+			<a href="#_" class="lightbox" id="{{ $image | md5 }}-lightbox">
+				<img src="{{ $image | safeURL }}">
+			</a>
+			{{ end }}
 			{{ with .Params.externalUrl }}
 			<p><a class="u-bookmark-of" href="{{ . }}" target="_blank">{{ . }}</a></p>
 			{{ end }}
diff --git a/layouts/partials/cleanedContent.json b/layouts/partials/cleanedContent.json
new file mode 100644
index 0000000..59fd422
--- /dev/null
+++ b/layouts/partials/cleanedContent.json
@@ -0,0 +1 @@
+{{ (( htmlUnescape .Content | safeHTML ) | replaceRE "<a href=\".*lightbox\">(.*)</a>" "$1" | replaceRE "href=\"/([^\"]*)\"" ( printf "href=\"%s$1\"" ( "" | absURL ) ) ) | jsonify }}
\ No newline at end of file
diff --git a/layouts/partials/cleanedContent.xml b/layouts/partials/cleanedContent.xml
new file mode 100644
index 0000000..04647ef
--- /dev/null
+++ b/layouts/partials/cleanedContent.xml
@@ -0,0 +1 @@
+{{ (( htmlUnescape .Content | safeHTML ) | replaceRE "<a href=\".*lightbox\">(.*)</a>" "$1" | replaceRE "href=\"/([^\"]*)\"" ( printf "href=\"%s$1\"" ( "" | absURL ) ) ) | html }}
\ No newline at end of file