diff --git a/OurUmbraco.Site/Views/DocumentationMainpage.cshtml b/OurUmbraco.Site/Views/DocumentationMainpage.cshtml
index 47b48bb1..632d1299 100644
--- a/OurUmbraco.Site/Views/DocumentationMainpage.cshtml
+++ b/OurUmbraco.Site/Views/DocumentationMainpage.cshtml
@@ -7,11 +7,11 @@
         <div id="wiki" class="subpage">
             <div id="body">
                 <div style="margin-top: 25px;">
-                    @Umbraco.RenderMacro("DocsBreadcrumb")
+                    @Html.Partial("~/Views/Partials/Documentation/Breadcrumb.cshtml")
                 </div>
 
                 <div id="markdown-docs" class="markdown-syntax">
-                    @Umbraco.RenderMacro("DocsDisplayMarkdown")
+                    @Html.Partial("~/Views/Partials/Documentation/DisplayMarkdown.cshtml")
                 </div>
 
                 <br style="clear: both" />
diff --git a/OurUmbraco.Site/Views/DocumentationSubpage.cshtml b/OurUmbraco.Site/Views/DocumentationSubpage.cshtml
index 90dd7d4d..6112e6b1 100644
--- a/OurUmbraco.Site/Views/DocumentationSubpage.cshtml
+++ b/OurUmbraco.Site/Views/DocumentationSubpage.cshtml
@@ -8,7 +8,7 @@
             <div class="sidebar-area">
                 <div class="sidebar-content">
                     <div class="content-wrapper">
-                        @Umbraco.RenderMacro("DocsNavigation")
+                        @Html.Partial("~/Views/Partials/Documentation/Navigation.cshtml")
                     </div><!-- .content-wrapper -->
                 </div><!-- .sidebar-content -->
             </div><!-- .sidebar-area-->
@@ -17,7 +17,7 @@
                 <div class="main-content">
                     <div class="content-wrapper">
                         <div>
-                            @Umbraco.RenderMacro("DocsBreadcrumb")
+                            @Html.Partial("~/Views/Partials/Documentation/Breadcrumb.cshtml")
                         </div>
 
                         <div class="search-big">
@@ -28,7 +28,7 @@
                         <ul class="search-all-results docs-search-listing"></ul>
 
                         <div id="markdown-docs" class="docs-default-listing markdown-syntax">
-                            @Umbraco.RenderMacro("DocsDisplayMarkdown")
+                            @Html.Partial("~/Views/Partials/Documentation/DisplayMarkdown.cshtml")
                         </div>
                     </div><!-- .content-wrapper -->
                 </div><!-- .main-content -->
diff --git a/OurUmbraco.Site/Views/MacroPartials/Documenation/Breadcrumb.cshtml b/OurUmbraco.Site/Views/Partials/Documentation/Breadcrumb.cshtml
similarity index 93%
rename from OurUmbraco.Site/Views/MacroPartials/Documenation/Breadcrumb.cshtml
rename to OurUmbraco.Site/Views/Partials/Documentation/Breadcrumb.cshtml
index dbc37b61..2ab4a479 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Documenation/Breadcrumb.cshtml
+++ b/OurUmbraco.Site/Views/Partials/Documentation/Breadcrumb.cshtml
@@ -1,6 +1,6 @@
-@using OurUmbraco.Documentation
+@using OurUmbraco.Documentation
 @using OurUmbraco.Documentation.Busineslogic
-@inherits Umbraco.Web.Macros.PartialViewMacroPage
+@inherits OurUmbraco.Our.Models.OurUmbracoTemplatePage
 
 @{
     string baseurl = "/";
@@ -9,7 +9,7 @@
 
     directoryName = directoryName.Substring(1);
     string[] strDirs = directoryName.Split('\\');
-    
+
     var linkToGithub = string.Empty;
     if (absolutePath.StartsWith("/project") == false)
     {
diff --git a/OurUmbraco.Site/Views/MacroPartials/Documenation/DisplayMarkdown.cshtml b/OurUmbraco.Site/Views/Partials/Documentation/DisplayMarkdown.cshtml
similarity index 98%
rename from OurUmbraco.Site/Views/MacroPartials/Documenation/DisplayMarkdown.cshtml
rename to OurUmbraco.Site/Views/Partials/Documentation/DisplayMarkdown.cshtml
index 2e5a721e..ca458baa 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Documenation/DisplayMarkdown.cshtml
+++ b/OurUmbraco.Site/Views/Partials/Documentation/DisplayMarkdown.cshtml
@@ -1,5 +1,5 @@
 @using OurUmbraco.Documentation.Busineslogic
-@inherits Umbraco.Web.Macros.PartialViewMacroPage
+@inherits OurUmbraco.Our.Models.OurUmbracoTemplatePage
 
 <style>
     #markdown-docs .anchorjs-link {
diff --git a/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml b/OurUmbraco.Site/Views/Partials/Documentation/Navigation.cshtml
similarity index 97%
rename from OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml
rename to OurUmbraco.Site/Views/Partials/Documentation/Navigation.cshtml
index ff4fce64..7acc6354 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml
+++ b/OurUmbraco.Site/Views/Partials/Documentation/Navigation.cshtml
@@ -1,6 +1,5 @@
 @using OurUmbraco.Documentation.Busineslogic.GithubSourcePull
-@inherits Umbraco.Web.Macros.PartialViewMacroPage
-
+@inherits OurUmbraco.Our.Models.OurUmbracoTemplatePage
 @{
     var zipper = new ZipDownloader();
     dynamic sitemap = zipper.DocumentationSiteMap();