diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj
index ea6661d9..af4e5649 100644
--- a/OurUmbraco.Site/OurUmbraco.Site.csproj
+++ b/OurUmbraco.Site/OurUmbraco.Site.csproj
@@ -363,6 +363,7 @@
     <Content Include="config\uVersion.backup.config" />
     <Content Include="config\uVersion.config" />
     <Content Include="config\xsltExtensions.config" />
+    <Content Include="css\search\documentation.gif" />
     <Content Include="ImageGen.ashx" />
     <Content Include="jqtouch\jqtouch.css" />
     <Content Include="jqtouch\jqtouch.js" />
@@ -524,7 +525,9 @@
     <Content Include="usercontrols\our.umbraco.org\ForumSpamCleaner.ascx" />
     <Content Include="usercontrols\our.umbraco.org\SignupSimple.ascx" />
     <Content Include="Views\Web.config" />
-    <Content Include="web.config" />
+    <Content Include="web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="config\deli.currency.xml" />
@@ -3247,7 +3250,9 @@
     <Content Include="xslt\repository\breadcrumb.xslt" />
     <Content Include="xslt\repository\favs.xslt" />
     <Content Include="xslt\repository\Header_Login.xslt" />
-    <Content Include="xslt\RFC-TopicList.xslt" />
+    <Content Include="xslt\RFC-TopicList.xslt">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="xslt\Rss-ActiveTopics.xslt" />
     <Content Include="xslt\Rss-Forum.xslt" />
     <Content Include="xslt\Rss-Pages.xslt" />
diff --git a/OurUmbraco.Site/config/uVersion.config b/OurUmbraco.Site/config/uVersion.config
index ae69e6fd..5d182c81 100644
--- a/OurUmbraco.Site/config/uVersion.config
+++ b/OurUmbraco.Site/config/uVersion.config
@@ -9,7 +9,8 @@
 <configuration default="v49">
   <versions>
     <!-- version key="v5" name="Version 5.0.x" description="Compatible with version 5.0.x" vote="false"/ -->
-    <version key="v411" name="Version 4.11.x" description="Compatible with version 4.11.x" vote="true" voteDescription="Version 4.9.0" voteName="4.9.0"/>
+    <version key="v600" name="Version 6.0.0" description="Compatible with version 6.0.0" vote="true" voteDescription="Version 6.0.0" voteName="6.0.0"/>
+    <version key="v411" name="Version 4.11.x" description="Compatible with version 4.11.x" vote="true" voteDescription="Version 4.11.x" voteName="4.11.x"/>
     <version key="v410" name="Version 4.10.x" description="Compatible with version 4.10.x" vote="true" voteDescription="Version 4.10.0" voteName="4.10.0"/>
     <version vote="true" voteDescription="Version 4.9.1" voteName="4.9.1"/>
     <version key="v49" name="Version 4.9.x" description="Compatible with version 4.9.x" vote="true" voteDescription="Version 4.9.0" voteName="4.9.0"/>
diff --git a/OurUmbraco.Site/css/community.css b/OurUmbraco.Site/css/community.css
index c9fdf54e..f8d95ce9 100644
--- a/OurUmbraco.Site/css/community.css
+++ b/OurUmbraco.Site/css/community.css
@@ -164,7 +164,7 @@ input.wikiheadline{display: block; background: white; border: 1px solid #DEE4EF;
 #search .wiki{background-image: url(search/wiki.gif);}
 #search .project{background-image: url(search/project.gif);}
 #search .forum{background-image: url(search/forum.gif);}
-#search .documentation {background-image: url(http://placehold.it/39x40);}
+#search .documentation {background-image: url(search/documentation.gif);}
 #search .solution{background-image: url(search/solved.gif);}
 
 /* Member Badge */
diff --git a/OurUmbraco.Site/css/new-projects-mbd.css b/OurUmbraco.Site/css/new-projects-mbd.css
index f8c55c8b..91687554 100644
--- a/OurUmbraco.Site/css/new-projects-mbd.css
+++ b/OurUmbraco.Site/css/new-projects-mbd.css
@@ -147,7 +147,7 @@
   position: relative;
   display: block;
   margin: 0 auto;
-  width: 326px;
+  width: 386px;
 }
 
 #searchBar {
