diff --git a/_includes/badge.md b/_includes/badge.html
similarity index 100%
rename from _includes/badge.md
rename to _includes/badge.html
diff --git a/_includes/home.md b/_includes/home.html
similarity index 97%
rename from _includes/home.md
rename to _includes/home.html
index 039516214cb..cdac855ac79 100644
--- a/_includes/home.md
+++ b/_includes/home.html
@@ -70,6 +70,6 @@
         </div>
       </div>
     </div>
-    <div class="span4">{% include right.md %}</div>
+    <div class="span4">{% include right.html %}</div>
   </div>
 </div>
diff --git a/_includes/right.md b/_includes/right.html
similarity index 100%
rename from _includes/right.md
rename to _includes/right.html
diff --git a/_includes/samples/badges.md b/_includes/samples/badges.md
index 7c05d92f374..b0ac4b427cd 100644
--- a/_includes/samples/badges.md
+++ b/_includes/samples/badges.md
@@ -1,4 +1,4 @@
-{% include badge.md link="[ci](#ci-icon)" %}
-{% include badge.md link="[fork](#forkme-icon)" %}
-{% include badge.md link="[etc](#)" %}
-{% include badge.md link="[etc](#)" %}
+{% include badge.html link="[ci](#ci-icon)" %}
+{% include badge.html link="[fork](#forkme-icon)" %}
+{% include badge.html link="[etc](#)" %}
+{% include badge.html link="[etc](#)" %}
diff --git a/_includes/widget_template.html b/_includes/widgets.html
similarity index 100%
rename from _includes/widget_template.html
rename to _includes/widgets.html
diff --git a/_layouts/default.html b/_layouts/default.html
index 4d119f9f749..8b0e2a5a331 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -28,7 +28,7 @@
   <script type="text/javascript" src="{{site.baseurl}}/js/guide.js"></script>
   <script type="text/javascript">
     var apiBaseUrl = "{{ site.main_site_url }}";
-    var projectId = "{{ site.project }}";
+    var projectId = "{{ site.project }}"
   </script>
   <meta name="google-site-verification" content="7qGntFPD9lWAVCtUu5U77v4l68PsTHf6xpzgjQv2j2M" />
 </head>
@@ -116,7 +116,7 @@
     </div>
   </footer>
   <div id="scrim"></div>
-  {% include widget_template.html %}
+  {% include widgets.html %}
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/_layouts/home.md b/_layouts/home.html
similarity index 89%
rename from _layouts/home.md
rename to _layouts/home.html
index 68450b0fcde..098026aef0e 100644
--- a/_layouts/home.md
+++ b/_layouts/home.html
@@ -9,7 +9,7 @@ layout: default
       </div>
     </div>
     <div class="span4">
-        {% include right.md %}
+        {% include right.html %}
     </div>
   </div>
 </div>
diff --git a/_layouts/rightnav.md b/_layouts/rightnav.html
similarity index 88%
rename from _layouts/rightnav.md
rename to _layouts/rightnav.html
index 0636eb902c2..e7bde92a80b 100644
--- a/_layouts/rightnav.md
+++ b/_layouts/rightnav.html
@@ -9,7 +9,7 @@ layout: default
       </div>
     </div>
     <div class="span4">
-        {% include right.md %}
+        {% include right.html %}
     </div>
   </div>
 </div>
diff --git a/sample-pages/index.md b/sample-pages/index.md
index bbb553498bb..7da5f8f533c 100644
--- a/sample-pages/index.md
+++ b/sample-pages/index.md
@@ -2,8 +2,8 @@
 layout: default
 ---
 
-<!-- optional comma-separated list of markdown to render as breadcrumbs (any links between current page and main projects page) -->
-{% assign breadcrumbs = '[Parent]({{ site.projects_site_url }}#spring-project-parent)' %}
+<!-- optional " : "-separated list of markdown to render as breadcrumbs (links between current page and main projects page) -->
+{% capture breadcrumbs %}[Parent]({{ site.projects_site_url }}#spring-project-parent){% endcapture %}
 
 {% capture description %}
 
@@ -55,4 +55,4 @@ the energy hidden in matter rogue corpus callosum.
 
 {% endcapture %}
 
-{% include home.md breadcrumbs=breadcrumbs description=description body=body quickstart=quickstart %}
+{% include home.html breadcrumbs=breadcrumbs description=description body=body quickstart=quickstart %}