diff --git a/archetypes/default.md b/archetypes/default.md
index 4819c41..01c60e8 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -3,9 +3,10 @@ title: "{{ replace .Name "-" " " | title }}"
 date: {{ .Date }}
 draft: true
 toc: true
-prevFile: ""
-nextFile: ""
-introFile: ""
+comments: true
+prevFile: "/{{ .File.Dir }}"
+nextFile: "/{{ .File.Dir }}"
+introFile: "/{{ .File.Dir }}post-00"
 ---
 
 {{< header "{{ replace .Name "-" " " | title }}" >}}
diff --git a/config.toml b/config.toml
index cc86b9f..f8573df 100644
--- a/config.toml
+++ b/config.toml
@@ -1,6 +1,7 @@
 baseURL = "https://singularisart.github.io"
 languageCode = "en-us"
 title = "SingularisArt"
+disqusShortname = "singularisart-github-io"
 
 [markup]
   [markup.highlight]
diff --git a/content/_index.md b/content/_index.md
index 136a555..d810fd3 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,7 +1,8 @@
 ---
 title: "Home"
-date: 2023-08-13T07:29:02-07:00
-draft: false
+date:
+license: false
+comments: false
 ---
 
 # Home
diff --git a/content/about.md b/content/about.md
index e5276d4..5e0172c 100644
--- a/content/about.md
+++ b/content/about.md
@@ -1,8 +1,8 @@
 ---
 title: "About"
-date: 2023-08-13T07:29:02-07:00
-draft: false
+date:
 license: false
+comments: false
 ---
 
 # About
diff --git a/content/contact.md b/content/contact.md
index a042f15..672f2bc 100644
--- a/content/contact.md
+++ b/content/contact.md
@@ -1,8 +1,8 @@
 ---
 title: "Contact"
-date: 2023-08-13T07:29:02-07:00
-draft: false
+date:
 license: false
+comments: false
 ---
 
 # Contact
diff --git a/content/content.md b/content/content.md
index 52320ee..d055389 100644
--- a/content/content.md
+++ b/content/content.md
@@ -1,15 +1,15 @@
 ---
 title: "Content"
-date: 2023-08-13T07:29:02-07:00
-draft: false
+date:
 license: false
+comments: false
 ---
 
 # Content of this Website
 
 ## Tutorials
 
-[Taking notes with LaTeX](/tutorials/latex-notes/intro)
+[Taking notes with LaTeX](/tutorials/latex-notes/post-00)
 
 ## Projects
 
diff --git a/content/tutorials/latex-notes/intro.md b/content/tutorials/latex-notes/intro.md
deleted file mode 100644
index 76934f7..0000000
--- a/content/tutorials/latex-notes/intro.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: "NeoVim with LaTeX"
-date: 2023-08-13T07:29:02-07:00
-draft: false
-toc: true
-prevFile: "/tutorials/latex-notes/intro"
-nextFile: "/tutorials/latex-notes/prerequisites"
-introFile: "/tutorials/latex-notes/intro"
----
-
-{{< header "NeoVim with LaTeX" >}}
-
-{{< toc >}}
-
-{{< begin "/tutorials/latex-notes/prerequisites" >}}
diff --git a/content/tutorials/latex-notes/post-00.md b/content/tutorials/latex-notes/post-00.md
new file mode 100644
index 0000000..6832a48
--- /dev/null
+++ b/content/tutorials/latex-notes/post-00.md
@@ -0,0 +1,16 @@
+---
+title: "NeoVim with LaTeX"
+date:
+draft: false
+toc: true
+comments: false
+prevFile: "/tutorials/latex-notes/post-00"
+nextFile: "/tutorials/latex-notes/post-01"
+introFile: "/tutorials/latex-notes/post-00"
+---
+
+{{< header "NeoVim with LaTeX" >}}
+
+{{< toc >}}
+
+{{< begin "/tutorials/latex-notes/post-01" >}}
diff --git a/content/tutorials/latex-notes/prerequisites.md b/content/tutorials/latex-notes/post-01.md
similarity index 63%
rename from content/tutorials/latex-notes/prerequisites.md
rename to content/tutorials/latex-notes/post-01.md
index ab4e5a8..c9fc8a8 100644
--- a/content/tutorials/latex-notes/prerequisites.md
+++ b/content/tutorials/latex-notes/post-01.md
@@ -2,10 +2,11 @@
 title: "Prerequisites for Writing LaTeX"
 date:
 draft: false
