diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
index 9957c21..eef90e0 100644
--- a/layouts/shortcodes/img.html
+++ b/layouts/shortcodes/img.html
@@ -1,16 +1,27 @@
 {{ $img := $.Page.Resources.GetMatch (.Get "src")}}
+{{ $name_splitted := split $img.RelPermalink "." }}
+{{ $name_base := index $name_splitted 0 }}
+{{ $ext_base := index $name_splitted 1 }}
 <figure {{ with .Get "class" }} class="{{ . }}"{{ end }}>
 	{{ with .Get "link" }}
 		<a href="{{ . | absURL }}">
+	{{ else }}
+		<a href="{{ $img.RelPermalink }}">
 	{{ end }}
-	<img src="{{ $img.RelPermalink }}"
-	{{ with .Get "alt"}} alt="{{ . }}"{{ end }}
-	{{ with .Get "title"}} title="{{ . }}"{{ end }}
-	{{ with .Get "height"}} height="{{ . }}"{{ end }}
-	{{ with .Get "width"}} width="{{ . }}"{{ end }} />
-	{{ with .Get "link" }}
-		</a>
-	{{ end }}
+	<picture>
+		{{ if ( in "svg ico gif" $ext_base ) }}
+			<img src="{{ $img.RelPermalink }}"
+			{{ with .Get "alt"}} alt="{{ . }}"{{ end }}
+			{{ with .Get "title"}} title="{{ . }}"{{ end }}/>
+		{{ else }}
+			<source srcset="{{ $name_base }}.thumb.avif" type="image/avif"/>
+			<source srcset="{{ $name_base }}.thumb.webp" type="image/webp"/>
+			<img src="{{ $name_base }}.thumb.{{ $ext_base }}"
+			{{ with .Get "alt"}} alt="{{ . }}"{{ end }}
+			{{ with .Get "title"}} title="{{ . }}"{{ end }}/>
+		{{ end }}
+	</picture>
+	</a>
 	{{ if .Get "caption" }}
 	<figcaption>
 		<p>{{ .Get "caption" }}