diff --git a/_includes/layouts/common.liquid b/_includes/layouts/common.liquid
index 537445a7..ac5a6f09 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 %}
@@ -25,9 +21,16 @@ theme:
         <meta name="og:site_name" property="og:site_name" content="Orionrobots" />
         <meta property="og:type" name="og:type" content="article" />
         <meta name="og:title" property="og:title" content="{{ title }} | {{ site_title }} - {{ site_tagline }}" />
-        {% if description %}
-            <meta name="og:description" property="og:description" content="{{ description }}" />
-        {% endif %}
+        {% capture real_description -%}
+            {% if description -%}
+                {{ description }}
+            {%- else -%}
+                {{ content | strip_html | strip_newlines | truncatewords: 50 }}
+            {%- endif -%}
+        {%- endcapture %}
+        <meta name="og:description" property="og:description" content="{{ real_description }}" />
+        <meta name="description" content="{{ real_description }}">
+
         {% if thumbnail %}
             <meta name="og:image" property="og:image" content="{{ BASE_PATH }}/{% thumbnail_from_path thumbnail %}" />
             <meta name="twitter:image" content="{{ BASE_PATH }}/{% thumbnail_from_path thumbnail %}" />
@@ -38,11 +41,9 @@ theme:
 
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>{{ title }} | {{ site_title }} - {{ site_tagline }}</title>
-        {% if description %}<meta name="description" content="{{ description }}">{% endif %}
         <meta name="author" content="{{ author | default: "Danny Staple"}}">
         <meta name="article:author" property="article:author" content="{{ author | default: "Danny Staple"}}">
 
-
         <script type="text/javascript" src="/dist/bundle.js"></script>
         {% capture css %}{% include css/bootstrap-style.css %}{% endcapture %}
         <style>{{ css | cssmin }}
@@ -56,9 +57,35 @@ theme:
     <body class="template">
         <div class="container">
             <!-- Header -->
-        {% include nav.liquid %}
+            {% include nav.liquid %}
             <!-- Content -->
-            {{ content }}
+            <div class="row">
+                <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">
                     <div class="co-lg-12">
@@ -83,4 +110,19 @@ theme:
             </footer>
         </div>
     </body>
+    {% if using_mathjax %}
+        <script>
+            MathJax = {
+              tex: {
+                inlineMath: [['$', '$']]
+              },
+              svg: {
+                fontCache: 'global'
+              }
+            };
+        </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 2dbaaf34..716f29fb 100644
--- a/_includes/layouts/default.liquid
+++ b/_includes/layouts/default.liquid
@@ -1,50 +1,24 @@
----
-theme :
-  name : orionrobots
-layout: common
----
-<div class="row">
-  <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 }}
-    {% if comments %}
-        {% include disqus_thread %}
-    {% endif %}
+{% assign content_class="col-md-8" %}
 
-  </article>
-  <aside class="col-md-4">
-      {% include sidebar-book.liquid %}
-      {% comment %}{% include sidebar_ads.liquid %}{% endcomment %}
-  </aside>
-</div>
-{% if using_mathjax %}
-    <script>
-        MathJax = {
-          tex: {
-            inlineMath: [['$', '$']]
-          },
-          svg: {
-            fontCache: 'global'
-          }
-        };
-    </script>
-    <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
-{% endif %}
+{% layout layouts/common %}
+
+{% block content %}
+  {% if comments %}
+      {% include disqus_thread %}
+  {% endif %}
+{% endblock %}
+
+{% block side_bar %}
+<aside class="col-md-4">
+    {% include sidebar-book.liquid %}
+</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 8829c5a8..99733d35 100644
--- a/_includes/layouts/index.liquid
+++ b/_includes/layouts/index.liquid
@@ -1,37 +1,2 @@
----
-theme :
-  name : orionrobots
-layout: common
-date: Last Modified
----
-<div class="row">
-  <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>
-</div>
-{% if using_mathjax %}
-    <script>
-        MathJax = {
-          tex: {
-            inlineMath: [['$', '$']]
-          },
-          svg: {
-            fontCache: 'global'
-          }
-        };
-    </script>
-    <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
-{% endif %}
+{% 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 %}
diff --git a/content/2014/01/2014-01-30-my_plan.md b/content/2014/01/2014-01-30-my_plan.md
index 0799ffaa..e0442b20 100644
--- a/content/2014/01/2014-01-30-my_plan.md
+++ b/content/2014/01/2014-01-30-my_plan.md
@@ -1,7 +1,6 @@
 ---
 date: '2014-01-30'
 description: What I plan to do first with the CNC
