Revert to 80752d9

33 files changed, 534 insertions, 554 deletions

diff --git a/layouts/_default/header.html b/layouts/_default/header.html
index 92b0dc1..f7184e7 100644
--- a/layouts/_default/header.html
+++ b/layouts/_default/header.html
@@ -1,13 +1,13 @@
 <header>
-  <div class="title">
-    {{ if $.Scratch.Get "h1" }}
-      <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
-      {{ $.Scratch.Set "h1" false }}
-    {{ else }}
-      <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
-    {{ end }}
-    {{ with .Description }}
-      <p>{{ . }}</p>
-    {{ end }}
-  </div>
+    <div class="title">
+        {{ if $.Scratch.Get "h1" }}
+            <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
+            {{ $.Scratch.Set "h1" false }}
+        {{ else }}
+            <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+        {{ end }}
+        {{ with .Description }}
+            <p>{{ . }}</p>
+        {{ end }}
+    </div>
 </header>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9a8d157..9eaffcc 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,15 +1,15 @@
 {{ partial "general-title" . }}
 
 {{ partial "header" . }}
-{{ partial "navbar" . }}
-<!-- Main -->
-<div id="main">
-  {{ $paginator := .Paginate .Data.Pages }}
-  {{ range .Paginator.Pages }}
-    {{ .Render "content-list" }}
-  {{ end }}
+    {{ partial "navbar" . }}
+    <!-- Main -->
+    <div id="main">
+        {{ $paginator := .Paginate .Data.Pages }}
+        {{ range .Paginator.Pages }}
+            {{ .Render "content-list" }}
+        {{ end }}
 
-  {{ partial "pagination" . }}
-</div>
-{{ partial "sidebar" . }}
+        {{ partial "pagination" . }}
+    </div>
+    {{ partial "sidebar" . }}
 {{ partial "footer" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d94cf5a..d0160bc 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,16 +1,16 @@
 {{ partial "general-title" . }}
 
 {{ partial "header" . }}
-{{ partial "navbar" . }}
-<!-- Main -->
-<div id="main">
-  <article class="post">
-    {{ $.Scratch.Set "h1" true }}
-    {{ .Render "header" }}
-    <div id="content">
-      {{ .Content }}
+    {{ partial "navbar" . }}
+    <!-- Main -->
+    <div id="main">
+        <article class="post">
+            {{ $.Scratch.Set "h1" true }}
+            {{ .Render "header" }}
+            <div id="content">
+                {{ .Content }}
+            </div>
+        </article>
     </div>
-  </article>
-</div>
-{{ partial "sidebar" . }}
+    {{ partial "sidebar" . }}
 {{ partial "footer" . }}
diff --git a/layouts/about/list.html b/layouts/about/list.html
index d490e3d..e821afd 100644
--- a/layouts/about/list.html
+++ b/layouts/about/list.html
@@ -6,17 +6,17 @@
 <div id="main">
   <article class="post">
     <header>
-      <div class="title">
-        {{ if $.Scratch.Get "h1" }}
-          <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
-          {{ $.Scratch.Set "h1" false }}
-        {{ else }}
-          <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
-        {{ end }}
-        {{ with .Description }}
-          <p>{{ . }}</p>
-        {{ end }}
-      </div>
+        <div class="title">
+            {{ if $.Scratch.Get "h1" }}
+                <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
+                {{ $.Scratch.Set "h1" false }}
+            {{ else }}
+                <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+            {{ end }}
+            {{ with .Description }}
+                <p>{{ . }}</p>
+            {{ end }}
+        </div>
     </header>
     <div id="content">
       {{ .Content }}
diff --git a/layouts/contact/list.html b/layouts/contact/list.html
index a585a4b..cc2f35b 100644
--- a/layouts/contact/list.html
+++ b/layouts/contact/list.html
@@ -1,48 +1,48 @@
 {{ partial "general-title" . }}
 
 {{ partial "header" . }}
-{{ partial "navbar" . }}
-<!-- Main -->
-<div id="main">
-  <article class="post">
-    <header>
-      <div class="title">
-        {{ if $.Scratch.Get "h1" }}
-          <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
-          {{ $.Scratch.Set "h1" false }}
-        {{ else }}
-          <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
-        {{ end }}
-        {{ with .Description }}
-          <p>{{ . }}</p>
-        {{ end }}
-      </div>
-    </header>
-    <div id="content">
-      {{ .Content }}
-      <div class="contact-container">
-        {{ if .Params.netlify }}
-          <form name="contact" action="thank-you" netlify center width="300px">
-        {{ else }}
-          <form id="contact" action="//{{ .Params.emailservice }}" method="post" center width="300px">
-        {{ end }}
-        <h4>Replies Typically Within 24 Hours.</h4>
-          <fieldset>
-            <input placeholder="{{ .Params.contactname }}" type="text" name="name" tabindex="1" required autofocus>
-          </fieldset>
-          <fieldset>
-            <input placeholder="{{ .Params.contactemail}}" type="email" name="email" tabindex="2" required>
-          </fieldset>
-          <fieldset>
-            <textarea placeholder="{{ .Params.contactmessage}}" name="message" tabindex="3" required></textarea>
-          </fieldset>
-          <fieldset>
-           <button name="submit" class="button" type="submit" id="contact-submit" tabindex="4">Submit</button>
-          </fieldset>
-        </form>
-      </div>
+    {{ partial "navbar" . }}
+    <!-- Main -->
+    <div id="main">
+        <article class="post">
+          <header>
+              <div class="title">
+                  {{ if $.Scratch.Get "h1" }}
+                      <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
+                      {{ $.Scratch.Set "h1" false }}
+                  {{ else }}
+                      <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+                  {{ end }}
+                  {{ with .Description }}
+                      <p>{{ . }}</p>
+                  {{ end }}
+              </div>
+          </header>
+            <div id="content">
+                {{ .Content }}
+                <div class="contact-container">
+                {{ if .Params.netlify }}
+                  <form name="contact" action="thank-you" netlify center width="300px">
+                {{ else }}
+                  <form id="contact" action="//{{ .Params.emailservice }}" method="post" center width="300px">
+                {{ end }}
+                  <h4>Replies Typically Within 24 Hours.</h4>
+                  <fieldset>
+                   <input placeholder="{{ .Params.contactname }}" type="text" name="name" tabindex="1" required autofocus>
+                  </fieldset>
+                  <fieldset>
+                   <input placeholder="{{ .Params.contactemail}}" type="email" name="email" tabindex="2" required>
+                  </fieldset>
+                  <fieldset>
+                   <textarea placeholder="{{ .Params.contactmessage}}" name="message" tabindex="3" required></textarea>
+                  </fieldset>
+                  <fieldset>
+                   <button name="submit" class="button" type="submit" id="contact-submit" tabindex="4">Submit</button>
+                  </fieldset>
+              </form>
+            </div>
+            </div>
+        </article>
     </div>
-  </article>
-</div>
-{{ partial "sidebar" . }}
+    {{ partial "sidebar" . }}
 {{ partial "footer" . }}
diff --git a/layouts/index.html b/layouts/index.html
index d5bc1a6..be5f8da 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,13 +1,13 @@
 {{ partial "header" . }}
-{{ $.Scratch.Set "shareNav" true }}
-{{ partial "navbar" . }}
-<!-- Main -->
-<div id="main">
-  {{ range first 4 (where .Site.Pages "Type" "post") }}
-    {{ .Render "content-list" }}
+    {{ $.Scratch.Set "shareNav" true }}
+    {{ partial "navbar" . }}
+    <!-- Main -->
+    <div id="main">
+        {{ range first 1 (where .Site.Pages "Type" "post") }}
+            {{ .Render "content-single" }}
 
-    {{ partial "share-menu" . }}
-  {{ end }}
-</div>
-{{ partial "sidebar" . }}
+            {{ partial "share-menu" . }}
+        {{ end }}
+    </div>
+    {{ partial "sidebar" . }}
 {{ partial "footer" . }}
diff --git a/layouts/itemized/content-list.html b/layouts/itemized/content-list.html
index 703baa9..ae5be37 100644
--- a/layouts/itemized/content-list.html
+++ b/layouts/itemized/content-list.html
@@ -1,3 +1,3 @@
 <article class="itemized">
-  {{ .Render "header" }}
+    {{ .Render "header" }}
 </article>
diff --git a/layouts/itemized/footer-category.html b/layouts/itemized/footer-category.html
index 47a4308..35d85a9 100644
--- a/layouts/itemized/footer-category.html
+++ b/layouts/itemized/footer-category.html
@@ -1,44 +1,44 @@
 <ul class="stats">
-  {{ if isset .Params "categories" }}
-    {{ $categoryCount := (len .Params.categories) }}
+    {{ if isset .Params "categories" }}
+        {{ $categoryCount := (len .Params.categories) }}
 
-    <!--
-        Set the title before displaying the categories associated with this post.
-        The title will use the variables from the Categories menu set in the Config.
-        If the Categories menu was not set then use the default values instead.
-    -->
-    {{ if ge $categoryCount 1 }}
-      <li>
-        {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }}
-        {{ if ne (len $categoryMenu) 0 }}
-          {{ $categoryMenu := index $categoryMenu 0 }}
+        <!--
+            Set the title before displaying the categories associated with this post.
+            The title will use the variables from the Categories menu set in the Config.
+            If the Categories menu was not set then use the default values instead.
+        -->
+        {{ if ge $categoryCount 1 }}
+            <li>
+                {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }}
+                {{ if ne (len $categoryMenu) 0 }}
+                    {{ $categoryMenu := index $categoryMenu 0 }}
 
