diff --git a/_config.yml b/_config.yml
index 8aceb350..b619453b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -108,7 +108,7 @@ defaults:
       path: ""
       type: posts
     values:
-      layout: post
+      layout: single
       comments: true
       share: true
       related: true
@@ -117,19 +117,19 @@ defaults:
       path: _pages
       type: pages
     values:
-      layout: post
+      layout: single
   # _recipes
   - scope:
       path: _recipes
       type: recipes
     values:
-      layout: post
+      layout: single
   # _pets
   - scope:
       path: _pets
       type: pets
     values:
-      layout: post
+      layout: single
 
 # Plugins
 gems:
diff --git a/_drafts/post-draft.md b/_drafts/post-draft.md
index da9be9ae..71a42605 100644
--- a/_drafts/post-draft.md
+++ b/_drafts/post-draft.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: single
 title:  "Draft Post"
 categories: 
   - Jekyll
diff --git a/_layouts/post.html b/_layouts/single.html
similarity index 100%
rename from _layouts/post.html
rename to _layouts/single.html
diff --git a/_pages/theme-setup.md b/_pages/theme-setup.md
index 033f2fbc..e98f3079 100644
--- a/_pages/theme-setup.md
+++ b/_pages/theme-setup.md
@@ -1,7 +1,6 @@
 ---
-layout: post
-permalink: /theme-setup/
 title: "Theme Setup"
+permalink: /theme-setup/
 modified: 2016-01-19
 excerpt: "Instructions on how to install and customize the Jekyll theme Minimal Mistakes."
 share: true