From 3bd495f1d4f25fb4f81f73e6744048c176c4a943 Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Mon, 7 Mar 2016 10:27:07 -0500
Subject: [PATCH] Remove extensions from _includes to simplify naming

---
 _includes/absolute-url.liquid                 |  1 -
 _includes/archive-list-single                 |  8 +++++
 _includes/archive-list-single.html            |  8 -----
 .../{author-profile.html => author-profile}   |  2 +-
 _includes/base_path                           |  1 +
 _includes/{breadcrumbs.html => breadcrumbs}   |  4 +--
 .../{browser-upgrade.html => browser-upgrade} |  0
 .../{disqus-comments.html => disqus-comments} |  0
 _includes/feed-footer.html                    |  4 ---
 _includes/{footer.html => footer}             |  0
 _includes/gallery                             |  8 ++---
 .../{group-by-array.html => group-by-array}   |  0
 _includes/head                                | 30 +++++++++++++++++++
 _includes/head.html                           | 30 -------------------
 _includes/navigation                          | 19 ++++++++++++
 _includes/navigation.html                     | 19 ------------
 _includes/{scripts.html => scripts}           |  6 ++--
 _includes/{seo.html => seo}                   |  6 ++--
 _includes/social-share                        | 14 +++++++++
 _includes/social-share.html                   | 14 ---------
 _includes/toc                                 |  7 +++++
 _includes/toc.html                            |  9 ------
 _layouts/default.html                         | 20 ++++++-------
 _layouts/single.html                          | 10 +++----
 _pages/category-archive.html                  |  6 ++--
 _pages/collection-archive.html                |  4 +--
 _pages/home.md                                |  4 +--
 _pages/page-archive.html                      |  4 +--
 _pages/portfolio-archive.html                 |  6 ++--
 _pages/recipes-archive.html                   |  6 ++--
 _pages/sitemap.md                             | 10 +++----
 _pages/tag-archive.html                       |  6 ++--
 _pages/theme-setup.md                         | 16 +++++-----
 _pages/year-archive.html                      |  4 +--
 ...2-01-03-template-table-of-contents-post.md | 18 +++++------
 35 files changed, 148 insertions(+), 156 deletions(-)
 delete mode 100644 _includes/absolute-url.liquid
 create mode 100644 _includes/archive-list-single
 delete mode 100644 _includes/archive-list-single.html
 rename _includes/{author-profile.html => author-profile} (97%)
 create mode 100644 _includes/base_path
 rename _includes/{breadcrumbs.html => breadcrumbs} (68%)
 rename _includes/{browser-upgrade.html => browser-upgrade} (100%)
 rename _includes/{disqus-comments.html => disqus-comments} (100%)
 delete mode 100644 _includes/feed-footer.html
 rename _includes/{footer.html => footer} (100%)
 rename _includes/{group-by-array.html => group-by-array} (100%)
 create mode 100644 _includes/head
 delete mode 100644 _includes/head.html
 create mode 100644 _includes/navigation
 delete mode 100644 _includes/navigation.html
 rename _includes/{scripts.html => scripts} (72%)
 rename _includes/{seo.html => seo} (96%)
 create mode 100644 _includes/social-share
 delete mode 100644 _includes/social-share.html
 create mode 100644 _includes/toc
 delete mode 100644 _includes/toc.html