-          {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }}
+                    {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }}
 
-          {{ with $categoryMenu.Identifier }}
-            <i class="{{ . }}">&nbsp;</i>
-          {{ end }}
+                    {{ with $categoryMenu.Identifier }}
+                        <i class="{{ . }}">&nbsp;</i>
+                    {{ end }}
 
-          {{ if gt $categoryCount 1 }}
-            {{ $categoryMenu.Name }}
-          {{ else }}
-            {{ $categoryMenu.Name | singularize }}
-          {{ end }}
-          {{ else }}
-            {{ $.Scratch.Set "categoryUrl" "/categories/" }}
+                    {{ if gt $categoryCount 1 }}
+                        {{ $categoryMenu.Name }}
+                    {{ else }}
+                        {{ $categoryMenu.Name | singularize }}
+                    {{ end }}
+                {{ else }}
+                    {{ $.Scratch.Set "categoryUrl" "/categories/" }}
 
-            {{ if gt $categoryCount 1 }}
-                Categories
-            {{ else }}
-                Category
-            {{ end }}
-          {{ end }}
-      </li>
+                    {{ if gt $categoryCount 1 }}
+                        Categories
+                    {{ else }}
+                        Category
+                    {{ end }}
+                {{ end }}
+            </li>
+        {{ end }}
     {{ end }}
-  {{ end }}
 
-  <!-- Display the categories associated with this post -->
-  {{ range .Params.categories }}
-    <li><a href='{{ add ($.Scratch.Get "categoryUrl") . | urlize }}'>{{ . }}</a></li>
-  {{ end }}
+    <!-- Display the categories associated with this post -->
+    {{ range .Params.categories }}
+        <li><a href='{{ add ($.Scratch.Get "categoryUrl") . | urlize }}'>{{ . }}</a></li>
+    {{ end }}
 </ul>
diff --git a/layouts/itemized/header.html b/layouts/itemized/header.html
index 52f5fc1..9193947 100644
--- a/layouts/itemized/header.html
+++ b/layouts/itemized/header.html
@@ -1,22 +1,22 @@
 <header>
-  <div class="title">
-    {{ if $.Scratch.Get "h1" }}
-      <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
-      {{ $.Scratch.Set "h1" false }}
-    {{ else }}
-      <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
-    {{ end }}
-    {{ with .Description }}
-      <p>{{ . }}</p>
-    {{ end }}
-  </div>
-  <div class="meta">
+    <div class="title">
+        {{ if $.Scratch.Get "h1" }}
+            <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
+            {{ $.Scratch.Set "h1" false }}
+        {{ else }}
+            <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+        {{ end }}
+        {{ with .Description }}
+            <p>{{ . }}</p>
+        {{ end }}
+    </div>
+    <div class="meta">
 
-    <span class="author">{{ .Params.author }}</span>
-    <span class="format">{{ .Params.format }}</span>
-    {{ if isset .Params "link" }}
-      <a href="{{ .Params.link }}">Link</a>
-    {{ end }}
-      <!--<a href="#" class="author"><span class="name">Jane Doe</span><img src="images/avatar.jpg" alt="" /></a>-->
-  </div>
+      <span class="author">{{ .Params.author }}</span>
+      <span class="author">{{ .Params.format }}</span>
+      {{ if isset .Params "link" }}
+        <a href="{{ .Params.link }}">Link</a>
+      {{ end }}
+        <!--<a href="#" class="author"><span class="name">Jane Doe</span><img src="images/avatar.jpg" alt="" /></a>-->
+    </div>
 </header>
diff --git a/layouts/itemized/single.html b/layouts/itemized/single.html
index a9f19af..20f53ad 100644
--- a/layouts/itemized/single.html
+++ b/layouts/itemized/single.html
@@ -1,12 +1,12 @@
 {{ partial "header" . }}
-{{ $.Scratch.Set "shareNav" true }}
-{{ partial "navbar" . }}
-{{ partial "share-menu" . }}
-<!-- Main -->
-<div id="main">
-  <!-- Post -->
-  {{ $.Scratch.Set "h1" true }}
-  {{ .Render "content-single" }}
-</div>
-{{ partial "sidebar" . }}
+    {{ $.Scratch.Set "shareNav" true }}
+    {{ partial "navbar" . }}
+    {{ partial "share-menu" . }}
+    <!-- Main -->
+    <div id="main">
+        <!-- Post -->
+        {{ $.Scratch.Set "h1" true }}
+        {{ .Render "content-single" }}
+    </div>
+    {{ partial "sidebar" . }}
 {{ partial "footer" . }}
diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html
index 194762c..47ddd20 100644
--- a/layouts/partials/favicon.html
+++ b/layouts/partials/favicon.html
@@ -1,16 +1,18 @@
 {{ if .Site.Params.loadFavicon }}
-  {{ with .Site.Params.faviconVersion }}
-    {{ $.Scratch.Set "favVer" "-" }}
-    {{ $.Scratch.Add "favVer" . }}
-  {{ else }}
-    {{ $.Scratch.Set "favVer" "" }}
-  {{ end }}
+    {{ with .Site.Params.faviconVersion }}
+        {{ $.Scratch.Set "favVer" "-" }}
+        {{ $.Scratch.Add "favVer" . }}
+    {{ else }}
+        {{ $.Scratch.Set "favVer" "" }}
+    {{ end }}
 
-  {{ $favVer := $.Scratch.Get "favVer" }}
+    {{ $favVer := $.Scratch.Get "favVer" }}
 
-  <link rel="apple-touch-icon-precomposed" href='/favicon/apple-touch-icon-precomposed{{ $favVer }}.png'>
-  <link rel="icon" href='/favicon/favicon{{ $favVer }}.png'>
-  <!--[if IE]><link rel="shortcut icon" href='/favicon{{ $favVer }}.ico'><![endif]-->
-  <meta name="msapplication-TileColor" content="#da532c">
-  <meta name="msapplication-TileImage" content='/favicon/mstile{{ $favVer }}.png'>
+    <link rel="apple-touch-icon-precomposed"
+        href='/favicon/apple-touch-icon-precomposed{{ $favVer }}.png'>
+    <link rel="icon" href='/favicon/favicon{{ $favVer }}.png'>
+    <!--[if IE]><link rel="shortcut icon" href='/favicon{{ $favVer }}.ico'><![endif]-->
+    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="msapplication-TileImage"
+        content='/favicon/mstile{{ $favVer }}.png'>
 {{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 957db5c..2bc8f0b 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -21,10 +21,10 @@
 {{ end }}
 
 {{ if ne ($.Scratch.Get "jsFiles") false }}
-  {{ range $.Scratch.Get "jsFiles" }}
-    {{ if ne . "default" }}
-      <script src="{{ "{{ . }}" | absURL }}"></script>
-    {{ end }}
+{{ range $.Scratch.Get "jsFiles" }}
+      {{ if ne . "default" }}
+          <script src="{{ "{{ . }}" | absURL }}"></script>
+      {{ end }}
   {{ end }}
 {{ end }}
 
diff --git a/layouts/partials/general-title.html b/layouts/partials/general-title.html
index aac7af8..f21be7e 100644
--- a/layouts/partials/general-title.html
+++ b/layouts/partials/general-title.html
@@ -1,14 +1,14 @@
 {{ $.Scratch.Set "generalTitle" .Title }}
 {{ if eq ($.Scratch.Get "generalTitle") "Blogs" }}
-  {{ $.Scratch.Set "generalTitle" "Blog" }}
+    {{ $.Scratch.Set "generalTitle" "Blog" }}
 {{ end }}
 {{ if and (.IsNode) (eq .Data.Plural "categories") }}
-  {{ if ne .Data.Plural (lower .Title) }}
-    {{ $.Scratch.Add "generalTitle" " Posts - " }}
-  {{ else }}
-    {{ $.Scratch.Add "generalTitle" " - " }}
-  {{ end }}
+    {{ if ne .Data.Plural (lower .Title) }}
+        {{ $.Scratch.Add "generalTitle" " Posts - " }}
+    {{ else }}
+        {{ $.Scratch.Add "generalTitle" " - " }}
+    {{ end }}
 {{ else }}
-  {{ $.Scratch.Add "generalTitle" " - " }}
+    {{ $.Scratch.Add "generalTitle" " - " }}
 {{ end }}
 {{ $.Scratch.Add "generalTitle" .Site.Title }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 05e7ed3..54953d9 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,68 +5,68 @@
     Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-  <head>
-    {{ with $.Scratch.Get "generalTitle" }}
-      <title>{{ . }}</title>
-    {{ else }}
-      {{ with .Title }}
-        <title>{{ . }}</title>
-      {{ else }}
-        <title>{{ .Site.Title }}</title>
-      {{ end }}
-    {{ end }}
+    <head>
+        {{ with $.Scratch.Get "generalTitle" }}
+            <title>{{ . }}</title>
+        {{ else }}
+            {{ with .Title }}
+                <title>{{ . }}</title>
+            {{ else }}
+                <title>{{ .Site.Title }}</title>
+            {{ end }}
+        {{ end }}
 
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    {{ .Hugo.Generator }}
-    {{ partial "favicon" . }}
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        {{ .Hugo.Generator }}
+        {{ partial "favicon" . }}
 
-    {{ with .Params.author }}
-      <meta name="author" content="{{ . }}">
-    {{ end }}
-    {{ with .Description }}
-      <meta name="description" content="{{ . }}">
-    {{ else }}
-      {{ with .Site.Params.description }}
-        <meta name="description" content="{{ . }}">
-      {{ end }}
-    {{ end }}
+        {{ with .Params.author }}
+            <meta name="author" content="{{ . }}">
+        {{ end }}
+        {{ with .Description }}
+            <meta name="description" content="{{ . }}">
+        {{ else }}
+            {{ with .Site.Params.description }}
+                <meta name="description" content="{{ . }}">
+            {{ end }}
+        {{ end }}
 
-    {{ template "_internal/twitter_cards.html" . }}
-    {{ template "_internal/opengraph.html" . }}
-    {{ template "_internal/schema.html" . }}
-    {{ template "_internal/google_news.html" . }}
+        {{ template "_internal/twitter_cards.html" . }}
+        {{ template "_internal/opengraph.html" . }}
+        {{ template "_internal/schema.html" . }}
+        {{ template "_internal/google_news.html" . }}
 
-    {{ if isset .Site.Params "customcss" }}
-      {{ $.Scratch.Set "cssFiles" .Site.Params.customCSS }}
-    {{ else }}
-      {{ $.Scratch.Set "cssFiles" false }}
-    {{ end }}
+        {{ if isset .Site.Params "customcss" }}
+            {{ $.Scratch.Set "cssFiles" .Site.Params.customCSS }}
+        {{ else }}
+            {{ $.Scratch.Set "cssFiles" false }}
+        {{ end }}
 
-    <!-- If the value "default" is passed into the param then we will first
-         load the standard css files associated with the theme -->
-    {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }}
-      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-light.min.css">
-      <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,800,900|Source+Sans+Pro:400,700">
-      <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.1.20/jquery.fancybox.min.css" />
-      <link rel="stylesheet" href="{{ "css/main.css" | absURL }}">
-      <link rel="stylesheet" href="{{ "css/add-on.css" | absURL }}">
-    {{ end }}
+        <!-- If the value "default" is passed into the param then we will first
+             load the standard css files associated with the theme -->
+        {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }}
+            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-light.min.css">
+            <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,800,900|Source+Sans+Pro:400,700">
+            <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.1.20/jquery.fancybox.min.css" />
+            <link rel="stylesheet" href="{{ "css/main.css" | absURL }}">
+            <link rel="stylesheet" href="{{ "css/add-on.css" | absURL }}">
+        {{ end }}
 
-    {{ if ne ($.Scratch.Get "cssFiles") false }}
-      {{ range $.Scratch.Get "cssFiles" }}
-        {{ if ne . "default" }}
-          <link rel="stylesheet" href="{{ . | absURL }}">
+        {{ if ne ($.Scratch.Get "cssFiles") false }}
+            {{ range $.Scratch.Get "cssFiles" }}
+                {{ if ne . "default" }}
+                    <link rel="stylesheet" href="{{ . | absURL }}">
+                {{ end }}
+            {{ end }}
         {{ end }}
-      {{ end }}
-    {{ end }}
 
-    {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }}
-      {{ template "_internal/google_analytics.html" . }}
-    {{ end }}
-  </head>
-  <body>
+        {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }}
+            {{ template "_internal/google_analytics.html" . }}
+        {{ end }}
+    </head>
+    <body>
 
