diff --git a/data/videos.yaml b/data/videos.yaml
index 5c81aad..b971f32 100644
--- a/data/videos.yaml
+++ b/data/videos.yaml
@@ -5,7 +5,10 @@ icon: stroke_speaker
 content:
   - title: IPFS Alpha - Why we must redistribute the web
     website: https://www.youtube.com/watch?v=skMTdSEaCtA
+    picture: /images/ipfs-alpha.jpg
   - title: Juan Benet at Stanford 2015
     website: https://www.youtube.com/watch?v=HUVmypx9HGI
+    picture: /images/stanford-2015.jpg
   - title: Juan Benet at Fullstack Fest 2016
     website: https://www.youtube.com/watch?v=jONZtXMu03w
+    picture: /images/fullstack-fest-2016.jpg
diff --git a/scripts/make-data.js b/scripts/make-data.js
index 96fbefe..967e70e 100644
--- a/scripts/make-data.js
+++ b/scripts/make-data.js
@@ -8,13 +8,9 @@ const contentDir = path.join(__dirname, '../src/content')
 const indexesDir = path.join(__dirname, '../src/layouts/partials/indexes')
 
 const processDataType = (data) => {
-  const content = data.content.map((info, index) => {
+  const content = data.content.map(info => {
     const { website, ...more } = info
 
-    if (data.title === 'Videos' && website.includes('youtube')) {
-      more.youtube = website.replace('https://www.youtube.com/watch?v=', '')
-    }
-
     return {
       website: website,
       categories: [data.title.toLowerCase()],
diff --git a/src/layouts/partials/list.html b/src/layouts/partials/list.html
index 6b7717c..5324c9d 100644
--- a/src/layouts/partials/list.html
+++ b/src/layouts/partials/list.html
@@ -39,17 +39,9 @@
 
         {{- if isset .Params "picture" -}}
         <div class="mt2 mw5">
-          <img class="br2" src="{{ .Site.BaseURL }}{{ .Params.picture }}" >
-        </div>
-        {{ end }}
-
-        {{- if isset .Params "youtube" -}}
-        <div class="relative mt2 mw5" style="height: 0; padding-bottom: 56.25%">
-          <iframe class="absolute top-0 left-0 w-100 h-100"
-            type="text/html"
-            src="https://www.youtube.com/embed/{{ .Params.youtube }}"
-            allowfullscreen
-            frameborder="0"></iframe>
+          <a target="_blank" class="no-underline charcoal" href="{{ if .Params.website }}{{ .Params.website }}{{ else if .Params.source }}{{ .Params.source }}{{ else if .Params.demo }}{{ .Params.demo }}{{ end }}">
+            <img class="br2" src="{{ .Site.BaseURL }}{{ .Params.picture }}" >
+          </a>
         </div>
         {{ end }}
 
diff --git a/src/static/images/fullstack-fest-2016.jpg b/src/static/images/fullstack-fest-2016.jpg
new file mode 100644
index 0000000..9e3f504
Binary files /dev/null and b/src/static/images/fullstack-fest-2016.jpg differ
diff --git a/src/static/images/ipfs-alpha.jpg b/src/static/images/ipfs-alpha.jpg
new file mode 100644
index 0000000..0a3a36d
Binary files /dev/null and b/src/static/images/ipfs-alpha.jpg differ
diff --git a/src/static/images/stanford-2015.jpg b/src/static/images/stanford-2015.jpg
new file mode 100644
index 0000000..76998bd
Binary files /dev/null and b/src/static/images/stanford-2015.jpg differ