diff --git a/_includes/layouts/common.liquid b/_includes/layouts/common.liquid
index 63d6394d..6885642b 100644
--- a/_includes/layouts/common.liquid
+++ b/_includes/layouts/common.liquid
@@ -1,7 +1,3 @@
----
-theme:
-    name: orionrobots
----
 {% comment %}{% capture BASE_PATH %}{% if eleventy.env.runMode == "serve" %}{% else %}{{ site.production_url }}{% endif %}{% endcapture %}{% endcomment %}
 {% capture BASE_PATH %}{{ site.production_url }}{% endcapture %}
 {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ theme.name }}{% endcapture %}
@@ -59,8 +55,31 @@ theme:
             {% include nav.liquid %}
             <!-- Content -->
             <div class="row">
-                {% block content %}{% endblock %}
-                {{ content }}
+                <div id="col-main" class="content {{ content_class }}">
+                    <div class="gcse-searchresults"></div>
+                    <nav class="row g-0 border rounded tag-row">
+                        <div class="row g-0">
+                            {% unless tags == empty %}
+                                <nav>
+                                {% assign tags_list = tags %}
+                                {% include tags_list %}
+                                </nav>
+                            {% endunless %}
+                        </div>
+                        <div class="row g-0">{% include social-sharing %}</div>
+                    </nav>
+                    <h2 class="page-header">{{ title }} {% if tagline %}<small>{{tagline}}</small>{% endif %}</h2>
+                    <div class="row-fluid post-full">
+                        <div class="span12">                        
+                            {% block post_info %}{% endblock %}
+                        </div>
+                    </div>  
+                    <article>
+                    {% block content %}{% endblock %}
+                    {{ content }}
+                    </article>
+            </div>
+                {% block side_bar %}{% endblock %}
             </div>
             <footer id="bottom">
                 <div class="row" id="footer-left">
@@ -99,4 +118,6 @@ theme:
         </script>
         <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
     {% endif %}
+    {% block footer_scripts %}
+    {% endblock %}
 </html>
diff --git a/_includes/layouts/default.liquid b/_includes/layouts/default.liquid
index 2a58596d..716f29fb 100644
--- a/_includes/layouts/default.liquid
+++ b/_includes/layouts/default.liquid
@@ -1,35 +1,24 @@
----
-theme :
-  name : orionrobots
-layout: common
----
-<article id="col-main" class="content col-md-8">
-  <div class="gcse-searchresults"></div>
-  <nav class="row g-0 border rounded tag-row">
-    <div class="row g-0">
-      {% unless tags == empty %}
-          <nav>
-            {% assign tags_list = tags %}
-            {% include tags_list %}
-          </nav>
-      {% endunless %}
-    </div>
-    <div class="row g-0">{% include social-sharing %}</div>
-  </nav>
-  <h2 class="page-header">{{ title }} {% if tagline %}<small>{{tagline}}</small>{% endif %}</h2>
-  {{ content }}
+{% assign content_class="col-md-8" %}
+
+{% layout layouts/common %}
+
+{% block content %}
   {% if comments %}
       {% include disqus_thread %}
   {% endif %}
+{% endblock %}
 
-</article>
+{% block side_bar %}
 <aside class="col-md-4">
     {% include sidebar-book.liquid %}
-    {% comment %}{% include sidebar_ads.liquid %}{% endcomment %}
 </aside>
+{% endblock %}
+
+{% block footer_scripts %}
 <script>
   const newSlug = "{{ date | date: '%Y-%m-%d' }}-{{ slug }}";
   document.addEventListener("DOMContentLoaded", function(event) {
     document.addPostAdminButton(newSlug);
   });
 </script>
+{% endblock %}
diff --git a/_includes/layouts/gallery.liquid b/_includes/layouts/gallery.liquid
index aea6e959..73dae177 100644
--- a/_includes/layouts/gallery.liquid
+++ b/_includes/layouts/gallery.liquid
@@ -1,4 +1,4 @@
 ---
-layout: page
+layout: default
 ---
 {{ content }}
diff --git a/_includes/layouts/index.liquid b/_includes/layouts/index.liquid
index 3c7a9c1c..99733d35 100644
--- a/_includes/layouts/index.liquid
+++ b/_includes/layouts/index.liquid
@@ -1,22 +1,2 @@
----
-theme :
-  name : orionrobots
-layout: common
-date: Last Modified
----
-<article id="col-main" class="content col-md-12">
-  <div class="gcse-searchresults"></div>
-  <nav class="row g-0 border rounded tag-row">
-    <div class="row g-0">
-      {% unless tags == empty %}
-          <nav>
-            {% assign tags_list = tags %}
-            {% include tags_list %}
-          </nav>
-      {% endunless %}
-    </div>
-    <div class="row g-0">{% include social-sharing %}</div>
-  </nav>
-  <h2 class="page-header">{{ title }} {% if tagline %}<small>{{tagline}}</small>{% endif %}</h2>
-  {{ content }}
-</article>
+{% assign content_class="col-md-12" %}
+{% layout layouts/common %}
diff --git a/_includes/layouts/post.liquid b/_includes/layouts/post.liquid
index fb365118..3b170835 100644
--- a/_includes/layouts/post.liquid
+++ b/_includes/layouts/post.liquid
@@ -1,15 +1,7 @@
----
-layout: default
----
-<div class="row-fluid post-full">
-  <div class="span12">
-    <div class="date">
-      <time>{{ page.date | date_to_long_string }}</time>
-      <div class="author">by {{ page.author | default: author | default: "Danny Staple" }}</div>
-    </div>
-
-    <article class="content">
-      {{ content }}
-    </article>
-  </div>
+{% layout layouts/default %}
+{% block post_info %}
+<div class="date text-secondary">
+  <time class="d-inline">{{ page.date | date_to_long_string }}</time>
+  <div class="author d-inline">by {{ page.author | default: author | default: "Danny Staple" }}</div>
 </div>
+{% endblock %}