diff --git a/source/blog.html b/source/blog.html
index 28ef5158..b40fedc6 100644
--- a/source/blog.html
+++ b/source/blog.html
@@ -1,13 +1,15 @@
 ---
 layout: default
 title: Blog
-body_class: page--blog
 generator: pagination
 pagination:
   max_per_page: 5
 use:
   - posts
 ---
+{% block body_classes %}page--blog page--blog__list{% endblock %}
+
+{% block content %}
 <h1>Blog</h1>
 
 {% for post in page.pagination.items %}
@@ -30,3 +32,4 @@ use:
     {% endif %}
   </nav>
 {% endif %}
+{% endblock %}
diff --git a/source/contact.md b/source/contact.md
index 00271cea..c60b2e95 100644
--- a/source/contact.md
+++ b/source/contact.md
@@ -1,10 +1,12 @@
 ---
 layout: default
 title: Contact
-body_class: page--contact
 meta:
   description: 'Information about how to get in touch with Oliver.'
 ---
+{% block body_classes %}page--contact{% endblock %}
+
+{% block content %}
 # Contact
 
 The best ways to contact me is via <a href="mailto:{{ site.email }}?subject=Contact%20Oliver%20Davies">email</a> and <a href="{{ site.twitter.url }}">Twitter</a>.
@@ -21,3 +23,4 @@ Here are the best places to contact me online:
 * <a href="{{ site.linkedin.url }}">LinkedIn</a>
 
 I also have profiles on <a href="{{ site.lanyrd.url }}">Lanyrd</a> and <a href="{{ site.joindin.url }}">Joind.in</a>.
+{% endblock %}
diff --git a/source/index.md b/source/index.md
index 8c4ba11d..305f3df5 100644
--- a/source/index.md
+++ b/source/index.md
@@ -1,6 +1,5 @@
 ---
 layout: default
-body_class: page--about
 meta:
   description: 'The personal website and blog of Oliver Davies, a Drupal Developer and System Administrator from Wales, UK.'
   og:
@@ -13,6 +12,9 @@ meta:
       height: 327
       type: image/jpg
 ---
+{% block body_classes %}page--about{% endblock %}
+
+{% block content %}
 # About
 
 <img src="{{ site.gravatar.url }}?s=85" alt="Picture of Oliver" class="img-circle">
@@ -26,3 +28,4 @@ I'm contributor to <a href="http://cgit.drupalcode.org/drupal/log/?h=7.x&qt=grep
 I'm also the Git Documentation Maintainer for the Drupal project, and a provisional member of the [Drupal Security team](https://www.drupal.org/security-team).
 
 You can follow me on <a href="{{ site.twitter.url }}">Twitter</a> and <a href="{{ site.linkedin.url }}">LinkedIn</a>, and you can view my code on <a href="{{ site.drupalorg.url }}/track/code">Drupal.org</a> and <a href="{{ site.github.url }}?tab=activity">GitHub</a>.
+{% endblock %}
diff --git a/source/services.md b/source/services.md
index 3f6ac118..691c38a1 100644
--- a/source/services.md
+++ b/source/services.md
@@ -1,10 +1,12 @@
 ---
 layout: default
 title: Services
-body_class: page--services
 meta:
   description: 'Information about freelance services that Oliver offers.'
 ---
+{% block body_classes %}page--services{% endblock %}
+
+{% block content %}
 # Services
 
 ## Drupal
@@ -26,4 +28,4 @@ meta:
 * Continuous integration using [Jenkins](http://jenkins-ci.org).
 * Virtual machine setup using [Vagrant](http://vagrantup.com) for development or server testing.
 * Domain name and DNS management.
-
+{% endblock %}
diff --git a/source/talks.html b/source/talks.html
index b0f5bca7..6c82a10d 100644
--- a/source/talks.html
+++ b/source/talks.html
@@ -1,12 +1,14 @@
 ---
 layout: default
 title: Talks
-body_class: page--talks
 meta:
   description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
 use:
   - talks
 ---
+{% block body_classes %}page--talks{% endblock %}
+
+{% block content %}
 <h1>Talks</h1>
 
 <p>I regularly speak at conferences and user groups about a range of subjects relating to Drupal, PHP and web development. If you would like to me to speak at your group or conference, please <a href="/contact/">get in touch</a>.</p>
@@ -41,3 +43,4 @@ use:
 {% if found %}
   </dl>
 {% endif %}
+{% endblock %}
diff --git a/source/work.md b/source/work.md
index 15581218..eca8bf1c 100644
--- a/source/work.md
+++ b/source/work.md
@@ -1,10 +1,12 @@
 ---
 layout: default
 title: Work
-body_class: page--work
 meta:
   description: "Information about Oliver's current work."
 ---
+{% block body_classes %}page--work{% endblock %}
+
+{% block content %}
 # Work
 
 ## Drupal Association
@@ -30,3 +32,4 @@ Some of the tasks that I've worked on so far:
 In my spare time, I provide remote freelance consultancy services for Drupal websites and Linux servers.
 
 Services include Drupal site architecture, builds, upgrades and maintenance, custom module development and theming, Linux server administration and configuration management using [Puppet](http://puppetlabs.com) and [Ansible](http://www.ansible.com), and [Jenkins](http://jenkins-ci.org) continuous integration setup and configuration.
+{% endblock %}