diff --git a/source/_partials/about/badges.html.twig b/source/_partials/about/badges.html.twig
index 60b6b5b4..b9419fbe 100644
--- a/source/_partials/about/badges.html.twig
+++ b/source/_partials/about/badges.html.twig
@@ -11,7 +11,7 @@
 
     <div class="px-4">
         <div class="widget bg-grey-light p-4 rounded">
-            <div class="markup -mb-3">
+            <div class="-mb-3">
                 <h2 class="visuallyhidden">Certifications</h2>
 
                 {% include 'about/certification' with {
diff --git a/source/_partials/blog/post-summary.html.twig b/source/_partials/blog/post-summary.html.twig
index f8bb7f06..e1e06d67 100644
--- a/source/_partials/blog/post-summary.html.twig
+++ b/source/_partials/blog/post-summary.html.twig
@@ -1,4 +1,4 @@
-<div class="markup mb-2">
+<div class="mb-2">
     <h2 class="text-inherit text-lg m-0">
         <a href="{{ post.url }}" class="text-black focus:text-white inline-block">
             {{ post.draft ? 'Draft: '|upper }}{{ post.title }}
@@ -8,6 +8,6 @@
     <p class="text-sm text-grey-dark">Posted on {{ post.date|date('jS F Y') }}</p>
 </div>
 
-<div class="markup">
+<div>
     <p class="text-sm">{{ post.excerpt }}</p>
 </div>
diff --git a/source/_partials/layout/footer.html.twig b/source/_partials/layout/footer.html.twig
index 43f4e1a4..0eefa9a7 100644
--- a/source/_partials/layout/footer.html.twig
+++ b/source/_partials/layout/footer.html.twig
@@ -1,5 +1,5 @@
 <footer class="border-grey-light border-t mb-8 mt-10 pt-5 text-sm">
-    <div class="markup md:flex md:justify-between">
+    <div class="md:flex md:justify-between">
         <div>
             <p>&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}</p>
         </div>
diff --git a/source/_partials/post/about-author.html.twig b/source/_partials/post/about-author.html.twig
index 06dce72a..1f56e7c3 100644
--- a/source/_partials/post/about-author.html.twig
+++ b/source/_partials/post/about-author.html.twig
@@ -1,4 +1,4 @@
-<div class="markup">
+<div>
     <h2 class="mb-1">About the Author</h2>
 
     <div class="flex items-center">
diff --git a/source/_partials/post/questions-comments.html.twig b/source/_partials/post/questions-comments.html.twig
index abeb1452..01347bc1 100644
--- a/source/_partials/post/questions-comments.html.twig
+++ b/source/_partials/post/questions-comments.html.twig
@@ -1,4 +1,4 @@
-<div class="markup mb-4">
+<div class="mb-4">
     <p>
         Questions? Comments?
         I’m <a href="https://twitter.com/{{ site.twitter.name }}">@{{ site.twitter.name }}</a> on Twitter.
diff --git a/source/_partials/talks/table.html.twig b/source/_partials/talks/table.html.twig
index 573b8591..37e5983c 100644
--- a/source/_partials/talks/table.html.twig
+++ b/source/_partials/talks/table.html.twig
@@ -27,7 +27,7 @@
                     </td>
 
                     {% if not talk_page %}
-                        <td class="markup whitespace-no-wrap xl:whitespace-normal">
+                        <td class="whitespace-no-wrap xl:whitespace-normal">
                             {% if talk.talk.url is not empty %}
                                 <a href="{{ talk.talk.url }}">
                                     {{ talk.talk.title }}
@@ -46,7 +46,7 @@
                         </td>
                     {% endif %}
 
-                    <td class="markup whitespace-no-wrap xl:whitespace-normal">
+                    <td class="whitespace-no-wrap xl:whitespace-normal">
                         {% if talk.event.url is not empty %}
                             <a href="{{ talk.event.url }}">
                                 {{ talk.event.name }}
diff --git a/source/articles/index.html.twig b/source/articles/index.html.twig
index 23b39bf2..24edf105 100644
--- a/source/articles/index.html.twig
+++ b/source/articles/index.html.twig
@@ -17,7 +17,7 @@ use: [posts]
         {% endfor %}
     </div>
 
-    <footer class="markup">
+    <footer>
         <p>Read the rest of my articles in the <a href="/articles/archive">archives</a>.</p>
     </footer>
 </div>
diff --git a/source/talks.html.twig b/source/talks.html.twig
index e6d4ed8e..a134d6c4 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -28,7 +28,7 @@ talks:
         date: 2018-09-05
 ---
 {% block content %}
-    <div class="markup mb-8">
+    <div class="mb-8">
         <p>I regularly speak at conferences and user groups about a range of subjects including PHP, Drupal, automated testing, Git and systems administration.</p>
     </div>