diff --git a/index.html b/index.html
deleted file mode 100644
index 352450b70..000000000
--- a/index.html
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: default
-title: Welcome
----
-
-<a href="https://github.com/tianocore/tianocore.github.io/wiki/UDK2014"><img src="images/IntroducingUDK2014.png"/></a><br/>
-
-<br/>
-
-<p>
-This is the community site surrounding the open source components of Intel's implementation of <a href="https://github.com/tianocore/tianocore.github.io/wiki/UEFI">UEFI</a>.
-To learn how to use UEFI see our <a href="https://github.com/tianocore/tianocore.github.io/wiki/start using UEFI">start using UEFI</a> page.<br/>
-</p>
-
-<p>
-To learn more about getting involved in the community see our <a href="https://github.com/tianocore/tianocore.github.io/wiki/How To Contribute">how to contribute</a> page.
-<a href="https://github.com/tianocore/tianocore.github.io/wiki/EDK2">EDK II</a> is a modern, feature-rich, cross-platform firmware development environment for the UEFI and PI specifications.<br/>
-</p>
-
-<p>
-If you have any comments for this site please see the <a href="https://github.com/tianocore/tianocore.github.io/wiki/Community_Admins">Community_Admins</a> page.<br/>
-</p>
-
-<p>
-For the full list of our community projects, visit the <a href="https://github.com/tianocore/tianocore.github.io/wiki/Projects">Projects</a> page.<br/>
-
-<h2>New Announcements</h2>
-
-<h3>March 20, 2014 </h3>
-Announcing the new UDK2014 Release. Goto the <a href="https://github.com/tianocore/tianocore.github.io/wiki/UDK2014">UDK2014</a> page to download the release and documentation.
-The UDK2014 release will deliver the UEFI 2.4  and PI 1.3 support.  Specific details on features and on what is new is contained in the UDK2014
-<a href="http://sourceforge.net/projects/edk2/files/UDK2014_Releases/UDK2014/UDK2014-ReleaseNotes-MyWorkSpace.txt/download">Release Notes</a>.<br/>
-
-<h3>Feb 11, 2014 </h3>
-Upcomming soon UDK2014 See a sneak pre-view: <a href="https://github.com/tianocore/tianocore.github.io/wiki/RoadMap2014">UDK2014 Features</a><br/>
-
-<h3><a href="https://github.com/tianocore/tianocore.github.io/wiki/Archived News">Archived News</a> News from 2009-2013</h3>
diff --git a/index.md b/index.md
new file mode 100644
index 000000000..562f217d7
--- /dev/null
+++ b/index.md
@@ -0,0 +1,46 @@
+---
+layout: default
+title: Welcome
+---
+
+[<img src="images/IntroducingUDK2014.png"/>](https://github.com/tianocore/tianocore.github.io/wiki/UDK2014)
+
+<br/>
+
+This is the community site surrounding the open source components of
+Intel's implementation of
+[UEFI](https://github.com/tianocore/tianocore.github.io/wiki/UEFI).
+To learn how to use UEFI see our
+[start using UEFI](https://github.com/tianocore/tianocore.github.io/wiki/start-using-UEFI)
+page.
+
+To learn more about getting involved in the community see our
+[how to contribute](https://github.com/tianocore/tianocore.github.io/wiki/How-To-Contribute)
+page. [EDK II](edk2.html) is a modern, feature-rich, cross-platform
+firmware development environment for the UEFI and PI specifications.
+
+If you have any comments for this site please see the
+[community admins](https://github.com/tianocore/tianocore.github.io/wiki/Community_Admins)
+page.
+
+For the full list of our community projects, visit the
+[Projects](https://github.com/tianocore/tianocore.github.io/wiki/Projects)
+page.
+
+## New Announcements
+
+### March 20, 2014
+
+Announcing the new UDK2014 Release. Goto the
+[UDK2014](https://github.com/tianocore/tianocore.github.io/wiki/UDK2014)
+page to download the release and documentation.  The UDK2014 release
+will deliver the UEFI 2.4 and PI 1.3 support.  Specific details on
+features and on what is new is contained in the UDK2014
+[Release Notes](http://sourceforge.net/projects/edk2/files/UDK2014_Releases/UDK2014/UDK2014-ReleaseNotes-MyWorkSpace.txt/download).
+
+### Feb 11, 2014
+
+Upcomming soon UDK2014 See a sneak pre-view:
+[UDK2014 Features](https://github.com/tianocore/tianocore.github.io/wiki/RoadMap2014)
+
+### [Archived News](https://github.com/tianocore/tianocore.github.io/wiki/Archived-News) from 2009-2013