diff --git a/_includes/badge.html b/_includes/badge.md
similarity index 100%
rename from _includes/badge.html
rename to _includes/badge.md
diff --git a/_includes/billboard.html b/_includes/billboard.html
deleted file mode 100644
index 0dd0b04abcb..00000000000
--- a/_includes/billboard.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="billboard--wrapper project-header--wrapper">
-    <div class="billboard--container">
-        <div class="container-fluid">
-            <div  class="content--title">
-{% capture breadcrumb %}
-[Projects]({{ site.projects_site_url }}){% if include.parent_link %} : {{ include.parent_link }}{% endif %}
-{% endcapture %}
-{{ breadcrumb | markdownify }}
-            </div>
-            <div class="row-fluid">
-                <div class="span8">
-                    <div class="project--links--container">
-                        <a href="{{ site.github }}" class="project-link">
-                            <i class="icon-github"></i>
-                        </a>
-                        <a href="{{ site.forum }}" class="project-link project-link-forum">
-                            <i class="icon-comment-alt"></i>
-                        </a>
-                    </div>
-                    <div class="project--title">{{ site.name }}</div>
-
-                    <div class="project--description">
-                        {{ include.billboard_description | markdownify }}
-                    </div>
-                    <a class="btn btn-black uppercase project-quickstart-btn" href="#quick-start">Quick Start</a> <!-- TODO: this button not working -->
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="billboard-bg spring-data--bg"></div>
-</div>
diff --git a/_includes/billboard.md b/_includes/billboard.md
new file mode 100644
index 00000000000..2219b0ab9d3
--- /dev/null
+++ b/_includes/billboard.md
@@ -0,0 +1,31 @@
+<div class="billboard--wrapper project-header--wrapper">
+<div class="billboard--container">
+<div class="container-fluid">
+<div  class="content--title">
+{% capture breadcrumb %}
+[Projects]({{ site.projects_site_url }}){% if include.parent_link %} : {{ include.parent_link }}{% endif %}
+{% endcapture %}
+{{ breadcrumb | markdownify }}
+</div>
+<div class="row-fluid">
+<div class="span8">
+<div class="project--links--container">
+<a href="{{ site.github }}" class="project-link">
+<i class="icon-github"></i>
+</a>
+<a href="{{ site.forum }}" class="project-link project-link-forum">
+<i class="icon-comment-alt"></i>
+</a>
+</div>
+<div class="project--title">{{ site.name }}</div>
+
+<div class="project--description">
+{{ include.billboard_description | markdownify }}
+</div>
+<a class="btn btn-black uppercase project-quickstart-btn" href="#quick-start">Quick Start</a>
+</div>
+</div>
+</div>
+</div>
+<div class="billboard-bg spring-data--bg"></div>
+</div>
diff --git a/_includes/documentation.html b/_includes/documentation.md
similarity index 100%
rename from _includes/documentation.html
rename to _includes/documentation.md
diff --git a/_includes/home.html b/_includes/home.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/_includes/project_captures.md b/_includes/project_captures.md
deleted file mode 100644
index d7965d07aa7..00000000000
--- a/_includes/project_captures.md
+++ /dev/null
@@ -1,3 +0,0 @@
-{% capture body %}
-IN project captures
-{% endcapture %}
\ No newline at end of file
diff --git a/_includes/project_home_include.html b/_includes/project_home_include.md
similarity index 56%
rename from _includes/project_home_include.html
rename to _includes/project_home_include.md
index cf53d9b24f6..c09f7e812cc 100644
--- a/_includes/project_home_include.html
+++ b/_includes/project_home_include.md
@@ -1,6 +1,4 @@
-<!-- Do not add indents, as this file is processed as markdown -->
-
-{% include billboard.html %}
+{% include billboard.md %}
 
 <div class="billboard-body--wrapper project-body--container">
 <div class="row-fluid">
@@ -9,6 +7,6 @@
 {{ include.project_content | markdownify }}
 </div>
 </div>
-<div class="span4">{% include project_sidebar.html %}</div>
+<div class="span4">{% include project_sidebar.md %}</div>
 </div>
 </div>
\ No newline at end of file
diff --git a/_includes/project_sidebar.html b/_includes/project_sidebar.md
similarity index 88%
rename from _includes/project_sidebar.html
rename to _includes/project_sidebar.md
index 87d55663843..4aa95f318d8 100644
--- a/_includes/project_sidebar.html
+++ b/_includes/project_sidebar.md
@@ -1,4 +1,4 @@
-{% include documentation.html %}
+{% include documentation.md %}
 
 {% capture badges %}
 {% if site.sample %}
@@ -18,9 +18,9 @@
 
 {%unless badges contains 'not found in _includes directory' %}
 <div class="right-pane-widget--container no-top-border">
-  <div class="project-sub-link--wrapper">
+<div class="project-sub-link--wrapper">
 {{ badges | markdownify }}
- </div>
+</div>
 </div>
 {%endunless%}
 
diff --git a/_includes/quickstart.html b/_includes/quickstart.md
similarity index 91%
rename from _includes/quickstart.html
rename to _includes/quickstart.md
index 332b719fb1b..3e796064f8e 100644
--- a/_includes/quickstart.html
+++ b/_includes/quickstart.md
@@ -1,5 +1,3 @@
-<!-- Do not add indents, as this file is processed as markdown -->
-
 <div class="project-body--section" id="quick-start">
 
 <div class="row-fluid quickstart--container">
diff --git a/_includes/samples/badges.md b/_includes/samples/badges.md
index 26fc1bfbf9f..9cfc15db197 100644
--- a/_includes/samples/badges.md
+++ b/_includes/samples/badges.md
@@ -1,6 +1,6 @@
 {% capture cilink %}
 <a href="https://drone.io/github.com/springframework-meta/gs-rest-service/latest">
-  <img src="https://drone.io/github.com/springframework-meta/gs-rest-service/status.png">
+<img src="https://drone.io/github.com/springframework-meta/gs-rest-service/status.png">
 </a>
 {% endcapture %}
 
diff --git a/sample-pages/project_home.md b/sample-pages/project_home.md
index 6add9423e4f..58b82453a52 100644
--- a/sample-pages/project_home.md
+++ b/sample-pages/project_home.md
@@ -42,7 +42,7 @@ extraordinary claims require extraordinary evidence stirred by
 starlight, culture? Flatland Tunguska event finite but unbounded
 corpus callosum!
 
-{% include quickstart.html quickstart_description=quickstart %}
+{% include quickstart.md quickstart_description=quickstart %}
 
 Radio telescope Orion's sword science, brain is the seed of intelligence. Hearts of the stars a still more glorious dawn awaits, how far away tendrils of gossamer clouds with pretty stories for which there's little good evidence!
 
@@ -62,4 +62,4 @@ Intelligent beings are creatures of the cosmos at the edge of forever of brillia
 
 
 
-{% include project_home_include.html parent_link=parent_link billboard_description=billboard_description project_content=project_content %}
+{% include project_home_include.md parent_link=parent_link billboard_description=billboard_description project_content=project_content %}