@@ -158,7 +158,7 @@
 #searchField {
   background: url(../images/bg-search.png) no-repeat;
   padding-left: 35px; 
-  width: 237px; 
+  width: 267px; 
   height: 32px; 
   border: none; 
   float: left; 
@@ -199,7 +199,7 @@
   background: #f8f8f8;
   -moz-box-shadow: 0 0 7px #aaa; -webkit-box-shadow: 0 0 7px #aaa;
   box-shadow: 0 0 7px #aaa;
-  width: 82px;
+  width: 102px;
   position: absolute;
   left: 204px;
   padding: 5px 10px 10px;
@@ -236,11 +236,11 @@
   top: -15px;
   -moz-border-radius: 5px; -webkit-border-radius: 5px;
   border-radius: 5px;
-  background: url("../images/arrows.png") no-repeat scroll 4px 2px #F8F8F8;
-  width: 42px;
+  background: no-repeat scroll 4px 2px #F8F8F8;
+  width: 74px;
   font-size: 11px;
   font-weight: normal;
-  padding: 1px 0 7px 18px;
+  padding: 1px 0 7px 12px;
   left: 4px;
   cursor: pointer;
 }
diff --git a/OurUmbraco.Site/css/search/documentation.gif b/OurUmbraco.Site/css/search/documentation.gif
new file mode 100644
index 00000000..a1ad07da
Binary files /dev/null and b/OurUmbraco.Site/css/search/documentation.gif differ
diff --git a/OurUmbraco.Site/images/bg-search.png b/OurUmbraco.Site/images/bg-search.png
index 066dea3a..6a3c3b9c 100644
Binary files a/OurUmbraco.Site/images/bg-search.png and b/OurUmbraco.Site/images/bg-search.png differ
diff --git a/OurUmbraco.Site/masterpages/Release.master b/OurUmbraco.Site/masterpages/Release.master
index 598a62b2..fd0738eb 100644
--- a/OurUmbraco.Site/masterpages/Release.master
+++ b/OurUmbraco.Site/masterpages/Release.master
@@ -1,109 +1,109 @@
-<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
-
-<asp:Content ContentPlaceHolderId="Head" runat="server">
-  <link rel="stylesheet" type="text/css" href="/css/releases.css?v=4" />
-  <!-- release scripts -->
-  <script src="/Scripts/jquery.cookie.js" type="text/javascript"></script>
-  <script src="/Scripts/knockout-2.0.0.js" type="text/javascript"></script>
-  <script src="/Scripts/knockout.mapping-latest.js" type="text/javascript"></script>
-  <script src="/Scripts/humane.js" type="text/javascript"></script>
-  <script src="/Scripts/app.js?v=2" type="text/javascript"></script>
-</asp:Content>
-  
-<asp:Content ContentPlaceHolderId="Main" runat="server">
-  <div id="body" class="subpage wrapper">
-    <div style="margin-top: 25px;">
-      <umbraco:Macro Alias="Breadcrumb" runat="server"></umbraco:Macro>
-    </div>
-<h2 id="loading" data-bind="visible: versions().length == 0">Loading release details...</h2>
-<!-- ko foreach: versions -->
-<h1>
-    Umbraco v<%= Request["v"] %>        
+<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
+
+<asp:Content ContentPlaceHolderId="Head" runat="server">
+  <link rel="stylesheet" type="text/css" href="/css/releases.css?v=4" />
+  <!-- release scripts -->
+  <script src="/Scripts/jquery.cookie.js" type="text/javascript"></script>
+  <script src="/Scripts/knockout-2.0.0.js" type="text/javascript"></script>
+  <script src="/Scripts/knockout.mapping-latest.js" type="text/javascript"></script>
+  <script src="/Scripts/humane.js" type="text/javascript"></script>
+  <script src="/Scripts/app.js?v=3" type="text/javascript"></script>
+</asp:Content>
+  
+<asp:Content ContentPlaceHolderId="Main" runat="server">
+  <div id="body" class="subpage wrapper">
+    <div style="margin-top: 25px;">
+      <umbraco:Macro Alias="Breadcrumb" runat="server"></umbraco:Macro>
+    </div>
+<h2 id="loading" data-bind="visible: versions().length == 0">Loading release details...</h2>
+<!-- ko foreach: versions -->
+<h1>
+    Umbraco v<%= Request["v"] %>        
     <small data-bind="visible: !released()">Status: <span data-bind="text: inProgressRelease() === true ? 'In progress' : 'Planned'"></span></small>
     <small data-bind="visible: released()">Status: Released</small>
