diff --git a/404.md b/_pages/404.md
similarity index 100%
rename from 404.md
rename to _pages/404.md
diff --git a/about/index.md b/_pages/about.md
similarity index 87%
rename from about/index.md
rename to _pages/about.md
index bb33af28..463b1ff0 100644
--- a/about/index.md
+++ b/_pages/about.md
@@ -1,9 +1,9 @@
 ---
 layout: post
+permalink: /about/
 title: About the Theme
 tags: [about, Jekyll, theme, responsive]
 modified: 2014-08-08T20:53:07.573882-04:00
-comments: true
 image:
   feature: sample-image-2.jpg
   credit: WeGraphics
@@ -22,4 +22,4 @@ Minimal Mistakes is responsive Jekyll theme with large featured images and solid
 * [Custom 404 page](http://mmistakes.github.io/minimal-mistakes/404.html) to get you started.
 * Support for Disqus Comments
 
-<a markdown="0" href="{{ site.url }}/theme-setup" class="btn">Install Minimal Mistakes Theme</a>
+<a markdown="0" href="{{ site.url }}{{ site.baseurl }}/theme-setup/" class="btn">Install Minimal Mistakes Theme</a>
diff --git a/index.md b/_pages/home.md
similarity index 95%
rename from index.md
rename to _pages/home.md
index 31f1a97a..452a3450 100644
--- a/index.md
+++ b/_pages/home.md
@@ -1,5 +1,6 @@
 ---
 layout: home
+permalink: /
 excerpt: "A minimal Jekyll theme for your blog by designer Michael Rose."
 tags: [Jekyll, theme, responsive, blog, template]
 image:
diff --git a/posts/index.md b/_pages/posts.md
similarity index 56%
rename from posts/index.md
rename to _pages/posts.md
index c29023f3..678cd240 100644
--- a/posts/index.md
+++ b/_pages/posts.md
@@ -1,5 +1,6 @@
 ---
 layout: archive
-title: All Posts
+permalink: /posts/
+title: "All Posts"
 excerpt: "A List of Posts"
 ---
\ No newline at end of file
diff --git a/theme-setup/index.md b/_pages/theme-setup.md
similarity index 99%
rename from theme-setup/index.md
rename to _pages/theme-setup.md
index 182ec3fb..e5b4a4e7 100644
--- a/theme-setup/index.md
+++ b/_pages/theme-setup.md
@@ -1,8 +1,11 @@
 ---
 layout: post
+permalink: /theme-setup/
 title: Theme Setup
 modified: 2016-01-19
 excerpt: "Instructions on how to install and customize the Jekyll theme Minimal Mistakes."
+share: true
+comments: true
 image:
   feature: sample-image-3.jpg
   credit: WeGraphics