diff --git a/_config.yml b/_config.yml
index 71e564f0..c497bfe8 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,12 +15,12 @@ url                      : "http://localhost:4000" # the base hostname & protoco
 baseurl                  : "/test" # the subpath of your site, e.g. /blog
 email                    : "your-email@domain.com"
 logo                     : "default-thumb.png"
-google_site_verification :
 twitter:
   username               : site_twitter
 facebook:
   app_id                 :
   publisher              :
+disqus_shortname         : "mmistakes-dev" # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
 google_site_verification :
 bing_site_verification   :
 alexa_site_verification  :
@@ -85,6 +85,17 @@ kramdown:
   smart_quotes: lsquo,rsquo,ldquo,rdquo
   enable_coderay: false
 
+# Defaults
+defaults:
+
+  # _posts
+  - scope:
+      path: ""
+      type: posts
+    values:
+      layout: post
+      comments: true
+
 # Plugins
 gems:
   - jekyll-paginate
@@ -106,10 +117,9 @@ compress_html:
 # Site Owner
 owner:
   name             : "Your Name"
-  avatar           : "/images/bio-photo.jpg" # external URLs are also acceptable
+  avatar           : "bio-photo.jpg" # external URLs are also acceptable
   bio              : "Describe your self."
   email            :
-  disqus-shortname : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
   bing-verify      :
   codepen          :
   dribbble         :
diff --git a/_includes/disqus-comments.html b/_includes/disqus-comments.html
index eb535e76..721316a1 100644
--- a/_includes/disqus-comments.html
+++ b/_includes/disqus-comments.html
@@ -1,7 +1,7 @@
-{% if site.owner.disqus-shortname %}
+{% if site.disqus_shortname %}
 <script type="text/javascript">
 	/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-	var disqus_shortname = '{{ site.owner.disqus-shortname }}';
+	var disqus_shortname = '{{ site.disqus_shortname }}';
 
 	/* * * DON'T EDIT BELOW THIS LINE * * */
 	(function() {
diff --git a/_layouts/post.html b/_layouts/post.html
index 33bbb23e..c88e86a9 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -32,7 +32,7 @@ layout: default
     </footer>
   </div><!-- /.article-wrap -->
 
-  {% if site.owner.disqus-shortname and page.comments == true %}
+  {% if site.disqus_shortname and page.comments %}
     <section id="disqus_thread"></section><!-- /#disqus_thread -->
   {% endif %}
 </article>
diff --git a/_posts/2011-03-10-sample-post.md b/_posts/2011-03-10-sample-post.md
index 9e560d31..0c08cf60 100644
--- a/_posts/2011-03-10-sample-post.md
+++ b/_posts/2011-03-10-sample-post.md
@@ -1,10 +1,9 @@
 ---
-layout: post
 title: Sample Post
 excerpt: "Just about everything you'll need to style in the theme: headings, paragraphs, blockquotes, tables, code blocks, and more."
 modified: 2013-05-31
 tags: [intro, beginner, jekyll, tutorial]
-comments: true
+comments: false
 image:
   feature: sample-image-5.jpg
   credit: WeGraphics
diff --git a/_posts/2012-05-22-readability-post.md b/_posts/2012-05-22-readability-post.md
index bdf22fc6..c742eb38 100644
--- a/_posts/2012-05-22-readability-post.md
+++ b/_posts/2012-05-22-readability-post.md
@@ -1,9 +1,7 @@
 ---
-layout: post
 title: "Testing Readability with a Bunch of Text"
 excerpt: "A ton of text to test readability."
 tags: [sample post, readability, test]
-comments: true
 ---
 
 Portland in shoreditch Vice, labore typewriter pariatur hoodie fap sartorial Austin. Pinterest literally occupy Schlitz forage. Odio ad blue bottle vinyl, 90's narwhal commodo bitters pour-over nostrud. Ugh est hashtag in, fingerstache adipisicing laboris esse Pinterest shabby chic Portland. Shoreditch bicycle rights anim, flexitarian laboris put a bird on it vinyl cupidatat narwhal. Hashtag artisan skateboard, flannel Bushwick nesciunt salvia aute fixie do plaid post-ironic dolor McSweeney's. Cliche pour-over chambray nulla four loko skateboard sapiente hashtag.
diff --git a/_posts/2013-05-22-sample-post-images.md b/_posts/2013-05-22-sample-post-images.md
index 738e3373..493b3cc0 100644
--- a/_posts/2013-05-22-sample-post-images.md
+++ b/_posts/2013-05-22-sample-post-images.md
@@ -1,9 +1,7 @@
 ---
-layout: post
 title: "A Post with Images"
 excerpt: "Examples and code for displaying images in posts."
 tags: [sample post, images, test]
-comments: true
 ---
 
 Here are some examples of what a post with images might look like. If you want to display two or three images next to each other responsively use `figure` with the appropriate `class`. Each instance of `figure` is auto-numbered and displayed in the caption.
diff --git a/_posts/2013-05-23-readability-feature-post.md b/_posts/2013-05-23-readability-feature-post.md
index 4e76e1a3..7cff1e7e 100644
--- a/_posts/2013-05-23-readability-feature-post.md
+++ b/_posts/2013-05-23-readability-feature-post.md
@@ -1,9 +1,7 @@
 ---
-layout: post
 title: "Post with Large Feature Image and Text"
 excerpt: "Custom written post descriptions are the way to go... if you're not lazy."
 tags: [sample post, readability, test]
-comments: true
 image:
   feature: sample-image-4.jpg
   credit: WeGraphics
diff --git a/_posts/2013-08-12-sample-link-post.md b/_posts/2013-08-12-sample-link-post.md
index 6649319b..736e1cb5 100644
--- a/_posts/2013-08-12-sample-link-post.md
+++ b/_posts/2013-08-12-sample-link-post.md
@@ -1,10 +1,8 @@
 ---
-layout: post
 title: "Sample Link Post"
 excerpt: "Example and code for using link posts."
 tags: [sample post, link post]
 link: http://mademistakes.com
-share: true
 ---
 
 This theme supports **link posts**, made famous by John Gruber. To use, just add `link: http://url-you-want-linked` to the post's YAML front matter and you're done.
diff --git a/_posts/2013-08-16-code-highlighting-post.md b/_posts/2013-08-16-code-highlighting-post.md
index 1a03d21d..4125eb75 100644
--- a/_posts/2013-08-16-code-highlighting-post.md
+++ b/_posts/2013-08-16-code-highlighting-post.md
@@ -1,10 +1,8 @@
 ---
-layout: post
 title: Syntax Highlighting Post
 excerpt: "Demo post displaying the various ways of highlighting code in Markdown."
 tags: [sample post, code, highlighting]
 modified: 2016-02-01
-comments: true
 ---
 
 Syntax highlighting is a feature that displays source code, in different colors and fonts according to the category of terms. This feature facilitates writing in a structured language such as a programming language or a markup language as both structures and syntax errors are visually distinct. Highlighting does not affect the meaning of the text itself; it is intended only for human readers.[^1]
diff --git a/_posts/2014-07-31-author-override.md b/_posts/2014-07-31-author-override.md
index af81bcd6..53b1f2c7 100644
--- a/_posts/2014-07-31-author-override.md
+++ b/_posts/2014-07-31-author-override.md
@@ -1,5 +1,4 @@
 ---
-layout: post
 title: "Author Override"
 author: billy_rick
 modified: