diff --git a/templates/base.html b/templates/base.html
index a8c96bd..e19a83d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,8 +16,6 @@
-
-
{% block extra_css %}{% endblock %}
@@ -41,7 +39,6 @@
-
{% block darkmode %}
diff --git a/website/blog/templates/blog/blog_post_page.html b/website/blog/templates/blog/blog_post_page.html
index 31c57dd..1d82e45 100644
--- a/website/blog/templates/blog/blog_post_page.html
+++ b/website/blog/templates/blog/blog_post_page.html
@@ -1,13 +1 @@
-{% extends "wagtail_base.html" %}
-
-{% load wagtailcore_tags %}
-
-{% block content %}
-
-{% include "common/hero.html" %}
-
-
- {% include_block page.body %}
-
-
-{% endblock content %}
+{% extends "common/content_page.html" %}
diff --git a/website/common/templates/common/content_page.html b/website/common/templates/common/content_page.html
index 31c57dd..e580c42 100644
--- a/website/common/templates/common/content_page.html
+++ b/website/common/templates/common/content_page.html
@@ -1,6 +1,6 @@
{% extends "wagtail_base.html" %}
-{% load wagtailcore_tags %}
+{% load wagtailcore_tags static %}
{% block content %}
@@ -10,4 +10,13 @@
{% include_block page.body %}
-{% endblock content %}
+{% endblock %}
+
+{% block extra_css %}
+
+
+{% endblock %}
+
+{% block extra_js %}
+
+{% endblock %}
diff --git a/website/common/templates/common/listing_page.html b/website/common/templates/common/listing_page.html
index 8a009f3..7cac715 100644
--- a/website/common/templates/common/listing_page.html
+++ b/website/common/templates/common/listing_page.html
@@ -1,7 +1,5 @@
{% extends "wagtail_base.html" %}
-{% load util_tags %}
-
{% block content %}
{% include "common/hero.html" %}