-layout: default
 tags:
 - cnc projects
 - plans
diff --git a/content/2014/02/2014-02-03-unboxing-and-setup.md b/content/2014/02/2014-02-03-unboxing-and-setup.md
index 9441ecd1..344dd728 100644
--- a/content/2014/02/2014-02-03-unboxing-and-setup.md
+++ b/content/2014/02/2014-02-03-unboxing-and-setup.md
@@ -1,7 +1,7 @@
 ---
 date: '2014-02-03'
 description: CNC Mill Unboxing and Setup
-layout: default
+
 tags:
 - cnc projects
 - stepper motors
diff --git a/content/2014/02/2014-02-04-connecting-it-to-grbl.md b/content/2014/02/2014-02-04-connecting-it-to-grbl.md
index 8d0fe97c..228552db 100644
--- a/content/2014/02/2014-02-04-connecting-it-to-grbl.md
+++ b/content/2014/02/2014-02-04-connecting-it-to-grbl.md
@@ -2,7 +2,7 @@
 title: Connecting my CNC 3020 to grbl
 description: Connecting my CNC 3020 to grbl
 tags: [cnc projects, arduino, grbl, electronics, parallel port]
-layout: default
+
 ---
 
 ## Connections
diff --git a/content/2014/02/2014-02-05-teardown.md b/content/2014/02/2014-02-05-teardown.md
index 80452f3e..a54fea80 100644
--- a/content/2014/02/2014-02-05-teardown.md
+++ b/content/2014/02/2014-02-05-teardown.md
@@ -1,7 +1,7 @@
 ---
 date: '2014-02-05'
 description: Getting inside the CNC Machine electronics
-layout: default
+
 tags:
 - cnc projects
 - electronics
diff --git a/content/2014/02/2014-02-06-it-moves.md b/content/2014/02/2014-02-06-it-moves.md
index ee51f87e..4b765dd7 100644
--- a/content/2014/02/2014-02-06-it-moves.md
+++ b/content/2014/02/2014-02-06-it-moves.md
@@ -1,6 +1,6 @@
 ---
 date: '2014-02-06'
-layout: default
+
 tags:
 - cnc projects
 - electronics
diff --git a/content/2014/02/2014-02-07-real-test-new-plan-disaster.md b/content/2014/02/2014-02-07-real-test-new-plan-disaster.md
index 4fe02057..c25929d4 100644
--- a/content/2014/02/2014-02-07-real-test-new-plan-disaster.md
+++ b/content/2014/02/2014-02-07-real-test-new-plan-disaster.md
@@ -1,7 +1,7 @@
 ---
 date: '2014-02-07'
 description: An exciting day, but going to need to replace a part of it
-layout: default
+
 tags:
 - cnc projects
 - electronics
diff --git a/content/2014/05/2014-05-09-cam-programs.md b/content/2014/05/2014-05-09-cam-programs.md
index 29ec9523..be90ddba 100644
--- a/content/2014/05/2014-05-09-cam-programs.md
+++ b/content/2014/05/2014-05-09-cam-programs.md
@@ -1,6 +1,6 @@
 ---
 date: '2014-05-09'
-layout: default
+
 tags:
 - cnc projects
 - cam
diff --git a/content/2014/05/2014-05-16-using-heeks-cnc-to-mill-an-stl-file.md b/content/2014/05/2014-05-16-using-heeks-cnc-to-mill-an-stl-file.md
index 892e116a..a1acbb44 100644
--- a/content/2014/05/2014-05-16-using-heeks-cnc-to-mill-an-stl-file.md
+++ b/content/2014/05/2014-05-16-using-heeks-cnc-to-mill-an-stl-file.md
@@ -1,6 +1,6 @@
 ---
 date: '2014-05-16'
