diff --git a/assets/sass/components/markup.sass b/assets/sass/components/markup.sass
index 05593020..703f5641 100644
--- a/assets/sass/components/markup.sass
+++ b/assets/sass/components/markup.sass
@@ -1,9 +1,15 @@
 .markup
-  @apply leading-normal
+  @apply leading-normal -mb-6
+
+  > *
+    @apply mb-6
 
   h2,
   h3
-    @apply mt-8 mb-3 text-black
+    @apply text-black mb-3
+
+  h2
+    @apply mt-8
 
   code
     @apply bg-grey-lighter font-mono text-sm
@@ -13,12 +19,6 @@
     code
       @apply inline-block px-1 py-1 border border-grey-light font-bold
 
-  // pre code
-  //   @apply my-8
-
-  // pre:first-child code
-  //   @apply mt-0
-
   a,
   .link
     @apply text-blue no-underline
@@ -34,7 +34,7 @@
     @apply block leading-loose overflow-x-scroll p-6
 
   figure
-    @apply block mb-8
+    @apply block
 
   figcaption
     @apply italic text-sm text-grey-darker text-center mb-0 mt-1
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index 8f3a0d0c..189199ae 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -15,7 +15,7 @@
     {% include 'post/header' %}
     {% include 'post/intro-image' %}
 
-    <div class="markup spaced-y-8 mb-6">
+    <div class="markup mb-6">
         {% include 'post/old-post-message' %}
         {% block content %}{% endblock %}
     </div>