diff --git a/source/_partials/talk/slides.twig b/source/_partials/talk/slides.twig
index 69f43f946..950a46f1b 100644
--- a/source/_partials/talk/slides.twig
+++ b/source/_partials/talk/slides.twig
@@ -1,5 +1,5 @@
-{% if page.slides.embed %}
+{% if page.slides_embed %}
- {{ page.slides.embed|raw }}
+ {{ page.slides_embed|raw }}
{% endif %}
diff --git a/source/_partials/talk/video.twig b/source/_partials/talk/video.twig
index 2f4e8961a..309251892 100644
--- a/source/_partials/talk/video.twig
+++ b/source/_partials/talk/video.twig
@@ -1,7 +1,7 @@
-{% if page.video.embed %}
+{% if page.video_embed %}
- {{ page.video.embed|raw }}
+ {{ page.video_embed|raw }}
{% endif %}
diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md b/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md
index 851e896c9..cc283059c 100644
--- a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md
+++ b/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md
@@ -3,9 +3,8 @@ title: So, what is this Drupal thing?
location: Unified Diff
logo: assets/images/talks/logos/unified-diff.png
logo_link: http://unifieddiff.co.uk
-video:
- embed:
- url: https://vimeo.com/49827006
+video: https://vimeo.com/49827006
+video_embed:
tags:
- meetup
- drupal
diff --git a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md b/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md
index ce1a10aa2..854be058c 100644
--- a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md
+++ b/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md
@@ -3,12 +3,10 @@ title: Never Commit to Master - An Introduction to Git Flow
location: DrupalCamp London 2014
logo: assets/images/talks/logos/drupalcamp-london-2014.png
logo_link: http://2014.drupalcamplondon.co.uk
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
-video:
- embed:
- url: https://www.youtube.com/watch?v=T-miCpHxfds
+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:
tags:
- conference
- drupalcamp
diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md
index dfae553f7..4661d32ce 100644
--- a/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md
+++ b/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md
@@ -2,9 +2,8 @@
title: drush make drupalbristol
location: Bristol Drupal
logo_link: http://www.drupalbristol.org.uk
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/drush-make-drupalbristol
+slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol
+slides_embed:
tags:
- meetup
- drupal
diff --git a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md b/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md
index abb22f2ef..df4cdb974 100644
--- a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md
+++ b/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md
@@ -9,4 +9,6 @@ tags:
- drupal-association
slug: drupalorg-2015
logo: assets/images/talks/logos/drupalcamp-brighton-2015.png
+slides: https://speakerdeck.com/opdavies/drupal-dot-org-in-2015
+slides_embed:
---
diff --git a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md b/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md
index 2c39aa3e6..9e80b5d49 100644
--- a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md
+++ b/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md
@@ -8,4 +8,6 @@ tags:
- drupalcamp-london
- drupal-association
logo: assets/images/talks/logos/drupalcamp-london-2015.png
+slides: https://speakerdeck.com/opdavies/drupal-dot-org-in-2015
+slides_embed:
---
diff --git a/source/_talks/2015-04-08-drupal-8-phpsw.md b/source/_talks/2015-04-08-drupal-8-phpsw.md
index 8bd49b64f..c7d7fe7a4 100644
--- a/source/_talks/2015-04-08-drupal-8-phpsw.md
+++ b/source/_talks/2015-04-08-drupal-8-phpsw.md
@@ -1,12 +1,10 @@
---
title: Drupal 8
location: PHPSW
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/drupal-8
-video:
- embed:
- url: https://www.youtube.com/watch?v=36zCxPrOOzM
+slides: https://speakerdeck.com/opdavies/drupal-8
+slides_embed:
+video: https://www.youtube.com/watch?v=36zCxPrOOzM
+video_embed:
joindin: https://joind.in/talk/view/14380
tags:
- meetup
diff --git a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md b/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md
index c9722d20a..3e9d5eafa 100644
--- a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md
+++ b/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md
@@ -1,9 +1,8 @@
---
title: Test Drive Twig with Sculpin
location: DrupalCamp North 2015
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
+slides: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
+slides_embed:
code: https://github.com/opdavies/sculpin-demo
tags:
- conference
diff --git a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md b/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md
index 07c270878..ecf9c1b52 100644
--- a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md
+++ b/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md
@@ -1,9 +1,8 @@
---
title: Dancing for Drupal
location: umBristol (Bristol Umbraco user group)
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
+slides: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
+slides_embed:
tags:
- meetup
- umbristol
diff --git a/source/_talks/2015-10-14-sculpin-phpsw.md b/source/_talks/2015-10-14-sculpin-phpsw.md
index 76990f63e..81a23dc09 100644
--- a/source/_talks/2015-10-14-sculpin-phpsw.md
+++ b/source/_talks/2015-10-14-sculpin-phpsw.md
@@ -1,9 +1,8 @@
---
title: Building Static Websites with Sculpin
location: PHPSW
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin
+slides: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin
+slides_embed:
code: https://github.com/opdavies/sculpin-demo
joindin: https://joind.in/talk/view/15486
tags:
diff --git a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md b/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md
index 732df4f1d..f6e7de7e3 100644
--- a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md
+++ b/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md
@@ -9,13 +9,11 @@ tags:
- drupal-8
tweets: yes
code: https://github.com/opdavies/dclondon16-d8-module
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development
+slides: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development
+slides_embed:
date: 2016-03-05 14:00
-video:
- embed:
- url: https://www.youtube.com/watch?v=qO_Wh5WE3VA
+video: https://www.youtube.com/watch?v=qO_Wh5WE3VA
+video_embed:
meta:
og:
title: Getting Started with Drupal 8 Module Development
diff --git a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md b/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md
index 9b32c32c6..48b354a3d 100644
--- a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md
+++ b/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md
@@ -7,9 +7,8 @@ tags:
- drupal-vm-generator
- meetup
- symfony
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator
+slides: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator
+slides_embed:
logo: assets/images/talks/logos/drupal-bristol.jpg
logo_link: https://groups.drupal.org/node/510443
---
diff --git a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md
index 97f898860..6576bbf8b 100644
--- a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md
+++ b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md
@@ -6,9 +6,8 @@ tags:
- php
- drupal
- drupal-8
-slides:
- embed:
- url: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd
+slides: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd
+slides_embed:
logo: assets/images/talks/logos/php-south-coast-2016.png
logo_link: http://2016.phpsouthcoast.co.uk/schedule
---
diff --git a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md b/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md
index 24571fb16..c477be622 100644
--- a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md
+++ b/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md
@@ -8,9 +8,8 @@ tags:
- php
- drupal-vm
- symfony
-slides:
- url: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console
- embed:
+slides: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console
+slides_embed:
image: drupal-vm-meet-symfony-console.png
---
_TL;DR - Come and learn about Symfony Console, with examples from a real-world project._
diff --git a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md b/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md
index 37688f483..0f126362b 100644
--- a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md
+++ b/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md
@@ -3,13 +3,10 @@ title: Modern Drupal Development with Composer
type: Lightning talk
location: PHPSW
tags: ['meetups', 'phpsw', 'drupal', 'composer']
-slides:
- embed: ''
- url: https://speakerdeck.com/opdavies/modern-drupal-development-with-composer
-# joindin:
-video:
- embed: ''
- url: https://www.youtube.com/watch?v=Yi_FPI3xHwc
+slides: https://speakerdeck.com/opdavies/modern-drupal-development-with-composer
+slides_embed: ''
+video: https://www.youtube.com/watch?v=Yi_FPI3xHwc
+video_embed: ''
logo: assets/images/talks/logos/phpsw.png
logo_link: http://phpsw.uk/talks/modern-drupal-development-with-composer
---
diff --git a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md b/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md
index 15e1e116a..3ccc35f60 100644
--- a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md
+++ b/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md
@@ -4,10 +4,8 @@ location: Drupal Bristol
logo: assets/images/talks/logos/drupal-bristol.jpg
logo_link: https://groups.drupal.org/node/514559
tags: ['meetup', 'drupal', 'composer']
-# image: drush-make-is-dead-long-live-composer.png
-slides:
- url: http://bit.ly/slides-goodbye-drush-make-hello-composer2
- embed: ''
+slides: http://bit.ly/slides-goodbye-drush-make-hello-composer2
+slides_embed: ''
---
One of the main outcomes of Drupal 8 was “getting off the island” with third-party code included in core and adopting modern best practices from the wider PHP ecosystem - including [Composer][1], PHP’s dependency manager.
diff --git a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md b/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md
index a4a96d790..61d9307fa 100644
--- a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md
+++ b/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md
@@ -4,9 +4,8 @@ location: Drupal Bristol
logo: assets/images/talks/logos/drupal-bristol.jpg
logo_link: https://groups.drupal.org/node/515718
tags: ['meetup', 'drupal', 'drupal-8']
-slides:
- url: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol
- embed:
+slides: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol
+slides_embed:
---
If you’ve moved a site from Drupal 6 to 7, the chances are that you’ve either used the upgrade path to update your old site in-place, or you built a new site from scratch and used the Migrate module from contrib to migrate your data from the old database.
diff --git a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md b/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md
index 9d29ef9f7..e292bbe33 100644
--- a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md
+++ b/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md
@@ -2,9 +2,8 @@
title: It All Started With A Patch
location: PHPSW
tags: [meetup, phpsw, open-source]
-slides:
- url: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw
- embed:
+slides: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw
+slides_embed:
logo: assets/images/talks/logos/phpsw.png
logo_link: http://phpsw.uk/talks/it-started-with-a-patch
---
diff --git a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md b/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md
index 282da72a3..d8ea78090 100644
--- a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md
+++ b/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md
@@ -1,12 +1,12 @@
---
title: Deploying PHP Applications with Fabric
location: Nomad PHP
-tags: ['meetup', 'php', 'fabric']
-slides:
- url: ~
- embed: ~
-draft: true
+slides: ~
+slides_embed: ~
logo: assets/images/talks/logos/nomad-php.png
+logo_link: ~
+tags: [meetup, php, fabric]
+draft: true
---
You’ve built your application, and now you just need to deploy it. There are various ways that this could be done – from (S)FTP, to SCP and rsync, to running commands like “git pull” and “composer install” directly on the server (not recommended).
diff --git a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md b/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md
index 6b67e2ff0..9d73cfed3 100644
--- a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md
+++ b/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md
@@ -1,12 +1,11 @@
---
title: Getting (Your Data) Into Drupal 8
location: DrupalCamp London 2017
-tags: []
-slides:
- url: ~
- embed: ~
logo: assets/images/talks/logos/drupalcamp-london-2017.png
logo_link: http://drupalcamp.london/session/getting-your-data-drupal-8
+slides: ~
+slides_embed: ~
+tags: []
---
If you’ve moved a site from Drupal 6 to 7, the chances are that you’ve either used the upgrade path to update your old site in-place, or you built a new site from scratch and used the Migrate module from contrib to migrate your data from the old database.
diff --git a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md b/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md
index 56cf95e3d..3e52fe705 100644
--- a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md
+++ b/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md
@@ -1,13 +1,11 @@
-
---
title: Test driven Drupal development with SimpleTest and PHPUnit
location: DrupalCamp London 2017
-tags: []
-slides:
- url: ~
- embed: ~
logo: assets/images/talks/logos/drupalcamp-london-2017.png
logo_link: http://drupalcamp.london/session/test-driven-drupal-development-simpletest-and-phpunit
+slides: ~
+slides_embed: ~
+tags: []
---
Testing is important. Why? It allows developers to add new features and edit and refactor existing code without the worry of adding regressions, reduces the reliance on manual testing to discover bugs, and by taking a test driven approach, your implementation code is leaner as you only write what is needed for your tests to pass.