diff --git a/themes/hello-friend-ng/layouts/partials/singleImage-embed.html b/themes/hello-friend-ng/layouts/partials/singleImage-embed.html
new file mode 100644
index 00000000..43e0c1e0
--- /dev/null
+++ b/themes/hello-friend-ng/layouts/partials/singleImage-embed.html
@@ -0,0 +1,20 @@
+{{ $image := . }}
+{{ $full := index ($image.Links) 0 }}
+{{ $alt := $image.Caption }}
+{{ if not $alt}}
+{{ $alt = $image.Title }}
+{{ end }}
+{{ $srcset := "" }}
+{{ range $image.Links }}
+{{ $srcset = printf "%s %s %vw," $srcset .Url .Width }}
+{{ end }}
+{{ $srcset = trim $srcset ","}}
+<!-- start embed -->
+<a class="gallery-item" href="{{ $full.Url }}" data-pswp-src="{{ $full.Url }}" data-pswp-width="{{ $full.Width }}"
+  data-pswp-height="{{ $full.Height }}" title="{{ .Title }}" itemscope itemtype="https://schema.org/ImageObject"
+  style="aspect-ratio: {{ $full.Width }} / {{ $full.Height }}" {{ printf "data-pswp-srcset=%q" $srcset | safeHTMLAttr
+  }}>
+  <img loading="lazy" width="{{ $full.Width }}" height="{{ $full.Height }}" src="{{ $full.Url }}" alt="{{ $alt }}"
+    srcset="{{ $srcset }}" >
+</a>
+<!-- end embed -->
\ No newline at end of file
diff --git a/themes/hello-friend-ng/layouts/shortcodes/albumImage.html b/themes/hello-friend-ng/layouts/shortcodes/albumImage.html
index 7886ba62..44772fb2 100644
--- a/themes/hello-friend-ng/layouts/shortcodes/albumImage.html
+++ b/themes/hello-friend-ng/layouts/shortcodes/albumImage.html
@@ -3,7 +3,7 @@
 {{ $album := .Site.GetPage $albumName }}
 {{ $image := index $album.Params.Pictures $imageIndex }}
 {{ with $image }}
-<div class="photo-list" >
-    {{ partial "singleImage.html" . }}
+<div class="photo-list">
+{{ partial "singleImage-embed.html" . }}
 </div>
 {{ end }}
\ No newline at end of file