diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 25cbdd5..53430a0 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -7,5 +7,5 @@
 {{- end -}}
 
 {{ define "footer" -}}
-    {{ partial "footer.html" . }}
+    {{ partial "page-list/footer.html" . }}
 {{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index eceb1d3..0f38911 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -8,10 +8,6 @@
 {{- end -}}
 
 {{ define "footer" -}}
-    <div class="container content">
-        {{- partial "page-single/commenting.html" . -}}
-    </div>
-    {{- partial "highlight-js.html" . -}}
-    {{ partial "footer.html" . }}
+    {{ partial "page-single/footer.html" . }}
     {{ partial "page-single/variables-deinit.html" . }}
 {{- end -}}
diff --git a/layouts/partials/footer/deferred-styles.html b/layouts/partials/footer/deferred-styles.html
deleted file mode 100644
index f36b1d9..0000000
--- a/layouts/partials/footer/deferred-styles.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<noscript id="deferred-styles">
-  <!-- // styles to be deferred: 
-      // https://developers.google.com/speed/docs/insights/OptimizeCSSDelivery
-  <link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}/css/styles.css" />
-  -->
-</noscript>
diff --git a/layouts/partials/footer/load-deferred-styles.html b/layouts/partials/footer/load-deferred-styles.html
deleted file mode 100644
index 27e949e..0000000
--- a/layouts/partials/footer/load-deferred-styles.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<script>
-  var loadDeferredStyles = function () {
-    var addStylesNode = document.getElementById("deferred-styles");
-    if (addStylesNode) {
-      var replacement = document.createElement("div");
-      replacement.innerHTML = addStylesNode.textContent;
-      document.body.appendChild(replacement);
-      addStylesNode.parentElement.removeChild(addStylesNode);
-    }
-  };
-  var raf = window.requestAnimationFrame || window.mozRequestAnimationFrame ||
-    window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;
-  if (raf) raf(function () {
-    window.setTimeout(loadDeferredStyles, 0);
-  });
-  else
-    window.addEventListener('load', loadDeferredStyles);
-</script>
diff --git a/layouts/partials/header/highlight-css.html b/layouts/partials/header/styles-highlight.html
similarity index 100%
rename from layouts/partials/header/highlight-css.html
rename to layouts/partials/header/styles-highlight.html
diff --git a/layouts/partials/header/styles.html b/layouts/partials/header/styles.html
index 700acd5..66eef57 100644
--- a/layouts/partials/header/styles.html
+++ b/layouts/partials/header/styles.html
@@ -1,3 +1,3 @@
-{{ partial "header/highlight-css.html" . }}
+{{ partial "header/styles-highlight.html" . }}
 <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/hyde-hyde.css">
 <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/print.min.css" media="print">
diff --git a/layouts/partials/highlight-js.html b/layouts/partials/highlight-js.html
index da63f30..8baa9e7 100644
--- a/layouts/partials/highlight-js.html
+++ b/layouts/partials/highlight-js.html
@@ -1,7 +1,7 @@
 {{ if .Site.Params.highlightjs -}}
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 {{ with .Site.Params.highlightjslanguages }}
-    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/{{.}}.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/{{.}}.min.js"></script>
 {{ end }}
 <script type="text/javascript">
     hljs.configure({languages: []});
diff --git a/layouts/partials/footer.html b/layouts/partials/page-list/footer.html
similarity index 64%
rename from layouts/partials/footer.html
rename to layouts/partials/page-list/footer.html
index 15b942b..02a8bdc 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/page-list/footer.html
@@ -1,6 +1,5 @@
-{{ if (.Site.GoogleAnalytics) -}}
+{{ if .Site.GoogleAnalytics -}}
   <!-- Google Analytics -->
   {{- template "_internal/google_analytics_async.html" . -}}
 {{- end }}
 {{ partial "footer/font-awesome-js.html" . }}
-{{ partial "footer/deferred-styles.html" . }}
diff --git a/layouts/partials/page-single/commenting/disqus.html b/layouts/partials/page-single/comment/disqus.html
similarity index 100%
rename from layouts/partials/page-single/commenting/disqus.html
rename to layouts/partials/page-single/comment/disqus.html
diff --git a/layouts/partials/page-single/commenting/graphcomment.html b/layouts/partials/page-single/comment/graphcomment.html
similarity index 100%
rename from layouts/partials/page-single/commenting/graphcomment.html
rename to layouts/partials/page-single/comment/graphcomment.html
diff --git a/layouts/partials/page-single/content.html b/layouts/partials/page-single/content.html
index 4645a30..241786a 100644
--- a/layouts/partials/page-single/content.html
+++ b/layouts/partials/page-single/content.html
@@ -13,4 +13,5 @@
   </div>
   {{ partial "page-single/post-meta-bottom.html" . }}
   {{ partial "page-single/post-related.html" . }}
+  {{- partial "page-single/post-comment.html" . -}}
 </article>
diff --git a/layouts/partials/page-single/footer.html b/layouts/partials/page-single/footer.html
new file mode 100644
index 0000000..7eb9392
--- /dev/null
+++ b/layouts/partials/page-single/footer.html
@@ -0,0 +1,6 @@
+{{ if .Site.GoogleAnalytics -}}
+  <!-- Google Analytics -->
+  {{- template "_internal/google_analytics_async.html" . -}}
+{{- end }}
+{{ partial "footer/font-awesome-js.html" . }}
+{{ partial "highlight-js.html" . }}
diff --git a/layouts/partials/page-single/commenting.html b/layouts/partials/page-single/post-comment.html
similarity index 53%
rename from layouts/partials/page-single/commenting.html
rename to layouts/partials/page-single/post-comment.html
index 64bcf29..19b58df 100644
--- a/layouts/partials/page-single/commenting.html
+++ b/layouts/partials/page-single/post-comment.html
@@ -1,7 +1,7 @@
 {{- if ne .Params.showcomments false -}}
     {{ if .Site.DisqusShortname -}}
-        {{- partial "page-single/commenting/disqus.html" . -}}
+        {{- partial "page-single/comment/disqus.html" . -}}
     {{- else if .Site.Params.GraphCommentId -}}
-        {{- partial "page-single/commenting/graphcomment.html" . -}}
+        {{- partial "page-single/comment/graphcomment.html" . -}}
     {{- end -}}
 {{- end }}