diff --git a/_includes/author-bio.html b/_includes/_author-bio.html
similarity index 100%
rename from _includes/author-bio.html
rename to _includes/_author-bio.html
diff --git a/_includes/browser-upgrade.html b/_includes/_browser-upgrade.html
similarity index 100%
rename from _includes/browser-upgrade.html
rename to _includes/_browser-upgrade.html
diff --git a/_includes/footer.html b/_includes/_footer.html
similarity index 100%
rename from _includes/footer.html
rename to _includes/_footer.html
diff --git a/_includes/head.html b/_includes/_head.html
similarity index 100%
rename from _includes/head.html
rename to _includes/_head.html
diff --git a/_includes/navigation.html b/_includes/_navigation.html
similarity index 100%
rename from _includes/navigation.html
rename to _includes/_navigation.html
diff --git a/_includes/scripts.html b/_includes/_scripts.html
similarity index 100%
rename from _includes/scripts.html
rename to _includes/_scripts.html
diff --git a/_layouts/home.html b/_layouts/home.html
index 39e56816..7dd941eb 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -4,14 +4,14 @@
 <!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en"><!--<![endif]-->
 <head>
-{% include head.html %}
+{% include _head.html %}
 </head>
 
 <body class="home" itemscope itemtype="http://schema.org/WebPage">
 
-{% include browser-upgrade.html %}
+{% include _browser-upgrade.html %}
 
-{% include navigation.html %}
+{% include _navigation.html %}
 
 {% if page.image.feature %}<div class="image-wrap">
   <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
@@ -19,7 +19,7 @@
 </div><!-- /.image-wrap -->{% endif %}
 
 <div class="article-author-top">
-  {% include author-bio.html %}
+  {% include _author-bio.html %}
 </div>
 
 <div id="index" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
@@ -34,11 +34,11 @@
 
 <div class="footer-wrap">
   <footer>
-    {% include footer.html %}
+    {% include _footer.html %}
   </footer>
 </div><!-- /.footer-wrap -->
 
-{% include scripts.html %}
+{% include _scripts.html %}
   
 </body>
 </html>
\ No newline at end of file
diff --git a/_layouts/page.html b/_layouts/page.html
index 9466931e..5cd6123f 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -4,14 +4,14 @@
 <!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en"><!--<![endif]-->
 <head>
-{% include head.html %}
+{% include _head.html %}
 </head>
 
 <body class="page" itemscope itemtype="http://schema.org/WebPage">
 
-{% include browser-upgrade.html %}
+{% include _browser-upgrade.html %}
 
-{% include navigation.html %}
+{% include _navigation.html %}
 
 {% if page.image.feature %}<div class="image-wrap">
   <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
@@ -20,7 +20,7 @@
 
 <div id="main" role="main"  itemprop="mainContentOfPage">
   <div class="article-author-top">
-    {% include author-bio.html %}
+    {% include _author-bio.html %}
   </div>
   <article itemscope itemtype="http://schema.org/CreativeWork">
     <h1 itemprop="name">{{ page.title }}</h1>
@@ -32,11 +32,11 @@
 
 <div class="footer-wrap">
   <footer>
-    {% include footer.html %}
+    {% include _footer.html %}
   </footer>
 </div><!-- /.footer-wrap -->
 
-{% include scripts.html %}          
+{% include _scripts.html %}          
 
 </body>
 </html>
\ No newline at end of file
diff --git a/_layouts/post-index.html b/_layouts/post-index.html
index 83cac079..6d03a657 100644
--- a/_layouts/post-index.html
+++ b/_layouts/post-index.html
@@ -4,14 +4,14 @@
 <!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en"><!--<![endif]-->
 <head>
-{% include head.html %}
+{% include _head.html %}
 </head>
 
 <body class="articles" itemscope itemtype="http://schema.org/WebPage">
 
-{% include browser-upgrade.html %}
+{% include _browser-upgrade.html %}
 
-{% include navigation.html %}
+{% include _navigation.html %}
 
 {% if page.image.feature %}<div class="image-wrap">
   <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
@@ -19,7 +19,7 @@
 </div><!-- /.image-wrap -->{% endif %}
 
 <div class="article-author-top">
-  {% include author-bio.html %}
+  {% include _author-bio.html %}
 </div>
 
 <div id="index" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
@@ -43,11 +43,11 @@
 
 <div class="footer-wrap">
   <footer>
-    {% include footer.html %}
+    {% include _footer.html %}
   </footer>
 </div><!-- /.footer-wrap -->
 
-{% include scripts.html %}
+{% include _scripts.html %}
   
 </body>
 </html>
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index 8e563e42..7d8be586 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -4,14 +4,14 @@
 <!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en"><!--<![endif]-->
 <head>
-{% include head.html %}
+{% include _head.html %}
 </head>
 
 <body class="article" itemscope itemtype="http://schema.org/WebPage">
 
-{% include browser-upgrade.html %}
+{% include _browser-upgrade.html %}
 
-{% include navigation.html %}
+{% include _navigation.html %}
 
 {% if page.image.feature %}<div class="image-wrap">
   <img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
@@ -20,7 +20,7 @@
 
 <div id="main" role="main" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
   <div class="article-author-top">
-    {% include author-bio.html %}
+    {% include _author-bio.html %}
   </div>
   <article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
     <div class="headline-wrap">
@@ -32,7 +32,7 @@
       <hr />
       <footer role="contentinfo">
         <div class="article-author-bottom">
-          {% include author-bio.html %}
+          {% include _author-bio.html %}
         </div>
         <p class="byline"><strong>{{ page.title }}</strong> was published on <time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%B %d, %Y" }}</time>{% if page.modified %} and last modified on <time datetime="{{ page.modified | date: "%Y-%m-%d" }}" itemprop="dateModified">{{ page.modified | date: "%B %d, %Y" }}</time>{% endif %} by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name"><a href="{{ site.url }}/about" title="About {{ site.owner.name }}" itemprop="url">{{ site.owner.name }}</a></span></span>.</p>
       </footer>
@@ -59,11 +59,11 @@
     <hr />
   </div><!-- /.related-articles -->{% endif %}
   <footer>
-    {% include footer.html %}
+    {% include _footer.html %}
   </footer>
 </div><!-- /.footer-wrap -->
 
-{% include scripts.html %}	        
+{% include _scripts.html %}	        
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/theme-setup.md b/theme-setup.md
index de7f58ae..7301484f 100644
--- a/theme-setup.md
+++ b/theme-setup.md
@@ -33,12 +33,12 @@ General notes and suggestions for customizing Minimal Mistakes.
 {% highlight text %}
 minimal-mistakes/
 ├── _includes/
-|    ├── author-bio.html  #bio stuff goes here
-|    ├── browser-upgrade.html  #displays on IE8 and less
-|    ├── footer.html  #site footer
-|    ├── head.html  #site head
-|    ├── navigation.html #site top nav
-|    └── scripts.html  #jQuery, plugins, GA, etc.
+|    ├── _author-bio.html  #bio stuff goes here
+|    ├── _browser-upgrade.html  #displays on IE8 and less
+|    ├── _footer.html  #site footer
+|    ├── _head.html  #site head
+|    ├── _navigation.html #site top nav
+|    └── _scripts.html  #jQuery, plugins, GA, etc.
 ├── _layouts/
 |    ├── home.html  #homepage layout
 |    ├── page.html  #page layout
@@ -69,7 +69,7 @@ Most of the variables found here are used in the .html files found in `_includes
 
 #### Owner/Author Information
 
-Change your name, bio, and avatar photo (100x100 pixels or larger), Twitter url, email, and Google+ url. If you want to link to an external image on Gravatar or something similiar you'll need to edit the path in `author-bio.html` since it assumes it is located in `\images`.
+Change your name, bio, and avatar photo (100x100 pixels or larger), Twitter url, email, and Google+ url. If you want to link to an external image on Gravatar or something similiar you'll need to edit the path in `_author-bio.html` since it assumes it is located in `\images`.
 
 Including a link to your Google+ profile has the added benefit of displaying [Google Authorship](https://plus.google.com/authorship) in Google search results if you've went ahead and applied for it. Don't have a Google+ account? Just leave it blank.
 
@@ -122,7 +122,7 @@ image:
 
 #### Thumbnails for OG and Twitter Cards
 
-Post and page thumbnails work the same way. These are used by [Open Graph](https://developers.facebook.com/docs/opengraph/) and [Twitter Cards](https://dev.twitter.com/docs/cards) meta tags found in *head.html*. If you don't assign a thumbnail the default graphic *(default-thumb.png)* is used. I'd suggest changing this to something more meaningful --- your logo or avatar are good options.
+Post and page thumbnails work the same way. These are used by [Open Graph](https://developers.facebook.com/docs/opengraph/) and [Twitter Cards](https://dev.twitter.com/docs/cards) meta tags found in *_head.html*. If you don't assign a thumbnail the default graphic *(default-thumb.png)* is used. I'd suggest changing this to something more meaningful --- your logo or avatar are good options.
 
 #### Table of Contents
 
@@ -180,6 +180,6 @@ Having a problem getting something to work or want to know why I setup something
 This theme is free and open source software, distributed under the [GNU General Public License]({{ site.url }}/LICENSE) version 2 or later. So feel free to use this Jekyll theme on your site without linking back to me or including a disclaimer. 
 
 
-[^1]: Used to generate absolute urls in `sitemap.xml`, `feed.xml`, and for canonical urls in `head.html`. Don't include a trailing `/` in your base url ie: `http://mademistakes.com`. When developing locally remove or comment out this line so local .css, .js, and images are used.
+[^1]: Used to generate absolute urls in `sitemap.xml`, `feed.xml`, and for canonical urls in `_head.html`. Don't include a trailing `/` in your base url ie: `http://mademistakes.com`. When developing locally remove or comment out this line so local .css, .js, and images are used.
 
 [^2]: If you're using GitHub Pages to host your site be aware that plugins are disabled. So you'll need to build your site locally and then manually deploy if you want to use this sweet plugin.
\ No newline at end of file