diff --git a/_includes/absolute-url.liquid b/_includes/absolute-url.liquid
deleted file mode 100644
index 7809e99..0000000
--- a/_includes/absolute-url.liquid
+++ /dev/null
@@ -1 +0,0 @@
-{% capture absurl %}{{ site.url }}{{ site.baseurl }}{% endcapture %}
\ No newline at end of file
diff --git a/_includes/archive-list-single b/_includes/archive-list-single
new file mode 100644
index 0000000..37d421d
--- /dev/null
+++ b/_includes/archive-list-single
@@ -0,0 +1,8 @@
+<article itemscope itemtype="http://schema.org/CreativeWork">
+  {% if post.link %}
+    <h2 class="link-post" itemprop="headline"><a href="{{ base_path }}{{ post.url }}">{% if post.id %}{{ post.title | markdownify | remove: "<p>" | remove: "</p>" }}{% else %}{{ post.title }}{% endif %}</a> <a href="{{ post.link }}" target="_blank"><i class="fa fa-link"></i></a></h2>
+  {% else %}
+    <h2 itemprop="headline"><a href="{{ base_path }}{{ post.url }}">{% if post.id %}{{ post.title | markdownify | remove: "<p>" | remove: "</p>" }}{% else %}{{ post.title }}{% endif %}</a></h2>
+  {% endif %}
+  {% if post.excerpt %}<p itemprop="description">{{ post.excerpt | markdownify | strip_html | truncate: 160 }}</p>{% endif %}
+</article>
\ No newline at end of file
diff --git a/_includes/archive-list-single.html b/_includes/archive-list-single.html
deleted file mode 100644
index 3b4032b..0000000
--- a/_includes/archive-list-single.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<article itemscope itemtype="http://schema.org/CreativeWork">
-  {% if post.link %}
-    <h2 class="link-post" itemprop="headline"><a href="{{ absurl }}{{ post.url }}">{% if post.id %}{{ post.title | markdownify | remove: "<p>" | remove: "</p>" }}{% else %}{{ post.title }}{% endif %}</a> <a href="{{ post.link }}" target="_blank"><i class="fa fa-link"></i></a></h2>
-  {% else %}
-    <h2 itemprop="headline"><a href="{{ absurl }}{{ post.url }}">{% if post.id %}{{ post.title | markdownify | remove: "<p>" | remove: "</p>" }}{% else %}{{ post.title }}{% endif %}</a></h2>
-  {% endif %}
-  {% if post.excerpt %}<p itemprop="description">{{ post.excerpt | markdownify | strip_html | truncate: 160 }}</p>{% endif %}
-</article>
\ No newline at end of file
diff --git a/_includes/author-profile.html b/_includes/author-profile
similarity index 97%
rename from _includes/author-profile.html
rename to _includes/author-profile
index 29458ce..76bb326 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile
@@ -7,7 +7,7 @@
   {% if author.avatar contains "http" %}
   	<img src="{{ author.avatar }}" class="author-avatar" alt="{{ author.name }} photo">
   {% else %}
-  	<img src="{{ author.avatar | prepend: "/images/" | prepend: absurl }}" class="author-avatar" alt="{{ author.name }} photo">
+  	<img src="{{ author.avatar | prepend: "/images/" | prepend: base_path }}" class="author-avatar" alt="{{ author.name }} photo">
   {% endif %}
 
   <h3 class="author-name">{{ author.name }}</h3>
diff --git a/_includes/base_path b/_includes/base_path
new file mode 100644
index 0000000..8c7dc62
--- /dev/null
+++ b/_includes/base_path
@@ -0,0 +1 @@
+{% capture base_path %}{{ site.url }}{{ site.baseurl }}{% endcapture %}
\ No newline at end of file
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs
similarity index 68%
rename from _includes/breadcrumbs.html
rename to _includes/breadcrumbs
index 8a12274..3caff14 100644
--- a/_includes/breadcrumbs.html
+++ b/_includes/breadcrumbs
@@ -5,7 +5,7 @@
     {% for crumb in crumbs offset: 1 %}
       {% if forloop.first %}
         <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
-          <a href="{{ absurl }}/" itemprop="item"><span itemprop="name">{{ site.breadcrumb_home_label }}</span></a>
+          <a href="{{ base_path }}/" itemprop="item"><span itemprop="name">{{ site.breadcrumb_home_label }}</span></a>
           <meta itemprop="position" content="{{ i }}" />
         </li>
         <span class="sep">{{ site.breadcrumb_separator }}</span>
@@ -15,7 +15,7 @@
       {% else %}
         {% assign i = i | plus: 1 %}
         <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
-          <a href="{{ absurl }}{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' }}{% endfor %}" itemprop="item"><span itemprop="name">{{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}</span></a>
+          <a href="{{ base_path }}{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' }}{% endfor %}" itemprop="item"><span itemprop="name">{{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}</span></a>
           <meta itemprop="position" content="{{ i }}" />
         </li>
         <span class="sep">{{ site.breadcrumb_separator }}</span>
diff --git a/_includes/browser-upgrade.html b/_includes/browser-upgrade
similarity index 100%
rename from _includes/browser-upgrade.html
rename to _includes/browser-upgrade
diff --git a/_includes/disqus-comments.html b/_includes/disqus-comments
similarity index 100%
rename from _includes/disqus-comments.html
rename to _includes/disqus-comments
diff --git a/_includes/feed-footer.html b/_includes/feed-footer.html
deleted file mode 100644
index 59faf91..0000000
--- a/_includes/feed-footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% capture feed_footer %}
-  <p><a href="{{ absurl }}{{ post.url }}" rel="nofollow">{{ post.title }}</a> was originally published by {{ site.owner.name }} on <a href="{{ site.url }}" rel="nofollow">{{ site.title }}</a></p>
-{% endcapture %}
-{{ feed_footer | markdownify | xml_escape }}
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer
similarity index 100%
rename from _includes/footer.html
rename to _includes/footer
diff --git a/_includes/gallery b/_includes/gallery
index db1b0a2..4f1f77b 100644
--- a/_includes/gallery
+++ b/_includes/gallery
@@ -1,4 +1,4 @@
-{% include absolute-url.liquid %}
+{% include base_path %}
 
 {% if include.id %}
   {% assign gallery = page.[include.id] %}
@@ -23,14 +23,14 @@
         {% if img.url contains "http" %}
           "{{ img.url }}"
         {% else %}
-          "{{ img.url | prepend: "/images/" | prepend: absurl }}"
+          "{{ img.url | prepend: "/images/" | prepend: base_path }}"
         {% endif %}
       >
         <img src=
           {% if img.image_path contains "http" %}
             "{{ img.image_path }}"
           {% else %}
-            "{{ img.image_path | prepend: "/images/" | prepend: absurl }}"
+            "{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
           {% endif %}
         alt="{% if img.alt %}{{ img.alt }}{% endif %}">
       </a>
@@ -39,7 +39,7 @@
         {% if img.image_path contains "http" %}
           "{{ img.image_path }}"
         {% else %}
-          "{{ img.image_path | prepend: "/images/" | prepend: absurl }}"
+          "{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
         {% endif %}
       alt="{% if img.alt %}{{ img.alt }}{% endif %}">
     {% endif %}
diff --git a/_includes/group-by-array.html b/_includes/group-by-array
similarity index 100%
rename from _includes/group-by-array.html
rename to _includes/group-by-array
diff --git a/_includes/head b/_includes/head
new file mode 100644
index 0000000..38a4355
--- /dev/null
+++ b/_includes/head
@@ -0,0 +1,30 @@
+<meta charset="utf-8">
+
+{% include seo %}
+
+<link href="{{ base_path }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
+
+<!-- http://t.co/dKP3o1e -->
+<meta name="HandheldFriendly" content="True">
+<meta name="MobileOptimized" content="320">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+<!-- For all browsers -->
+<link rel="stylesheet" href="{{ base_path }}/assets/css/main.css">
+
+<meta http-equiv="cleartype" content="on">
+
+<!-- HTML5 Shiv and Media Query Support -->
+<!--[if lt IE 9]>
+	<script src="{{ base_path }}/assets/js/vendor/html5shiv.min.js"></script>
+	<script src="{{ base_path }}/assets/js/vendor/respond.min.js"></script>
+<![endif]-->
+
+<!-- Modernizr -->
+<script src="{{ base_path }}/assets/js/vendor/modernizr-2.7.1.custom.min.js"></script>
+
+<link href="//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700%7CPT+Serif:400,700,400italic" rel="stylesheet" type="text/css">
+
+<!-- Icons -->
+<link rel="shortcut icon" href="{{ base_path }}/favicon.ico">
+<link rel="shortcut icon" href="{{ base_path }}/favicon.png">
diff --git a/_includes/head.html b/_includes/head.html
deleted file mode 100644
index dfd62a5..0000000
--- a/_includes/head.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<meta charset="utf-8">
-
-{% include seo.html %}
-
-<link href="{{ absurl }}/feed.xml" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
-
-<!-- http://t.co/dKP3o1e -->
-<meta name="HandheldFriendly" content="True">
-<meta name="MobileOptimized" content="320">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-<!-- For all browsers -->
-<link rel="stylesheet" href="{{ absurl }}/assets/css/main.css">
-
-<meta http-equiv="cleartype" content="on">
-
-<!-- HTML5 Shiv and Media Query Support -->
-<!--[if lt IE 9]>
-	<script src="{{ absurl }}/assets/js/vendor/html5shiv.min.js"></script>
-	<script src="{{ absurl }}/assets/js/vendor/respond.min.js"></script>
-<![endif]-->
-
-<!-- Modernizr -->
-<script src="{{ absurl }}/assets/js/vendor/modernizr-2.7.1.custom.min.js"></script>
-
-<link href="//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700%7CPT+Serif:400,700,400italic" rel="stylesheet" type="text/css">
-
-<!-- Icons -->
-<link rel="shortcut icon" href="{{ absurl }}/favicon.ico">
-<link rel="shortcut icon" href="{{ absurl }}/favicon.png">
diff --git a/_includes/navigation b/_includes/navigation
new file mode 100644
index 0000000..0400597
--- /dev/null
+++ b/_includes/navigation
@@ -0,0 +1,19 @@
+<div class="navigation-wrapper">
+  <div class="site-name">
+    <a href="{{ base_path }}/">{{ site.title }}</a>
+  </div><!-- /.site-name -->
+  <div class="top-navigation">
+    <nav id="site-nav" class="nav">
+        <ul>
+          {% for link in site.data.navigation %}
+            {% if link.url contains 'http' %}
+              {% assign domain = '' %}
+              {% else %}
+              {% assign domain = base_path %}
+            {% endif %}
+            <li><a href="{{ domain }}{{ link.url }}" {% if link.url contains 'http' %}target="_blank"{% endif %}>{{ link.title }}</a></li>
+          {% endfor %}
+        </ul>
+    </nav>
+  </div><!-- /.top-navigation -->
+</div><!-- /.navigation-wrapper -->
diff --git a/_includes/navigation.html b/_includes/navigation.html
deleted file mode 100644
index 27aff53..0000000
--- a/_includes/navigation.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="navigation-wrapper">
-	<div class="site-name">
-		<a href="{{ absurl }}/">{{ site.title }}</a>
-	</div><!-- /.site-name -->
-	<div class="top-navigation">
-		<nav id="site-nav" class="nav">
-		    <ul>
-	        {% for link in site.data.navigation %}
-				    {% if link.url contains 'http' %}
-			        {% assign domain = '' %}
-			        {% else %}
-			        {% assign domain = absurl %}
-				    {% endif %}
-				    <li><a href="{{ domain }}{{ link.url }}" {% if link.url contains 'http' %}target="_blank"{% endif %}>{{ link.title }}</a></li>
-					{% endfor %}
-		    </ul>
-		</nav>
-	</div><!-- /.top-navigation -->
-</div><!-- /.navigation-wrapper -->
diff --git a/_includes/scripts.html b/_includes/scripts
similarity index 72%
rename from _includes/scripts.html
rename to _includes/scripts
index 746e9f5..c8b4714 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts
@@ -1,6 +1,6 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script>window.jQuery || document.write('<script src="{{ absurl }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
-<script src="{{ absurl }}/assets/js/scripts.min.js"></script>
+<script>window.jQuery || document.write('<script src="{{ base_path }}/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
+<script src="{{ base_path }}/assets/js/scripts.min.js"></script>
 
 {% if site.google_analytics %}
 <script>
@@ -16,5 +16,5 @@
 {% endif %}
 
 {% if page.comments %}
-  {% include disqus-comments.html %}
+  {% include disqus-comments %}
 {% endif %}
diff --git a/_includes/seo.html b/_includes/seo
similarity index 96%
rename from _includes/seo.html
rename to _includes/seo
index 34caa2c..afeee5b 100644
--- a/_includes/seo.html
+++ b/_includes/seo
@@ -58,11 +58,11 @@
 
   {% if page.header.image %}
     <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:image" content="{% if page.header.image contains "http" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: absurl }}{% endif %}">
+    <meta name="twitter:image" content="{% if page.header.image contains "http" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
   {% else %}
     <meta name="twitter:card" content="summary">
     {% if site.logo %}
-      <meta name="twitter:image" content="{{ site.logo | prepend: "/images/" | prepend: absurl }}">
+      <meta name="twitter:image" content="{{ site.logo | prepend: "/images/" | prepend: base_path }}">
     {% endif %}
   {% endif %}
 
@@ -82,7 +82,7 @@
 {% endif %}
 
 {% if page.header.image %}
-  <meta property="og:image" content="{% if page.header.image contains "http" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: absurl }}{% endif %}">
+  <meta property="og:image" content="{% if page.header.image contains "http" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
 {% endif %}
 
 {% if page.date %}
diff --git a/_includes/social-share b/_includes/social-share
new file mode 100644
index 0000000..e266218
--- /dev/null
+++ b/_includes/social-share
@@ -0,0 +1,14 @@
+<div class="social-share">
+  <h4>Share on</h4>
+  <ul>
+    <li>
+      <a href="https://twitter.com/intent/tweet?text={{ base_path }}{{ page.url }}" class="twitter" title="Share on Twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
+    </li>
+    <li>
+      <a href="https://www.facebook.com/sharer/sharer.php?u={{ base_path }}{{ page.url }}" class="facebook" title="Share on Facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
+    </li>
+    <li>
+      <a href="https://plus.google.com/share?url={{ base_path }}{{ page.url }}" class="google-plus" title="Share on Google Plus"><i class="fa fa-google-plus"></i><span> Google+</span></a>
+    </li>
+  </ul>
+</div><!-- /.social-share -->
\ No newline at end of file
diff --git a/_includes/social-share.html b/_includes/social-share.html
deleted file mode 100644
index 820f486..0000000
--- a/_includes/social-share.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="social-share">
-  <h4>Share on</h4>
-  <ul>
-    <li>
-      <a href="https://twitter.com/intent/tweet?text={{ absurl }}{{ page.url }}" class="twitter" title="Share on Twitter"><i class="fa fa-twitter"></i><span> Twitter</span></a>
-    </li>
-    <li>
-      <a href="https://www.facebook.com/sharer/sharer.php?u={{ absurl }}{{ page.url }}" class="facebook" title="Share on Facebook"><i class="fa fa-facebook"></i><span> Facebook</span></a>
-    </li>
-    <li>
-      <a href="https://plus.google.com/share?url={{ absurl }}{{ page.url }}" class="google-plus" title="Share on Google Plus"><i class="fa fa-google-plus"></i><span> Google+</span></a>
-    </li>
-  </ul>
-</div><!-- /.social-share -->
\ No newline at end of file
diff --git a/_includes/toc b/_includes/toc
new file mode 100644
index 0000000..27c636a
--- /dev/null
+++ b/_includes/toc
@@ -0,0 +1,7 @@
+<section id="table-of-contents" class="toc">
+<header><h3><i class="fa fa-{{ include.icon | default: 'book' }}"></i> {{ include.title | default: "Overview" }}</h3></header>
+<div id="drawer" markdown="1">
+*  Auto generated table of contents
+{:toc}
+</div>
+</section>
\ No newline at end of file
diff --git a/_includes/toc.html b/_includes/toc.html
deleted file mode 100644
index cca407d..0000000
--- a/_includes/toc.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<section id="table-of-contents" class="toc">
-  <header>
-    <h3><i class="fa fa-book"></i> Overview</h3>
-  </header>
-<div id="drawer" markdown="1">
-*  Auto generated table of contents
-{:toc}
-</div>
-</section><!-- /#table-of-contents -->
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index f2b15f4..2b0fae4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -2,18 +2,18 @@
 layout: compress
 ---
 
-{% include absolute-url.liquid %}
+{% include base_path %}
 
 <!DOCTYPE html>
 <html lang="{{ site.locale | slice: 0,2 }}">
   <head>
-  {% include head.html %}
+  {% include head %}
   </head>
 
   <body>
 
-  {% include browser-upgrade.html %}
-  {% include navigation.html %}
+  {% include browser-upgrade %}
+  {% include navigation %}
 
   {% if page.header.image %}
     <div class="image-wrap">
@@ -21,7 +21,7 @@ layout: compress
         {% if page.header.image contains "http" %}
           "{{ page.header.image }}"
         {% else %}
-          "{{ page.header.image | prepend: "/images/" | prepend: absurl }}"
+          "{{ page.header.image | prepend: "/images/" | prepend: base_path }}"
         {% endif %}
         alt="{{ page.title }}">
       {% if page.header.caption %}
@@ -31,12 +31,12 @@ layout: compress
   {% endif %}
 
   {% if site.breadcrumbs %}
-    {% include breadcrumbs.html %}
+    {% include breadcrumbs %}
   {% endif %}
 
   <div id="main" role="main">
     <div class="sidebar">
-      {% if page.author_profile %}{% include author-profile.html %}{% endif %}
+      {% if page.author_profile %}{% include author-profile %}{% endif %}
       {% if page.sidebar %}
         {% for s in page.sidebar %}
           {% if s.image %}
@@ -44,7 +44,7 @@ layout: compress
             {% if s.image contains "http" %}
               "{{ s.image }}"
             {% else %}
-              "{{ s.image | prepend: "/images/" | prepend: absurl }}"
+              "{{ s.image | prepend: "/images/" | prepend: base_path }}"
             {% endif %}
             alt="{% if s.image_alt %}{{ s.image_alt }}{% endif %}">
           {% endif %}
@@ -59,11 +59,11 @@ layout: compress
 
   <div class="footer-wrap">
     <footer>
-      {% include footer.html %}
+      {% include footer %}
     </footer>
   </div><!-- /.footer-wrap -->
 
-  {% include scripts.html %}
+  {% include scripts %}
 
   </body>
 </html>
diff --git a/_layouts/single.html b/_layouts/single.html
index f91d37e..5cc99da 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 
-{% include absolute-url.liquid %}
+{% include base_path %}
 
 <article class="post" itemscope itemtype="http://schema.org/CreativeWork">
   {% if page.excerpt %}<meta itemprop="description" content="{{ page.excerpt | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
@@ -14,7 +14,7 @@ layout: default
       {% if page.link %}
         <h1 itemprop="headline"><a href="{{ page.link }}">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</a></h1>
       {% else %}
-        <h1 itemprop="headline"><a href="{{ absurl }}{{ page.url }}" rel="bookmark">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</a></h1>
+        <h1 itemprop="headline"><a href="{{ base_path }}{{ page.url }}" rel="bookmark">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</a></h1>
       {% endif %}
     </header>
 
@@ -25,7 +25,7 @@ layout: default
     <hr />
 
     <footer role="contentinfo">
-      {% if page.share %}{% include social-share.html %}{% endif %}
+      {% if page.share %}{% include social-share %}{% endif %}
       {% if page.date %}
         <p class="byline"><strong>{{ page.title }}</strong> was published on <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time>{% if page.modified %} and last modified on <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time>{% endif %}.</p>
       {% endif %}
@@ -40,10 +40,10 @@ layout: default
 {% comment %}<!-- only show related on a post page when not disabled -->{% endcomment %}
 {% if page.id and page.related and site.related_posts.size > 0 %}
   <div class="related-articles">
-  <h4>You might also enjoy <small class="pull-right">(<a href="{{ absurl }}/posts/">View all posts</a>)</small></h4>
+  <h4>You might also enjoy <small class="pull-right">(<a href="{{ base_path }}/posts/">View all posts</a>)</small></h4>
     <ul>
     {% for post in site.related_posts limit:3 %}
-      <li><a href="{{ absurl }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
+      <li><a href="{{ base_path }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
     {% endfor %}
     </ul>
     <hr />
diff --git a/_pages/category-archive.html b/_pages/category-archive.html
index f0ebe93..701ead4 100644
--- a/_pages/category-archive.html
+++ b/_pages/category-archive.html
@@ -5,13 +5,13 @@ title: "Posts by Category"
 author_profile: false
 ---
 
-{% include absolute-url.liquid %}
-{% include group-by-array.html collection=site.posts field='categories' %}
+{% include base_path %}
+{% include group-by-array collection=site.posts field='categories' %}
 
 {% for category in group_names %}
   {% assign posts = group_items[forloop.index0] %}
   <h3>{{ category }}</h3>
   {% for post in posts %}
-    {% include archive-list-single.html %}
+    {% include archive-list-single %}
   {% endfor %}
 {% endfor %}
\ No newline at end of file
diff --git a/_pages/collection-archive.html b/_pages/collection-archive.html
index f4eaca5..2c889ee 100644
--- a/_pages/collection-archive.html
+++ b/_pages/collection-archive.html
@@ -5,7 +5,7 @@ permalink: /collection-archive/
 author_profile: false
 ---
 
-{% include absolute-url.liquid %}
+{% include base_path %}
 {% capture written_label %}'None'{% endcapture %}
 
 {% for collection in site.collections %}
@@ -18,7 +18,7 @@ author_profile: false
   {% endunless %}
   {% for post in collection.docs %}
     {% unless collection.output == false or collection.label == 'posts' %}
-      {% include archive-list-single.html %}
+      {% include archive-list-single %}
     {% endunless %}
   {% endfor %}
 {% endfor %}
\ No newline at end of file
diff --git a/_pages/home.md b/_pages/home.md
index a99328d..eb31bcf 100644
--- a/_pages/home.md
+++ b/_pages/home.md
@@ -7,10 +7,10 @@ header:
   caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
 ---
 
-{% include absolute-url.liquid %}
+{% include base_path %}
 
 ### Recent Posts
 
 {% for post in site.posts limit:5 %}
-  {% include archive-list-single.html %}
+  {% include archive-list-single %}
 {% endfor %}
\ No newline at end of file
diff --git a/_pages/page-archive.html b/_pages/page-archive.html
index c2afbcf..f909548 100644
--- a/_pages/page-archive.html
+++ b/_pages/page-archive.html
@@ -5,7 +5,7 @@ permalink: /page-archive/
 author_profile: false
 ---
 
-{% include absolute-url.liquid %}
+{% include base_path %}
 {% for post in site.pages %}
-  {% include archive-list-single.html %}
+  {% include archive-list-single %}
 {% endfor %}
\ No newline at end of file
diff --git a/_pages/portfolio-archive.html b/_pages/portfolio-archive.html
index 0f1df95..3536585 100644
--- a/_pages/portfolio-archive.html
+++ b/_pages/portfolio-archive.html
@@ -4,13 +4,13 @@ title: "Portfolio"
 permalink: /portfolio/
 ---
 
-{% include absolute-url.liquid %}
-{% include group-by-array.html collection=site.portfolio field='categories' %}
+{% include base_path %}
+{% include group-by-array collection=site.portfolio field='categories' %}
 
 {% for category in group_names %}
   {% assign posts = group_items[forloop.index0] %}
   <h3>{{ category }}</h3>
   {% for post in posts %}
-    {% include archive-list-single.html %}
+    {% include archive-list-single %}
   {% endfor %}
 {% endfor %}
\ No newline at end of file
diff --git a/_pages/recipes-archive.html b/_pages/recipes-archive.html
index 0baca5f..a80b81d 100644
--- a/_pages/recipes-archive.html
+++ b/_pages/recipes-archive.html
@@ -5,13 +5,13 @@ permalink: /recipes/
 author_profile: false
 ---
 
-{% include absolute-url.liquid %}
-{% include group-by-array.html collection=site.recipes field='categories' %}
+{% include base_path %}
+{% include group-by-array collection=site.recipes field='categories' %}
 
 {% for category in group_names %}
   {% assign posts = group_items[forloop.index0] %}
   <h3>{{ category }}</h3>
   {% for post in posts %}
-    {% include archive-list-single.html %}
+    {% include archive-list-single %}
   {% endfor %}
 {% endfor %}
\ No newline at end of file
diff --git a/_pages/sitemap.md b/_pages/sitemap.md
index be35f58..7fe1854 100644
--- a/_pages/sitemap.md
+++ b/_pages/sitemap.md
@@ -5,18 +5,18 @@ permalink: /sitemap/
 author_profile: false
 ---
 
-{% include absolute-url.liquid %}
+{% include base_path %}
 
-A list of all the posts and pages found on the site. For you robots out there is an [XML version]({{ absurl }}/sitemap.xml) available for digesting as well.
+A list of all the posts and pages found on the site. For you robots out there is an [XML version]({{ base_path }}/sitemap.xml) available for digesting as well.
 
 <h3>Pages</h3>
 {% for post in site.pages %}
-  {% include archive-list-single.html %}
+  {% include archive-list-single %}
 {% endfor %}
 
 <h3>Posts</h3>
 {% for post in site.posts %}
-  {% include archive-list-single.html %}
+  {% include archive-list-single %}
 {% endfor %}
 
 {% capture written_label %}'None'{% endcapture %}
@@ -31,7 +31,7 @@ A list of all the posts and pages found on the site. For you robots out there is
 {% endunless %}
 {% for post in collection.docs %}
   {% unless collection.output == false or collection.label == 'posts' %}
-  {% include archive-list-single.html %}
+  {% include archive-list-single %}
   {% endunless %}
 {% endfor %}
 {% endfor %}
\ No newline at end of file
diff --git a/_pages/tag-archive.html b/_pages/tag-archive.html
index 2fb2b1f..2713316 100644
--- a/_pages/tag-archive.html
+++ b/_pages/tag-archive.html
@@ -4,13 +4,13 @@ permalink: /tag-archive/
 title: "Posts by Tags"
 ---
 
-{% include absolute-url.liquid %}
-{% include group-by-array.html collection=site.posts field='tags' %}
+{% include base_path %}
+{% include group-by-array collection=site.posts field='tags' %}
 
 {% for tag in group_names %}
   {% assign posts = group_items[forloop.index0] %}
   <h3>{{ tag }}</h3>
   {% for post in posts %}
-    {% include archive-list-single.html %}
+    {% include archive-list-single %}
   {% endfor %}
 {% endfor %}
\ No newline at end of file
diff --git a/_pages/theme-setup.md b/_pages/theme-setup.md
index 5badf55..1566367 100644
--- a/_pages/theme-setup.md
+++ b/_pages/theme-setup.md
@@ -7,7 +7,7 @@ share: true
 comments: true
 ---
 
-{% include toc.html %}
+{% include toc %}
 
 ## Installation
 
@@ -58,13 +58,13 @@ How Minimal Mistakes is organized and what the various files are. All posts, lay
 minimal-mistakes/
 ├── _includes/
 |    ├── author-bio.html        # bio stuff layout. pulls optional owner data from _config.yml
-|    ├── browser-upgrade.html   # prompt to install a modern browser for < IE9
-|    ├── disqus-comments.html   # Disqus comments script
-|    ├── footer.html            # site footer
-|    ├── head.html              # site head
-|    ├── navigation.html        # site top navigation
+|    ├── browser-upgrade   # prompt to install a modern browser for < IE9
+|    ├── disqus-comments   # Disqus comments script
+|    ├── footer            # site footer
+|    ├── head              # site head
+|    ├── navigation        # site top navigation
 |    ├── open-graph.html        # Twitter Cards and Open Graph meta data
-|    └── scripts.html           # site scripts
+|    └── scripts           # site scripts
 ├── _layouts/
 |    ├── home.html               # homepage layout
 |    ├── page.html               # page layout
@@ -296,7 +296,7 @@ Not sure if this only effects Kramdown or if it's an issue with Markdown in gene
 
 ### Social Sharing Links
 
-Social sharing links for Twitter, Facebook, and Google+ are included on posts/pages by default. To hide them on specific posts or pages add `share: false` to the YAML Front Matter. If you'd like to use different social networks modify `_includes/social-share.html` to your liking. Icons are set using [Font Awesome](http://fontawesome.io).
+Social sharing links for Twitter, Facebook, and Google+ are included on posts/pages by default. To hide them on specific posts or pages add `share: false` to the YAML Front Matter. If you'd like to use different social networks modify `_includes/social-share` to your liking. Icons are set using [Font Awesome](http://fontawesome.io).
 
 ---
 
diff --git a/_pages/year-archive.html b/_pages/year-archive.html
index 91c0b20..4b601de 100644
--- a/_pages/year-archive.html
+++ b/_pages/year-archive.html
@@ -5,7 +5,7 @@ title: "Posts by Year"
 author_profile: false
 ---
 
-{% include absolute-url.liquid %}
+{% include base_path %}
 {% capture written_year %}'None'{% endcapture %}
 {% for post in site.posts %}
   {% capture year %}{{ post.date | date: '%Y' }}{% endcapture %}
@@ -13,5 +13,5 @@ author_profile: false
     <h3>{{ year }}</h3>
     {% capture written_year %}{{ year }}{% endcapture %}
   {% endif %}
-  {% include archive-list-single.html %}
+  {% include archive-list-single %}
 {% endfor %}
\ No newline at end of file
diff --git a/_posts/2012-01-03-template-table-of-contents-post.md b/_posts/2012-01-03-template-table-of-contents-post.md
index d9314b7..c2fb1ab 100644
--- a/_posts/2012-01-03-template-table-of-contents-post.md
+++ b/_posts/2012-01-03-template-table-of-contents-post.md
@@ -4,15 +4,13 @@ tags:
   - table of contents
 ---
 
-<section id="table-of-contents" class="toc">
-  <header>
-    <h3>Overview</h3>
-  </header>
-<div id="drawer" markdown="1">
-*  Auto generated table of contents
-{:toc}
-</div>
-</section><!-- /#table-of-contents -->
+{% include toc title="Unique Title" icon="file-text" %}
+
+Testing Kramdown auto-generated table of contents with unique title and icon assigned in the include like so:
+
+```liquid
+{% raw %}{% include toc title="Unique Title" icon="file-text" %}{% endraw %}
+```
 
 ## HTML Elements
 
@@ -34,7 +32,7 @@ Below is just about everything you'll need to style in the theme. Check the sour
 
 Lorem ipsum dolor sit amet, test link adipiscing elit. **This is strong**. Nullam dignissim convallis est. Quisque aliquam.
 
-![Smithsonian Image]({{ site.url }}/images/3953273590_704e3899d5_m.jpg)
+![Smithsonian Image]({{ site.url }}{{ site.baseurl }}/images/3953273590_704e3899d5_m.jpg)
 {: .image-pull-right}
 
 *This is emphasized*. Donec faucibus. Nunc iaculis suscipit dui. 53 = 125. Water is H2O. Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. The New York Times (That’s a citation). Underline.Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.
-- 
2.43.0