+comments: true
 toc: true
-prevFile: "/tutorials/latex-notes/intro"
-nextFile: "/tutorials/latex-notes/ultisnips"
-introFile: "/tutorials/latex-notes/intro"
+prevFile: "/tutorials/latex-notes/post-00"
+nextFile: "/tutorials/latex-notes/post-02"
+introFile: "/tutorials/latex-notes/post-00"
 ---
 
 {{< header "Prerequisites for Writing LaTeX" >}}
diff --git a/content/tutorials/latex-notes/ultisnips.md b/content/tutorials/latex-notes/post-02.md
similarity index 63%
rename from content/tutorials/latex-notes/ultisnips.md
rename to content/tutorials/latex-notes/post-02.md
index 0a51ce8..c8eb92d 100644
--- a/content/tutorials/latex-notes/ultisnips.md
+++ b/content/tutorials/latex-notes/post-02.md
@@ -2,10 +2,11 @@
 title: "Setting up UltiSnips with Neovim"
 date:
 draft: false
+comments: true
 toc: true
-prevFile: "/tutorials/latex-notes/prerequisites"
-nextFile: "/tutorials/latex-notes/vimtex-basics"
-introFile: "/tutorials/latex-notes/intro"
+prevFile: "/tutorials/latex-notes/post-01"
+nextFile: "/tutorials/latex-notes/post-03"
+introFile: "/tutorials/latex-notes/post-00"
 ---
 
 {{< header "Setting up UltiSnips with Neovim" >}}
diff --git a/content/tutorials/latex-notes/vimtex-basics.md b/content/tutorials/latex-notes/post-03.md
similarity index 62%
rename from content/tutorials/latex-notes/vimtex-basics.md
rename to content/tutorials/latex-notes/post-03.md
index 4f482a2..b2c2def 100644
--- a/content/tutorials/latex-notes/vimtex-basics.md
+++ b/content/tutorials/latex-notes/post-03.md
@@ -2,10 +2,11 @@
 title: "An Introduction to Vimtex"
 date:
 draft: false
+comments: true
 toc: true
-prevFile: "/tutorials/latex-notes/ultisnips"
-nextFile: "/tutorials/latex-notes/vimtex-advanced"
-introFile: "/tutorials/latex-notes/intro"
+prevFile: "/tutorials/latex-notes/post-02"
+nextFile: "/tutorials/latex-notes/post-04"
+introFile: "/tutorials/latex-notes/post-00"
 ---
 
 {{< header "An Introduction to Vimtex" >}}
diff --git a/content/tutorials/latex-notes/vimtex-advanced.md b/content/tutorials/latex-notes/post-04.md
similarity index 62%
rename from content/tutorials/latex-notes/vimtex-advanced.md
rename to content/tutorials/latex-notes/post-04.md
index d7d6325..0e1ad74 100644
--- a/content/tutorials/latex-notes/vimtex-advanced.md
+++ b/content/tutorials/latex-notes/post-04.md
@@ -2,10 +2,11 @@
 title: "More Advanced Vimtex Features"
 date:
 draft: false
+comments: true
 toc: true
-prevFile: "/tutorials/latex-notes/vimtex-basics"
-nextFile: "/tutorials/latex-notes/tmux"
-introFile: "/tutorials/latex-notes/intro"
+prevFile: "/tutorials/latex-notes/post-03"
+nextFile: "/tutorials/latex-notes/post-05"
+introFile: "/tutorials/latex-notes/post-00"
 ---
 
 {{< header "More Advanced Vimtex Features" >}}
diff --git a/content/tutorials/latex-notes/tmux.md b/content/tutorials/latex-notes/post-05.md
similarity index 63%
rename from content/tutorials/latex-notes/tmux.md
rename to content/tutorials/latex-notes/post-05.md
index 1948457..436b6f8 100644
--- a/content/tutorials/latex-notes/tmux.md
+++ b/content/tutorials/latex-notes/post-05.md
@@ -2,10 +2,11 @@
 title: "Using Tmux to Enhance your Workflow"
 date:
 draft: false
+comments: true
 toc: true
-prevFile: "/tutorials/latex-notes/vimtex-advanced"
-nextFile: "/tutorials/latex-notes/manage-notes"
-introFile: "/tutorials/latex-notes/intro"
+prevFile: "/tutorials/latex-notes/post-04"
+nextFile: "/tutorials/latex-notes/post-06"
+introFile: "/tutorials/latex-notes/post-00"
 ---
 
 {{< header "Using Tmux to Enhance your Workflow" >}}
diff --git a/content/tutorials/latex-notes/manage-notes.md b/content/tutorials/latex-notes/post-06.md
similarity index 61%
rename from content/tutorials/latex-notes/manage-notes.md
rename to content/tutorials/latex-notes/post-06.md
index 08f0ba1..690048b 100644
--- a/content/tutorials/latex-notes/manage-notes.md
+++ b/content/tutorials/latex-notes/post-06.md
@@ -2,10 +2,11 @@
 title: "How I manage my notes"
 date:
 draft: false
+comments: true
 toc: true
-prevFile: "/tutorials/latex-notes/tmux"
-nextFile: "/tutorials/latex-notes/figures"
-introFile: "/tutorials/latex-notes/intro"
+prevFile: "/tutorials/latex-notes/post-05"
+nextFile: "/tutorials/latex-notes/post-07"
+introFile: "/tutorials/latex-notes/post-00"
 ---
 
 {{< header "How I Manage my Notes" >}}
diff --git a/content/tutorials/latex-notes/figures.md b/content/tutorials/latex-notes/post-07.md
similarity index 61%
rename from content/tutorials/latex-notes/figures.md
rename to content/tutorials/latex-notes/post-07.md
index c4863b4..0776429 100644
--- a/content/tutorials/latex-notes/figures.md
+++ b/content/tutorials/latex-notes/post-07.md
@@ -2,10 +2,11 @@
 title: "How I Draw my Figures"
 date:
 draft: false
+comments: true
 toc: true
-prevFile: "/tutorials/latex-notes/manage-notes"
-nextFile: "/tutorials/latex-notes/end"
-introFile: "/tutorials/latex-notes/intro"
+prevFile: "/tutorials/latex-notes/post-06"
+nextFile: "/tutorials/latex-notes/post-08"
+introFile: "/tutorials/latex-notes/post-00"
 ---
 
 {{< header "How I Draw my Figures" >}}
diff --git a/content/tutorials/latex-notes/end.md b/content/tutorials/latex-notes/post-08.md
similarity index 55%
rename from content/tutorials/latex-notes/end.md
rename to content/tutorials/latex-notes/post-08.md
index d2c6ab5..7909bdf 100644
--- a/content/tutorials/latex-notes/end.md
+++ b/content/tutorials/latex-notes/post-08.md
@@ -1,7 +1,12 @@
 ---
 title: "That's it my Friends"
-date: 
+date:
 draft: false
+toc: false
+comments: false
+prevFile: ""
+nextFile: ""
+introFile: ""
 ---
 
 {{< header "That's it my Friends" >}}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 7ad53ee..90d3362 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,6 +6,7 @@
 {{ $search := resources.Get "js/search.js" }}
 {{ $theme := resources.Get "js/theme.js" }}
 
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -20,30 +21,29 @@
   <link rel="stylesheet" href="{{ $style.Permalink }}">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.18.2/tocbot.css">
 </head>