-    <!-- Wrapper -->
-    <div id="wrapper">
+      <!-- Wrapper -->
+      <div id="wrapper">
diff --git a/layouts/partials/img-path.html b/layouts/partials/img-path.html
index c2eccd5..dabfa61 100644
--- a/layouts/partials/img-path.html
+++ b/layouts/partials/img-path.html
@@ -1,5 +1,5 @@
 <!-- This partial is used by the img shortcodes and the template,
-featured in the post type
+     featured in the post type
 
      Set the path depending on the value passed through
 
@@ -13,19 +13,19 @@ featured in the post type
 {{ $structType := $.Scratch.Get "structType" }}
 
 {{ if eq $path "title" }}
-  {{ $.Scratch.Set "path" "/img/" }}
-  {{ if eq $structType "shortcode" }}
-    {{ $.Scratch.Add "path" (lower (replace .Page.LinkTitle " " "-")) }}
-  {{ else }}
-    {{ $.Scratch.Add "path" (lower (replace .LinkTitle " " "-")) }}
-  {{ end }}
+    {{ $.Scratch.Set "path" "/img/" }}
+    {{ if eq $structType "shortcode" }}
+        {{ $.Scratch.Add "path" (lower (replace .Page.LinkTitle " " "-")) }}
+    {{ else }}
+        {{ $.Scratch.Add "path" (lower (replace .LinkTitle " " "-")) }}
+    {{ end }}
 {{ else if eq $path "date" }}
-  {{ $.Scratch.Set "path" "/img/" }}
-  {{ if eq $structType "shortcode" }}
-    {{ $.Scratch.Add "path" (.Page.Date.Format "2006/01") }}
-  {{ else }}
-    {{ $.Scratch.Add "path" (.Date.Format "2006/01") }}
-  {{ end }}
+    {{ $.Scratch.Set "path" "/img/" }}
+    {{ if eq $structType "shortcode" }}
+        {{ $.Scratch.Add "path" (.Page.Date.Format "2006/01") }}
+    {{ else }}
+        {{ $.Scratch.Add "path" (.Date.Format "2006/01") }}
+    {{ end }}
 {{ else }}
-  {{ $.Scratch.Set "path" $path }}
+    {{ $.Scratch.Set "path" $path }}
 {{ end }}
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 10129aa..63fe851 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,44 +1,41 @@
 <!-- Header -->
 <header id="header">
+    {{ if .IsHome }}
+        <h1><a href="/">{{ .Site.Params.navbarTitle }}</a></h1>
+    {{ else }}
+        <h1><a href="/">{{ .Section }}</a></h1>
+    {{ end }}
 
-  {{ if .IsHome }}
-    <h1><a href="/">{{ .Site.Params.navbarTitle }}</a></h1>
-  {{ else if ne .Section "" }}
-    <h1><a href="/">{{ .Section }}</a></h1>
-  {{ else }}
-    <h1><a href="/">{{ .Title }}</a></h1>
-  {{ end }}
-
-  <nav class="links">
-    <ul>
-      {{ range .Site.Menus.main }}
-        <li>
-          <a href="{{ .URL }}">
-            <i class="{{ .Identifier }}">&nbsp;</i>{{ .Name }}
-          </a>
-        </li>
-      {{ end }}
-    </ul>
-  </nav>
-  <nav class="main">
-    <ul>
-      {{ if $.Scratch.Get "shareNav" }}
-        <li id="share-nav" class="share-menu" style="display:none;">
-          <a class="fa-share-alt" href="#share-menu">Share</a>
-        </li>
-      {{ end }}
-      <li class="search">
-        <a class="fa-search" href="#search">Search</a>
-        <form id="search" method="get" action="//google.com/search">
-          <input type="text" name="q" placeholder="Search" />
-          <input type="hidden" name="as_sitesearch" value="{{ .Site.BaseURL }}">
-        </form>
-      </li>
-      <li class="menu">
-        <a class="fa-bars" href="#menu">Menu</a>
-      </li>
-    </ul>
-  </nav>
+    <nav class="links">
+        <ul>
+            {{ range .Site.Menus.main }}
+                <li>
+                    <a href="{{ .URL }}">
+                            <i class="{{ .Identifier }}">&nbsp;</i>{{ .Name }}
+                    </a>
+                </li>
+            {{ end }}
+        </ul>
+    </nav>
+    <nav class="main">
+        <ul>
+            {{ if $.Scratch.Get "shareNav" }}
+            <li id="share-nav" class="share-menu" style="display:none;">
+                <a class="fa-share-alt" href="#share-menu">Share</a>
+            </li>
+            {{ end }}
+            <li class="search">
+                <a class="fa-search" href="#search">Search</a>
+                <form id="search" method="get" action="//google.com/search">
+                    <input type="text" name="q" placeholder="Search" />
+                    <input type="hidden" name="as_sitesearch" value="{{ .Site.BaseURL }}">
+                </form>
+            </li>
+            <li class="menu">
+                <a class="fa-bars" href="#menu">Menu</a>
+            </li>
+        </ul>
+    </nav>
 </header>
 
 <!-- Menu -->
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index fd1b902..a47ff0a 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -1,22 +1,16 @@
 <!-- Pagination -->
 <ul class="actions pagination">
-  {{ if .Paginator.HasPrev }}
-    <li>
-      <a href="{{ .Paginator.Prev.URL }}" class="button big previous">Previous Page</a>
-    </li>
-  {{ else }}
-    <li>
-      <a href="#" class="disabled button big previous">Previous Page</a>
-    </li>
-  {{ end }}
+    {{ if .Paginator.HasPrev }}
+        <li><a href="{{ .Paginator.Prev.URL }}"
+                class="button big previous">Previous Page</a></li>
+    {{ else }}
+        <li><a href="#" class="disabled button big previous">Previous Page</a></li>
+    {{ end }}
 
