diff --git a/source/_includes/talk/events.html.twig b/source/_includes/talk/events.html.twig
new file mode 100644
index 00000000..a43848a6
--- /dev/null
+++ b/source/_includes/talk/events.html.twig
@@ -0,0 +1,20 @@
+<div class="mt4">
+    <h2>Events</h2>
+
+    {% set events = [] %}
+    {% for date in site.events.dates %}
+        {% set key = (date.talk.id is defined) ? date.talk.id : date.talk %}
+        {% set talk = (page.id is defined) ? page.id : page.url|split('/')|last %}
+        {% if key == talk %}
+            {% set events = events|merge([{
+                date: date,
+                event: site.events.events[date.event],
+            }]) %}
+        {% endif %}
+    {% endfor %}
+
+    {% include 'talks-table' with {
+        events: events,
+        talk_page: true,
+    } %}
+</div>
diff --git a/source/_includes/talk/slides.html.twig b/source/_includes/talk/slides.html.twig
new file mode 100644
index 00000000..0821e562
--- /dev/null
+++ b/source/_includes/talk/slides.html.twig
@@ -0,0 +1,8 @@
+{% if page.slides.embed %}
+    <div class="mt2">
+        <h2>Slides</h2>
+        <div class="slides w-100 bg-center">
+            {{ page.slides.embed|raw }}
+        </div>
+    </div>
+{% endif %}
diff --git a/source/_includes/talk/video.html.twig b/source/_includes/talk/video.html.twig
new file mode 100644
index 00000000..981bd8d1
--- /dev/null
+++ b/source/_includes/talk/video.html.twig
@@ -0,0 +1,9 @@
+{% if page.video.embed %}
+    <div class="mt2">
+        <h2>Video</h2>
+
+        <div class="video w-100 pa0 relative">
+            {{ page.video.embed|raw }}
+        </div>
+    </div>
+{% endif %}
diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
index 15190273..5fcb715b 100644
--- a/source/_layouts/talk.html.twig
+++ b/source/_layouts/talk.html.twig
@@ -5,45 +5,9 @@
         {% block content %}{% endblock %}
     </div>
 
-    {% if page.slides.embed %}
-        <div class="mt2">
-            <h2>Slides</h2>
-            <div class="slides w-100 bg-center">
-                {{ page.slides.embed|raw }}
-            </div>
-        </div>
-    {% endif %}
-
-    {% if page.video.embed %}
-        <div class="mt2">
-            <h2>Video</h2>
-
-            <div class="video w-100 pa0 relative">
-                {{ page.video.embed|raw }}
-            </div>
-        </div>
-    {% endif %}
-
-    <div class="mt4">
-        <h2>Events</h2>
-
-        {% set events = [] %}
-        {% for date in site.events.dates %}
-            {% set key = (date.talk.id is defined) ? date.talk.id : date.talk %}
-            {% set talk = (page.id is defined) ? page.id : page.url|split('/')|last %}
-            {% if key == talk %}
-                {% set events = events|merge([{
-                    date: date,
-                    event: site.events.events[date.event],
-                }]) %}
-            {% endif %}
-        {% endfor %}
-
-        {% include 'talks-table' with {
-            events: events,
-            talk_page: true,
-        } %}
-    </div>
+    {% include 'talk/slides' %}
+    {% include 'talk/video' %}
+    {% include 'talk/events' %}
 {% endblock %}
 
 {% block stylesheets %}