diff --git a/templates/base.html b/templates/base.html
index ff0a37d..e2527a0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -26,24 +26,9 @@
       {% include "snippets/navbar.html" %}
     </header>
 
-    <main class="container main-sidebar">
-      <div>
-        {% block content %}
-        {% endblock content %}
-      </div>
-      <aside class="hide-at-s">
-        <nav>
-          <ul>
-            <li><strong>Recent Posts</strong></li>
-          </ul>
-          <ul>
-            {% get_recent_posts as posts %}
-            {% for post in posts %}
-              <li><a href="{{ post.url }}">{{ post.title }}</a></li>
-            {% endfor %}
-          </ul>
-        </nav>
-      </aside>
+    <main class="container {% block main_classes %}{% endblock %}">
+      {% block content %}
+      {% endblock content %}
     </main>
 
   </body>
diff --git a/templates/djpress/stuartmnz/base.html b/templates/djpress/stuartmnz/base.html
new file mode 100644
index 0000000..1cba915
--- /dev/null
+++ b/templates/djpress/stuartmnz/base.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% load djpress_tags %}
+
+{% block main_classes %}main-sidebar{% endblock %}
+
+{% block content %}
+
+  <div>
+    {% block djpress_content %}{% endblock %}
+  </div>
+  <aside class="hide-at-s">
+    <nav>
+      <ul>
+        <li><strong>Recent Posts</strong></li>
+      </ul>
+      <ul>
+        {% get_recent_posts as posts %}
+        {% for post in posts %}
+          <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+        {% endfor %}
+      </ul>
+    </nav>
+  </aside>
+
+{% endblock content %}
diff --git a/templates/djpress/stuartmnz/index.html b/templates/djpress/stuartmnz/index.html
index df1fd40..1ec4a35 100644
--- a/templates/djpress/stuartmnz/index.html
+++ b/templates/djpress/stuartmnz/index.html
@@ -1,7 +1,7 @@
-{% extends 'base.html' %}
+{% extends 'djpress/stuartmnz/base.html' %}
 {% load djpress_tags %}
 
-{% block content %}
+{% block djpress_content %}
 
   {% for post in posts %}
 
@@ -46,4 +46,4 @@
   {% endif %}
 
 
-{% endblock content %}
+{% endblock djpress_content %}
diff --git a/templates/djpress/stuartmnz/page.html b/templates/djpress/stuartmnz/page.html
index e9e469e..4de4aa7 100644
--- a/templates/djpress/stuartmnz/page.html
+++ b/templates/djpress/stuartmnz/page.html
@@ -1,12 +1,12 @@
-{% extends 'base.html' %}
+{% extends 'djpress/stuartmnz/base.html' %}
 {% load djpress_tags %}
 
 
-{% block content %}
+{% block djpress_content %}
 
   <article>
     {% post_title outer_tag="h1" %}
     {% post_content outer_tag="section" %}
   </article>
 
-{% endblock content %}
+{% endblock djpress_content %}
diff --git a/templates/djpress/stuartmnz/single.html b/templates/djpress/stuartmnz/single.html
index c66b3f2..54de0e6 100644
--- a/templates/djpress/stuartmnz/single.html
+++ b/templates/djpress/stuartmnz/single.html
@@ -1,9 +1,9 @@
-{% extends 'base.html' %}
+{% extends 'djpress/stuartmnz/base.html' %}
 {% load djpress_tags %}
 
 
-{% block content %}
+{% block djpress_content %}
 
   {% include "djpress/stuartmnz/snippets/post_detail.html" %}
 
-{% endblock content %}
+{% endblock djpress_content %}