diff --git a/web/themes/custom/opdavies/assets/css/components/markup.pcss b/web/themes/custom/opdavies/assets/css/components/markup.pcss
index a1a2a17..ebb0d1d 100644
--- a/web/themes/custom/opdavies/assets/css/components/markup.pcss
+++ b/web/themes/custom/opdavies/assets/css/components/markup.pcss
@@ -90,11 +90,11 @@
   }
 
   * + h2 {
-    @apply mt-8
+    @apply mt-6
   }
 
   h2 + * {
-    @apply mt-4
+    @apply mt-3
   }
 
   h3 {
diff --git a/web/themes/custom/opdavies/templates/block/block.html.twig b/web/themes/custom/opdavies/templates/block/block.html.twig
index 350989b..75f0065 100644
--- a/web/themes/custom/opdavies/templates/block/block.html.twig
+++ b/web/themes/custom/opdavies/templates/block/block.html.twig
@@ -25,13 +25,15 @@
  * @see template_preprocess_block()
  */
 #}
-<div{{ attributes.addClass('mt-4 first:mt-0') }}>
+<section{{ attributes.addClass('mt-6 first:mt-0') }}>
   {{ title_prefix }}
   {% if label %}
-    <h2{{ title_attributes }}>{{ label }}</h2>
+    <h2{{ title_attributes.addClass('mb-3') }}>
+      {{ label }}
+    </h2>
   {% endif %}
   {{ title_suffix }}
   {% block content %}
     {{ content }}
   {% endblock %}
-</div>
+</section>
diff --git a/web/themes/custom/opdavies/templates/node/node--talk.html.twig b/web/themes/custom/opdavies/templates/node/node--talk.html.twig
index 40140fc..c499639 100644
--- a/web/themes/custom/opdavies/templates/node/node--talk.html.twig
+++ b/web/themes/custom/opdavies/templates/node/node--talk.html.twig
@@ -90,7 +90,7 @@
     </footer>
   {% endif %}
 
-  <div{{ content_attributes.addClass('space-y-4') }}>
+  <div{{ content_attributes.addClass(['space-y-6', page ? 'markup']) }}>
     {{ content }}
   </div>
 
diff --git a/web/themes/custom/opdavies/templates/node/node.html.twig b/web/themes/custom/opdavies/templates/node/node.html.twig
index a1a7a16..f2b9a86 100644
--- a/web/themes/custom/opdavies/templates/node/node.html.twig
+++ b/web/themes/custom/opdavies/templates/node/node.html.twig
@@ -90,7 +90,7 @@
     </footer>
   {% endif %}
 
-  <div{{ content_attributes.addClass('node-content') }}>
+  <div{{ content_attributes.addClass('node-content space-y-6') }}>
     {{ content }}
   </div>