-</h1>
-<div class="version" data-bind="css: { released: released() }, attr: { id: id }">
-          <h3>
-          <span data-bind="text: (released()?'100':percentComplete()) + '% Complete' "></span>
-            <span data-bind="text: percentInProgress() + '% In Progress' "></span>  
-        </h3>
-        <!-- Progress Bar -->    
-        <div class="progressbar">
-          <div class="bar bar1 rl" data-bind="style: { width: (released()?'100':percentComplete()) + '%' }, visible: percentComplete()  > 0 || released(), css: { rr: percentInProgress() == 0 }">&nbsp;</div>
-            <div class="bar bar2 rr" data-bind="style: { width: percentInProgress() + '%' }, visible: percentInProgress() > 0, css: { rl: percentComplete() == 0 }">&nbsp;</div>
-        </div>
-  <h3 data-bind="visible: !released()">Target release date: <span data-bind="text: releaseDate() === '' ? 'Not yet determined' : new Date(releaseDate()).format('dddd, dd MMMM yyyy')" style="color:#5B5B5B"></span></h3>
-  <h3 data-bind="visible: released()"><a href="http://umbraco.codeplex.com/releases">Download it now!</a></h3>
-  <h3>Summary:</h3>
-  <p><span data-bind="html: releaseDescription"></span></p>
-  <div class="panel-wrapper">
-    <div class="panel-left">
-
-
-        <!-- Columns for statuses -->
-        <div class="statuses group">
-            <div class="status features">
-                <h3>Features</h3>
-                <p data-bind="visible: featureIssues().length == 0">No items to display</p>
-                <ul data-bind="template: { name: 'issue-template', foreach: featureIssues}"></ul>                
-            </div>
-            <div class="status breaking">
-                <h3>Breaking Changes</h3>
-                <p data-bind="visible: breakingIssues().length == 0">No items to display</p>
-                <ul data-bind="template: { name: 'issue-template', foreach: breakingIssues}"></ul>
-            </div>
-            <div class="status issues">
-                <h3>Issues &amp; Tasks</h3>
-                <p data-bind="visible: issueIssues().length == 0">No items to display</p>
-                <ul data-bind="template: { name: 'issue-template', foreach: issueIssues}"></ul>
-            </div>
-        </div>
-        
-      <%--
-        <h3 class="activityStream">Activity stream</h3>
-        <ul data-bind="foreach: activities">
-            <li><strong data-bind="text: date.prettyDate()"></strong> <a data-bind="text: username, attr: { href: 'http://issues.umbraco.org/user/' + username() }" target="_blank"></a> updated the issue <a data-bind="text: id, attr: { href: 'http://issues.umbraco.org/issues/' + id() }" target="_blank"></a>. 
-                <ul data-bind="foreach: changes">
-                    <li><strong data-bind="text: fieldName"></strong> was updated <!-- ko if: oldValue() -->from <strong data-bind="text: oldValue"></strong><!-- /ko --> to <strong data-bind="text: newValue"></strong></li>
-                </ul>
-            </li>
-        </ul>
-      
-      --%>
-          
-          
-          
-          </div>
-          <div class="panel-right">
-            <h3 style="margin-bottom:0;">Feature Proposals</h3>
-            <p style="margin:0 0 10px 0;padding:0;"><strong>Open for your comments</strong></p>
-            <umbraco:Macro Alias="RFC-topicList" runat="server"></umbraco:Macro>
-          </div>
-    </div>
-</div>
-<!-- /ko -->
-  </div>
-<script type="text/html" id="issue-template">
-    <li data-bind="attr: { 'class': state().replace(/\s/g, '') }">
-        <a data-bind="text: id() +' '+ title(), attr: { href: 'http://issues.umbraco.org/issue/' + id() }" target="_blank"></a>
-    </li>
-</script>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderId="EndScripts" runat="server">
-  <script type="text/javascript">
-    var currentVersions= [];
-    var inProgressVersions = [];
-    var futureVersions = [];
-    var patchReleases = [];
-    $(function () {
-
-      // Apply bindings
-      ko.applyBindings(viewModel);
-      // Load data
-      loadData('<%= Request["v"] %>');
-    
-    });
-
-    </script>
+</h1>
+<div class="version" data-bind="css: { released: released() }, attr: { id: id }">
+          <h3>
+          <span data-bind="text: (released()?'100':percentComplete()) + '% Complete' "></span>
+            <span data-bind="text: percentInProgress() + '% In Progress' "></span>  
+        </h3>
+        <!-- Progress Bar -->    
+        <div class="progressbar">
+          <div class="bar bar1 rl" data-bind="style: { width: (released()?'100':percentComplete()) + '%' }, visible: percentComplete()  > 0 || released(), css: { rr: percentInProgress() == 0 }">&nbsp;</div>
+            <div class="bar bar2 rr" data-bind="style: { width: percentInProgress() + '%' }, visible: percentInProgress() > 0, css: { rl: percentComplete() == 0 }">&nbsp;</div>
+        </div>
+  <h3 data-bind="visible: !released()">Target release date: <span data-bind="text: releaseDate() === '' ? 'Not yet determined' : new Date(releaseDate()).format('dddd, dd MMMM yyyy')" style="color:#5B5B5B"></span></h3>
+  <h3 data-bind="visible: released()"><a href="http://umbraco.codeplex.com/releases">Download it now!</a></h3>
+  <h3>Summary:</h3>
+  <p><span data-bind="html: releaseDescription"></span></p>
+  <div class="panel-wrapper">
+    <div class="panel-left">
+
+
+        <!-- Columns for statuses -->
+        <div class="statuses group">
+            <div class="status features">
+                <h3>Features</h3>
+                <p data-bind="visible: featureIssues().length == 0">No items to display</p>
+                <ul data-bind="template: { name: 'issue-template', foreach: featureIssues}"></ul>                
+            </div>
+            <div class="status breaking">
+                <h3>Breaking Changes</h3>
+                <p data-bind="visible: breakingIssues().length == 0">No items to display</p>
+                <ul data-bind="template: { name: 'issue-template', foreach: breakingIssues}"></ul>
+            </div>
+            <div class="status issues">
+                <h3>Issues &amp; Tasks</h3>
+                <p data-bind="visible: issueIssues().length == 0">No items to display</p>
+                <ul data-bind="template: { name: 'issue-template', foreach: issueIssues}"></ul>
+            </div>
+        </div>
+        
+      <%--
+        <h3 class="activityStream">Activity stream</h3>
+        <ul data-bind="foreach: activities">
+            <li><strong data-bind="text: date.prettyDate()"></strong> <a data-bind="text: username, attr: { href: 'http://issues.umbraco.org/user/' + username() }" target="_blank"></a> updated the issue <a data-bind="text: id, attr: { href: 'http://issues.umbraco.org/issues/' + id() }" target="_blank"></a>. 
+                <ul data-bind="foreach: changes">
+                    <li><strong data-bind="text: fieldName"></strong> was updated <!-- ko if: oldValue() -->from <strong data-bind="text: oldValue"></strong><!-- /ko --> to <strong data-bind="text: newValue"></strong></li>
+                </ul>
+            </li>
+        </ul>
+      
+      --%>
+          
+          
+          
+          </div>
+          <div class="panel-right">
+            <h3 style="margin-bottom:0;">Feature Proposals</h3>
+            <p style="margin:0 0 10px 0;padding:0;"><strong>Open for your comments</strong></p>
+            <umbraco:Macro Alias="RFC-topicList" runat="server"></umbraco:Macro>
+          </div>
+    </div>
+</div>
+<!-- /ko -->
+  </div>
+<script type="text/html" id="issue-template">
+    <li data-bind="attr: { 'class': state().replace(/\s/g, '') }">
+        <a data-bind="text: id() +' '+ title(), attr: { href: 'http://issues.umbraco.org/issue/' + id() }" target="_blank"></a>
+    </li>
+</script>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderId="EndScripts" runat="server">
+  <script type="text/javascript">
+    var currentVersions= [];
+    var inProgressVersions = [];
+    var futureVersions = [];
+    var patchReleases = [];
+    $(function () {
+
+      // Apply bindings
+      ko.applyBindings(viewModel);
+      // Load data
+      loadData('<%= Request["v"] %>');
+    
+    });
+
+    </script>
 </asp:Content>
