diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
index ca4ed8084..608893131 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
@@ -1,5 +1,8 @@
 @model ModuleAddViewModel
 @using Orchard.Modules.ViewModels
+@{
+    Style.Require("ModulesAdmin");
+}
 
 @{
     <h1>@Html.TitleForPage(T("Install a Module").ToString())</h1>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
index dc0b1774e..c4c3347b4 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
@@ -5,7 +5,11 @@
 @using Orchard.Utility.Extensions
 @using Orchard.Modules.Models
 
-<h1>@Html.TitleForPage(T("Manage Features").ToString()).</h1>
+@{
+    Style.Require("ModulesAdmin");
+}
+
+<h1>@Html.TitleForPage(T("Manage Features").ToString())</h1>
 @if (Model.Features.Count() > 0) {
 <ul class="features summary-view">@{
     var featureGroups = Model.Features.OrderBy(f => f.Descriptor.Category, new DoghouseComparer("Core")).GroupBy(f => f.Descriptor.Category);
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
index 01b46ec32..494b041fb 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
@@ -2,6 +2,11 @@
 @using Orchard.Modules.Extensions
 @using Orchard.Mvc.Html
 @using Orchard.Modules.ViewModels
+
+@{
+    Style.Require("ModulesAdmin");
+}
+
 <h1>@Html.TitleForPage(T("Installed Modules").ToString())</h1>
 <div class="manage">@Html.ActionLink(T("Install a module").ToString(), "Add", null, new { @class = "button primaryAction" })</div>
 @if (Model.Modules.Count() > 0) {
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
index 042d40689..e32bea943 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
@@ -24,7 +24,7 @@
                 <col id="Edit" />
             </colgroup>
             <thead>
-				    <th scope="col">&nbsp;&darr;<%-- todo: (heskew) something more appropriate for "this applies to the bulk actions --%></th>
+				    <th scope="col">&nbsp;&darr;@/*todo: (heskew) something more appropriate for "this applies to the bulk actions*/</th>
 				    <th scope="col">@T("Name")</th>
 				    <th scope="col"></th>
             </thead>
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 9171d6ca1..f1f2bebe1 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -101,9 +101,6 @@
     <Content Include="Global.asax" />
     <Content Include="Refresh.html" />
     <Content Include="Themes\Contoso\Styles\search.css" />
-    <Content Include="Themes\Contoso\Views_\DisplayTemplates\Items\Contents.Item.ascx" />
-    <Content Include="Themes\Contoso\Views_\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
-    <Content Include="Themes\Contoso\Views_\Orchard.Search\Search\Index.ascx" />
     <Content Include="Themes\Contoso\Zones\Footer.html" />
     <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
     <Content Include="Themes\Green\Views\Orchard.Search\Search\Index.ascx" />
@@ -140,13 +137,10 @@
     <Content Include="Themes\TheAdmin\Styles\images\tableHeaderBackgroundRed.gif" />
     <Content Include="Themes\TheAdmin\Styles\site.css" />
     <Content Include="Themes\TheAdmin\Theme.txt" />
-    <Content Include="Themes\TheAdmin\Views\Layout.ascx" />
+    <None Include="Themes\TheAdmin\Views\Layout.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config\Sample.Host.config" />
-    <None Include="Themes\Contoso\Views_\Header.ascx_" />
-    <None Include="Themes\Contoso\Views_\Layout.ascx_" />
-    <None Include="Themes\Contoso\Views_\Layout.HomePage.ascx_" />
     <None Include="Themes\SafeMode\Views\DocumentZone.cshtml" />
     <None Include="Themes\TheAdmin\Styles\images\icons.psd" />
     <Content Include="Themes\ClassicDark\Content\Images\bodyBackgroundgrey.gif" />
@@ -206,20 +200,10 @@
     <Content Include="Themes\Contoso\Zones\Home-Hero-Gallery.html" />
     <Content Include="Themes\Contoso\Zones\Home-Hero.html" />
     <Content Include="Themes\Contoso\Zones\Sidebar-w1.html" />
-    <Content Include="Themes\Contoso\Views_\DisplayTemplates\Items\Blogs.Blog.ascx" />
-    <Content Include="Themes\Contoso\Views_\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
-    <Content Include="Themes\Contoso\Views_\DisplayTemplates\Items\Blogs.BlogPost.ListByArchive.ascx" />
-    <Content Include="Themes\Contoso\Views_\DisplayTemplates\Parts\Comments.Comments.ascx" />
-    <Content Include="Themes\Contoso\Views_\DisplayTemplates\Parts\Common.Metadata.ascx" />
-    <Content Include="Themes\Contoso\Views_\DisplayTemplates\Parts\Tags.ShowTags.ascx" />
     <Content Include="Themes\Contoso\Scripts\easySlider.js" />
     <Content Include="Themes\Contoso\Styles\site.css" />
     <Content Include="Themes\Contoso\Theme.png" />
     <Content Include="Themes\Contoso\Theme.txt" />
-    <None Include="Themes\Contoso\Views_\Footer.ascx_" />
-    <Content Include="Themes\Contoso\Views_\ListOfComments.ascx" />
-    <None Include="Themes\Contoso\Views_\LogOn.ascx_" />
-    <None Include="Themes\Contoso\Views_\User.ascx_" />
     <Content Include="Themes\Corporate\Content\Images\bkg.jpg" />
     <Content Include="Themes\Corporate\Content\Images\consult-bkg.png" />
     <Content Include="Themes\Corporate\Content\Images\content-bkg.png" />
@@ -311,8 +295,8 @@
     <Content Include="Themes\TheAdmin\Styles\images\orchardLogo.gif" />
     <Content Include="Themes\TheAdmin\Theme.png" />
     <None Include="Themes\TheAdmin\Views\DumpShapeTable.cshtml" />
-    <Content Include="Themes\TheAdmin\Views\User.ascx" />
-    <Content Include="Themes\TheAdmin\Views\Header.ascx" />
+    <None Include="Themes\TheAdmin\Views\User.cshtml" />
+    <None Include="Themes\TheAdmin\Views\Header.cshtml" />
     <Content Include="Themes\Web.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx
deleted file mode 100644
index bdcb0ace4..000000000
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
-<div id="app"><%: Html.ActionLink(T("Project Orchard").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
-<div id="site"><%: Html.ActionLink(T("Your Site").ToString(), "Index", new { Area = "", Controller = "Home" })%></div>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Header.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Header.cshtml
new file mode 100644
index 000000000..45808d798
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Header.cshtml
@@ -0,0 +1,3 @@
+@model dynamic
+<div id="app">@Html.ActionLink(T("Project Orchard").ToString(), "Index", new { Area = "", Controller = "Home" })</div>
+<div id="site">@Html.ActionLink(T("Your Site").ToString(), "Index", new { Area = "", Controller = "Home" })</div>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx
deleted file mode 100644
index 63d5c3d5d..000000000
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
-<%@ Import Namespace="Orchard.Security" %>
-<%@ Import Namespace="Orchard.DisplayManagement.Descriptors" %>
-<%@ Import Namespace="Orchard.UI.Resources" %>
-<%@ Import Namespace="Orchard" %>
-<%@ Import Namespace="Orchard.ContentManagement" %>
-<%
-Style.Require("TheAdmin");
-Script.Require("TheAdmin");
-RegisterLink(new LinkEntry { Condition = "lte IE 8", Rel = "stylesheet", Type = "text/css", Href = ResolveUrl("../Styles/ie.css") }.AddAttribute("media", "screen, projection"));
-RegisterLink(new LinkEntry { Condition = "lte IE 6", Rel = "stylesheet", Type = "text/css", Href = ResolveUrl("../Styles/ie6.css") }.AddAttribute("media", "screen, projection"));
-    // these are just hacked together to fire existing partials... can change
-    Model.Header.Add(Display.Header());
-
-    // <experimentation>
-    var thisUser = Html.Resolve<IAuthenticationService>().GetAuthenticatedUser();
-    Model.Header.Add(Display.User(CurrentUser: thisUser), "after");
-    
-    // </experimentation>
-    
-
-    // these are just hacked together to fire existing partials... can change
-
-    //Model.Zones.AddRenderPartial("header", "Header", Model);
-    //Model.Zones.AddRenderPartial("header:after", "User", Model); // todo: (heskew) should be a user display or widget
-%>
-<div id="header" role="banner">
-    <%: Display(Model.Header) %></div>
-<div id="content">
-    <div id="navshortcut">
-        <a href="#Menu-admin">
-            <%: T("Skip to navigation") %></a></div>
-    <div id="messages">
-        <%: Display(Model.Messages) %>
-    </div>
-    <div id="main" role="main">
-        <%: Display(Model.Content) %></div>
-    <div id="menu">
-        <%: Display(Model.Navigation) %></div>
-</div>
-<div id="footer" role="contentinfo">
-    <%: Display(Model.Footer) %></div>
-
-<%: Display.DumpShapeTable() %>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
new file mode 100644
index 000000000..099298fa2
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
@@ -0,0 +1,42 @@
+@model dynamic
+@using Orchard.Security
+@using Orchard.DisplayManagement.Descriptors
+@using Orchard.UI.Resources
+@using Orchard
+@using Orchard.ContentManagement
+
+@{
+    Style.Require("TheAdmin");
+    Script.Require("TheAdmin");
+    RegisterLink(new LinkEntry { Condition = "lte IE 8", Rel = "stylesheet", Type = "text/css", Href = Url.Content("../Styles/ie.css") }.AddAttribute("media", "screen, projection"));
+    RegisterLink(new LinkEntry { Condition = "lte IE 6", Rel = "stylesheet", Type = "text/css", Href = Url.Content("../Styles/ie6.css") }.AddAttribute("media", "screen, projection"));
+    // these are just hacked together to fire existing partials... can change
+    Model.Header.Add(Display.Header());
+
+    // experimentation
+    var thisUser = Html.Resolve<IAuthenticationService>().GetAuthenticatedUser();
+    Model.Header.Add(Display.User(CurrentUser: thisUser), "after");
+    
+    // these are just hacked together to fire existing partials... can change
+
+    //Model.Zones.AddRenderPartial("header", "Header", Model);
+    //Model.Zones.AddRenderPartial("header:after", "User", Model); // todo: (heskew) should be a user display or widget
+}
+<div id="header" role="banner">
+    @Display(Model.Header)</div>
+<div id="content">
+    <div id="navshortcut">
+        <a href="#Menu-admin">
+            @T("Skip to navigation")</a></div>
+    <div id="messages">
+        @Display(Model.Messages)
+    </div>
+    <div id="main" role="main">
+        @Display(Model.Content)</div>
+    <div id="menu">
+        @Display(Model.Navigation)</div>
+</div>
+<div id="footer" role="contentinfo">
+    @Display(Model.Footer)</div>
+
+@Display.DumpShapeTable()
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml
new file mode 100644
index 000000000..c234a20ee
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml
@@ -0,0 +1,14 @@
+<ul id="navigation">
+	@foreach(var firstLevelMenuItem in Model) {
+        <li>
+            <h3><a href="#">@firstLevelMenuItem.Text</a></h3>
+            <ul class="menuItems">
+        	@foreach(var secondLevelMenuItem in firstLevelMenuItem) {
+                <li>
+                    <a href="@secondLevelMenuItem.Href">@secondLevelMenuItem.Text</a>
+                </li>
+            }
+            </ul>
+        </li>
+    }
+</ul>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
deleted file mode 100644
index 383633b39..000000000
--- a/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
-<% if (Model.CurrentUser != null) {
-    %><div id="login"><%: T("User:")%> <%: Model.CurrentUser.UserName %> | <%: Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" }) %></div><%
-   } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
new file mode 100644
index 000000000..17b7cfb9a
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
@@ -0,0 +1,2 @@
+@model dynamic
+@if (Model.CurrentUser != null) {<div id="login">@T("User:") @Model.CurrentUser.UserName | @Html.ActionLink(T("Logout").ToString(), "LogOff", new { Area = "Orchard.Users", Controller = "Account" })</div>}
\ No newline at end of file