diff --git a/source/404.md b/source/404.md
index 2296803ed..bec4b0d9a 100644
--- a/source/404.md
+++ b/source/404.md
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Page Not Found
permalink: /404.html
use: [posts]
diff --git a/source/_layouts/page.html.twig b/source/_layouts/default.html.twig
similarity index 100%
rename from source/_layouts/page.html.twig
rename to source/_layouts/default.html.twig
diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
index af658ed4b..bd51d4600 100644
--- a/source/_layouts/talk.html.twig
+++ b/source/_layouts/talk.html.twig
@@ -1,4 +1,4 @@
-{% extends 'page' %}
+{% extends 'default' %}
{% block content_wrapper %}
diff --git a/source/about.md b/source/about.md
index 65b27142e..9066fb5dc 100644
--- a/source/about.md
+++ b/source/about.md
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: About Me
meta:
og:
diff --git a/source/accessibility.md b/source/accessibility.md
index a925de69c..ac49a1439 100644
--- a/source/accessibility.md
+++ b/source/accessibility.md
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Accessibility
use: [posts]
---
diff --git a/source/blog.html b/source/blog.html
index c06dc566d..24fa1bf86 100644
--- a/source/blog.html
+++ b/source/blog.html
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Blog
generator: pagination
pagination:
diff --git a/source/blog/tags.html b/source/blog/tags.html
index e3f17f784..a170cb222 100644
--- a/source/blog/tags.html
+++ b/source/blog/tags.html
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
nav: blog
title: Tags
use:
diff --git a/source/blog/tags/tag.html b/source/blog/tags/tag.html
index 56d65031e..06ea7229e 100644
--- a/source/blog/tags/tag.html
+++ b/source/blog/tags/tag.html
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
nav: blog
title: Tag Archive
generator:
diff --git a/source/company-information.md b/source/company-information.md
index c49615366..273c503de 100644
--- a/source/company-information.md
+++ b/source/company-information.md
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Company Information
meta:
description: 'Company information for Oliver Davies Ltd.'
diff --git a/source/contact-thanks.md b/source/contact-thanks.md
index e1444f62f..d46f89b76 100644
--- a/source/contact-thanks.md
+++ b/source/contact-thanks.md
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Thanks!
permalink: contact/thanks/
use: [posts]
diff --git a/source/contact.html.twig b/source/contact.html.twig
index 6b96b8afe..8ca06e950 100644
--- a/source/contact.html.twig
+++ b/source/contact.html.twig
@@ -1,6 +1,6 @@
---
title: Contact
-layout: page
+layout: default
use: [posts]
---
{% block content %}
diff --git a/source/experience.html.twig b/source/experience.html.twig
index c16bbdfbd..ffe998716 100644
--- a/source/experience.html.twig
+++ b/source/experience.html.twig
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Experience
use: [posts]
experiences:
diff --git a/source/opensource.html.twig b/source/opensource.html.twig
index 7dc4a88d4..24fe0754d 100644
--- a/source/opensource.html.twig
+++ b/source/opensource.html.twig
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Open Source
projects:
drupal:
diff --git a/source/speaker-info.md b/source/speaker-info.md
index 36539794d..51865bd73 100644
--- a/source/speaker-info.md
+++ b/source/speaker-info.md
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
---
# Speaker Info
diff --git a/source/talks.html.twig b/source/talks.html.twig
index 512709d37..0aa9f3139 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Talks
meta:
description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
diff --git a/source/terms.md b/source/terms.md
index 3ed6b41b4..6296c3bb0 100644
--- a/source/terms.md
+++ b/source/terms.md
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Development Terms
use: [posts]
---
diff --git a/source/test-driven-drupal.md b/source/test-driven-drupal.md
index 88807321c..b097e9230 100644
--- a/source/test-driven-drupal.md
+++ b/source/test-driven-drupal.md
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: 'Test Driven Drupal: The Book'
mailchimp_url: 'https://oliverdavi.us18.list-manage.com/subscribe/post?u=b4ac8dd177796d37b93f9c285&id=033c84e0d5'
contact_email: 'oliver@testdrivendrupal.com'
diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig
index 8b8a68663..dde38bc0e 100644
--- a/source/testimonials.html.twig
+++ b/source/testimonials.html.twig
@@ -1,5 +1,5 @@
---
-layout: page
+layout: default
title: Testimonials
use: [posts]
testimonials: