diff --git a/README.md b/README.md
index 61e15e1..a65f72b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Tale is a minimal Jekyll theme curated for storytellers. Checkout the demo [here
 - Syntax highlighting, with the help of Pygments
 - Markdown and HTML text formatting
 - Pagination of posts
-- [Enabling Comments (via Disqus)](#enabling-comments-via-disqus)
+- [Disqus comments (can be enabled if needed)](#enabling-comments)
 
 ## Installation
 There are 3 ways to install this theme
@@ -113,20 +113,14 @@ $ bundle exec jekyll serve
 
 And you're all set! Head over to http://127.0.0.1:4000/ to see your site in action.
 
-
-### Enabling Comments (via Disqus)
-
-Optionally, if you have a Disqus account, you can tell Jekyll to use it to show a comments section below each post.
-
-To enable it, add the following lines to your Jekyll site:
+### Enabling Comments
+Comments are disabled by default. To enable them, look for the following line in `_config.yml` and change `jekyll-tale` to your site's Disqus id.
 
 ```yml
-disqus: your_disqus_id
+disqus: jekyll-tale
 ```
 
-You can find out more about Disqus' shortnames [here](https://help.disqus.com/installation/whats-a-shortname).
-
-Comments are disabled by default and will only appear in when adding `comments: true` to that post's YAML Front Matter
+Next, add `comments: true` to the YAML front matter of the posts which you would like to enable comments for.
 
 ## Contributing
 Found a bug or have a suggestion? Feel free to create an issue or make a pull request!
diff --git a/_config.yml b/_config.yml
index fdf2308..7c01e96 100644
--- a/_config.yml
+++ b/_config.yml
@@ -36,3 +36,6 @@ paginate:       5
 
 # Excludes
 exclude: [ Gemfile, Gemfile.lock, tale.gemspec ]
+
+# Disqus (Set to your disqus id)
+disqus:         jekyll-tale
\ No newline at end of file
diff --git a/_data/theme.yml b/_data/theme.yml
deleted file mode 100644
index 5594052..0000000
--- a/_data/theme.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# Disqus
-disqus: your_disqus_id
\ No newline at end of file
diff --git a/_includes/disqus_comment.html b/_includes/disqus_comment.html
deleted file mode 100644
index c895db6..0000000
--- a/_includes/disqus_comment.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Start disqus -->
-  <script src="{{ "/assets/js/disqusLoader.js" | relative_url }}" /></script>
-  <div id="disqus_thread"><h3>Discussion and feedback</h3></div>
-  <div class="disqus"></div>
-  <div class="disqus-loading"><!-- Please wait, loading comments&hellip; --></div>
-  <style>
-   .disqus-placeholder.is-hidden { display: none; }
-  </style>
-  <script>
-      disqusLoader( '.disqus',
-      {
-          scriptUrl:    'https://{{ site.data.theme.disqus }}.disqus.com/embed.js',
-          disqusConfig: function()
-          {
-              this.page.identifier  = '{{ page.id }}';
-              this.page.url     = '{{ site.baseurl }}/{{ post.url }}';
-              this.page.title     = '{{page.title}}';
-              this.callbacks.onReady  = [function()
-              {
-                  var el = document.querySelector( '.disqus-loading' );
-                  if( el.classList )
-                      el.classList.add( 'is-hidden' );
-                  else
-                      el.className += ' ' + 'is-hidden';
-              }];
-          }
-      });
-  </script>
-  <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<!-- End disqus -->
\ No newline at end of file
diff --git a/_includes/disqus_comments.html b/_includes/disqus_comments.html
new file mode 100644
index 0000000..4b06c13
--- /dev/null
+++ b/_includes/disqus_comments.html
@@ -0,0 +1,11 @@
+<!-- Start disqus -->
+<script src="{{ "/assets/js/disqusLoader.js" | relative_url }}" /></script>
+<div id="disqus_thread"><h3>Discussion and feedback</h3></div>
+<div class="disqus"></div>
+<script>
+    disqusLoader('.disqus', {
+        scriptUrl: 'https://{{ site.disqus }}.disqus.com/embed.js'
+    });
+</script>
+<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<!-- End disqus -->
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index ae4eb5e..82d9079 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -21,11 +21,12 @@ layout: default
   <div class="post-line"></div>
 
   {{ content }}
-
 </div>
+
 {% if page.comments %}
-  {% include disqus_comment.html %}
+  {% include disqus_comments.html %}
 {% endif %}
+
 <div class="pagination">
   {% if page.next.url %}
     <a href="{{ page.next.url | prepend: site.baseurl }}" class="left arrow">&#8592;</a>
diff --git a/assets/js/disqusLoader.js b/assets/js/disqusLoader.js
index 935aa92..56eae93 100644
--- a/assets/js/disqusLoader.js
+++ b/assets/js/disqusLoader.js
@@ -1,11 +1,10 @@
-
-  /*
-      disqusLoader.js v1.0
-      A JavaScript plugin for lazy-loading Disqus comments widget.
-      -
-      By Osvaldas Valutis, www.osvaldas.info
-      Available for use under the MIT License
-  */
-  (function(b,f,l){var r=function(a){a=a.getBoundingClientRect();return{top:a.top+f.body.scrollTop,left:a.left+f.body.scrollLeft}},t=function(a,c){var d=f.createElement("script");d.src=a;d.async=!0;d.setAttribute("data-timestamp",+new Date);d.addEventListener("load",function(){"function"===typeof c&&c()});(f.head||f.body).appendChild(d)};l=function(a,c){var d,e;return function(){var g=this,f=arguments,b=+new Date;d&&b<d+a?(clearTimeout(e),e=setTimeout(function(){d=b;c.apply(g,f)},a)):(d=b,c.apply(g,
-  f))}};var m=!1,n=!1,p=!1,k=!1,h="unloaded",e=!1,q=function(){if(!e||!f.body.contains(e)||"loaded"==e.disqusLoaderStatus)return!0;var a=b.pageYOffset,c=r(e).top;if(c-a>b.innerHeight*n||0<a-c-e.offsetHeight-b.innerHeight*n)return!0;(a=f.getElementById("disqus_thread"))&&a.removeAttribute("id");e.setAttribute("id","disqus_thread");e.disqusLoaderStatus="loaded";"loaded"==h?DISQUS.reset({reload:!0,config:p}):(b.disqus_config=p,"unloaded"==h&&(h="loading",t(k,function(){h="loaded"})))};b.addEventListener("scroll",
-  l(m,q));b.addEventListener("resize",l(m,q));b.disqusLoader=function(a,c){var d={laziness:1,throttle:250,scriptUrl:!1,disqusConfig:!1},b=c,g,h={};for(g in d)Object.prototype.hasOwnProperty.call(d,g)&&(h[g]=d[g]);for(g in b)Object.prototype.hasOwnProperty.call(b,g)&&(h[g]=b[g]);c=h;n=c.laziness+1;m=c.throttle;p=c.disqusConfig;k=!1===k?c.scriptUrl:k;e="string"===typeof a?f.querySelector(a):"number"===typeof a.length?a[0]:a;e.disqusLoaderStatus="unloaded";q()}})(window,document,0); 
\ No newline at end of file
+/*
+    disqusLoader.js v1.0
+    A JavaScript plugin for lazy-loading Disqus comments widget.
+    -
+    By Osvaldas Valutis, www.osvaldas.info
+    Available for use under the MIT License
+*/
+(function(b,f,l){var r=function(a){a=a.getBoundingClientRect();return{top:a.top+f.body.scrollTop,left:a.left+f.body.scrollLeft}},t=function(a,c){var d=f.createElement("script");d.src=a;d.async=!0;d.setAttribute("data-timestamp",+new Date);d.addEventListener("load",function(){"function"===typeof c&&c()});(f.head||f.body).appendChild(d)};l=function(a,c){var d,e;return function(){var g=this,f=arguments,b=+new Date;d&&b<d+a?(clearTimeout(e),e=setTimeout(function(){d=b;c.apply(g,f)},a)):(d=b,c.apply(g,
+f))}};var m=!1,n=!1,p=!1,k=!1,h="unloaded",e=!1,q=function(){if(!e||!f.body.contains(e)||"loaded"==e.disqusLoaderStatus)return!0;var a=b.pageYOffset,c=r(e).top;if(c-a>b.innerHeight*n||0<a-c-e.offsetHeight-b.innerHeight*n)return!0;(a=f.getElementById("disqus_thread"))&&a.removeAttribute("id");e.setAttribute("id","disqus_thread");e.disqusLoaderStatus="loaded";"loaded"==h?DISQUS.reset({reload:!0,config:p}):(b.disqus_config=p,"unloaded"==h&&(h="loading",t(k,function(){h="loaded"})))};b.addEventListener("scroll",
+l(m,q));b.addEventListener("resize",l(m,q));b.disqusLoader=function(a,c){var d={laziness:1,throttle:250,scriptUrl:!1,disqusConfig:!1},b=c,g,h={};for(g in d)Object.prototype.hasOwnProperty.call(d,g)&&(h[g]=d[g]);for(g in b)Object.prototype.hasOwnProperty.call(b,g)&&(h[g]=b[g]);c=h;n=c.laziness+1;m=c.throttle;p=c.disqusConfig;k=!1===k?c.scriptUrl:k;e="string"===typeof a?f.querySelector(a):"number"===typeof a.length?a[0]:a;e.disqusLoaderStatus="unloaded";q()}})(window,document,0); 
\ No newline at end of file
diff --git a/tale.gemspec b/tale.gemspec
index dba3595..6623a5b 100644
--- a/tale.gemspec
+++ b/tale.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "tale"
-  spec.version       = "0.1.5"
+  spec.version       = "0.1.6"
   spec.authors       = ["Chester How"]
   spec.email         = ["chesterhow@gmail.com"]