diff --git a/source/talks.html.twig b/source/talks.html.twig
index a134d6c4..031a7c12 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -28,29 +28,31 @@ talks:
         date: 2018-09-05
 ---
 {% block content %}
-    <div class="mb-8">
-        <p>I regularly speak at conferences and user groups about a range of subjects including PHP, Drupal, automated testing, Git and systems administration.</p>
-    </div>
+    <div class="spaced-y-10">
+        <div>
+            <h2 class="mb-4">Upcoming Talks</h2>
 
-    <div class="mb-8">
-        <h2 class="mb-2">Upcoming Talks</h2>
+            <div class="spaced-y-8">
+                {% for talk in getUpcomingTalks(page.talks|merge(data.talks)) %}
+                    <div class="bg-blue-lighter">
+                        <h3>{{ talk.title }}</h3>
+                    </div>
+                {% else %}
+                    <p>sdf</p>
+                {% endfor %}
+            </div>
+        </div>
 
-        {% set upcoming_talks = getUpcomingTalks(data.talks|merge(page.talks), site.events) %}
-        {% if not upcoming_talks.empty %}
-            {% include "talks/table" with {
-                talks: upcoming_talks,
-                upcoming: true,
-            } %}
-        {% else %}
-            <p>Nothing scheduled at the moment.</p>
-        {% endif %}
-    </div>
+        <div>
+            <h2 class="mb-4">Previous Talks</h2>
 
-    <div>
-        <h2 class="mb-2">Previous Talks</h2>
-
-        {% include "talks/table" with {
-            talks: getPastTalks(data.talks|merge(page.talks), site.events)
-        } %}
+            <div class="spaced-y-8">
+                {% for talk in getPastTalks(page.talks|merge(data.talks))|reverse %}
+                    <div class="bg-blue-lighter">
+                        <h3>{{ talk.title }}</h3>
+                    </div>
+                {% endfor %}
+            </div>
+        </div>
     </div>
 {% endblock %}