diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing.md b/source/_talks/2012-09-05-what-is-this-drupal-thing.md
index bdab95e3..42f775d8 100644
--- a/source/_talks/2012-09-05-what-is-this-drupal-thing.md
+++ b/source/_talks/2012-09-05-what-is-this-drupal-thing.md
@@ -1,9 +1,8 @@
 ---
 nav: talks
 title: So, What is This Drupal Thing?
-location: Unified Diff
+event:
+    name: Unified Diff
 slides:
-    url:
-    embed:
 slug: what-this-drupal-thing
 ---
diff --git a/source/_talks/2013-07-10-drupal-ldap.md b/source/_talks/2013-07-10-drupal-ldap.md
index bbab25d4..49f769a1 100644
--- a/source/_talks/2013-07-10-drupal-ldap.md
+++ b/source/_talks/2013-07-10-drupal-ldap.md
@@ -1,5 +1,6 @@
 ---
 nav: talks
 title: Drupal and the LDAP Module
-location: SWDUG (South Wales Drupal user group)
+event:
+    name: SWDUG (South Wales Drupal user group)
 ---
diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md
index 354de01a..6aedf01b 100644
--- a/source/_talks/2014-03-01-git-flow.md
+++ b/source/_talks/2014-03-01-git-flow.md
@@ -1,7 +1,8 @@
 ---
 nav: talks
 title: Never Commit to Master - An Introduction to Git Flow
-location: DrupalCamp London
+event:
+    name: DrupalCamp London
 slides:
     url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
     embed: <script async class="speakerdeck-embed" data-id="201559e0f103013198dd5a5f6f23ab67" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md
index 1283a327..4e574e11 100644
--- a/source/_talks/2014-07-02-drush-make-drupalbristol.md
+++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md
@@ -1,7 +1,8 @@
 ---
 nav: talks
 title: drush make drupalbristol
-location: Bristol Drupal user group
+event:
+    name: Bristol Drupal user group
 slides:
     url: https://speakerdeck.com/opdavies/drush-make-drupalbristol
     embed: <script async class="speakerdeck-embed" data-id="42605700f102013198de5a5f6f23ab67" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
diff --git a/source/_talks/2014-08-19-drupal-association.md b/source/_talks/2014-08-19-drupal-association.md
index c78c37fb..b961f212 100644
--- a/source/_talks/2014-08-19-drupal-association.md
+++ b/source/_talks/2014-08-19-drupal-association.md
@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: About the Drupal Association
-location: SWDUG
+event:
+    name: SWDUG
 ---
 An impromptu talk about the [Drupal Association](https://association.drupal.org), and what I’ve been working on since joining the Engineering team earlier in the year.
diff --git a/source/_talks/2015-01-18-drupalorg.md b/source/_talks/2015-01-18-drupalorg.md
index f5005a51..7d952c67 100644
--- a/source/_talks/2015-01-18-drupalorg.md
+++ b/source/_talks/2015-01-18-drupalorg.md
@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Drupal.org in 2015: What's Coming Next
-location: DrupalCamp Brighton
+event:
+    name: DrupalCamp Brighton
 slug: drupalorg-2015
 ---
diff --git a/source/_talks/2015-02-28-drupalorg.md b/source/_talks/2015-02-28-drupalorg.md
index 90735687..0b071649 100644
--- a/source/_talks/2015-02-28-drupalorg.md
+++ b/source/_talks/2015-02-28-drupalorg.md
@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Drupal.org in 2015: What's Coming Next
-location: DrupalCamp London
+event:
+    name: DrupalCamp London
 slug: drupalorg-2015
 ---
diff --git a/source/_talks/2015-04-08-drupal8.md b/source/_talks/2015-04-08-drupal8.md
index f6903eb6..f166247c 100644
--- a/source/_talks/2015-04-08-drupal8.md
+++ b/source/_talks/2015-04-08-drupal8.md
@@ -1,7 +1,8 @@
 ---
 nav: talks
 title: Drupal 8
-location: PHPSW
+event:
+    name: PHPSW
 slides:
     url: https://speakerdeck.com/opdavies/drupal-8
     embed: <script async class="speakerdeck-embed" data-id="46ba4ba577d94a32b7abdade610ceb69" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
diff --git a/source/_talks/2015-07-25-sculpin.md b/source/_talks/2015-07-25-sculpin.md
index 4496d448..21f29a0f 100644
--- a/source/_talks/2015-07-25-sculpin.md
+++ b/source/_talks/2015-07-25-sculpin.md
@@ -1,7 +1,8 @@
 ---
 nav: talks
 title: Test Drive Twig with Sculpin
-location: DrupalCamp North
+event:
+    name: DrupalCamp North
 slides:
     url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
     embed: <script async class="speakerdeck-embed" data-id="54589d2e50a3476a9a75aed809e9edf1" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
diff --git a/source/_talks/2015-08-25-dancing-for-drupal.md b/source/_talks/2015-08-25-dancing-for-drupal.md
index 6d6eed23..5e7f7764 100644
--- a/source/_talks/2015-08-25-dancing-for-drupal.md
+++ b/source/_talks/2015-08-25-dancing-for-drupal.md
@@ -1,7 +1,8 @@
 ---
 nav: talks
 title: Dancing for Drupal
-location: umBristol (Bristol Umbraco user group)
+event:
+    name: umBristol (Bristol Umbraco user group)
 slides:
     url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
     embed: <script async class="speakerdeck-embed" data-id="ffa9b6dea6dc4a8eb207b9982ed6e1bd" data-ratio="1.33333333333333" src="//speakerdeck.com/assets/embed.js"></script>
diff --git a/source/_talks/2015-10-14-sculpin.md b/source/_talks/2015-10-14-sculpin.md
index 3d297c9e..e9896a7d 100644
--- a/source/_talks/2015-10-14-sculpin.md
+++ b/source/_talks/2015-10-14-sculpin.md
@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Building Static Websites with Sculpin
-location: PHPSW
+event:
+    name: PHPSW
 ---
 TBC.
diff --git a/source/_talks/2015-11-01-accessible-drupal.md b/source/_talks/2015-11-01-accessible-drupal.md
index 261d856d..dfd7f052 100644
--- a/source/_talks/2015-11-01-accessible-drupal.md
+++ b/source/_talks/2015-11-01-accessible-drupal.md
@@ -1,7 +1,8 @@
 ---
 nav: talks
 title: Accessible Drupal
-location: Accessible Bristol
+event:
+    name: Accessible Bristol
 fuzzy_date: yes
 draft: yes
 ---
diff --git a/source/_talks/2015-11-19-sculpin.md b/source/_talks/2015-11-19-sculpin.md
index bd721058..9feacf7c 100644
--- a/source/_talks/2015-11-19-sculpin.md
+++ b/source/_talks/2015-11-19-sculpin.md
@@ -1,7 +1,8 @@
 ---
 nav: talks
 title: Building Static Websites with Sculpin
-location: Unified Diff
+event:
+    name: Unified Diff
 slug: sculpin
 ---
 TBC.
diff --git a/source/themes/opdavies/oliverdavies/_layouts/talk.html.twig b/source/themes/opdavies/oliverdavies/_layouts/talk.html.twig
index ad1e0678..acc8776a 100644
--- a/source/themes/opdavies/oliverdavies/_layouts/talk.html.twig
+++ b/source/themes/opdavies/oliverdavies/_layouts/talk.html.twig
@@ -5,7 +5,7 @@
         <h1>{{ page.title }}</h1>
 
         <p>
-            At {{ page.location }} -
+            At {{ page.event.name }} -
             {% spaceless %}{% if page.fuzzy_date %}
                 {{ page.date|date(site.fuzzy_date_format) }}
             {% else %}
diff --git a/source/themes/opdavies/oliverdavies/_partials/talk-listing-item.html.twig b/source/themes/opdavies/oliverdavies/_partials/talk-listing-item.html.twig
index 548d3408..d92c0339 100644
--- a/source/themes/opdavies/oliverdavies/_partials/talk-listing-item.html.twig
+++ b/source/themes/opdavies/oliverdavies/_partials/talk-listing-item.html.twig
@@ -5,7 +5,7 @@
         {% else %}
             {{ talk.date|date('jS F') }}
         {% endif %}
-    {% endspaceless %}</strong> - {{ talk.location }}
+    {% endspaceless %}</strong> - {{ talk.event.name }}
     -
     {% if talk.fuzzy_date %}
         {{ talk.title }}