diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html
index 86dd22c..fde6de3 100644
--- a/layouts/shortcodes/video.html
+++ b/layouts/shortcodes/video.html
@@ -1,3 +1,33 @@
-<video autoplay loop style="max-width: 100%;">
-    <source src="{{ .Get 0 }}" />
-</video>
+{{ $h265 := .Get "h265" }}
+{{ $h264 := .Get "h264" }}
+{{ $vp9 := .Get "vp9" }}
+{{ $vp8 := .Get "vp8" }}
+{{ $caption := .Get "caption" }}
+{{ $attr := .Get "attr" }}
+{{ $attrlink := .Get "attrlink" }}
+<figure>
+    <video autoplay loop controls style="max-width: 100%;">
+        {{ if $h265 }}
+            <source src='{{ $h265 }}' />
+        {{ end }}
+        {{ if $h264 }}
+            <source src='{{ $h264 }}' />
+        {{ end }}
+        {{ if $vp9 }}
+            <source src='{{ $vp9 }}' />
+        {{ end }}
+        {{ if $vp8 }}
+            <source src='{{ $vp8 }}' />
+        {{ end }}
+    </video>
+    {{ if or $caption $attr }}
+        <figcaption>
+            {{ if $caption }}
+                <p>{{ . }}</p>
+            {{ end }}
+            <p>
+                {{ if $attrlink }}<a href="{{ $attrlink }}">{{ end }}{{ $attr }}{{ if $attrlink }}</a>{{ end }}
+            </p>
+        </figcaption>
+    {{ end }}
+</figure>