-
-<body class="leading-normal font-md text-gray-700 dark:text-gray-300 bg-[#fafafa] dark:bg-gray-900">
-  {{ partial "header.html" . }}
-
-  <div class="pt-20"></div>
-
-  <div class="sm:px-8">
-    {{ block "main" . }} {{ end }}
-  </div>
-
-  <script defer type="text/javascript" src="{{ $disqus.Permalink }}"></script>
-  <script defer type="text/javascript" src="{{ $header.Permalink }}"></script>
-  <script defer type="text/javascript" src="{{ $katex.Permalink }}"></script>
-  <script defer type="text/javascript" src="{{ $search.Permalink }}"></script>
-  <script defer type="text/javascript" src="{{ $theme.Permalink }}"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.4.2/tocbot.js"></script>
-  <script type="text/javascript">
+  <body class="leading-normal font-md text-gray-700 dark:text-gray-300 bg-[#fafafa] dark:bg-gray-900">
+    {{ partial "header.html" . }}
+
+    <div class="pt-20"></div>
+
+    <div class="sm:px-8">
+      {{ block "main" . }} {{ end }}
+    </div>
+
+    <script id="dsq-count-scr" src="//singularisart-github-io.disqus.com/count.js" async></script>
+    <script defer type="text/javascript" src="{{ $disqus.Permalink }}"></script>
+    <script defer type="text/javascript" src="{{ $header.Permalink }}"></script>
+    <script defer type="text/javascript" src="{{ $katex.Permalink }}"></script>
+    <script defer type="text/javascript" src="{{ $search.Permalink }}"></script>
+    <script defer type="text/javascript" src="{{ $theme.Permalink }}"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.4.2/tocbot.js"></script>
+    <script type="text/javascript">
     tocbot.init({
       tocSelector: ".toc",
       contentSelector: ".post",
       headingSelector: "h2, h3, h4",
       collapseDepth: 4
     });
-  </script>
-</body>
-
+    </script>
+  </body>
 </html>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 678ec6f..6475f9e 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,5 @@
 {{ define "main" }}
 {{- $toc := .Params.toc -}}
-{{- $license := .Params.license -}}
 
 {{- if eq $toc true -}}
   <div class="prose-singularisart dark:prose-invert px-4 py-4 md:py-3 md:px-8 grid grid-rows-[1,100%] md:grid-cols-[13rem_auto]">
@@ -18,9 +17,6 @@
   </div>
 {{- end -}}
 
-{{- if eq $license false -}}
-{{ else }}
-  {{ partial "license.html" . }}
-{{- end -}}
+{{ partial "footer.html" . }}
 
 {{ end }}
diff --git a/layouts/partials/comment.html b/layouts/partials/comment.html
new file mode 100644
index 0000000..32c9cba
--- /dev/null
+++ b/layouts/partials/comment.html
@@ -0,0 +1,15 @@
+{{ template "_internal/disqus.html" . }}
+
+<div id="disqus_thread"></div>
+<script>
+  (function () {
+    var d = document, s = d.createElement("script");
+    s.src = "https://singularisart-github-io.disqus.com/embed.js";
+    s.setAttribute("data-timestamp", +new Date());
+    (d.head || d.body).appendChild(s);
+  })();
+</script>
+<noscript>
+  Please enable JavaScript to view the
+  <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a>
+</noscript>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e69de29..9187b10 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -0,0 +1,11 @@
+{{- $license := .Params.license -}}
+{{- if eq $license false -}}
+{{ else }}
+  {{ partial "license.html" . }}
+{{- end -}}
+
+{{- $comments := .Params.comments -}}
+{{- if eq $comments false -}}
+{{ else }}
+  {{ partial "comment.html" . }}
+{{- end -}}