diff --git a/web/themes/custom/opdavies/templates/block--opdavies-page-title.html.twig b/web/themes/custom/opdavies/templates/block--opdavies-page-title.html.twig
new file mode 100644
index 0000000..64c6b9b
--- /dev/null
+++ b/web/themes/custom/opdavies/templates/block--opdavies-page-title.html.twig
@@ -0,0 +1,37 @@
+{#
+/**
+ * @file
+ * Theme override to display a block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ *   - label: The configured label for the block.
+ *   - label_display: The display settings for the label.
+ *   - provider: The module or other provider that provided this block plugin.
+ *   - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
+ *   - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ */
+#}
+<div{{ attributes.addClass('mb-4') }}>
+  {{ title_prefix }}
+  {% if label %}
+    <h2{{ title_attributes }}>{{ label }}</h2>
+  {% endif %}
+  {{ title_suffix }}
+  {% block content %}
+    {{ content }}
+  {% endblock %}
+</div>
diff --git a/web/themes/custom/opdavies/templates/page-title.html.twig b/web/themes/custom/opdavies/templates/page-title.html.twig
new file mode 100644
index 0000000..f26b270
--- /dev/null
+++ b/web/themes/custom/opdavies/templates/page-title.html.twig
@@ -0,0 +1,19 @@
+{#
+/**
+ * @file
+ * Theme override for page titles.
+ *
+ * Available variables:
+ * - title_attributes: HTML attributes for the page title element.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title: The page title, for use in the actual content.
+ * - title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
+ */
+#}
+{{ title_prefix }}
+{% if title %}
+  <h1{{ title_attributes.addClass('text-xl font-bold md:text-2xl') }}>{{ title }}</h1>
+{% endif %}
+{{ title_suffix }}
diff --git a/web/themes/custom/opdavies/templates/page.html.twig b/web/themes/custom/opdavies/templates/page.html.twig
index 8043473..1be4f7d 100644
--- a/web/themes/custom/opdavies/templates/page.html.twig
+++ b/web/themes/custom/opdavies/templates/page.html.twig
@@ -3,9 +3,7 @@
 
   <div class="max-w-2xl px-4 py-10 mx-auto md:py-16">
     <div id="main-content">
-      <div class="mt-4">
-        {{ page.content }}
-      </div>
+      {{ page.content }}
     </div>
 
     {{ page.footer }}