diff --git a/themes/v2/layouts/shortcodes/thumbnail.html b/themes/v2/layouts/shortcodes/thumbnail.html
new file mode 100644
index 0000000..ccfcb8b
--- /dev/null
+++ b/themes/v2/layouts/shortcodes/thumbnail.html
@@ -0,0 +1,14 @@
+{{ $orig := .Page.Resources.GetMatch (printf "*%s*" (.Get 0)) }}
+{{ $options := .Get 1 }}
+{{ $img := $orig.Fill $options }}
+
+<figure>
+  <a href="{{ $orig.RelPermalink }}">
+    <img src="{{ $img.RelPermalink }}" width="{{ $img.Width }}" height="{{ $img.Height }}">
+    <figcaption>
+      {{ with .Inner }}
+        {{ . }}
+      {{ end }}
+    </figcaption>
+  </a>
+</figure>