diff --git a/layouts/shortcodes/gifv.html b/layouts/shortcodes/gifv.html
deleted file mode 100644
index 503d15a..0000000
--- a/layouts/shortcodes/gifv.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Usage: gifv "url|title" "url2|title" -->
-<div class="columns">
-    {{ range $param := .Params }}
-    <!-- gifv -->
-    {{ $items := split $param "|" }}
-    {{ $src := (index $items 0) }}
-    {{ $title := (index $items 1) }}
-    <div class="column">
-        <video preload="auto" autoplay="autoplay" muted="muted" loop="loop" webkit-playsinline="">
-            <source src="{{ $src }}" type="video/mp4">
-            Your browser doesn't support mp4 video. :(
-        </video>
-
-        {{ if $title }}
-            <p class="has-text-centered is-italic has-text-grey-light">{{ $title }}</p>
-        {{ end }}
-    </div>
-    {{ end }}
-</div>
diff --git a/layouts/shortcodes/imgs.html b/layouts/shortcodes/imgs.html
index f5fa671..cce9b95 100644
--- a/layouts/shortcodes/imgs.html
+++ b/layouts/shortcodes/imgs.html
@@ -4,13 +4,22 @@
     {{ $items := split $param "|" }}
     {{ $src := (index $items 0) }}
     {{ $title := (index $items 1) }}
+    {{ $split_src := split $src "." }}
+    {{ $extension := index $split_src (sub (len $split_src) 1) }}
     <div class="column">
-        <a href="{{ $src }}" title="{{ $title }}">
-            <img src="{{ $src }}" alt="{{ $title }}">
-        </a>
+        {{ if eq $extension "mp4" }}
+            <video preload="auto" autoplay="autoplay" muted="muted" loop="loop" webkit-playsinline="">
+                <source src="{{ $src }}" type="video/mp4">
+                Your browser doesn't support mp4 video. :(
+            </video>
+        {{ else }}
+            <a href="{{ $src }}" title="{{ $title }}">
+                <img src="{{ $src }}" alt="{{ $title }}">
+            </a>
+        {{ end }}
         {{ if $title }}
             <p class="has-text-centered is-italic has-text-grey-light">{{ $title }}</p>
         {{ end }}
     </div>
     {{ end }}
-</div>
\ No newline at end of file
+</div>