diff --git a/source/_partials/talk_listing_item.twig b/source/_partials/talk_listing_item.twig
index f3eb4ade..ee691bf6 100644
--- a/source/_partials/talk_listing_item.twig
+++ b/source/_partials/talk_listing_item.twig
@@ -1,26 +1,9 @@
 <li>
-    <strong>
+    <strong>{% spaceless %}
         {% if talk.fuzzy_date %}
             {{ talk.date|date('F') }}
         {% else %}
             {{ talk.date|date('jS F') }}
         {% endif %}
-    </strong> -
-    {% if talk.location_link %}
-        <a href="{{ talk.location_link }}">
-    {% endif %}
-    {{ talk.location }}
-    {% if talk.location_link %}
-        </a>
-    {% endif %}
-    {{ talk.location_suffix }}
-    -
-    {% if talk.title_link %}
-        <a href="{{ talk.title_link }}">
-    {% endif %}
-    {{ talk.title }}
-    {% if talk.title_link %}
-        </a>
-    {% endif %}
-    {{ talk.title_suffix }}
+    {% endspaceless %}</strong> - {{ talk.location|raw }} - {{ talk.title|raw }}
 </li>
diff --git a/source/talks.twig b/source/talks.twig
index de58f40c..6a266b01 100644
--- a/source/talks.twig
+++ b/source/talks.twig
@@ -4,17 +4,17 @@ 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, location_link: http://unifieddiff.co.uk, title: "So, What's This Drupal Thing?", title_link: https://vimeo.com/49827006 }
+    - { date: 2012-09-05, location: <a href="http://unifieddiff.co.uk">Unified Diff</a>, title: '<a href="https://vimeo.com/49827006">So, What’s This Drupal Thing?</a>' }
     - { date: 2013-07-10, location: SWDUG (South Wales Drupal user group), title: Drupal and the LDAP Module }
-    - { date: 2014-03-01, location: DrupalCamp London, location_link: http://drupalcamplondon.co.uk, title: "Never Commit to Master: An Introduction to Git Flow", title_link: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow }
-    - { date: 2014-07-02, location: Drupal Bristol user group, title: drush make drupalbristol, title_link: https://speakerdeck.com/opdavies/drush-make-drupalbristol }
+    - { date: 2014-03-01, location: <a href="http://drupalcamplondon.co.uk">DrupalCamp London</a>, title: '<a href="https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow">Never Commit to Master: An Introduction to Git Flow</a>' }
+    - { date: 2014-07-02, location: Drupal Bristol user group, title: <a href="https://speakerdeck.com/opdavies/drush-make-drupalbristol">drush make drupalbristol</a> }
     - { date: 2014-08-19, location: SWDUG, title: About the Drupal Association }
-    - { date: 2015-01-18, location: DrupalCamp Brighton, location_link: http://www.drupalcampbrighton.co.uk, title: "Drupal.org in 2015: What's Coming Next" }
+    - { date: 2015-01-18, location: <a href="http://www.drupalcampbrighton.co.uk">DrupalCamp Brighton</a>, 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, location_link: http://phpsw.uk, title: Drupal 8, title_suffix: (lightning talk), title_link: https://joind.in/talk/view/14380 }
-    - { date: 2015-07-25, location: DrupalCamp North, location_link: http://drupalcampnorth.org, title: Test Drive Twig with Sculpin, title_link: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin }
-    - { date: 2015-08-25, location: umBristol, location_suffix: (Umbraco Bristol user group), location_link: http://umbristol.co.uk, title: Dancing for Drupal, title_suffix: (CMS Dance-Off), title_link: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal }
-    - { date: 2015-11-01, location: Accessible Bristol, location_link: http://www.accessiblebristol.org.uk, title: Accessible Drupal, fuzzy_date: true }
+    - { date: 2015-04-08, location: <a href="http://phpsw.uk">PHPSW</a>, title: <a href="https://joind.in/talk/view/14380">Drupal 8</a> (lightning talk) }
+    - { date: 2015-07-25, location: <a href="http://drupalcampnorth.org">DrupalCamp North</a>, title: <a href="https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin">Test Drive Twig with Sculpin</a> }
+    - { date: 2015-08-25, location: '<a href="http://www.umbristol.co.uk">umBristol</a> (Bristol Umbraco user group)', title: '<a href="https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal">Dancing for Drupal</a> (CMS Dance-Off)' }
+    - { date: 2015-11-01, location: <a href="http://www.accessiblebristol.org.uk">Accessible Bristol</a>, title: Accessible Drupal, fuzzy_date: true }
     - { date: 2015-11-01, location: Unified Diff, title: Building Static Websites with Sculpin, fuzzy_date: true }
 ---
 {% block body_classes 'page--talks page--talks__list' %}