-layout: default
+
 tags:
 - cnc projects
 - cam
diff --git a/galleries/inside__control_box/index.html b/galleries/inside__control_box/index.html
index 2d747e58..93743a01 100644
--- a/galleries/inside__control_box/index.html
+++ b/galleries/inside__control_box/index.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside The Control Box
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target0.html b/galleries/inside__control_box/target0.html
index eb12e839..4568fdce 100644
--- a/galleries/inside__control_box/target0.html
+++ b/galleries/inside__control_box/target0.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - The Power and Spindle Board
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target1.html b/galleries/inside__control_box/target1.html
index 74329a83..bf49e11b 100644
--- a/galleries/inside__control_box/target1.html
+++ b/galleries/inside__control_box/target1.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - Close up showing discretes and connectors
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target10.html b/galleries/inside__control_box/target10.html
index 69bfbcd8..906bd488 100644
--- a/galleries/inside__control_box/target10.html
+++ b/galleries/inside__control_box/target10.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - Closer view of stepper board
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target2.html b/galleries/inside__control_box/target2.html
index 072ae853..9659ef47 100644
--- a/galleries/inside__control_box/target2.html
+++ b/galleries/inside__control_box/target2.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - Close up showing IC numbers
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target3.html b/galleries/inside__control_box/target3.html
index f853138c..7f9fa05c 100644
--- a/galleries/inside__control_box/target3.html
+++ b/galleries/inside__control_box/target3.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - The Stepper Motor Board - With Toshiba Stepper Controllers
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target4.html b/galleries/inside__control_box/target4.html
index 9131144e..6ec0e87f 100644
--- a/galleries/inside__control_box/target4.html
+++ b/galleries/inside__control_box/target4.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - Caps, connectors and flyback diodes
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target5.html b/galleries/inside__control_box/target5.html
index efe0af3a..2669a33e 100644
--- a/galleries/inside__control_box/target5.html
+++ b/galleries/inside__control_box/target5.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - DC/DC converters, Optocouplers and schmitt trigger buffers
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target6.html b/galleries/inside__control_box/target6.html
index 9421e965..3450b067 100644
--- a/galleries/inside__control_box/target6.html
+++ b/galleries/inside__control_box/target6.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - Closer view of stepper board
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target7.html b/galleries/inside__control_box/target7.html
index 36d55f8a..f077cf12 100644
--- a/galleries/inside__control_box/target7.html
+++ b/galleries/inside__control_box/target7.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - Closer view of stepper board
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target8.html b/galleries/inside__control_box/target8.html
index bbe06df4..3cf1ca28 100644
--- a/galleries/inside__control_box/target8.html
+++ b/galleries/inside__control_box/target8.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - Closer view of stepper board
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/inside__control_box/target9.html b/galleries/inside__control_box/target9.html
index bec86d7e..f082a6b1 100644
--- a/galleries/inside__control_box/target9.html
+++ b/galleries/inside__control_box/target9.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: Inside CNC mill control box - Closer view of stepper board
 tags: [electronics]
 date: 2014-02-05
diff --git a/galleries/unboxing_pictures/index.html b/galleries/unboxing_pictures/index.html
index f63f4d7e..f38a9996 100644
--- a/galleries/unboxing_pictures/index.html
+++ b/galleries/unboxing_pictures/index.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: gallery
 title: CNC Mill Unboxing Pictures
 date: 2014-02-06
 ---
diff --git a/galleries/unboxing_pictures/target0.html b/galleries/unboxing_pictures/target0.html
index f0189864..d3e6a05f 100644
--- a/galleries/unboxing_pictures/target0.html
+++ b/galleries/unboxing_pictures/target0.html
@@ -1,6 +1,6 @@
 ---
 title: CNC Mill Unboxing Pictures - Spindle above the border
-layout: default
+layout: gallery
 date: 2014-02-06
 ---
 <p><span class="textreg">
