diff --git a/assets/sass/components/content-types/_talk.sass b/assets/sass/components/content-types/_talk.sass
index 54adc1bc9..3982e67a6 100644
--- a/assets/sass/components/content-types/_talk.sass
+++ b/assets/sass/components/content-types/_talk.sass
@@ -17,5 +17,7 @@
.feedback
width: 15%
+.talk-type,
.event-location
display: block
+ margin-top: 1px
diff --git a/source/_partials/talks-table.twig b/source/_partials/talks-table.twig
index 0bf5d3a2e..e5de70eab 100644
--- a/source/_partials/talks-table.twig
+++ b/source/_partials/talks-table.twig
@@ -21,6 +21,12 @@
{{ event.talk.title }}
+
+ {% if event.talk.type %}
+
+ {{ event.talk.type }}
+
+ {% endif %}
{% endif %}
diff --git a/source/_talks/dancing-for-drupal.md b/source/_talks/dancing-for-drupal.md
index 04a2775df..3721ed49d 100644
--- a/source/_talks/dancing-for-drupal.md
+++ b/source/_talks/dancing-for-drupal.md
@@ -1,5 +1,6 @@
---
title: Dancing for Drupal
+type: Talk
slides:
url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
embed:
diff --git a/source/_talks/drupal-8-module-development.md b/source/_talks/drupal-8-module-development.md
index 2557c6da6..36656b681 100644
--- a/source/_talks/drupal-8-module-development.md
+++ b/source/_talks/drupal-8-module-development.md
@@ -1,5 +1,6 @@
---
title: Getting Started with Drupal 8 Module Development
+type: Talk
tags: [conference, php, drupal, drupalcamp, drupal-8]
tweets: yes
code: https://github.com/opdavies/dclondon16-d8-module
diff --git a/source/_talks/drupal-8-rejoining-the-herd.md b/source/_talks/drupal-8-rejoining-the-herd.md
index 69d85b08e..479d8cb9d 100644
--- a/source/_talks/drupal-8-rejoining-the-herd.md
+++ b/source/_talks/drupal-8-rejoining-the-herd.md
@@ -1,5 +1,6 @@
---
title: Drupal 8: Rejoining the Herd
+type: Talk
tags: [conference, php, drupal, drupal-8]
slides:
url: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd
diff --git a/source/_talks/drupal-8.md b/source/_talks/drupal-8.md
index 17432c25d..5a8636990 100644
--- a/source/_talks/drupal-8.md
+++ b/source/_talks/drupal-8.md
@@ -1,5 +1,6 @@
---
title: Drupal 8
+type: Lightning talk
slides:
url: https://speakerdeck.com/opdavies/drupal-8
embed:
diff --git a/source/_talks/drupal-association.md b/source/_talks/drupal-association.md
index 9ae3bc3b1..ca0361986 100644
--- a/source/_talks/drupal-association.md
+++ b/source/_talks/drupal-association.md
@@ -1,5 +1,6 @@
---
title: About the Drupal Association
+type: Talk
tags: [meetup, swdug, drupal, drupal-association]
slug: drupal-association
events:
diff --git a/source/_talks/drupal-ldap.md b/source/_talks/drupal-ldap.md
index 0784e3380..9d7b8c9af 100644
--- a/source/_talks/drupal-ldap.md
+++ b/source/_talks/drupal-ldap.md
@@ -1,5 +1,6 @@
---
title: Drupal and the LDAP Module
+type: Talk
tags: [meetup, swdug, drupal, ldap]
slug: drupal-ldap
logo: assets/images/talks/logos/swdug.png
diff --git a/source/_talks/drupal-vm-generator.md b/source/_talks/drupal-vm-generator.md
index 0fac5785a..52ff0d9d5 100644
--- a/source/_talks/drupal-vm-generator.md
+++ b/source/_talks/drupal-vm-generator.md
@@ -1,5 +1,6 @@
---
title: Drupal VM Generator
+type: Lightning talk
code: https://github.com/opdavies/drupal-vm-generator
tags: [drupal-vm, drupal-vm-generator, meetup, symfony]
slides:
diff --git a/source/_talks/drupal-vm-meet-symfony-console.md b/source/_talks/drupal-vm-meet-symfony-console.md
index cdf7aaedd..eb568f23f 100644
--- a/source/_talks/drupal-vm-meet-symfony-console.md
+++ b/source/_talks/drupal-vm-meet-symfony-console.md
@@ -1,5 +1,6 @@
---
title: Drupal VM, Meet Symfony Console
+type: Talk
tags: [conference, php, drupal-vm, symfony]
slides:
url: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console
diff --git a/source/_talks/drupalorg-2015.md b/source/_talks/drupalorg-2015.md
index a1ee0963a..ee6a926e2 100644
--- a/source/_talks/drupalorg-2015.md
+++ b/source/_talks/drupalorg-2015.md
@@ -1,5 +1,6 @@
---
title: Drupal.org in 2015: What's Coming Next
+type: Talk
tags: [conference, drupalcamp, drupalcamp-london, drupal-association]
slides:
url: https://speakerdeck.com/opdavies/drupal-dot-org-in-2015
diff --git a/source/_talks/drush-make-drupalbristol.md b/source/_talks/drush-make-drupalbristol.md
index e8c2d994f..707a0358e 100644
--- a/source/_talks/drush-make-drupalbristol.md
+++ b/source/_talks/drush-make-drupalbristol.md
@@ -1,5 +1,6 @@
---
title: drush make drupalbristol
+type: Talk
slides:
url: https://speakerdeck.com/opdavies/drush-make-drupalbristol
embed:
diff --git a/source/_talks/getting-your-data-into-drupal-8.md b/source/_talks/getting-your-data-into-drupal-8.md
index aee4ca4f8..8e57fee0f 100644
--- a/source/_talks/getting-your-data-into-drupal-8.md
+++ b/source/_talks/getting-your-data-into-drupal-8.md
@@ -1,5 +1,6 @@
---
title: Getting (Your Data) Into Drupal 8
+type: Talk
slides:
url: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol
embed:
diff --git a/source/_talks/git-flow.md b/source/_talks/git-flow.md
index c1870dfdb..c749cb73b 100644
--- a/source/_talks/git-flow.md
+++ b/source/_talks/git-flow.md
@@ -1,5 +1,6 @@
---
title: Never Commit to Master - An Introduction to Git Flow
+type: Talk
slides:
url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
embed:
diff --git a/source/_talks/goodbye-drush-make-hello-composer.md b/source/_talks/goodbye-drush-make-hello-composer.md
index 7d7fa802f..9ab958139 100644
--- a/source/_talks/goodbye-drush-make-hello-composer.md
+++ b/source/_talks/goodbye-drush-make-hello-composer.md
@@ -1,5 +1,6 @@
---
title: Goodbye Drush Make. Hello Composer!
+type: Talk
tags: ['meetup', 'drupal', 'composer']
slides:
url: http://bit.ly/slides-goodbye-drush-make-hello-composer2
diff --git a/source/_talks/it-all-started-with-a-patch.md b/source/_talks/it-all-started-with-a-patch.md
index d7d00b27b..876c844a3 100644
--- a/source/_talks/it-all-started-with-a-patch.md
+++ b/source/_talks/it-all-started-with-a-patch.md
@@ -1,5 +1,6 @@
---
title: It All Started With A Patch
+type: Lightning talk
tags: [meetup, phpsw, open-source]
slides:
url: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw
diff --git a/source/_talks/sculpin.md b/source/_talks/sculpin.md
index ebdc49cab..8918f8afe 100644
--- a/source/_talks/sculpin.md
+++ b/source/_talks/sculpin.md
@@ -1,5 +1,6 @@
---
title: Building Static Websites with Sculpin
+type: Lightning talk
slides:
url: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin
embed:
diff --git a/source/_talks/test-drive-twig-with-sculpin.md b/source/_talks/test-drive-twig-with-sculpin.md
index e0b956352..53a76d132 100644
--- a/source/_talks/test-drive-twig-with-sculpin.md
+++ b/source/_talks/test-drive-twig-with-sculpin.md
@@ -1,5 +1,6 @@
---
title: Test Drive Twig with Sculpin
+type: Talk
slides:
url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
embed:
diff --git a/source/_talks/test-driven-drupal-simpletest-phpunit.md b/source/_talks/test-driven-drupal-simpletest-phpunit.md
index 29a92b2a1..8743f1abc 100644
--- a/source/_talks/test-driven-drupal-simpletest-phpunit.md
+++ b/source/_talks/test-driven-drupal-simpletest-phpunit.md
@@ -1,5 +1,6 @@
---
title: Test Driven Drupal Development with SimpleTest and PHPUnit
+type: Talk
slides:
url: https://speakerdeck.com/opdavies/test-driven-drupal-development-with-simpletest-and-phpunit-drupalcamp-london-2017
embed:
diff --git a/source/_talks/what-is-this-drupal-thing.md b/source/_talks/what-is-this-drupal-thing.md
index 76b40982e..83e049797 100644
--- a/source/_talks/what-is-this-drupal-thing.md
+++ b/source/_talks/what-is-this-drupal-thing.md
@@ -1,6 +1,6 @@
---
title: So, what is this Drupal thing?
-location:
+type: Talk
video:
url: https://vimeo.com/49827006
embed: