diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index fda5daa..75a6ccb 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,22 +4,16 @@
 
 */}}
 
-<!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
-{{ partial "header.html" . }}
-
-<body>
+{{ define "main" }}
 <div id="layout" class="pure-g">
-<article class="pure-u-1">
-{{ partial "brand.html" . }}
-{{ partial "content.header.html" . }}
-{{ partial "toc.html" . }}
-<section>{{ .Content }}</section>
-<section>
-  {{ partial "disqus.html" . }}
-  {{ partial "footer.html" . }}
-</section>
-</article>
+  <article class="pure-u-1">
+    {{ partial "brand.html" . }}
+    {{ partial "content.header.html" . }}
+    {{ partial "toc.html" . }}
+    <section>{{ .Content }}</section>
+    <section>
+      {{ partial "footer.html" . }}
+    </section>
+  </article>
 </div>
-</body>
-</html>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/body.includes.html b/layouts/partials/body.includes.html
deleted file mode 100644
index 026abba..0000000
--- a/layouts/partials/body.includes.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- Includes go here -->
diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html
deleted file mode 100644
index e69de29..0000000
diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html
deleted file mode 100644
index 64a4a3b..0000000
--- a/layouts/partials/disqus.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{{ if .Params.comments }}
-  <div id="disqus_thread"></div>
-  <script type="text/javascript">
-
-  (function() {
-      // Don't ever inject Disqus on localhost--it creates unwanted
-      // discussions from 'localhost:1313' on your Disqus account...
-      if (window.location.hostname == "localhost")
-          return;
-
-      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-      var disqus_shortname = '{{ .Site.Params.disqusShortname }}';
-      dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  })();
-  </script>
-  <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-  <a href="http://disqus.com/" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 1c1b3ee..cedeb7f 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -25,4 +25,3 @@
   </p>
 </div>
 </footer>
-{{ partial "body.includes.html" . }}
diff --git a/layouts/partials/header.includes.html b/layouts/partials/header.includes.html
index c0a2025..5059dde 100644
--- a/layouts/partials/header.includes.html
+++ b/layouts/partials/header.includes.html
@@ -3,8 +3,6 @@
     {{ partial "math.html" . }}
 {{ end }}
 
-<!-- Syntax highlighting -->
-<!-- {{ partial "highlight.html" . }} -->
 
 <!-- Pure css -->
 <link rel="stylesheet" href="https://unpkg.com/purecss@2.0.6/build/pure-min.css">
