diff --git a/src/jakecharman/templates/article.html b/src/jakecharman/templates/article.html
index 6aba5b7..fd0f5a4 100755
--- a/src/jakecharman/templates/article.html
+++ b/src/jakecharman/templates/article.html
@@ -1,4 +1,6 @@
-{% include 'header.html' %}
+{% extends 'main.html' %}
+
+{% block content %}
 <main>
     <section id="article">
         <h1>{{ metadata.title}} </h1>
@@ -7,4 +9,4 @@
         {{post|safe}}
     </section>
 </main>
-{% include 'footer.html' %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/src/jakecharman/templates/contact.html b/src/jakecharman/templates/contact.html
index bc0c72b..b09b4f9 100755
--- a/src/jakecharman/templates/contact.html
+++ b/src/jakecharman/templates/contact.html
@@ -1,4 +1,6 @@
-{% include 'header.html' %}
+{% extends 'main.html' %}
+
+{% block content %}
 <main id="contact-main">
     <h2>Contact Me</h2>
     <p>Got a question or want to talk about something on this site? Drop me a message below:</p>
@@ -17,4 +19,4 @@
         <p id="{{ 'contact-error' if error else 'contact-message' }}">{{ user_message }}</p>
     {% endif %}
 </main>
-{% include 'footer.html' %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/src/jakecharman/templates/error.html b/src/jakecharman/templates/error.html
index 0003ba3..d473543 100755
--- a/src/jakecharman/templates/error.html
+++ b/src/jakecharman/templates/error.html
@@ -1,4 +1,6 @@
-{% include 'header.html' %}
+{% extends 'main.html' %}
+
+{% block content %}
 <main>
     <div id="error-container">
         <div id='error'>
@@ -8,4 +10,4 @@
         </div>
     </div>
 </main>
-{% include 'footer.html' %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/src/jakecharman/templates/footer.html b/src/jakecharman/templates/footer.html
deleted file mode 100755
index 2c1dbdd..0000000
--- a/src/jakecharman/templates/footer.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<footer>
-    <p>&copy <span id="cr-year"></span> {{branding}}. This site uses cookies.</p>
-</footer>
-</body>
-</html>
diff --git a/src/jakecharman/templates/index.html b/src/jakecharman/templates/index.html
index 05b9e79..8ab4428 100755
--- a/src/jakecharman/templates/index.html
+++ b/src/jakecharman/templates/index.html
@@ -1,4 +1,6 @@
-{% include 'header.html' %}
+{% extends 'main.html' %}
+
+{% block content %}
     <main>
         <section id="technology">
             <div class="gradient gradient-left">
@@ -59,7 +61,7 @@
                         <hr />
                         <p>When I'm not at work, I can often be found at <a href="https://santapod.com">Santa Pod Raceway</a> with <a href="https://nitrojunkie.uk">Nitro Junkie Racing</a></p>
                         <p>We run a Top Fuel motorcycle purpose built for drag racing. The engine is loosely based on a Kawasaki Z 1000, but supercharged, and nitromethane injected to produce around 1,000 horsepower.</p>
-                        <p>I've also had the opportunity to work on a 10,000 horsepower Top Fuel Dragster. I <a href="https://nitrojunkie.uk/news/post/10000_horses">wrote about this on the Nitro Junkie website.</a></p>
+                        <p>I've also had the opportunity to work on a 10,000 horsepower Top Fuel Dragster. I <a href="https://jakecharman.co.uk/projects/topfuel_dragster">wrote about this on the Nitro Junkie website, and later extended that post here.</a></p>
                         <div class="gallery">
                             <iframe class="yt" src="https://www.youtube.com/embed/Wa-V8mQTXFk?si=W-LzfR3Qj_jgAdkY&amp;clip=UgkxV9lBj4pP1cvnR5seb82RQpWeE7RdnOXB&amp;clipt=EOrWtgsYyqu6Cw&amp;autoplay=1&amp;mute=1" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
                             <img src="/static/images/jake_tf_1.jpg">
@@ -75,4 +77,4 @@
             </div>
         </section>
     </main>
-{% include 'footer.html' %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/src/jakecharman/templates/links.html b/src/jakecharman/templates/links.html
index 73fdbf5..2d1f57b 100644
--- a/src/jakecharman/templates/links.html
+++ b/src/jakecharman/templates/links.html
@@ -1,4 +1,6 @@
-{% include 'header.html' %}
+{% extends 'main.html' %}
+
+{% block content %}
 <main id="links-main">
     <h2>Useful Links</h2>
     <section id="links">
@@ -30,4 +32,4 @@
         {% endfor %}
     </section>
 </main>
-{% include 'footer.html' %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/src/jakecharman/templates/header.html b/src/jakecharman/templates/main.html
old mode 100755
new mode 100644
similarity index 92%
rename from src/jakecharman/templates/header.html
rename to src/jakecharman/templates/main.html
index a9cfac0..b90b16d
--- a/src/jakecharman/templates/header.html
+++ b/src/jakecharman/templates/main.html
@@ -38,3 +38,11 @@
             </div>
         </div>
     </header>
+
+{% block content %}{% endblock %}
+
+<footer>
+    <p>&copy <span id="cr-year"></span> {{branding}}. This site uses cookies.</p>
+</footer>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/jakecharman/templates/projects.html b/src/jakecharman/templates/projects.html
index 30650ee..f1ff1b5 100755
--- a/src/jakecharman/templates/projects.html
+++ b/src/jakecharman/templates/projects.html
@@ -1,4 +1,6 @@
-{% include 'header.html' %}
+{% extends 'main.html' %}
+
+{% block content %}
 <main id="project-main">
     <nav id="filter">
         <label for="filter_category">Filter:</label>
@@ -51,4 +53,4 @@
         {% endfor %}
     </section>
 </main>
-{% include 'footer.html' %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file