diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 595cde4..37c3712 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -130,4 +130,9 @@ copyright = "This work is licensed under a Creative Commons Attribution-NonComme
     url = "cover.png"
     width = 800
     height = 600
-    
+
+[params.gitalk]           
+owner = ""              
+repo = ""               
+clientId = ""           
+clientSecret = ""   
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 0dcadf8..a569fcf 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -103,9 +103,7 @@
 
     <div class="post-comment">
           {{ if ( .Params.showComments | default true ) }}
-                 {{ if ne .Site.DisqusShortname "" }}
-                     {{ template "_internal/disqus.html" . }}
-                 {{ end }}
+          {{ partial "comments.html" . }}
           {{ end }}
     </div>
 </article>
diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html
new file mode 100644
index 0000000..2bce448
--- /dev/null
+++ b/layouts/partials/comments.html
@@ -0,0 +1,41 @@
+{{ if and .IsPage (ne .Params.comment false) -}}
+  <!-- Disqus Comment System-->
+  {{- if .Site.DisqusShortname -}}
+    <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.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>
+  {{- end -}}
+
+  <!-- gitalk Comment System-->
+  {{- if .Site.Params.gitalk.owner -}}
+    <div id="gitalk-container"></div>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.css" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.js" crossorigin="anonymous"></script>
+    <script type="text/javascript">
+      var gitalk = new Gitalk({
+        id: '{{ .Date }}',
+        title: '{{ .Title }}',
+        clientID: '{{ .Site.Params.gitalk.clientId }}',
+        clientSecret: '{{ .Site.Params.gitalk.clientSecret }}',
+        repo: '{{ .Site.Params.gitalk.repo }}',
+        owner: '{{ .Site.Params.gitalk.owner }}',
+        admin: ['{{ .Site.Params.gitalk.owner }}'],
+        body: decodeURI(location.href)
+      });
+      gitalk.render('gitalk-container');
+    </script>
+    <noscript>Please enable JavaScript to view the <a href="https://github.com/gitalk/gitalk">comments powered by gitalk.</a></noscript>
+  {{- end }}
+
+{{- end }}
\ No newline at end of file