diff --git a/_config.yml b/_config.yml
index 8035041d..4a4bbb15 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,7 +15,7 @@ url                      : "http://localhost:4000" # the base hostname & protoco
 baseurl                  : "/minimal-mistakes" # the subpath of your site, e.g. /blog
 email                    : "your-email@domain.com"
 logo                     : "site-logo.png"
-breadcrumbs              : # true / false (default)
+breadcrumbs              : false # true / false (default)
 breadcrumb_home_label    : "Home"
 breadcrumb_separator     : "/"
 twitter:
@@ -24,12 +24,25 @@ facebook:
   username               : &facebook "site_facebook"
   app_id                 :
   publisher              :
-disqus_shortname         : "mmistakes-dev" # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
+share                    : true # false (default), true
+comments:
+  provider               : false # false (default), "disqus", "facebook", "google-plus", custom"
+  disqus:
+    shortname            : "mmistakes-dev" # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
+  facebook:
+    # https://developers.facebook.com/docs/plugins/comments
+    appid                :
+    num_posts            : # 5 (default)
+    width                : # 580 (default)
+    colorscheme          : # "light" (default), "dark"
 google_site_verification :
 bing_site_verification   :
 alexa_site_verification  :
 yandex_site_verification :
-google_analytics         : # Universal Analytics tracking ID
+analytics:
+  provider               : false # false (default), "google", "google-universal", "custom"
+  google:
+    tracking_id          : "UA-123456-7"
 google_ad_client         :
 google_ad_slot           :
 
@@ -118,32 +131,37 @@ defaults:
       related: true
   # _pages
   - scope:
-      path: _pages
+      path: ""
       type: pages
     values:
       layout: single
       author_profile: true
   # _recipes
   - scope:
-      path: _recipes
+      path: ""
       type: recipes
     values:
       layout: single
       author_profile: true
+      share: true
+      comments: true
   # _pets
   - scope:
-      path: _pets
+      path: ""
       type: pets
     values:
       layout: single
       author_profile: true
+      share: true
+      comment: true
   # _portfolio
   - scope:
-      path: _portfolio
+      path: ""
       type: portfolio
     values:
       layout: single
       author_profile: true
+      share: true
 
 # Plugins
 gems:
