diff --git a/source/talks.html.twig b/source/talks.html.twig
new file mode 100644
index 00000000..fca8345f
--- /dev/null
+++ b/source/talks.html.twig
@@ -0,0 +1,78 @@
+---
+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 get in touch.
+
+There is also information about events that I’ve attended and spoken at on my
+Lanyrd and Joind.in profiles.
+
+{% set now = 'today'|date('U') %}
+{% set talks = data.talks %}
+
+{% set found, year, new_year = false, '0', false %}
+
+{% for talk in talks if talk.date >= now %}
+ {% if loop.first %}
+ Upcoming Talks
+ {% endif %}
+
+ {% set this_year %}{{ talk.date|date('Y') }}{% endset %}
+
+ {% if this_year != year %}
+ {% if new_year %}
+ {# Close the list for the previous year. #}
+
+ {% endif %}
+
+ {% set found, year = true, this_year %}
+
+ {{ this_year }}
+
+ {% else %}
+ {% set new_year = true %}
+ {% endif %}
+
+ {% include 'talk_listing_item' %}
+{% endfor %}
+
+{% if found %}
+
+{% endif %}
+
+{% set found, year, new_year = false, '0', false %}
+
+{% for talk in talks if talk.date < now %}
+ {% if loop.first %}
+ Previous Talks
+ {% endif %}
+
+ {% set this_year %}{{ talk.date|date('Y') }}{% endset %}
+
+ {% if this_year != year %}
+ {% if new_year %}
+ {# Close the list for the previous year. #}
+
+ {% endif %}
+
+ {% set year, found = this_year, true %}
+
+ {{ this_year }}
+
+ {% else %}
+ {% set new_year = true %}
+ {% endif %}
+
+ {% include 'talk_listing_item' %}
+{% endfor %}
+
+{% if found %}
+
+{% endif %}
diff --git a/source/talks.twig b/source/talks.twig
deleted file mode 100644
index b307e47c..00000000
--- a/source/talks.twig
+++ /dev/null
@@ -1,91 +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'
-#talks:
-# - { date: 2012-09-05, location: Unified Diff, title: 'So, What’s This Drupal Thing?' }
-# - { date: 2013-07-10, location: SWDUG (South Wales Drupal user group), title: Drupal and the LDAP Module }
-# - { date: 2014-03-01, location: DrupalCamp London, title: 'Never Commit to Master: An Introduction to Git Flow' }
-# - { date: 2014-07-02, location: Drupal Bristol user group, title: drush make drupalbristol }
-# - { date: 2014-08-19, location: SWDUG, title: About the Drupal Association }
-# - { date: 2015-01-18, location: DrupalCamp Brighton, title: "Drupal.org in 2015: What's Coming Next" }
-# - { date: 2015-02-28, location: DrupalCamp London, title: "Drupal.org in 2015: What's Coming Next" }
-# - { date: 2015-04-08, location: PHPSW, title: Drupal 8 (lightning talk) }
-# - { date: 2015-07-25, location: DrupalCamp North, title: Test Drive Twig with Sculpin }
-# - { date: 2015-08-25, location: 'umBristol (Bristol Umbraco user group)', title: 'Dancing for Drupal (CMS Dance-Off)' }
-# - { date: 2015-11-01, location: Accessible Bristol, title: Accessible Drupal, fuzzy_date: true }
-# - { date: 2015-11-01, location: Unified Diff, title: Building Static Websites with Sculpin, fuzzy_date: true }
-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 get in touch.
-
-There is also information about events that I’ve attended and spoken at on my
-Lanyrd and Joind.in profiles.
-
-{% set now = 'today'|date('U') %}
-{% set talks = data.talks %}
-
-{% set found, year, new_year = false, '0', false %}
-
-{% for talk in talks if talk.date >= now %}
- {% if loop.first %}
- Upcoming Talks
- {% endif %}
-
- {% set this_year %}{{ talk.date|date('Y') }}{% endset %}
-
- {% if this_year != year %}
- {% if new_year %}
- {# Close the list for the previous year. #}
-
- {% endif %}
-
- {% set found, year = true, this_year %}
-
- {{ this_year }}
-
- {% else %}
- {% set new_year = true %}
- {% endif %}
-
- {% include 'talk_listing_item' %}
-{% endfor %}
-
-{% if found %}
-
-{% endif %}
-
-{% set found, year, new_year = false, '0', false %}
-
-{% for talk in talks if talk.date < now %}
- {% if loop.first %}
- Previous Talks
- {% endif %}
-
- {% set this_year %}{{ talk.date|date('Y') }}{% endset %}
-
- {% if this_year != year %}
- {% if new_year %}
- {# Close the list for the previous year. #}
-
- {% endif %}
-
- {% set year, found = this_year, true %}
-
- {{ this_year }}
-
- {% else %}
- {% set new_year = true %}
- {% endif %}
-
- {% include 'talk_listing_item' %}
-{% endfor %}
-
-{% if found %}
-
-{% endif %}