diff --git a/source/_includes/previous-talks.html.twig b/source/_includes/previous-talks.html.twig
deleted file mode 100644
index b10d207d..00000000
--- a/source/_includes/previous-talks.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% set year = 0 %}
-
-{% for talk in data.talks if date(talk.date) < date('today') %}
-    {% if loop.first %}
-        <h2>Previous Talks</h2>
-    {% endif %}
-
-    {% if talk.date|date('Y') != year %}
-        {% set year = talk.date|date('Y') %}
-
-        </ul>
-        <h3>{{ year }}</h3>
-        <ul>
-    {% endif %}
-
-    <li>
-        {{- include('talk-listing-item') -}}
-    </li>
-{% endfor %}
-
-{% if year != 0 %}
-    </ul>
-{% endif %}
diff --git a/source/_includes/talk-listing-item.html.twig b/source/_includes/talk-listing-item.html.twig
index e0301387..f97c1e69 100644
--- a/source/_includes/talk-listing-item.html.twig
+++ b/source/_includes/talk-listing-item.html.twig
@@ -1,6 +1,8 @@
-{{ talk.event.name }} -
-{% if talk.fuzzy_date %}
-    {{ talk.title }}
-{% else %}
-    <a href="{{ talk.url }}">{{ talk.title }}</a>
-{% endif %}
+<li>
+    {{ talk.event.name }} -
+    {% if talk.fuzzy_date %}
+        {{ talk.title }}
+    {% else %}
+        <a href="{{ talk.url }}">{{ talk.title }}</a>
+    {% endif %}
+</li>
diff --git a/source/_includes/upcoming-talks.html.twig b/source/_includes/upcoming-talks.html.twig
deleted file mode 100644
index fd57dd2d..00000000
--- a/source/_includes/upcoming-talks.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% set year = 0 %}
-
-{% for talk in data.talks if date(talk.date) >= date('today') %}
-    {% if loop.first %}
-        <h2>Upcoming Talks</h2>
-    {% endif %}
-
-    {% if talk.date|date('Y') != year %}
-        {% set year = talk.date|date('Y') %}
-
-        </ul>
-        <h3>{{ year }}</h3>
-        <ul>
-    {% endif %}
-
-    <li>
-        {{- include('talk-listing-item') -}}
-    </li>
-{% endfor %}
-
-{% if year != 0 %}
-    </ul>
-{% endif %}
diff --git a/source/talks.html.twig b/source/talks.html.twig
new file mode 100644
index 00000000..053aa461
--- /dev/null
+++ b/source/talks.html.twig
@@ -0,0 +1,56 @@
+---
+layout: default
+nav: talks
+title: Talks
+meta:
+    description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
+use:
+    - talks
+---
+<h1>Talks</h1>
+
+<p>I regularly speak at conferences and user groups about a range of subjects including Drupal, Sculpin and Git. If you would like to me to speak at your group or conference, please <a href="mailto:{{ site.email }}?subject=Speaking%20enquiry">get in touch</a>.</p>
+<p>There is also information about events that I’ve attended and spoken at on my <a href="{{ site.lanyrd.url }}">Lanyrd</a> and <a href="{{ site.joindin.url }}">Joind.in</a> profiles.</p>
+
+{% set found = false %}
+{% set year = 0 %}
+{% set now = 'now'|date_modify('-2 days')|date('U') %}
+{% for talk in data.talks if talk.date >= now %}
+    {% if loop.first %}
+        {% set found = true %}
+        <h2>Upcoming Talks</h2>
+    {% endif %}
+    
+    {% if talk.date|date('Y') != year %}
+        {% set year = talk.date|date('Y') %}
+        </ul>
+        <h3>{{ year }}</h3>
+        <ul>
+    {% endif %}
+
+    {{ include('talk-listing-item') }}
+{% endfor %}
+{% if found %}
+    </ul>
+{% endif %}
+
+{% set found = false %}
+{% set year = 0 %}
+{% for talk in data.talks if talk.date < now %}
+    {% if loop.first %}
+        {% set found = true %}
+        <h2>Previous Talks</h2>
+    {% endif %}
+
+    {% if talk.date|date('Y') != year %}
+        {% set year = talk.date|date('Y') %}
+        </ul>
+        <h3>{{ year }}</h3>
+        <ul>
+    {% endif %}
+
+    {{ include('talk-listing-item') }}
+{% endfor %}
+{% if found %}
+    </ul>
+{% endif %}
diff --git a/source/talks.md b/source/talks.md
deleted file mode 100644
index 52a362ce..00000000
--- a/source/talks.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: default
-nav: talks
-title: Talks
-meta:
-    description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
-use:
-    - talks
----
-# Talks
-
-I regularly speak at conferences and user groups about a range of subjects including Drupal, Sculpin and Git. If you would like to me to speak at your group or conference, please <a href="mailto:{{ site.email }}?subject=Speaking%20enquiry">get in touch</a>.
-
-There is also information about events that I’ve attended and spoken at on my <a href="{{ site.lanyrd.url }}">Lanyrd</a> and <a href="{{ site.joindin.url }}">Joind.in</a> profiles.
-
-{{ include('upcoming-talks') }}
-{{ include('previous-talks') }}