diff --git a/_includes/absolute-url.liquid b/_includes/absolute-url.liquid
deleted file mode 100644
index 7809e996..00000000
--- 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/analytics b/_includes/analytics
new file mode 100644
index 00000000..295516aa
--- /dev/null
+++ b/_includes/analytics
@@ -0,0 +1,12 @@
+{% if site.analytics.provider and page.analytics != false %}
+
+{% case site.analytics.provider %}
+{% when "google" %}
+  {% include /analytics-providers/google %}
+{% when "google-universal" %}
+  {% include /analytics-providers/google-universal %}
+{% when "custom" %}
+  {% include /analytics-providers/custom %}
+{% endcase %}
+
+{% endif %}
\ No newline at end of file
diff --git a/_includes/analytics-providers/custom b/_includes/analytics-providers/custom
new file mode 100644
index 00000000..c34b97ad
--- /dev/null
+++ b/_includes/analytics-providers/custom
@@ -0,0 +1,3 @@
+<!-- start custom analytics snippet -->
+
+<!-- end custom analytics snippet -->
\ No newline at end of file
diff --git a/_includes/analytics-providers/google b/_includes/analytics-providers/google
new file mode 100644
index 00000000..b591b995
--- /dev/null
+++ b/_includes/analytics-providers/google
@@ -0,0 +1,11 @@
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '{{ site.analytics.google.tracking_id }}']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
\ No newline at end of file
diff --git a/_includes/analytics-providers/google-universal b/_includes/analytics-providers/google-universal
new file mode 100644
index 00000000..8da1929c
--- /dev/null
+++ b/_includes/analytics-providers/google-universal
@@ -0,0 +1,9 @@
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', {{ site.analytics.google.tracking_id }}', 'auto');
+  ga('send', 'pageview');
+</script>
\ No newline at end of file
diff --git a/_includes/archive-list-single b/_includes/archive-list-single
new file mode 100644
index 00000000..37d421d6
--- /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 3b4032bb..00000000
--- 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 29458ce7..76bb3267 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 00000000..8c7dc62b
--- /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 8a12274e..3caff149 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/comments b/_includes/comments
new file mode 100644
index 00000000..a549d8e7
--- /dev/null
+++ b/_includes/comments
@@ -0,0 +1,14 @@
+{% if site.comments.provider and page.comments %}
+
+{% case site.comments.provider %}
+{% when "disqus" %}
+  {% include /comments-providers/disqus %}
+{% when "facebook" %}
+  {% include /comments-providers/facebook %}
+{% when "google-plus" %}
+  {% include /comments-providers/google-plus %}
+{% when "custom" %}
+  {% include /comments-providers/custom %}
+{% endcase %}
+
+{% endif %}
\ No newline at end of file
diff --git a/_includes/comments-providers/custom b/_includes/comments-providers/custom
new file mode 100644
index 00000000..90993691
--- /dev/null
+++ b/_includes/comments-providers/custom
@@ -0,0 +1,3 @@
+<!-- start custom comments snippet -->
+
+<!-- end custom comments snippet -->
\ No newline at end of file
diff --git a/_includes/comments-providers/disqus b/_includes/comments-providers/disqus
new file mode 100644
index 00000000..b80be9ef
--- /dev/null
+++ b/_includes/comments-providers/disqus
@@ -0,0 +1,22 @@
+{% if site.comments.disqus.shortname %}
+  <script type="text/javascript">
+  	/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+  	var disqus_shortname = '{{ site.comments.disqus.shortname }}';
+
+  	/* * * DON'T EDIT BELOW THIS LINE * * */
+  	(function() {
+  		var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+  		dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+  		(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+  	})();
+
+  	/* * * DON'T EDIT BELOW THIS LINE * * */
+  	(function () {
+  		var s = document.createElement('script'); s.async = true;
+  		s.type = 'text/javascript';
+  		s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+  		(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+  	}());
+  </script>
+  <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+{% endif %}
diff --git a/_includes/comments-providers/facebook b/_includes/comments-providers/facebook
new file mode 100644
index 00000000..009dc1c6
--- /dev/null
+++ b/_includes/comments-providers/facebook
@@ -0,0 +1,8 @@
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.5{% if site.comments.facebook.appid %}&appId={{ site.comments.facebook.appid }}{% endif %}";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
\ No newline at end of file
diff --git a/_includes/comments-providers/google-plus b/_includes/comments-providers/google-plus
new file mode 100644
index 00000000..cd582c3d
--- /dev/null
+++ b/_includes/comments-providers/google-plus
@@ -0,0 +1,2 @@
+<script async type="text/javascript" src="//apis.google.com/js/plusone.js?callback=gpcb"></script>
+<noscript>Please enable JavaScript to view the <a href="https://plus.google.com/">comments powered by Google+.</a></noscript>
diff --git a/_includes/disqus-comments.html b/_includes/disqus-comments.html
deleted file mode 100644
index 721316a1..00000000
--- a/_includes/disqus-comments.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% if site.disqus_shortname %}
-<script type="text/javascript">
-	/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-	var disqus_shortname = '{{ site.disqus_shortname }}';
-
-	/* * * DON'T EDIT BELOW THIS LINE * * */
-	(function() {
-		var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-		dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-		(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-	})();
-
-	/* * * DON'T EDIT BELOW THIS LINE * * */
-	(function () {
-		var s = document.createElement('script'); s.async = true;
-		s.type = 'text/javascript';
-		s.src = '//' + disqus_shortname + '.disqus.com/count.js';
-		(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
-	}());
-</script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-{% endif %}
diff --git a/_includes/feed-footer.html b/_includes/feed-footer.html
deleted file mode 100644
index 59faf918..00000000
--- 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 db1b0a22..4f1f77b2 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 00000000..38a43551
--- /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 dfd62a5b..00000000
--- 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 00000000..04005971
--- /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 27aff530..00000000
--- 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 b/_includes/scripts
new file mode 100644
index 00000000..dfe7ba46
--- /dev/null
+++ b/_includes/scripts
@@ -0,0 +1,6 @@
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.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>
+
+{% include analytics %}
+{% include comments %}
diff --git a/_includes/scripts.html b/_includes/scripts.html
deleted file mode 100644
index 746e9f5d..00000000
--- a/_includes/scripts.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<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>
-
-{% if site.google_analytics %}
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', '{{ site.google_analytics }}', 'auto');
-  ga('send', 'pageview');
-
-</script>
-{% endif %}
-
-{% if page.comments %}
-  {% include disqus-comments.html %}
-{% endif %}
diff --git a/_includes/seo.html b/_includes/seo
similarity index 96%
rename from _includes/seo.html
rename to _includes/seo
index 34caa2c2..afeee5be 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 00000000..e2662182
--- /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 820f486b..00000000
--- 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 00000000..27c636af
--- /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 cca407dd..00000000
--- 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/archive.html b/_layouts/archive.html
index 9f03103f..411c7929 100644
--- a/_layouts/archive.html
+++ b/_layouts/archive.html
@@ -1,6 +1,7 @@
 ---
 layout: default
 ---
+
 <div class="archive">
   <h1>{{ page.title }}</h1>
   {{ content }}
diff --git a/_layouts/default.html b/_layouts/default.html
index f2b15f4b..2b0fae47 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 f91d37ea..036db3e0 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,25 +25,34 @@ layout: default
     <hr />
 
     <footer role="contentinfo">
-      {% if page.share %}{% include social-share.html %}{% endif %}
+      {% if site.share and 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 %}
     </footer>
   </div><!-- /.article-wrap -->
 
-  {% if site.disqus_shortname and page.comments %}
-    <section id="disqus_thread"></section><!-- /#disqus_thread -->
+  {% if site.comments.provider and page.comments %}
+    {% case site.comments.provider %}
+    {% when "disqus" %}
+      <section id="disqus_thread"></section>
+    {% when "facebook" %}
+      <section class="fb-comments" data-href="{{ base_path }}{{ page.url }}" data-num-posts="{{ site.comments.facebook.num_posts | default: 5 }}" data-width="{{ site.comments.facebook.width | default: 580 }}" data-colorscheme="{{ site.comments.facebook.colorscheme | default: 'light' }}"></section>
+    {% when "google-plus" %}
+      <section class="g-comments" data-href="{{ base_path }}{{ page.url }}" data-first_party_property="BLOGGER" data-view_type="FILTERED_POSTMOD">Loading Google+ Comments ...</section>
+    {% when "custom" %}
+      <section id="comments"></section>
+    {% endcase %}
   {% endif %}
 </article>
 
 {% 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/404.md b/_pages/404.md
index ae3be79d..9d0f8606 100644
--- a/_pages/404.md
+++ b/_pages/404.md
@@ -4,6 +4,7 @@ excerpt: "Page not found. Your pixels are in another canvas."
 sitemap: false
 permalink: /404.html
 ---
+
 Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.
 
 <script type="text/javascript">
diff --git a/_pages/about.md b/_pages/about.md
index 39121b18..50fda9b2 100644
--- a/_pages/about.md
+++ b/_pages/about.md
@@ -3,6 +3,7 @@ permalink: /about/
 title: "About the Theme"
 modified: 2014-08-08T20:53:07.573882-04:00
 ---
+
 Minimal Mistakes is responsive Jekyll theme with large featured images and solid typography. As the name implies the styling is fairly minimal to make it easier for you to build on top of.
 
 ## Minimal Mistakes is all about:
diff --git a/_pages/category-archive.html b/_pages/category-archive.html
index d98b756e..701ead44 100644
--- a/_pages/category-archive.html
+++ b/_pages/category-archive.html
@@ -4,13 +4,14 @@ permalink: /category-archive/
 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 e837a4f5..2c889ee2 100644
--- a/_pages/collection-archive.html
+++ b/_pages/collection-archive.html
@@ -4,7 +4,8 @@ title: "Posts by Collection"
 permalink: /collection-archive/
 author_profile: false
 ---
-{% include absolute-url.liquid %}
+
+{% include base_path %}
 {% capture written_label %}'None'{% endcapture %}
 
 {% for collection in site.collections %}
@@ -17,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 cefcce01..eb31bcfe 100644
--- a/_pages/home.md
+++ b/_pages/home.md
@@ -6,10 +6,11 @@ header:
   image: unsplash-image-7.jpg
   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/lorem-ipsum.md b/_pages/lorem-ipsum.md
index edb9df7a..13be88ae 100644
--- a/_pages/lorem-ipsum.md
+++ b/_pages/lorem-ipsum.md
@@ -2,6 +2,7 @@
 title: "Lorem Ipsum"
 permalink: /lorem-ipsum/
 ---
+
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec mollis. Quisque convallis libero in sapien pharetra tincidunt. Aliquam elit ante, malesuada id, tempor eu, gravida id, odio. Maecenas suscipit, risus et eleifend imperdiet, nisi orci ullamcorper massa, et adipiscing orci velit quis magna. Praesent sit amet ligula id orci venenatis auctor. Phasellus porttitor, metus non tincidunt dapibus, orci pede pretium neque, sit amet adipiscing ipsum lectus et libero. Aenean bibendum. Curabitur mattis quam id urna. Vivamus dui. Donec nonummy lacinia lorem. Cras risus arcu, sodales ac, ultrices ac, mollis quis, justo. Sed a libero. Quisque risus erat, posuere at, tristique non, lacinia quis, eros.
 
 Cras volutpat, lacus quis semper pharetra, nisi enim dignissim est, et sollicitudin quam ipsum vel mi. Sed commodo urna ac urna. Nullam eu tortor. Curabitur sodales scelerisque magna. Donec ultricies tristique pede. Nullam libero. Nam sollicitudin felis vel metus. Nullam posuere molestie metus. Nullam molestie, nunc id suscipit rhoncus, felis mi vulputate lacus, a ultrices tortor dolor eget augue. Aenean ultricies felis ut turpis. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Suspendisse placerat tellus ac nulla. Proin adipiscing sem ac risus. Maecenas nisi. Cras semper.
diff --git a/_pages/page-a.md b/_pages/page-a.md
index 45f390ab..3083db24 100644
--- a/_pages/page-a.md
+++ b/_pages/page-a.md
@@ -3,4 +3,5 @@ title: "Page A"
 permalink: /page-a/
 date: 2011-06-23T18:38:52+00:00
 ---
+
 Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean lacinia bibendum nulla sed consectetur. Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
\ No newline at end of file
diff --git a/_pages/page-archive.html b/_pages/page-archive.html
index 4710dc94..f909548f 100644
--- a/_pages/page-archive.html
+++ b/_pages/page-archive.html
@@ -4,7 +4,8 @@ title: "Page Archive"
 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/page-b.md b/_pages/page-b.md
index 6ca49471..d15ce122 100644
--- a/_pages/page-b.md
+++ b/_pages/page-b.md
@@ -3,4 +3,5 @@ title: "Page B"
 permalink: /page-b/
 date: 2011-06-23T18:39:14+00:00
 ---
+
 (lorem ipsum)
\ No newline at end of file
diff --git a/_pages/portfolio-archive.html b/_pages/portfolio-archive.html
index a34c3bc0..3536585c 100644
--- a/_pages/portfolio-archive.html
+++ b/_pages/portfolio-archive.html
@@ -3,13 +3,14 @@ layout: archive
 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 27597e71..a80b81dc 100644
--- a/_pages/recipes-archive.html
+++ b/_pages/recipes-archive.html
@@ -4,13 +4,14 @@ title: "Recipes"
 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/sample-page.md b/_pages/sample-page.md
index e3db1d05..060e53b8 100644
--- a/_pages/sample-page.md
+++ b/_pages/sample-page.md
@@ -3,6 +3,7 @@ title: "Sample Page"
 permalink: /sample-page/
 date: 2016-02-24T03:02:20+00:00
 ---
+
 This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
 
 > Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi'a coladas. (And gettin' caught in the rain.)
diff --git a/_pages/sitemap.md b/_pages/sitemap.md
index 9d2d41a3..7fe18546 100644
--- a/_pages/sitemap.md
+++ b/_pages/sitemap.md
@@ -4,18 +4,19 @@ title: "Sitemap"
 permalink: /sitemap/
 author_profile: false
 ---
-{% include absolute-url.liquid %}
 
-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.
+{% include base_path %}
+
+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 %}
@@ -30,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 11cb0328..27133160 100644
--- a/_pages/tag-archive.html
+++ b/_pages/tag-archive.html
@@ -3,13 +3,14 @@ layout: archive
 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 e98f3079..15663677 100644
--- a/_pages/theme-setup.md
+++ b/_pages/theme-setup.md
@@ -6,7 +6,8 @@ excerpt: "Instructions on how to install and customize the Jekyll theme Minimal
 share: true
 comments: true
 ---
-{% include toc.html %}
+
+{% include toc %}
 
 ## Installation
 
@@ -57,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
@@ -295,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 1f81bda3..4b601de5 100644
--- a/_pages/year-archive.html
+++ b/_pages/year-archive.html
@@ -4,7 +4,8 @@ permalink: /year-archive/
 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 %}
@@ -12,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/_pets/lhasa-apso.md b/_pets/lhasa-apso.md
index ef9d5729..14b94b80 100644
--- a/_pets/lhasa-apso.md
+++ b/_pets/lhasa-apso.md
@@ -4,6 +4,7 @@ excerpt: "The Lhasa Apso is a non-sporting dog breed originating in Tibet."
 categories: 
   - dog
 ---
+
 > The Lhasa Apso (/ˈlɑːsə ˈæpsoʊ/ lah-sə ap-soh) is a non-sporting dog breed originating in Tibet. It was bred as an interior sentinel in the Buddhist monasteries, to alert the monks to any intruders who entered. Lhasa is the capital city of Tibet, and apso is a word in the Tibetan language meaning "bearded", so, Lhasa Apso simply means "long-haired Lhasa dog". There are, however, some who claim that the word "apso" is a form of the Tibetan word "rapso", meaning "goat-like", which would make the equivalent translation "wooly Lhasa dog".
 
 > <cite>From Wikipedia, the free encyclopedia</cite>
\ No newline at end of file
diff --git a/_pets/tabby.md b/_pets/tabby.md
index 5d1d9f89..71ed3151 100644
--- a/_pets/tabby.md
+++ b/_pets/tabby.md
@@ -4,6 +4,7 @@ excerpt: "A tabby is any domestic cat that has a coat featuring distinctive stri
 categories: 
   - cat
 ---
+
 > A tabby is any domestic cat that has a coat featuring distinctive stripes, dots, lines or swirling patterns, usually together with a mark resembling an 'M' on its forehead. Tabbies are sometimes erroneously assumed to be a cat breed. In fact, the tabby pattern is found in many breeds, as well as among the general mixed-breed population. The tabby pattern is a naturally occurring feature that may be related to the coloration of the domestic cat's direct ancestor, the African wildcat, which (along with the European wildcat and Asiatic wildcat) has a similar coloration.
 
 > <cite>From Wikipedia, the free encyclopedia</cite>
\ No newline at end of file
diff --git a/_portfolio/foo-bar-website.md b/_portfolio/foo-bar-website.md
index 54523b90..96bda6f0 100644
--- a/_portfolio/foo-bar-website.md
+++ b/_portfolio/foo-bar-website.md
@@ -25,6 +25,7 @@ categories:
   - web design
   - development
 ---
+
 Pictures of Goats section West Seattle Blog dingbat newspaper rubber cement Google+ newsroom cafe news.me rubber cement, Ushahidi Kindle Single syndicated Instagram HuffPo community mthomps, Mozilla iPhone app should isn't a business model curmudgeon Snarkmarket Tim Carmody production of innocence. Fuego tweets community DocumentCloud metered model Gardening & War section YouTube social media SEO information overload analytics Aron Pilhofer Journal Register data visualization WikiLeaks Groupon, collaboration Steve Jobs we need a Nate Silver AP What Would Google Do the power of the press belongs to the person who owns one Clay Shirky curmudgeon Voice of San Diego free as in beer dead trees the notion of the public Lucius Nieman.
 
 {% include gallery caption="This is a sample gallery to go along with this case study." %}
diff --git a/_posts/2009-05-15-edge-case-nested-and-mixed-lists.md b/_posts/2009-05-15-edge-case-nested-and-mixed-lists.md
index 1976f7bc..cc4fd5e5 100644
--- a/_posts/2009-05-15-edge-case-nested-and-mixed-lists.md
+++ b/_posts/2009-05-15-edge-case-nested-and-mixed-lists.md
@@ -9,6 +9,7 @@ tags:
   - lists
   - markup
 ---
+
 Nested and mixed lists are an interesting beast. It's a corner case to make sure that
 
 * Lists within lists do not break the ordered list numbering order
diff --git a/_posts/2009-06-01-edge-case-many-tags.md b/_posts/2009-06-01-edge-case-many-tags.md
index 551ada55..f43509f1 100644
--- a/_posts/2009-06-01-edge-case-many-tags.md
+++ b/_posts/2009-06-01-edge-case-many-tags.md
@@ -45,4 +45,5 @@ tags:
   - video
   - YouTube
 ---
+
 This post has many tags.
\ No newline at end of file
diff --git a/_posts/2009-07-02-edge-case-many-categories.md b/_posts/2009-07-02-edge-case-many-categories.md
index 53eeb400..648c2da3 100644
--- a/_posts/2009-07-02-edge-case-many-categories.md
+++ b/_posts/2009-07-02-edge-case-many-categories.md
@@ -7,64 +7,17 @@ categories:
   - asmodeus
   - broder
   - buying
-  - Cat A
-  - Cat B
-  - Cat C
   - championship
   - chastening
-  - Child 1
-  - Child 2
-  - Child Category 01
-  - Child Category 02
-  - Child Category 03
-  - Child Category 04
-  - Child Category 05
-  - clerkship
   - disinclination
   - disinfection
   - dispatch
   - echappee
-  - Edge Case
   - enphagy
   - equipollent
-  - fatuity
-  - Foo A
-  - Foo A
-  - Foo Parent
-  - gaberlunzie
-  - Grandchild Category
-  - illtempered
-  - insubordination
-  - lender
-  - Markup
-  - Media
-  - monosyllable
-  - packthread
-  - palter
-  - papilionaceous
-  - Parent
-  - Parent Category
-  - personable
-  - Post Formats
-  - propylaeum
-  - pustule
-  - quartern
-  - scholarship
-  - selfconvicted
-  - showshoe
-  - sloyd
-  - sub
-  - sublunary
-  - tamtam
-  - Unpublished
-  - weakhearted
-  - ween
-  - wellhead
-  - wellintentioned
-  - whetstone
-  - years
 tags:
   - categories
   - edge case
 ---
+
 This post has many categories.
\ No newline at end of file
diff --git a/_posts/2009-09-05-edge-case-no-yaml-title.md b/_posts/2009-09-05-edge-case-no-yaml-title.md
index d41ee64c..4e5323ff 100644
--- a/_posts/2009-09-05-edge-case-no-yaml-title.md
+++ b/_posts/2009-09-05-edge-case-no-yaml-title.md
@@ -6,4 +6,5 @@ tags:
   - layout
   - title
 ---
+
 This post has no title specified in the YAML Front Matter. Jekyll should auto-generate a title from the filename.
\ No newline at end of file
diff --git a/_posts/2009-10-05-edge-case-title-should-not-overflow-the-content-area.md b/_posts/2009-10-05-edge-case-title-should-not-overflow-the-content-area.md
index 0e5d7aa5..6fdc1b8a 100644
--- a/_posts/2009-10-05-edge-case-title-should-not-overflow-the-content-area.md
+++ b/_posts/2009-10-05-edge-case-title-should-not-overflow-the-content-area.md
@@ -10,6 +10,7 @@ tags:
   - layout
   - title
 ---
+
 ## Title should not overflow the content area
 
 A few things to check for:
diff --git a/_posts/2009-10-05-edge-case-very-long-title.md b/_posts/2009-10-05-edge-case-very-long-title.md
index 96a27c2d..29fcb77c 100644
--- a/_posts/2009-10-05-edge-case-very-long-title.md
+++ b/_posts/2009-10-05-edge-case-very-long-title.md
@@ -10,4 +10,5 @@ tags:
   - layout
   - title
 ---
+
 Check for long titles and how they might break a template.
\ No newline at end of file
diff --git a/_posts/2010-01-07-post-standard.md b/_posts/2010-01-07-post-standard.md
index e3419839..cd83ea03 100644
--- a/_posts/2010-01-07-post-standard.md
+++ b/_posts/2010-01-07-post-standard.md
@@ -8,6 +8,7 @@ tags:
   - readability
   - standard
 ---
+
 All children, except one, grow up. They soon know that they will grow up, and the way Wendy knew was this. One day when she was two years old she was playing in a garden, and she plucked another flower and ran with it to her mother. I suppose she must have looked rather delightful, for Mrs. Darling put her hand to her heart and cried, "Oh, why can't you remain like this for ever!" This was all that passed between them on the subject, but henceforth Wendy knew that she must grow up. You always know after you are two. Two is the beginning of the end.
 
 Mrs. Darling first heard of Peter when she was tidying up her children's minds. It is the nightly custom of every good mother after her children are asleep to rummage in their minds and put things straight for next morning, repacking into their proper places the many articles that have wandered during the day.
diff --git a/_posts/2010-01-08-post-chat.md b/_posts/2010-01-08-post-chat.md
index 03cc5563..e61b3f28 100644
--- a/_posts/2010-01-08-post-chat.md
+++ b/_posts/2010-01-08-post-chat.md
@@ -6,6 +6,7 @@ tags:
   - chat
   - Post Formats
 ---
+
 Abbott: Strange as it may seem, they give ball players nowadays very peculiar names.
 
 Costello: Funny names?
diff --git a/_posts/2010-02-05-post-notice.md b/_posts/2010-02-05-post-notice.md
index a7c159d7..97b12f92 100644
--- a/_posts/2010-02-05-post-notice.md
+++ b/_posts/2010-02-05-post-notice.md
@@ -6,6 +6,7 @@ tags:
   - Post Formats
   - notice
 ---
+
 A notice displays information that explains nearby content. Often used to call attention to a particular detail.
 
 When using Kramdown `{: .notice}` can be added after a sentence to assign the `.notice` to the `<p></p>` element. 
diff --git a/_posts/2010-02-05-post-quote.md b/_posts/2010-02-05-post-quote.md
index 09696dbf..231f70bf 100644
--- a/_posts/2010-02-05-post-quote.md
+++ b/_posts/2010-02-05-post-quote.md
@@ -6,6 +6,7 @@ tags:
   - Post Formats
   - quote
 ---
+
 > Only one thing is impossible for God: To find any sense in any copyright law on the planet.
   
 > <cite><a href="http://www.brainyquote.com/quotes/quotes/m/marktwain163473.html">Mark Twain</a></cite>
\ No newline at end of file
diff --git a/_posts/2010-03-07-post-link.md b/_posts/2010-03-07-post-link.md
index f29a6b64..6a8005ef 100644
--- a/_posts/2010-03-07-post-link.md
+++ b/_posts/2010-03-07-post-link.md
@@ -7,6 +7,7 @@ tags:
   - Post Formats
 link: https://github.com
 ---
+
 This theme supports **link posts**, made famous by John Gruber. To use, just add `link: http://url-you-want-linked` to the post's YAML front matter and you're done.
 
 > And this is how a quote looks.
diff --git a/_posts/2010-06-02-post-video-youtube.md b/_posts/2010-06-02-post-video-youtube.md
index 7d4d0464..16bc910c 100644
--- a/_posts/2010-06-02-post-video-youtube.md
+++ b/_posts/2010-06-02-post-video-youtube.md
@@ -5,6 +5,7 @@ categories:
 tags:
   - Post Formats
 ---
+
 YouTube video embed below.
 
 <iframe width="640" height="360" src="https://www.youtube-nocookie.com/embed/l2Of1-d5E5o?controls=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/_posts/2010-08-05-post-image-linked.md b/_posts/2010-08-05-post-image-linked.md
index 6e238f1f..ac9abd40 100644
--- a/_posts/2010-08-05-post-image-linked.md
+++ b/_posts/2010-08-05-post-image-linked.md
@@ -6,4 +6,5 @@ tags:
   - image
   - Post Formats
 ---
+
 [![foo]({{http://wpthemetestdata.files.wordpress.com/2008/06/100_5540.jpg?w=604}})](http://wpthemetestdata.files.wordpress.com/2008/06/100_5540.jpg)
\ No newline at end of file
diff --git a/_posts/2010-08-05-post-image-standard.md b/_posts/2010-08-05-post-image-standard.md
index 0720c164..d7cfe330 100644
--- a/_posts/2010-08-05-post-image-standard.md
+++ b/_posts/2010-08-05-post-image-standard.md
@@ -6,6 +6,7 @@ tags:
   - image
   - Post Formats
 ---
+
 The preferred way of using images is placing them in the `/images/` directory and referencing them with an absolute path. Prepending the filename with `{% raw %}{{ site.url }}{{ site.baseurl }}/images/{% endraw %}` well make sure your images display properly in feeds and such.
 
 ![Unsplash image 9]({{ site.url }}{{ site.baseurl }}/images/unsplash-image-9.jpg)
\ No newline at end of file
diff --git a/_posts/2010-08-06-post-image-linked-caption.md b/_posts/2010-08-06-post-image-linked-caption.md
index a240a980..dfb6addf 100644
--- a/_posts/2010-08-06-post-image-linked-caption.md
+++ b/_posts/2010-08-06-post-image-linked-caption.md
@@ -6,6 +6,7 @@ tags:
   - image
   - Post Formats
 ---
+
 {% capture fig_img %}
 [![Foo](http://wpthemetestdata.files.wordpress.com/2012/06/dsc20040724_152504_532.jpg)](http://wpthemetestdata.files.wordpress.com/2012/06/dsc20040724_152504_532.jpg)
 {% endcapture %}
diff --git a/_posts/2010-08-07-post-image-caption.md b/_posts/2010-08-07-post-image-caption.md
index 23049944..51599dd4 100644
--- a/_posts/2010-08-07-post-image-caption.md
+++ b/_posts/2010-08-07-post-image-caption.md
@@ -7,6 +7,7 @@ tags:
   - Post Formats
   - shortcode
 ---
+
 {% capture fig_img %}
 ![Foo](http://wpthemetestdata.files.wordpress.com/2008/06/100_5478.jpg?w=604)
 {% endcapture %}
diff --git a/_posts/2010-09-09-post-gallery.md b/_posts/2010-09-09-post-gallery.md
index a385e993..d9e99366 100644
--- a/_posts/2010-09-09-post-gallery.md
+++ b/_posts/2010-09-09-post-gallery.md
@@ -32,6 +32,7 @@ gallery3:
   - image_path: unsplash-gallery-image-4-th.jpg
     alt: "placeholder image 4"
 ---
+
 These are gallery tests for image wrapped in `<figure>` elements.
 
 To place a gallery add the necessary YAML Front Matter:
diff --git a/_posts/2010-09-10-post-twitter-embeds.md b/_posts/2010-09-10-post-twitter-embeds.md
index 583a940d..7c5c4187 100644
--- a/_posts/2010-09-10-post-twitter-embeds.md
+++ b/_posts/2010-09-10-post-twitter-embeds.md
@@ -8,6 +8,7 @@ tags:
   - media
   - twitter
 ---
+
 <blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">🎨 Finally got around to adding all my <a href="https://twitter.com/procreateapp">@procreateapp</a> creations with time lapse videos <a href="https://t.co/1nNbkefC3L">https://t.co/1nNbkefC3L</a> <a href="https://t.co/gcNLJoJ0Gn">pic.twitter.com/gcNLJoJ0Gn</a></p>&mdash; Michael Rose (@mmistakes) <a href="https://twitter.com/mmistakes/status/662678050795094016">November 6, 2015</a></blockquote>
 <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
 
diff --git a/_posts/2010-10-25-post-future-date.md b/_posts/2010-10-25-post-future-date.md
index 56a21ad8..7d1b203a 100644
--- a/_posts/2010-10-25-post-future-date.md
+++ b/_posts/2010-10-25-post-future-date.md
@@ -4,4 +4,5 @@ date: 9999-12-31
 categories:
   - Post
 ---
+
 This post lives in the future and is dated {{ page.date | date: "%c" }}. When building Jekyll with the `--future` flag it should appear.
\ No newline at end of file
diff --git a/_posts/2012-01-02-template-comments-disabled.md b/_posts/2012-01-02-template-comments-disabled.md
index 46a08d80..250e5def 100644
--- a/_posts/2012-01-02-template-comments-disabled.md
+++ b/_posts/2012-01-02-template-comments-disabled.md
@@ -8,6 +8,7 @@ tags:
   - comments
   - template
 ---
+
 This post has its comments disabled.
 
 There should be no comment form.
\ No newline at end of file
diff --git a/_posts/2012-01-02-template-comments.md b/_posts/2012-01-02-template-comments.md
index a7443e83..ee9f54ab 100644
--- a/_posts/2012-01-02-template-comments.md
+++ b/_posts/2012-01-02-template-comments.md
@@ -8,4 +8,5 @@ tags:
   - comments
   - template
 ---
+
 This post should display comments.
\ No newline at end of file
diff --git a/_posts/2012-01-02-template-related-posts-disabled.md b/_posts/2012-01-02-template-related-posts-disabled.md
index 47201067..00e77bc6 100644
--- a/_posts/2012-01-02-template-related-posts-disabled.md
+++ b/_posts/2012-01-02-template-related-posts-disabled.md
@@ -8,6 +8,7 @@ tags:
   - related posts
   - template
 ---
+
 This post has related posts disabled.
 
 Related post links should not appear.
\ No newline at end of file
diff --git a/_posts/2012-01-02-template-related-posts.md b/_posts/2012-01-02-template-related-posts.md
index 0f2a0046..e91f0df2 100644
--- a/_posts/2012-01-02-template-related-posts.md
+++ b/_posts/2012-01-02-template-related-posts.md
@@ -8,4 +8,5 @@ tags:
   - related posts
   - template
 ---
+
 This post has related posts enabled.
\ No newline at end of file
diff --git a/_posts/2012-01-02-template-sharing-disabled.md b/_posts/2012-01-02-template-sharing-disabled.md
index b82c3189..84a5ceff 100644
--- a/_posts/2012-01-02-template-sharing-disabled.md
+++ b/_posts/2012-01-02-template-sharing-disabled.md
@@ -8,6 +8,7 @@ tags:
   - social
   - template
 ---
+
 This post has social sharing disabled.
 
 Social sharing links should not appear.
\ No newline at end of file
diff --git a/_posts/2012-01-02-template-sharing.md b/_posts/2012-01-02-template-sharing.md
index aa4db931..5b82536a 100644
--- a/_posts/2012-01-02-template-sharing.md
+++ b/_posts/2012-01-02-template-sharing.md
@@ -8,4 +8,5 @@ tags:
   - social
   - template
 ---
+
 This post should display social sharing links.
\ No newline at end of file
diff --git a/_posts/2012-01-03-template-comments-sharing-related-posts-disabled.md b/_posts/2012-01-03-template-comments-sharing-related-posts-disabled.md
index e6828fd0..e14d8e02 100644
--- a/_posts/2012-01-03-template-comments-sharing-related-posts-disabled.md
+++ b/_posts/2012-01-03-template-comments-sharing-related-posts-disabled.md
@@ -12,6 +12,7 @@ tags:
   - comments
   - template
 ---
+
 This post has comments, social sharing links, and related posts disabled.
 
 Comments, social sharing and related post links should not appear.
\ 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 9aa96fdc..c2fb1ab8 100644
--- a/_posts/2012-01-03-template-table-of-contents-post.md
+++ b/_posts/2012-01-03-template-table-of-contents-post.md
@@ -3,15 +3,14 @@ title: "Template: Post with Table Of Contents"
 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
 
@@ -33,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.
diff --git a/_posts/2012-01-07-template-sticky.md b/_posts/2012-01-07-template-sticky.md
index d467bc33..347d9899 100644
--- a/_posts/2012-01-07-template-sticky.md
+++ b/_posts/2012-01-07-template-sticky.md
@@ -6,6 +6,7 @@ tags:
   - sticky
   - template
 ---
+
 This is a sticky post.
 
 There are a few things to verify:
diff --git a/_posts/2012-03-14-template-code-excerpt-generated.md b/_posts/2012-03-14-template-code-excerpt-generated.md
index 0f9f9966..78e9dbcd 100644
--- a/_posts/2012-03-14-template-code-excerpt-generated.md
+++ b/_posts/2012-03-14-template-code-excerpt-generated.md
@@ -8,6 +8,7 @@ tags:
   - excerpt
   - template
 ---
+
 This is the post content with inline code, (e.g. `<span style="color: red;">red</span>`. It should be displayed in place of the auto-generated excerpt in single-page views. Archive-index pages should display an auto-generated excerpt of this content.
 
 Be sure to test the formatting of the auto-generated excerpt, to ensure that it doesn't create any layout problems.
\ No newline at end of file
diff --git a/_posts/2012-03-14-template-excerpt-defined.md b/_posts/2012-03-14-template-excerpt-defined.md
index bdc9f899..7c41c571 100644
--- a/_posts/2012-03-14-template-excerpt-defined.md
+++ b/_posts/2012-03-14-template-excerpt-defined.md
@@ -9,6 +9,7 @@ tags:
   - excerpt
   - template
 ---
+
 This is the post content. It should be displayed in place of the user-defined excerpt in archive-index pages.
 
 This paragraph should be absent from an archive-index page where `post.excerpt` is shown.
\ No newline at end of file
diff --git a/_posts/2012-03-14-template-excerpt-generated.md b/_posts/2012-03-14-template-excerpt-generated.md
index 7ff3df7a..02542cf1 100644
--- a/_posts/2012-03-14-template-excerpt-generated.md
+++ b/_posts/2012-03-14-template-excerpt-generated.md
@@ -9,6 +9,7 @@ tags:
   - excerpt
   - template
 ---
+
 This is the post content. It should be displayed in place of the auto-generated excerpt in single-page views. Archive-index pages should display an auto-generated excerpt of this content.
 
 <!--more-->
diff --git a/_posts/2012-03-15-template-author-override.md b/_posts/2012-03-15-template-author-override.md
index db20af45..f0d12636 100644
--- a/_posts/2012-03-15-template-author-override.md
+++ b/_posts/2012-03-15-template-author-override.md
@@ -3,6 +3,7 @@ title: "Template: Author Override"
 author: Billy Rick
 excerpt: "A post to test author overrides using a data file."
 ---
+
 For those of you who may have content written by multiple authors on your site you can now assign different authors to each post if desired.
 
 Previously the theme used a global author for the entire site and those attributes would be used in all bylines, social networking links, Twitter Card attribution, and Google Authorship. These `owner` variables were defined in `config.yml`
diff --git a/_posts/2012-03-15-template-featured-image-external.md b/_posts/2012-03-15-template-featured-image-external.md
index 82155ea7..82987273 100644
--- a/_posts/2012-03-15-template-featured-image-external.md
+++ b/_posts/2012-03-15-template-featured-image-external.md
@@ -11,6 +11,7 @@ tags:
   - image
   - template
 ---
+
 This post should display a **featured image**, if the theme supports it.
 
 Featured image is an external asset and should load.
\ No newline at end of file
diff --git a/_posts/2012-03-15-template-featured-image-horizontal.md b/_posts/2012-03-15-template-featured-image-horizontal.md
index 6e1d3700..6e5313ff 100644
--- a/_posts/2012-03-15-template-featured-image-horizontal.md
+++ b/_posts/2012-03-15-template-featured-image-horizontal.md
@@ -12,6 +12,7 @@ tags:
   - image
   - template
 ---
+
 This post should display a **featured image**, if the theme supports it.
 
 Non-square images can provide some unique styling issues.
diff --git a/_posts/2012-03-15-template-featured-image-text-readability.md b/_posts/2012-03-15-template-featured-image-text-readability.md
index ac219fbe..c6ef168f 100644
--- a/_posts/2012-03-15-template-featured-image-text-readability.md
+++ b/_posts/2012-03-15-template-featured-image-text-readability.md
@@ -8,6 +8,7 @@ tags:
   - readability
   - test
 ---
+
 This is a sample post with a large feature image[^1] up top and tons of text. Odio ad blue bottle vinyl, 90's narwhal commodo bitters pour-over nostrud. Ugh est hashtag in, fingerstache adipisicing laboris esse Pinterest shabby chic Portland. Shoreditch bicycle rights anim, flexitarian laboris put a bird on it vinyl cupidatat narwhal. Hashtag artisan skateboard, flannel Bushwick nesciunt salvia aute fixie do plaid post-ironic dolor McSweeney's. Cliche pour-over chambray nulla four loko skateboard sapiente hashtag.
 
 Vero laborum commodo occupy. Semiotics voluptate mumblecore pug. Cosby sweater ullamco quinoa ennui assumenda, sapiente occupy delectus lo-fi. *Ea fashion axe [Marfa cillum aliquip](#). Retro Bushwick keytar cliche.* Before they sold out sustainable gastropub Marfa readymade, ethical Williamsburg skateboard brunch qui consectetur gentrify semiotics. Mustache cillum irony, fingerstache magna pour-over keffiyeh tousled selfies.
diff --git a/_posts/2012-03-15-template-featured-image-vertical.md b/_posts/2012-03-15-template-featured-image-vertical.md
index ff252d0f..6df4faea 100644
--- a/_posts/2012-03-15-template-featured-image-vertical.md
+++ b/_posts/2012-03-15-template-featured-image-vertical.md
@@ -13,6 +13,7 @@ tags:
   - image
   - template
 ---
+
 This post should display a **featured image**, if the theme supports it.
 
 Non-square images can provide some unique styling issues.
diff --git a/_posts/2012-03-15-template-more-tag.md b/_posts/2012-03-15-template-more-tag.md
index 9ace97ac..652e4a05 100644
--- a/_posts/2012-03-15-template-more-tag.md
+++ b/_posts/2012-03-15-template-more-tag.md
@@ -8,6 +8,7 @@ tags:
   - read more
   - template
 ---
+
 This content is before the [excerpt separator tag](http://jekyllrb.com/docs/posts/#post-excerpts).
 
 Right after this sentence there should be a **continue reading** link of some sort in archive-index pages.
diff --git a/_posts/2012-05-22-markup-text-readability.md b/_posts/2012-05-22-markup-text-readability.md
index be2779d2..e0dde8ee 100644
--- a/_posts/2012-05-22-markup-text-readability.md
+++ b/_posts/2012-05-22-markup-text-readability.md
@@ -6,6 +6,7 @@ tags:
   - readability
   - test
 ---
+
 Portland in shoreditch Vice, labore typewriter pariatur hoodie fap sartorial Austin. Pinterest literally occupy Schlitz forage. Odio ad blue bottle vinyl, 90's narwhal commodo bitters pour-over nostrud. Ugh est hashtag in, fingerstache adipisicing laboris esse Pinterest shabby chic Portland. Shoreditch bicycle rights anim, flexitarian laboris put a bird on it vinyl cupidatat narwhal. Hashtag artisan skateboard, flannel Bushwick nesciunt salvia aute fixie do plaid post-ironic dolor McSweeney's. Cliche pour-over chambray nulla four loko skateboard sapiente hashtag.
 
 Vero laborum commodo occupy. Semiotics voluptate mumblecore pug. Cosby sweater ullamco quinoa ennui assumenda, sapiente occupy delectus lo-fi. Ea fashion axe Marfa cillum aliquip. Retro Bushwick keytar cliche. Before they sold out sustainable gastropub Marfa readymade, ethical Williamsburg skateboard brunch qui consectetur gentrify semiotics. Mustache cillum irony, fingerstache magna pour-over keffiyeh tousled selfies.
diff --git a/_posts/2013-01-05-markup-title-with-markup.md b/_posts/2013-01-05-markup-title-with-markup.md
index 6a4a9622..2ead3fc9 100644
--- a/_posts/2013-01-05-markup-title-with-markup.md
+++ b/_posts/2013-01-05-markup-title-with-markup.md
@@ -7,6 +7,7 @@ tags:
   - html
   - title
 ---
+
 Verify that:
 
 * The post title renders the word "with" in *italics* and the word "Markdown" in **bold**.
diff --git a/_posts/2013-01-05-markup-title-with-special-characters.md b/_posts/2013-01-05-markup-title-with-special-characters.md
index 65a4888f..075828af 100644
--- a/_posts/2013-01-05-markup-title-with-special-characters.md
+++ b/_posts/2013-01-05-markup-title-with-special-characters.md
@@ -8,6 +8,7 @@ tags:
   - post
   - title
 ---
+
 Putting special characters in the title should have no adverse effect on the layout or functionality.
 
 Special characters in the post title have been known to cause issues with JavaScript and XML when not properly encoded and escaped.
diff --git a/_posts/2013-01-09-markup-text-alignment.md b/_posts/2013-01-09-markup-text-alignment.md
index 081a277e..e6fd09b3 100644
--- a/_posts/2013-01-09-markup-text-alignment.md
+++ b/_posts/2013-01-09-markup-text-alignment.md
@@ -8,6 +8,7 @@ tags:
   - css
   - markup
 ---
+
 ### Default
 
 This is a paragraph. It should not have any alignment of any kind. It should just flow like you would normally expect. Nothing fancy. Just straight up text, free flowing, with love. Completely neutral and not picking a side or sitting on the fence. It just is. It just freaking is. It likes where it is. It does not feel compelled to pick a side. Leave him be. It will just be better that way. Trust me.
diff --git a/_posts/2013-01-10-markup-image-alignment.md b/_posts/2013-01-10-markup-image-alignment.md
index e5440fcf..3ee05e86 100644
--- a/_posts/2013-01-10-markup-image-alignment.md
+++ b/_posts/2013-01-10-markup-image-alignment.md
@@ -10,6 +10,7 @@ tags:
   - image
   - markup
 ---
+
 Welcome to image alignment! The best way to demonstrate the ebb and flow of the various image positioning options is to nestle them snuggly among an ocean of words. Grab a paddle and let's get started.
 
 ![image-center](http://wpthemetestdata.files.wordpress.com/2013/03/image-alignment-580x300.jpg){: .align-center}
diff --git a/_posts/2013-01-11-markup-html-tags-and-formatting.md b/_posts/2013-01-11-markup-html-tags-and-formatting.md
index 424fa950..5d3f40a0 100644
--- a/_posts/2013-01-11-markup-html-tags-and-formatting.md
+++ b/_posts/2013-01-11-markup-html-tags-and-formatting.md
@@ -9,6 +9,7 @@ tags:
   - html
   - markup
 ---
+
 ## Headings
 
 # Header one
diff --git a/_posts/2016-02-24-welcome-to-jekyll.md b/_posts/2016-02-24-welcome-to-jekyll.md
index f343cd3a..bcaa097e 100644
--- a/_posts/2016-02-24-welcome-to-jekyll.md
+++ b/_posts/2016-02-24-welcome-to-jekyll.md
@@ -5,6 +5,7 @@ categories:
 tags:
   - update
 ---
+
 You'll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
 
 To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
diff --git a/_recipes/chocolate-chip-cookies.md b/_recipes/chocolate-chip-cookies.md
index d40da08e..f58e3022 100644
--- a/_recipes/chocolate-chip-cookies.md
+++ b/_recipes/chocolate-chip-cookies.md
@@ -4,6 +4,7 @@ categories:
   - cookies
   - desert
 ---
+
 A chocolate chip cookie is a drop cookie that originated in the United States and features chocolate chips as its distinguishing ingredient.
 
 The traditional recipe combines a dough composed of butter and both brown and white sugar with semi-sweet chocolate chips. Variations include recipes with other types of chocolate as well as additional ingredients such as nuts or oatmeal.
diff --git a/_recipes/oatmeal-cookies.md b/_recipes/oatmeal-cookies.md
index 3fc2793f..2eb2143c 100644
--- a/_recipes/oatmeal-cookies.md
+++ b/_recipes/oatmeal-cookies.md
@@ -3,6 +3,7 @@ title: "Oatmeal Cookies"
 categories: 
   - cookies
 ---
+
 Oatmeal cookies are a proverbial favorite with both kids and adults. This crisp and chewy cookie is loaded with oats, dried fruit, and chopped nuts.
 
 ## Ingredients
diff --git a/_recipes/peanut-butter-cookies.md b/_recipes/peanut-butter-cookies.md
index 969acce5..029c30d6 100644
--- a/_recipes/peanut-butter-cookies.md
+++ b/_recipes/peanut-butter-cookies.md
@@ -3,6 +3,7 @@ title: "Peanut Butter Cookies"
 categories: 
   - cookies
 ---
+
 A peanut butter cookie is a type of cookie that is distinguished for having peanut butter as a principal ingredient. The cookie generally originated in the United States, its development dating back to the 1910s.
 
 ## Ingredients