diff --git a/source/_partials/talk/slides.twig b/source/_partials/talk/slides.twig
index cf87ab82..dcec550e 100644
--- a/source/_partials/talk/slides.twig
+++ b/source/_partials/talk/slides.twig
@@ -1,8 +1,8 @@
-{% if page.slides_embed %}
+{% if page.slides.embed %}
Slides
- {{ page.slides_embed|raw }}
+ {{ page.slides.embed|raw }}
{% endif %}
diff --git a/source/_partials/talk/video.twig b/source/_partials/talk/video.twig
index a5fb8ec4..6da8ec08 100644
--- a/source/_partials/talk/video.twig
+++ b/source/_partials/talk/video.twig
@@ -1,8 +1,8 @@
-{% if page.video_embed %}
+{% if page.video.embed %}
Video
- {{ page.video_embed|raw }}
+ {{ page.video.embed|raw }}
{% endif %}
diff --git a/source/_talks/dancing-for-drupal.md b/source/_talks/dancing-for-drupal.md
index 420ebfa4..04a2775d 100644
--- a/source/_talks/dancing-for-drupal.md
+++ b/source/_talks/dancing-for-drupal.md
@@ -1,7 +1,8 @@
---
title: Dancing for Drupal
-slides: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
+ embed:
tags: [meetup, umbristol, drupal]
tweets: yes
events:
diff --git a/source/_talks/drupal-8-module-development.md b/source/_talks/drupal-8-module-development.md
index 8cddeb60..2557c6da 100644
--- a/source/_talks/drupal-8-module-development.md
+++ b/source/_talks/drupal-8-module-development.md
@@ -3,10 +3,12 @@ title: Getting Started with Drupal 8 Module Development
tags: [conference, php, drupal, drupalcamp, drupal-8]
tweets: yes
code: https://github.com/opdavies/dclondon16-d8-module
-slides: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development
-slides_embed:
-video: https://www.youtube.com/watch?v=qO_Wh5WE3VA
-video_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development
+ embed:
+video:
+ url: https://www.youtube.com/watch?v=qO_Wh5WE3VA
+ embed:
meta:
og:
title: Getting Started with Drupal 8 Module Development
diff --git a/source/_talks/drupal-8-rejoining-the-herd.md b/source/_talks/drupal-8-rejoining-the-herd.md
index b17e98a0..69d85b08 100644
--- a/source/_talks/drupal-8-rejoining-the-herd.md
+++ b/source/_talks/drupal-8-rejoining-the-herd.md
@@ -1,8 +1,9 @@
---
title: Drupal 8: Rejoining the Herd
tags: [conference, php, drupal, drupal-8]
-slides: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd
+ embed:
events:
- { id: phpsc-16, date: '2016-06-11' }
---
diff --git a/source/_talks/drupal-8.md b/source/_talks/drupal-8.md
index 6ac30311..17432c25 100644
--- a/source/_talks/drupal-8.md
+++ b/source/_talks/drupal-8.md
@@ -1,9 +1,11 @@
---
title: Drupal 8
-slides: https://speakerdeck.com/opdavies/drupal-8
-slides_embed:
-video: https://www.youtube.com/watch?v=36zCxPrOOzM
-video_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/drupal-8
+ embed:
+video:
+ url: https://www.youtube.com/watch?v=36zCxPrOOzM
+ embed:
joindin: https://joind.in/talk/view/14380
tags: [meetup, phpsw, drupal, drupal-8]
tweets: yes
diff --git a/source/_talks/drupal-development-with-composer.md b/source/_talks/drupal-development-with-composer.md
index 4bccd376..b395836c 100644
--- a/source/_talks/drupal-development-with-composer.md
+++ b/source/_talks/drupal-development-with-composer.md
@@ -2,10 +2,12 @@
title: Modern Drupal Development with Composer
type: Lightning talk
tags: ['meetups', 'phpsw', 'drupal', 'composer']
-slides: https://speakerdeck.com/opdavies/modern-drupal-development-with-composer
-slides_embed: ''
-video: https://www.youtube.com/watch?v=Yi_FPI3xHwc
-video_embed: ''
+slides:
+ url: https://speakerdeck.com/opdavies/modern-drupal-development-with-composer
+ embed: ''
+video:
+ url: https://www.youtube.com/watch?v=Yi_FPI3xHwc
+ embed: ''
events:
- { id: phpsw, date: '2016-11-09' }
---
diff --git a/source/_talks/drupal-vm-generator.md b/source/_talks/drupal-vm-generator.md
index d95870c3..0fac5785 100644
--- a/source/_talks/drupal-vm-generator.md
+++ b/source/_talks/drupal-vm-generator.md
@@ -2,10 +2,12 @@
title: Drupal VM Generator
code: https://github.com/opdavies/drupal-vm-generator
tags: [drupal-vm, drupal-vm-generator, meetup, symfony]
-slides: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator
-slides_embed:
-video: https://youtu.be/U1pbKAAO2Wo?t=3696
-video_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator
+ embed:
+video:
+ url: https://youtu.be/U1pbKAAO2Wo?t=3696
+ embed:
events:
- { id: nwdug, date: '2016-03-08' }
- { id: drupal-bristol, date: '2016-04-02' }
diff --git a/source/_talks/drupal-vm-meet-symfony-console.md b/source/_talks/drupal-vm-meet-symfony-console.md
index a4f6bd74..cdf7aaed 100644
--- a/source/_talks/drupal-vm-meet-symfony-console.md
+++ b/source/_talks/drupal-vm-meet-symfony-console.md
@@ -1,8 +1,9 @@
---
title: Drupal VM, Meet Symfony Console
tags: [conference, php, drupal-vm, symfony]
-slides: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console
+ embed:
image: drupal-vm-meet-symfony-console.png
events:
- { id: drupalcamp-bristol-2016, date: '2016-07-23' }
diff --git a/source/_talks/drupalorg-2015.md b/source/_talks/drupalorg-2015.md
index ed762145..a1ee0963 100644
--- a/source/_talks/drupalorg-2015.md
+++ b/source/_talks/drupalorg-2015.md
@@ -1,8 +1,9 @@
---
title: Drupal.org in 2015: What's Coming Next
tags: [conference, drupalcamp, drupalcamp-london, drupal-association]
-slides: https://speakerdeck.com/opdavies/drupal-dot-org-in-2015
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/drupal-dot-org-in-2015
+ embed:
events:
- { id: drupalcamp-brighton-2015, date: '2015-01-18' }
- { id: drupalcamp-london-2015, date: '2015-02-28' }
diff --git a/source/_talks/drush-make-drupalbristol.md b/source/_talks/drush-make-drupalbristol.md
index 8cc238b4..e8c2d994 100644
--- a/source/_talks/drush-make-drupalbristol.md
+++ b/source/_talks/drush-make-drupalbristol.md
@@ -1,7 +1,8 @@
---
title: drush make drupalbristol
-slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/drush-make-drupalbristol
+ embed:
tags: [meetup, drupal, drupal-bristol, drush, drush-make]
events:
- { id: drupal-bristol, date: '2014-07-02' }
diff --git a/source/_talks/getting-your-data-into-drupal-8.md b/source/_talks/getting-your-data-into-drupal-8.md
index 811061ae..aee4ca4f 100644
--- a/source/_talks/getting-your-data-into-drupal-8.md
+++ b/source/_talks/getting-your-data-into-drupal-8.md
@@ -1,7 +1,8 @@
---
title: Getting (Your Data) Into Drupal 8
-slides: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol
+ embed:
tags: [drupalcamp, migration, drupal-8]
events:
- { id: drupal-bristol, date: '2017-01-18' }
diff --git a/source/_talks/git-flow.md b/source/_talks/git-flow.md
index 75bc1895..c1870dfd 100644
--- a/source/_talks/git-flow.md
+++ b/source/_talks/git-flow.md
@@ -1,9 +1,11 @@
---
title: Never Commit to Master - An Introduction to Git Flow
-slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
-slides_embed:
-video: https://www.youtube.com/watch?v=T-miCpHxfds
-video_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
+ embed:
+video:
+ url: https://www.youtube.com/watch?v=T-miCpHxfds
+ embed:
tags: [conference, drupalcamp, drupalcamp-london, git, git-flow]
slug: git-flow
tweets: yes
diff --git a/source/_talks/goodbye-drush-make-hello-composer.md b/source/_talks/goodbye-drush-make-hello-composer.md
index f2931395..7d7fa802 100644
--- a/source/_talks/goodbye-drush-make-hello-composer.md
+++ b/source/_talks/goodbye-drush-make-hello-composer.md
@@ -1,8 +1,9 @@
---
title: Goodbye Drush Make. Hello Composer!
tags: ['meetup', 'drupal', 'composer']
-slides: http://bit.ly/slides-goodbye-drush-make-hello-composer2
-slides_embed: ''
+slides:
+ url: http://bit.ly/slides-goodbye-drush-make-hello-composer2
+ embed: ''
events:
- { id: drupal-bristol, date: '2016-11-17' }
---
diff --git a/source/_talks/it-all-started-with-a-patch.md b/source/_talks/it-all-started-with-a-patch.md
index b85d1a47..66d81429 100644
--- a/source/_talks/it-all-started-with-a-patch.md
+++ b/source/_talks/it-all-started-with-a-patch.md
@@ -1,8 +1,12 @@
---
title: It All Started With A Patch
tags: [meetup, phpsw, open-source]
-slides: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw
+ embed:
+video:
+ url: https://www.youtube.com/watch?v=5FYMRR61sdo
+ embed: ''
events:
- { id: phpsw, date: '2017-02-08' }
---
diff --git a/source/_talks/sculpin.md b/source/_talks/sculpin.md
index ea8bb8fb..ebdc49ca 100644
--- a/source/_talks/sculpin.md
+++ b/source/_talks/sculpin.md
@@ -1,7 +1,8 @@
---
title: Building Static Websites with Sculpin
-slides: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin
+ embed:
code: https://github.com/opdavies/sculpin-demo
joindin: https://joind.in/talk/view/15486
tags: [meetups, phpsw, sculpin]
diff --git a/source/_talks/test-drive-twig-with-sculpin.md b/source/_talks/test-drive-twig-with-sculpin.md
index 896a46b6..e0b95635 100644
--- a/source/_talks/test-drive-twig-with-sculpin.md
+++ b/source/_talks/test-drive-twig-with-sculpin.md
@@ -1,7 +1,8 @@
---
title: Test Drive Twig with Sculpin
-slides: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
-slides_embed:
+slides:
+ url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
+ embed:
code: https://github.com/opdavies/sculpin-demo
tags: [conference, drupalcamp, drupalcamp-north, sculpin, twig]
tweets: yes
diff --git a/source/_talks/test-driven-drupal-simpletest-phpunit.md b/source/_talks/test-driven-drupal-simpletest-phpunit.md
index 0d660877..29a92b2a 100644
--- a/source/_talks/test-driven-drupal-simpletest-phpunit.md
+++ b/source/_talks/test-driven-drupal-simpletest-phpunit.md
@@ -1,7 +1,8 @@
---
-title: Test Driven Drupal development with SimpleTest and PHPUnit
-slides: https://speakerdeck.com/opdavies/test-driven-drupal-development-with-simpletest-and-phpunit-drupalcamp-london-2017
-slides_embed:
+title: Test Driven Drupal Development with SimpleTest and PHPUnit
+slides:
+ url: https://speakerdeck.com/opdavies/test-driven-drupal-development-with-simpletest-and-phpunit-drupalcamp-london-2017
+ embed:
tags: [drupalcamp, simpletest, phpunit, testing]
events:
- { id: drupalcamp-london-2017, date: '2017-03-04' }
diff --git a/source/_talks/what-is-this-drupal-thing.md b/source/_talks/what-is-this-drupal-thing.md
index e0fdd9a1..76b40982 100644
--- a/source/_talks/what-is-this-drupal-thing.md
+++ b/source/_talks/what-is-this-drupal-thing.md
@@ -1,8 +1,9 @@
---
title: So, what is this Drupal thing?
location:
-video: https://vimeo.com/49827006
-video_embed:
+video:
+ url: https://vimeo.com/49827006
+ embed:
tags: [meetup, drupal, unified-diff]
events:
- { id: udiff, date: '2012-09-05' }