-  {{ if .Paginator.HasNext }}
-    <li>
-      <a href="{{ .Paginator.Next.URL }}" class="button big next">Next Page</a>
-    </li>
-  {{ else }}
-    <li>
-      <a href="#" class="disabled button big next">Next Page</a>
-    </li>
-  {{ end }}
+    {{ if .Paginator.HasNext }}
+        <li><a href="{{ .Paginator.Next.URL }}"
+                class="button big next">Next Page</a></li>
+    {{ else }}
+        <li><a href="#" class="disabled button big next">Next Page</a></li>
+    {{ end }}
 </ul>
diff --git a/layouts/partials/share-menu.html b/layouts/partials/share-menu.html
index 88c09aa..9ecfb08 100644
--- a/layouts/partials/share-menu.html
+++ b/layouts/partials/share-menu.html
@@ -1,10 +1,10 @@
 <section id="share-menu">
-  <section id="social-share-nav">
-    <ul class="links">
-      <header>
-        <h3>Share this post <i class="fa fa-smile-o"></i></h3>
-      </header>
-      {{ partial "share-links" . }}
-    </ul>
-  </section>
+    <section id="social-share-nav">
+        <ul class="links">
+            <header>
+                <h3>Share this post <i class="fa fa-smile-o"></i></h3>
+            </header>
+            {{ partial "share-links" . }}
+        </ul>
+    </section>
 </section>
diff --git a/layouts/post/comments.html b/layouts/post/comments.html
index 9b993d7..bdea945 100644
--- a/layouts/post/comments.html
+++ b/layouts/post/comments.html
@@ -1,11 +1,11 @@
 {{ if ne .Site.DisqusShortname "" }}
-  {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }}
+    {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }}
+        <article class="post">
+            {{ template "_internal/disqus.html" . }}
+        </article>
+    {{ end }}
+{{ else if .Site.Params.staticman.staticman }}
     <article class="post">
-      {{ template "_internal/disqus.html" . }}
+      {{ .Render "staticman" }}
     </article>
-  {{ end }}
-{{ else if .Site.Params.staticman.staticman }}
-  <article class="post">
-    {{ .Render "staticman" }}
-  </article>
 {{ end }}
diff --git a/layouts/post/content-list.html b/layouts/post/content-list.html
index b051f4a..32c4bcf 100644
--- a/layouts/post/content-list.html
+++ b/layouts/post/content-list.html
@@ -1,12 +1,12 @@
 <article class="post">
-  {{ .Render "header" }}
-  {{ .Render "featured" }}
-  <p>{{ printf "%s" .Summary | markdownify }}</p>
+    {{ .Render "header" }}
+    {{ .Render "featured" }}
+    <p>{{ printf "%s" .Summary | markdownify }}</p>
 
-  <footer>
-    <ul class="actions">
-      <li><a href="{{ .Permalink }}" class="button big">Continue Reading</a></li>
-    </ul>
-    {{ .Render "footer-category" }}
-  </footer>
+    <footer>
+        <ul class="actions">
+            <li><a href="{{ .Permalink }}" class="button big">Continue Reading</a></li>
+        </ul>
+        {{ .Render "footer-category" }}
+    </footer>
 </article>
diff --git a/layouts/post/content-single.html b/layouts/post/content-single.html
index 2266fca..b047740 100644
--- a/layouts/post/content-single.html
+++ b/layouts/post/content-single.html
@@ -18,6 +18,4 @@
     {{ .Render "footer-category" }}
   </footer>
 </article>
-
-{{ .Render "comments" }}
 {{ .Render "prev-next" }}
diff --git a/layouts/post/featured.html b/layouts/post/featured.html
index 861bfe9..7b7aa42 100644
--- a/layouts/post/featured.html
+++ b/layouts/post/featured.html
@@ -1,13 +1,13 @@
 {{ if and (isset .Params "featuredpath") (ne .Params.featuredpath "") }}
-  {{ $.Scratch.Set "path" .Params.featuredpath }}
+    {{ $.Scratch.Set "path" .Params.featuredpath }}
 
-  {{ if and (isset .Params "featured") (ne .Params.featuredpath "") }}
-    {{ $.Scratch.Set "structType" "page" }}
-    {{ partial "img-path" . }}
-    {{ $path := $.Scratch.Get "path" }}
+    {{ if and (isset .Params "featured") (ne .Params.featuredpath "") }}
+        {{ $.Scratch.Set "structType" "page" }}
+        {{ partial "img-path" . }}
+        {{ $path := $.Scratch.Get "path" }}
 
-    <a href="{{ .Permalink }}" class="image featured">
-      <img src="{{ $path }}/{{ .Params.featured }}" alt="{{ .Params.featuredalt }}" />
-    </a>
-  {{ end }}
+        <a href="{{ .Permalink }}" class="image featured">
+            <img src="{{ $path }}/{{ .Params.featured }}" alt="{{ .Params.featuredalt }}" />
+        </a>
+    {{ end }}
 {{ end }}
diff --git a/layouts/post/footer-category.html b/layouts/post/footer-category.html
index 9888746..35d85a9 100644
--- a/layouts/post/footer-category.html
+++ b/layouts/post/footer-category.html
@@ -1,46 +1,44 @@
 <ul class="stats">
-  {{ if isset .Params "categories" }}
-    {{ $categoryCount := (len .Params.categories) }}
+    {{ if isset .Params "categories" }}
+        {{ $categoryCount := (len .Params.categories) }}
 
-    <!--
-        Set the title before displaying the categories associated with this post.
-        The title will use the variables from the Categories menu set in the Config.
-        If the Categories menu was not set then use the default values instead.
-    -->
-    {{ if ge $categoryCount 1 }}
-      <li>
-        {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }}
-        {{ if ne (len $categoryMenu) 0 }}
-          {{ $categoryMenu := index $categoryMenu 0 }}
+        <!--
+            Set the title before displaying the categories associated with this post.
+            The title will use the variables from the Categories menu set in the Config.
+            If the Categories menu was not set then use the default values instead.
+        -->
+        {{ if ge $categoryCount 1 }}
+            <li>
+                {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }}
+                {{ if ne (len $categoryMenu) 0 }}
+                    {{ $categoryMenu := index $categoryMenu 0 }}
 
-          {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }}
+                    {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }}
 
-          {{ with $categoryMenu.Identifier }}
-            <i class="{{ . }}">&nbsp;</i>
-          {{ end }}
+                    {{ with $categoryMenu.Identifier }}
+                        <i class="{{ . }}">&nbsp;</i>
+                    {{ end }}
 