diff --git a/galleries/unboxing_pictures/target1.html b/galleries/unboxing_pictures/target1.html
index 53cfccd7..d433bac7 100644
--- a/galleries/unboxing_pictures/target1.html
+++ b/galleries/unboxing_pictures/target1.html
@@ -1,6 +1,6 @@
 ---
 title: CNC Mill Unboxing Pictures - img 3017
-layout: default
+layout: gallery
 date: 2014-02-06
 ---
 <p><span class="textreg">
diff --git a/galleries/unboxing_pictures/target2.html b/galleries/unboxing_pictures/target2.html
index 269e1ad1..a6f038c8 100644
--- a/galleries/unboxing_pictures/target2.html
+++ b/galleries/unboxing_pictures/target2.html
@@ -1,6 +1,6 @@
 ---
 title: CNC Mill Unboxing Pictures - img 3018
-layout: default
+layout: gallery
 date: 2014-02-06
 ---
 <p><span class="textreg">
diff --git a/galleries/unboxing_pictures/target3.html b/galleries/unboxing_pictures/target3.html
index 462a297f..fb183c6b 100644
--- a/galleries/unboxing_pictures/target3.html
+++ b/galleries/unboxing_pictures/target3.html
@@ -1,6 +1,6 @@
 ---
 title: CNC Mill Unboxing Pictures - img 3019
-layout: default
+layout: gallery
 date: 2014-02-06
 ---
 <p><span class="textreg">
diff --git a/galleries/unboxing_pictures/target4.html b/galleries/unboxing_pictures/target4.html
index 37ceeb8b..5ae86dff 100644
--- a/galleries/unboxing_pictures/target4.html
+++ b/galleries/unboxing_pictures/target4.html
@@ -1,6 +1,6 @@
 ---
 title: CNC Mill Unboxing Pictures - img 3020
-layout: default
+layout: gallery
 date: 2014-02-06
 ---
 <p><span class="textreg">
diff --git a/galleries/unboxing_pictures/target5.html b/galleries/unboxing_pictures/target5.html
index 73a744db..1acf57ce 100644
--- a/galleries/unboxing_pictures/target5.html
+++ b/galleries/unboxing_pictures/target5.html
@@ -1,6 +1,6 @@
 ---
 title: CNC Mill Unboxing Pictures - img 3023
-layout: default
+layout: gallery
 date: 2014-02-06
 ---
 <p><span class="textreg">
diff --git a/navigation_and_indexes/archive.html b/navigation_and_indexes/archive.html
index a5be3572..5deb7a54 100644
--- a/navigation_and_indexes/archive.html
+++ b/navigation_and_indexes/archive.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: page
 title : Orionrobots Blog
 header : Post Archive
 group: navigation
diff --git a/src/shortcodes/extract_excerpt.js b/src/shortcodes/extract_excerpt.js
index 5e50ed24..4a292486 100644
--- a/src/shortcodes/extract_excerpt.js
+++ b/src/shortcodes/extract_excerpt.js
@@ -32,6 +32,10 @@ function findExcerptEnd(content, skipLength = 0) {
  * @returns {String} the excerpt.
  */
 function extractExcerpt(doc) {
+    /* Ensure doc is an object type for sensible exceptions */
+    if (typeof doc !== 'object') {
+        throw new Error('Failed to extract excerpt: Document is not an object.');
+    }
     if (!'templateContent' in doc) {
         console.warn('Failed to extract excerpt: Document has no property `templateContent`.');
         return;
diff --git a/src/thumbnails.js b/src/thumbnails.js
index 5f56ccb9..001492b6 100644
--- a/src/thumbnails.js
+++ b/src/thumbnails.js
@@ -61,7 +61,7 @@ async function thumbnail_from_path(thumbnail_path) {
     if ( imageSrc.includes("amazon-adsystem") || !fs.existsSync(imageSrc)) {
         return "";
     } else {
-        console.log("Generating thumbnail URL for " + imageSrc);
+        // console.log("Generating thumbnail URL for " + imageSrc);
         const metadata = await make_thumbnail_for(imageSrc);
         return metadata.png[1].url;
     }
