diff --git a/assets/css/bobastyle.css b/assets/css/bobastyle.css
index a19f698..bc794e5 100644
--- a/assets/css/bobastyle.css
+++ b/assets/css/bobastyle.css
@@ -21,7 +21,7 @@
   margin-top: 10px;
 }
 
-.post-image {
+.post-media {
   margin-top: 15px;
 }
 
@@ -91,7 +91,7 @@ body {
   max-width: 720px;
 }
 
-img {
+img, video {
   max-width: 100%;
 }
 
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 7ed6c15..dfe2ccd 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -69,9 +69,17 @@
     {{ end }}
 
     {{ with .Resources.GetMatch "feature" }}
-    <div class="post-image">
+    <div class="post-media">
         <img src="{{ .Permalink }}" alt="{{ .Title }}" />
     </div>
+    {{ else }}
+    {{ with .Resources.GetMatch "feature-video" }}
+    <div class="post-media">
+        <video controls>
+            <source src="{{ .Permalink }}" alt="{{ .Title }}">
+        </video>
+    </div>
+    {{ end }}
     {{ end }}
 
     <div class="post-description">
diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html
new file mode 100644
index 0000000..3e852a2
--- /dev/null
+++ b/layouts/shortcodes/video.html
@@ -0,0 +1,4 @@
+<video controls>
+    <source src="{{ .Get "src" }}" alt="{{ .Get "title" }}">
+    Your browser does not support video.
+</video>