-          {{ if gt $categoryCount 1 }}
-            {{ $categoryMenu.Name }}
-          {{ else }}
-            {{ $categoryMenu.Name | singularize }}
-          {{ end }}
-        {{ else }}
-          {{ $.Scratch.Set "categoryUrl" "/categories/" }}
+                    {{ if gt $categoryCount 1 }}
+                        {{ $categoryMenu.Name }}
+                    {{ else }}
+                        {{ $categoryMenu.Name | singularize }}
+                    {{ end }}
+                {{ else }}
+                    {{ $.Scratch.Set "categoryUrl" "/categories/" }}
 
-          {{ if gt $categoryCount 1 }}
-            Categories
-          {{ else }}
-            Category
-          {{ end }}
+                    {{ if gt $categoryCount 1 }}
+                        Categories
+                    {{ else }}
+                        Category
+                    {{ end }}
+                {{ end }}
+            </li>
         {{ end }}
-      </li>
     {{ end }}
-  {{ end }}
 
-  <!-- Display the categories associated with this post -->
-  {{ range .Params.categories }}
-    <li>
-      <a href='{{ add ($.Scratch.Get "categoryUrl") . | urlize }}'>{{ . }}</a>
-    </li>
-  {{ end }}
+    <!-- Display the categories associated with this post -->
+    {{ range .Params.categories }}
+        <li><a href='{{ add ($.Scratch.Get "categoryUrl") . | urlize }}'>{{ . }}</a></li>
+    {{ end }}
 </ul>
diff --git a/layouts/post/header.html b/layouts/post/header.html
index 2e44285..e500a35 100644
--- a/layouts/post/header.html
+++ b/layouts/post/header.html
@@ -1,25 +1,25 @@
 <header>
-  <div class="title">
-    {{ if $.Scratch.Get "h1" }}
-      <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
-      {{ $.Scratch.Set "h1" false }}
-    {{ else }}
-      <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
-    {{ end }}
-    {{ with .Description }}
-      <p>{{ . }}</p>
-    {{ end }}
-  </div>
-  <div class="meta">
-    {{ $.Scratch.Set "dateType" .Date }}
+    <div class="title">
+        {{ if $.Scratch.Get "h1" }}
+            <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
+            {{ $.Scratch.Set "h1" false }}
+        {{ else }}
+            <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+        {{ end }}
+        {{ with .Description }}
+            <p>{{ . }}</p>
+        {{ end }}
+    </div>
+    <div class="meta">
+        {{ $.Scratch.Set "dateType" .Date }}
 
-    <time class="published" datetime='{{ ($.Scratch.Get "dateType").Format "2006-01-02" }}'>
-      {{ ($.Scratch.Get "dateType").Format "January 2, 2006" }}
-    </time>
-    <span class="author">{{ .Params.author }}</span>
-    {{ if .Site.Params.includeReadingTime }}
-      <p>{{ .ReadingTime }} minute read</p>
-    {{ end }}
-    <!--<a href="#" class="author"><span class="name">Jane Doe</span><img src="images/avatar.jpg" alt="" /></a>-->
-  </div>
+        <time class="published"
+            datetime='{{ ($.Scratch.Get "dateType").Format "2006-01-02" }}'>
+            {{ ($.Scratch.Get "dateType").Format "January 2, 2006" }}</time>
+        <span class="author">{{ .Params.author }}</span>
+        {{ if .Site.Params.includeReadingTime }}
+            <p>{{ .ReadingTime }} minute read</p>
+        {{ end }}
+        <!--<a href="#" class="author"><span class="name">Jane Doe</span><img src="images/avatar.jpg" alt="" /></a>-->
+    </div>
 </header>
diff --git a/layouts/post/prev-next.html b/layouts/post/prev-next.html
index 6279865..64b56de 100644
--- a/layouts/post/prev-next.html
+++ b/layouts/post/prev-next.html
@@ -1,13 +1,11 @@
 <ul class="actions pagination">
-  {{ if .PrevInSection }}
-    <li>
-      <a href="{{ .PrevInSection.Permalink }}" class="button big previous">{{ .PrevInSection.Title }}</a>
-    </li>
-  {{ end }}
+    {{ if .PrevInSection }}
+        <li><a href="{{ .PrevInSection.Permalink }}"
+                class="button big previous">{{ .PrevInSection.Title }}</a></li>
+    {{ end }}
 
-  {{ if .NextInSection }}
-    <li>
-      <a href="{{ .NextInSection.Permalink }}" class="button big next">{{ .NextInSection.Title }}</a>
-    </li>
-  {{ end }}
+    {{ if .NextInSection }}
+        <li><a href="{{ .NextInSection.Permalink }}"
+                class="button big next">{{ .NextInSection.Title }}</a></li>
+    {{ end }}
 </ul>
diff --git a/layouts/post/single.html b/layouts/post/single.html
index a9f19af..20f53ad 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -1,12 +1,12 @@
 {{ partial "header" . }}
-{{ $.Scratch.Set "shareNav" true }}
-{{ partial "navbar" . }}
-{{ partial "share-menu" . }}
-<!-- Main -->
-<div id="main">
-  <!-- Post -->
-  {{ $.Scratch.Set "h1" true }}
-  {{ .Render "content-single" }}
-</div>
-{{ partial "sidebar" . }}
+    {{ $.Scratch.Set "shareNav" true }}
+    {{ partial "navbar" . }}
+    {{ partial "share-menu" . }}
+    <!-- Main -->
+    <div id="main">
+        <!-- Post -->
+        {{ $.Scratch.Set "h1" true }}
+        {{ .Render "content-single" }}
+    </div>
+    {{ partial "sidebar" . }}
 {{ partial "footer" . }}
diff --git a/layouts/post/staticman.html b/layouts/post/staticman.html
index 4c5964e..955846b 100644
--- a/layouts/post/staticman.html
+++ b/layouts/post/staticman.html
@@ -40,7 +40,7 @@
       </div>
     </article>
     {{ end }}
-  {{ end }}
+{{ end }}
 {{ end }}
 
 {{ if eq ($.Scratch.Get "hasComments") 0 }}
diff --git a/layouts/shortcodes/img-fit.html b/layouts/shortcodes/img-fit.html
index b8603d2..08e8224 100644
--- a/layouts/shortcodes/img-fit.html
+++ b/layouts/shortcodes/img-fit.html
@@ -39,37 +39,37 @@
 -->
 {{ $numOfParams := sub (len .Params) 1 }}
 {{ if and (ge $numOfParams 3) (not (modBool $numOfParams 2)) }}
-  {{ $.Scratch.Set "path" (.Get $numOfParams) }}
+    {{ $.Scratch.Set "path" (.Get $numOfParams) }}
 
-  {{ $.Scratch.Set "structType" "shortcode" }}
-  {{ partial "img-path" . }}
-  {{ $path := $.Scratch.Get "path" }}
+    {{ $.Scratch.Set "structType" "shortcode" }}
+    {{ partial "img-path" . }}
+    {{ $path := $.Scratch.Get "path" }}
 
