diff --git a/content/index.md b/content/index.md
index 10b86e5..8762fb7 100644
--- a/content/index.md
+++ b/content/index.md
@@ -1,5 +1,6 @@
 +++
 title = "DoServer Home"
+template = "default_no_comment.html"
 +++
 
 **I am Daniel, aka CactiChameleon9**
diff --git a/templates/_content_end.html b/templates/_content_end.html
new file mode 100644
index 0000000..7f5eaa3
--- /dev/null
+++ b/templates/_content_end.html
@@ -0,0 +1 @@
+</div>
\ No newline at end of file
diff --git a/templates/_content_start.html b/templates/_content_start.html
new file mode 100644
index 0000000..fe0af7b
--- /dev/null
+++ b/templates/_content_start.html
@@ -0,0 +1 @@
+<div id="page">
diff --git a/templates/_footer.html b/templates/_footer.html
index d2bbc58..c4eafe4 100644
--- a/templates/_footer.html
+++ b/templates/_footer.html
@@ -1,5 +1,3 @@
-</div>
-
 <footer>
 
 <small><a href="https://www.biblegateway.com/passage/?search=John+15:13">John 15:13:</a> Greater love has no one than this: to lay down one’s life for one’s friends</small>
diff --git a/templates/_header.html b/templates/_header.html
index 4fc6273..6f62630 100644
--- a/templates/_header.html
+++ b/templates/_header.html
@@ -14,5 +14,3 @@
         </ul>
     </nav>
 </header>
-
-<div id="page">
diff --git a/templates/_style.html b/templates/_style.html
index aefb6bd..0a65893 100644
--- a/templates/_style.html
+++ b/templates/_style.html
@@ -80,6 +80,61 @@
             margin-right: auto;
         }
 
+        input {
+            font: inherit;
+            font-style: normal;
+            border: 3px solid var(--text-subcolor);
+            background: var(--background-color);
+            color: var(--text-color);
+
+            padding: 10px;
+            margin: 2.5px 0 2.5px -8px;
+
+            /* resize  : none; */
+            overflow: auto;
+        }
+        input:focus {
+            outline: 2px solid var(--text-subcolor);
+        }
+
+        input[type=submit] {
+            color: var(--text-subcolor);
+        }
+        input[type=submit]:hover,
+        input[type=submit]:focus {
+            color: var(--background-color);
+            background: var(--text-subcolor);
+        }
+
+        .comments-form {
+            margin-top: -0.8em;
+
+            input[type=submit] {
+                width: 15%;
+                float: right
+            }
+
+            input[type=text] {
+                width: 80%;
+            }
+        }
+
+        .comments-embed {
+            margin: 10px;
+            margin-top: -1em;
+            width: 100%;
+            height: auto;
+        }
+
+        .comments-list {
+            background: var(--background-color);
+            position: absolute;
+            top: 0;
+            left: 0;
+            height: 100%;
+            width: 100%;
+        }
+
         a {
             /* Links */
             color: var(--text-color);
@@ -118,8 +173,8 @@
             color: var(--text-subcolor);
         }
 
-        .publish-date {
-        	margin: -1.5em 0 0 0;
+        .header-caption {
+            margin: -1.5em 0 0 0;
             color: var(--text-subcolor);
         }
 
@@ -170,8 +225,8 @@
 
         footer {
             margin-top: 4em;
-			text-align: center;
-			color: var(--text-subcolor);
+            text-align: center;
+            color: var(--text-subcolor);
         }
 
         footer p {
diff --git a/templates/blog.html b/templates/blog.html
index 3f5ded4..e0c7ee2 100644
--- a/templates/blog.html
+++ b/templates/blog.html
@@ -1,7 +1,7 @@
 {{ template "_style.html" .}}
 {{ template "_header.html" .}}
 
-
+{{ template "_content_start.html" .}}
 <h1>{{ .Title }}</h1>
 
 <ul>
@@ -13,6 +13,7 @@
 {{ end }}
 </ul>
 
-{{ .Content }} 
+{{ .Content }}
+{{ template "_content_end.html" .}}
 
 {{ template "_footer.html" .}}
diff --git a/templates/comments.html b/templates/comments.html
new file mode 100644
index 0000000..3992784
--- /dev/null
+++ b/templates/comments.html
@@ -0,0 +1,20 @@
+
+<div id="page">
+
+<h2>Comments</h2>
+<p class="header-caption">If you have something to say, leave a comment!</p>
+
+<p> Comment: </p>
+<blockquote>
+<form method="GET" action="https://ntfy.doserver.top/comment/send" class="comments-form">
+<input type="text" name="tags" placeholder="Dave123">
+<input type="text" name="message" placeholder="Very interesting post, I like how...">
+<input type="text" name="title" value="{{ .Title }}" style="display:none !important" tabindex="-1" autocomplete="off">
+<input type="checkbox" name="priority" value="1" style="display:none !important" tabindex="-1" autocomplete="off">
+<input type="submit" value="Submit">
+</form>
+</blockquote>
+
+<h3>What other people said...</h3>
+<object type="text/html" data="/comments/{{.Title}}/" class="comments-embed"></object> 
+</div>
\ No newline at end of file
diff --git a/templates/comments_embedded.html b/templates/comments_embedded.html
new file mode 100644
index 0000000..a629ddd
--- /dev/null
+++ b/templates/comments_embedded.html
@@ -0,0 +1,5 @@
+{{ template "_style.html" .}}
+
+<div class="comments-list">
+{{ .Content }}
+</div>
\ No newline at end of file
diff --git a/templates/default.html b/templates/default.html
index c7121c7..a170901 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -1,13 +1,19 @@
 {{ template "_style.html" .}}
 {{ template "_header.html" .}}
 
+
+{{ template "_content_start.html" .}}
 <h1>{{ .Title }}</h1>
 
 {{ if not .Page.DatePublished.IsZero }}
-<p class="publish-date">Published on <time datetime="{{ .Page.DatePublished.Format `2006-01-02` }}">{{ .Page.DatePublished.Format `January 2, 2006` }}</time></p>
+<p class="header-caption">Published on <time datetime="{{ .Page.DatePublished.Format `2006-01-02` }}">{{ .Page.DatePublished.Format `January 2, 2006` }}</time></p>
 <p>
 {{ end }}
 
 {{ .Content }}
+{{ template "_content_end.html" .}}
+
+<br>
+{{ template "comments.html" .}}
 
 {{ template "_footer.html" .}}
diff --git a/templates/default_no_comment.html b/templates/default_no_comment.html
new file mode 100644
index 0000000..bc39534
--- /dev/null
+++ b/templates/default_no_comment.html
@@ -0,0 +1,17 @@
+{{ template "_style.html" .}}
+{{ template "_header.html" .}}
+
+
+{{ template "_content_start.html" .}}
+<h1>{{ .Title }}</h1>
+
+{{ if not .Page.DatePublished.IsZero }}
+<p class="header-caption">Published on <time datetime="{{ .Page.DatePublished.Format `2006-01-02` }}">{{ .Page.DatePublished.Format `January 2, 2006` }}</time></p>
+<p>
+{{ end }}
+
+{{ .Content }}
+{{ template "_content_end.html" .}}
+
+
+{{ template "_footer.html" .}}
\ No newline at end of file