\ No newline at end of file
diff --git a/OurUmbraco.Site/masterpages/ReleaseLanding.master b/OurUmbraco.Site/masterpages/ReleaseLanding.master
index 80239e3d..2fa616c7 100644
--- a/OurUmbraco.Site/masterpages/ReleaseLanding.master
+++ b/OurUmbraco.Site/masterpages/ReleaseLanding.master
@@ -8,7 +8,7 @@
   <script src="/Scripts/knockout-2.0.0.js" type="text/javascript"></script>
   <script src="/Scripts/knockout.mapping-latest.js" type="text/javascript"></script>
   <script src="/Scripts/humane.js" type="text/javascript"></script>
-  <script src="/Scripts/app.js?v=2" type="text/javascript"></script>
+  <script src="/Scripts/app.js?v=3" type="text/javascript"></script>
 </asp:Content>
 
 <asp:Content ContentPlaceHolderId="Main" runat="server">
diff --git a/OurUmbraco.Site/masterpages/RoadMap.master b/OurUmbraco.Site/masterpages/RoadMap.master
index 2d56c596..ebd806d7 100644
--- a/OurUmbraco.Site/masterpages/RoadMap.master
+++ b/OurUmbraco.Site/masterpages/RoadMap.master
@@ -8,10 +8,10 @@
   <script src="/Scripts/knockout-2.0.0.js" type="text/javascript"></script>
   <script src="/Scripts/knockout.mapping-latest.js" type="text/javascript"></script>
   <script src="/Scripts/humane.js" type="text/javascript"></script>