-  <div class="box alt">
-    <div class="row uniform">
-    {{ $.Scratch.Set "count" 1 }}
-    {{ $.Scratch.Set "imgFile" "" }}
-    {{ range first $numOfParams .Params }}
-      {{ if eq ($.Scratch.Get "count") 1 }}
-        <div class="{{ . }}">
-      {{ else if eq ($.Scratch.Get "count") 2 }}
-        {{ if eq . "" }}
-          </div>
-          {{ $.Scratch.Set "imgFile" "" }}
-        {{ else }}
-          {{ $.Scratch.Set "imgFile" . }}
-          <span class="image fit">
+    <div class="box alt">
+        <div class="row uniform">
+        {{ $.Scratch.Set "count" 1 }}
+        {{ $.Scratch.Set "imgFile" "" }}
+        {{ range first $numOfParams .Params }}
+            {{ if eq ($.Scratch.Get "count") 1 }}
+                <div class="{{ . }}">
+            {{ else if eq ($.Scratch.Get "count") 2 }}
+                {{ if eq . "" }}
+                    </div>
+                    {{ $.Scratch.Set "imgFile" "" }}
+                {{ else }}
+                    {{ $.Scratch.Set "imgFile" . }}
+                    <span class="image fit">
+                {{ end }}
+            {{ else }}
+                {{ if ne ($.Scratch.Get "imgFile") "" }}
+                        <img src='{{ $path }}/{{ $.Scratch.Get "imgFile" }}'
+                            alt="{{ . }}" />
+                    </span></div>
+                {{ end }}
+                {{ $.Scratch.Set "count" 0 }}
+            {{ end }}
+            {{ $.Scratch.Add "count" 1 }}
         {{ end }}
-      {{ else }}
-        {{ if ne ($.Scratch.Get "imgFile") "" }}
-              <img src='{{ $path }}/{{ $.Scratch.Get "imgFile" }}' alt="{{ . }}" />
-            </span>
-          </div>
-        {{ end }}
-        {{ $.Scratch.Set "count" 0 }}
-      {{ end }}
-      {{ $.Scratch.Add "count" 1 }}
-    {{ end }}
+        </div>
     </div>
-  </div>
 {{ end }}
diff --git a/layouts/shortcodes/img-post.html b/layouts/shortcodes/img-post.html
index 6749f96..6143696 100644
--- a/layouts/shortcodes/img-post.html
+++ b/layouts/shortcodes/img-post.html
@@ -22,49 +22,47 @@
 -->
 {{ $numOfParams := len .Params }}
 {{ if and (ge $numOfParams 2) (le $numOfParams 4) }}
-  <!-- Check if the Parameter is positional or named
-       which can handle both. -->
-  {{ if .IsNamedParams }}
-    {{ $.Scratch.Set "path" (.Get "path") }}
-    {{ $.Scratch.Set "file" (.Get "file") }}
-    {{ $.Scratch.Set "alt"  (.Get "alt") }}
-    {{ $.Scratch.Set "type" (.Get "type") }}
-  {{ else }}
-    {{ $.Scratch.Set "path" (.Get 0) }}
-    {{ $.Scratch.Set "file" (.Get 1) }}
-    {{ if ge $numOfParams 3 }}
-      {{ $.Scratch.Set "alt" (.Get 2) }}
+    <!-- Check if the Parameter is positional or named
+         which can handle both. -->
+    {{ if .IsNamedParams }}
+        {{ $.Scratch.Set "path" (.Get "path") }}
+        {{ $.Scratch.Set "file" (.Get "file") }}
+        {{ $.Scratch.Set "alt"  (.Get "alt") }}
+        {{ $.Scratch.Set "type" (.Get "type") }}
     {{ else }}
-      {{ $.Scratch.Set "alt" "" }}
+        {{ $.Scratch.Set "path" (.Get 0) }}
+        {{ $.Scratch.Set "file" (.Get 1) }}
+        {{ if ge $numOfParams 3 }}
+            {{ $.Scratch.Set "alt" (.Get 2) }}
+        {{ else }}
+            {{ $.Scratch.Set "alt" "" }}
+        {{ end }}
+        {{ if ge $numOfParams 4 }}
+            {{ $.Scratch.Set "type"  (.Get 3) }}
+        {{ else }}
+            {{ $.Scratch.Set "type" "center" }}
+        {{ end }}
     {{ end }}
-    {{ if ge $numOfParams 4 }}
-      {{ $.Scratch.Set "type"  (.Get 3) }}
-    {{ else }}
-      {{ $.Scratch.Set "type" "center" }}
-    {{ end }}
-  {{ end }}
 
-  {{ $file := $.Scratch.Get "file" }}
-  {{ $type := $.Scratch.Get "type" }}
-  {{ $alt  := $.Scratch.Get "alt" }}
+    {{ $file := $.Scratch.Get "file" }}
+    {{ $type := $.Scratch.Get "type" }}
+    {{ $alt  := $.Scratch.Get "alt" }}
 
-  {{ $.Scratch.Set "structType" "shortcode" }}
-  {{ partial "img-path" . }}
-  {{ $path := $.Scratch.Get "path" }}
+    {{ $.Scratch.Set "structType" "shortcode" }}
+    {{ partial "img-path" . }}
+    {{ $path := $.Scratch.Get "path" }}
 
-  {{ if eq $type "left" }}
-    <span class="image left">
-      <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" />
-    </span>
-  {{ else if eq $type "right" }}
-    <span class="image right">
-      <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" />
-    </span>
-  {{ else }}
-    <p>
-      <span class="image center">
-        <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" />
-      </span>
-    </p>
-  {{ end }}
+    {{ if eq $type "left" }}
+        <span class="image left">
+            <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" />
+        </span>
+    {{ else if eq $type "right" }}
+        <span class="image right">
+            <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" />
+        </span>
+    {{ else }}
+        <p><span class="image center">
+            <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" />
+        </span></p>
+    {{ end }}
 {{ end }}
diff --git a/layouts/shortcodes/url-link.html b/layouts/shortcodes/url-link.html
index c2b5f5e..419c098 100644
--- a/layouts/shortcodes/url-link.html
+++ b/layouts/shortcodes/url-link.html
@@ -1,10 +1,10 @@
 {{ $numOfParams := len .Params }}
 {{ if and (ge $numOfParams 2) (le $numOfParams 3) }}
-  {{ if eq $numOfParams 3 }}
-    {{ $.Scratch.Set "target" (.Get 2) }}
-  {{ else }}
-    {{ $.Scratch.Set "target" "_blank" }}
-  {{ end }}
+    {{ if eq $numOfParams 3 }}
+        {{ $.Scratch.Set "target" (.Get 2) }}
+    {{ else }}
+        {{ $.Scratch.Set "target" "_blank" }}
+    {{ end }}
 
-  <a href="{{ .Get 1 }}" target='{{ $.Scratch.Get "target"}}'>{{ .Get 0 }}</a>
+    <a href="{{ .Get 1 }}" target='{{ $.Scratch.Get "target"}}'>{{ .Get 0 }}</a>
 {{ end }}
diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html
index 0fd749f..8881b14 100644
--- a/layouts/taxonomy/category.html
+++ b/layouts/taxonomy/category.html
@@ -1,16 +1,16 @@
 {{ partial "general-title" . }}
 
 {{ partial "header" . }}
-{{ partial "navbar" . }}
-<!-- Main -->
-<div id="main">
-  <h1>{{ .Title }}</h1>
-  {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
-  {{ range $paginator.Pages }}
-    {{ .Render "content-list" }}
-  {{ end }}
+    {{ partial "navbar" . }}
+    <!-- Main -->
+    <div id="main">
+        <h1>{{ .Title }}</h1>
+        {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
+        {{ range $paginator.Pages }}
+            {{ .Render "content-list" }}
+        {{ end }}
 
-  {{ partial "pagination" . }}
-</div>
-{{ partial "sidebar" . }}
+        {{ partial "pagination" . }}
+    </div>
+    {{ partial "sidebar" . }}
 {{ partial "footer" . }}
diff --git a/layouts/taxonomy/category.terms.html b/layouts/taxonomy/category.terms.html
index 9affa3a..5e504c0 100644
--- a/layouts/taxonomy/category.terms.html
+++ b/layouts/taxonomy/category.terms.html
@@ -1,33 +1,33 @@
 {{ partial "general-title" . }}
 
 {{ partial "header" . }}
-{{ partial "navbar" . }}
-<!-- Main -->
-<div id="main">
-  {{ if .Site.Params.categoriesByCount }}
-    {{ $.Scratch.Set "categories" .Data.Terms.ByCount }}
-  {{ else }}
-    {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }}
-  {{ end }}
+    {{ partial "navbar" . }}
+    <!-- Main -->
+    <div id="main">
+        {{ if .Site.Params.categoriesByCount }}
+            {{ $.Scratch.Set "categories" .Data.Terms.ByCount }}
+        {{ else }}
+            {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }}
+        {{ end }}
 
-  <ul class="posts">
-    <header>
-      <h1>{{ .Data.Plural }}</h1>
-    </header>
-    {{ $data := .Data }}
-    {{ range $key, $value := $.Scratch.Get "categories" }}
-      <li>
-        <article>
-          <header>
-            <a href="/{{ $data.Plural }}/{{ $value.Name | urlize }}">{{ $value.Name }}</a>
-            <span style="float:right;">{{ $value.Count }}</span>
-          </header>
-        </article>
-      </li>
-    {{ end }}
-  </ul>
-</div>
+        <ul class="posts">
+            <header>
+                <h1>{{ .Data.Plural }}</h1>
+            </header>
+            {{ $data := .Data }}
+            {{ range $key, $value := $.Scratch.Get "categories" }}
+                <li>
+                    <article>
+                        <header>
+                            <a href="/{{ $data.Plural }}/{{ $value.Name | urlize }}">{{ $value.Name }}</a>
+                            <span style="float:right;">{{ $value.Count }}</span>
+                        </header>
+                    </article>
+                </li>
+            {{ end }}
+        </ul>
+    </div>
 
-{{ $.Scratch.Set "showCategories" false }}
-{{ partial "sidebar" . }}
+    {{ $.Scratch.Set "showCategories" false }}
+    {{ partial "sidebar" . }}
 {{ partial "footer" . }}
diff --git a/static/css/main.css b/static/css/main.css
index 00f8dbd..d1ac152 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -307,9 +307,9 @@
 		text-align: right;
 	}
 
-/* Author and Format */
+/* Author */
 
-	.author, .format {
+	.author {
 		display: -moz-flex;
 		display: -webkit-flex;
 		display: -ms-flex;
@@ -335,7 +335,7 @@
 		white-space: nowrap;
 	}
 
-		.author .name, .format .name {
+		.author .name {
 			-moz-transition: border-bottom-color 0.2s ease;
 			-webkit-transition: border-bottom-color 0.2s ease;
 			-ms-transition: border-bottom-color 0.2s ease;
@@ -345,13 +345,13 @@
 			margin: 0 1.5em 0 0;
 		}
 
-		.author img, .format img {
+		.author img {
 			border-radius: 100%;
 			display: block;
 			width: 4em;
 		}
 
-		.author:hover .name, .format:hover .name {
+		.author:hover .name {
 			border-bottom-color: transparent;
 		}
 
@@ -1213,7 +1213,7 @@
 				text-transform: uppercase;
 			}
 
-			.mini-post header .author, .mini-post header .format {
+			.mini-post header .author {
 				position: absolute;
 				right: 2em;
 				top: 2em;
@@ -1792,8 +1792,7 @@
 								margin-top: 0;
 							}
 
-							.itemized > header .meta .author,
-							.itemized > header .meta .format, {
+							.itemized > header .meta .author {
 								-moz-flex-direction: row-reverse;
 								-webkit-flex-direction: row-reverse;
 								-ms-flex-direction: row-reverse;
@@ -1801,14 +1800,12 @@
 								margin-bottom: 0;
 							}
 
-								.itemized > header .meta .author .name,
-								.itemized > header .meta .format .name {
+								.itemized > header .meta .author .name {
 									margin: 0 0 0 1.5em;
 
 								}
 
-								.itemized > header .meta .author img,
-								.itemized > header .meta .format img {
+								.itemized > header .meta .author img {
 									width: 3.5em;
 								}
 
@@ -1960,7 +1957,6 @@
 				table > thead > tr > td,
 				table > tbody > tr > td,
 				table > tfoot > tr > td {
-					vertical-align: middle;
 					padding: 0.5em;
 					-webkit-transition: all 0.3s ease;
 					-o-transition: all 0.3s ease;
@@ -2216,6 +2212,7 @@
 			line-height: inherit;
 			padding: 0 0 0 1.5em;
 			white-space: nowrap;
+			min-width: 12.4em;
 		}
 
 			#header h1 a {
@@ -2524,7 +2521,7 @@
 				/* Modern Browsers */
 				opacity: 0.65;
 				font-size: 0.9em;
-				padding: 0;
+				padding: 1.25em 1.25em 0.1em 1.25em
 		}
 
 		@media screen and (max-width: 1280px) {
@@ -2839,16 +2836,14 @@
 	.share-btn.facebook    { background: #3B5998; }
 	.share-btn.linkedin    { background: #4875B4; }
 	.share-btn.stumbleupon { background: #EB4823; }
-	.share-btn.pinterest	 { background: #BD081C; }
 	.share-btn.reddit      { background: #ff5700; }
 	.share-btn.email       { background: #444444; }
 
-	  .share-btn.twitter:hover     { background: #4c9ad6; }
+	  .share-btn.twitter:hover     { background: #4c9ad6 }
 	  .share-btn.google-plus:hover { background: #c64333; }
 	  .share-btn.facebook:hover    { background: #2f4779; }
 	  .share-btn.linkedin:hover    { background: #4069a2; }
 	  .share-btn.stumbleupon:hover { background: #d3401f; }
-		.share-btn.pinterest:hover   { background: #AD0000; }
 	  .share-btn.reddit:hover      { background: #e54e00; }
 	  .share-btn.email:hover       { background: #363636; }