diff --git a/config.toml b/config.toml
index 5ce543a..cedb2f1 100644
--- a/config.toml
+++ b/config.toml
@@ -253,12 +253,6 @@ invert_title_order = false
 # Full path after the base URL required. So if you were to place it in "static" it would be "/favicon.png"
 favicon = "img/seedling.png"
 
-# Optionally extend the header by supplying an `extend_header.html` template
-extend_header = false
-
-# Optionally extend the body by supplying an `extend_body.html` template
-extend_body = false
-
 # Add an emoji here to use it as favicon.
 # Compatibility: https://caniuse.com/link-icon-svg
 favicon_emoji = "🌱"
diff --git a/templates/base.html b/templates/base.html
index 4e76bb6..56f2a65 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -44,10 +44,8 @@ This variable will hold all the text strings for the language #}
     </div>
     {% include "partials/footer.html" %}
 
-    {# Optional extended body content #}
-    {%- if config.extra.extend_body -%}
-        {% include "extend_body.html" %}
-    {%- endif -%}
+    {# Users can optionally provide this template to add content to the body element. #}
+    {% include "tabi/extend_body.html" ignore missing %}
 </body>
 
 </html>
diff --git a/templates/partials/header.html b/templates/partials/header.html
index 5b659c9..ada1f23 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -177,8 +177,6 @@
         {%- endif -%}
     {%- endif -%}
 
-    {# Optional extended header content #}
-    {%- if config.extra.extend_header -%}
-        {% include "extend_header.html" %}
-    {%- endif -%}
+    {# Users can optionally provide this template to add content to the head element. #}
+    {% include "tabi/extend_head.html" ignore missing %}
 </head>