-  <script src="/Scripts/app.js?v=2" type="text/javascript"></script>
+  <script src="/Scripts/app.js?v=3" type="text/javascript"></script>
 </asp:Content>
 
-<asp:Content ContentPlaceHolderId="Main" runat="server">
+<asp:Content ContentPlaceHolderId="Main" runat="server"> 
 <div id="body" class="subpage wrapper">
     <div style="margin-top: 25px;">
       <umbraco:Macro Alias="Breadcrumb" runat="server"></umbraco:Macro>
diff --git a/OurUmbraco.Site/xslt/SearchField.xslt b/OurUmbraco.Site/xslt/SearchField.xslt
index 78f98b5c..d263bb63 100644
--- a/OurUmbraco.Site/xslt/SearchField.xslt
+++ b/OurUmbraco.Site/xslt/SearchField.xslt
@@ -24,9 +24,9 @@
 
 	<xsl:variable name="q" select="umbraco.library:RequestQueryString('&queryParam;')"/>
 	<xsl:variable name="c" select="umbraco.library:RequestQueryString('&contentParam;')"/>
-
-	<xsl:variable name="areas" select="umbraco.library:Split('Wiki|Forum|Projects', '|')"/>
-	<xsl:variable name="areaAlias" select="umbraco.library:Split('wiki|forum|project', '|')"/>
+  
+  <xsl:variable name="areas" select="umbraco.library:Split('Wiki|Forum|Projects|Documentation', '|')"/>
+  <xsl:variable name="areaAlias" select="umbraco.library:Split('wiki|forum|project|documentation', '|')"/>
 	
 	<xsl:variable name="communityNodeId" select="1052" />
 
@@ -44,13 +44,14 @@
 				<span id="sectionspan">
 					<label>All</label>
 				</span>
-				<div id="sections" class="clearfix">
+        <div id="sections" class="clearfix">
 					<label class="sectiontab">All</label>
 					<p>Search In</p>
-					<xsl:for-each select="$areas/value">
+          <xsl:for-each select="$areas/value">
+            
 						<xsl:variable name="index" select="position()"/>
 						<xsl:variable name="alias" select="$areaAlias/value[$index]"/>
-						<input type="checkbox" id="s_{.}" name="contentType" value="{$alias}">
+            <input type="checkbox" id="s_{.}" name="contentType" value="{$alias}">
 							<!-- If no area was specified and we're inside a specific area, select only that -->
 							<xsl:if test="$noSpecificArea and current() = $currentArea"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>