diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
index a097a2d21..266c454b1 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
@@ -8,9 +8,9 @@ namespace Orchard.Widgets {
             builder.Describe("Widget")
                 .Configure(descriptor => {
                     // todo: have "alternates" for chrome
-                    //todo: (heskew) something...this still doesn't feel right
-                    descriptor.Wrappers.Add("Widget_ControlWrapper");
+                    // todo: (heskew) something...this still doesn't feel right
                     descriptor.Wrappers.Add("Widget_Wrapper");
+                    descriptor.Wrappers.Add("Widget_ControlWrapper");
                 })
                 .OnCreated(created => {
                     var widget = created.Shape;
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.cshtml
index 5480ffce7..b77a02d06 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.cshtml
@@ -1,2 +1 @@
-@Display(Model.Header)
-@Display(Model.Content)
+@Display(Model.Content)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml
index 7f4f9b289..96d784427 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Wrapper.cshtml
@@ -1,3 +1,17 @@
-<div class="widget">
+@using Orchard.ContentManagement;
+@using Orchard.Widgets.Models;
+@{
+    var title = ((IContent)Model.ContentItem).As<WidgetPart>().Title;
+}
+<article class="widget">
+    <header>
+        <h1>@title</h1>
+        @Display(Model.Header)
+    </header>
     @Display.PlaceChildContent(Source: Model)
-</div>
\ No newline at end of file
+    @if(Model.Footer != null) {
+    <footer>
+        @Display(Model.Footer)
+    </footer>
+    }
+</article>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Orchard.Themes.csproj b/src/Orchard.Web/Themes/Orchard.Themes.csproj
index 449497226..0f989e987 100644
--- a/src/Orchard.Web/Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Themes/Orchard.Themes.csproj
@@ -64,7 +64,6 @@
     <Content Include="TheThemeMachine\Styles\Site.css" />
     <Content Include="TheThemeMachine\Theme.png" />
     <Content Include="TheThemeMachine\Theme.txt" />
-    <Content Include="TheThemeMachine\Views\Items\Widget-HtmlWidget.cshtml" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
@@ -218,8 +217,6 @@
     <Content Include="TheAdmin\Theme.png" />
     <Content Include="TheAdmin\Views\User.cshtml" />
     <Content Include="TheAdmin\Views\Header.cshtml" />
-    <Content Include="TheThemeMachine\Views\Items\Content.Blog.cshtml" />
-    <Content Include="TheThemeMachine\Views\Items\Widget-Content.cshtml" />
     <None Include="TheThemeMachine\Views\Layout.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
deleted file mode 100644
index 8a70f8a90..000000000
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
+++ /dev/null
@@ -1,10 +0,0 @@
-@using Orchard.Blogs.Extensions;
-@using Orchard.UI.Resources;
-@{
-    RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) });
-    RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) });
-}
-<h1>@Html.TitleForPage((string)Model.Title)</h1>
-@Display(Model.manage)
-@Display(Model.metadata)
-@Display(Model.Primary)
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Widget-Content.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Widget-Content.cshtml
deleted file mode 100644
index 052f312f7..000000000
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Widget-Content.cshtml
+++ /dev/null
@@ -1,17 +0,0 @@
-@using Orchard.ContentManagement;
-@using Orchard.Widgets.Models;
-@{
-    var title = ((IContent)Model.ContentItem).As<WidgetPart>().Title;
-}
-<article>
-    <header>
-        <h1>@title</h1>
-        @Display(Model.Header)
-    </header>
-    @Display(Model.Content)
-    @if(Model.Footer != null) {
-    <footer>
-        @Display(Model.Footer)
-    </footer>
-    }
-</article>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Widget-HtmlWidget.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Widget-HtmlWidget.cshtml
deleted file mode 100644
index 92878ff06..000000000
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Widget-HtmlWidget.cshtml
+++ /dev/null
@@ -1,11 +0,0 @@
-@using Orchard.ContentManagement;
-@using Orchard.Widgets.Models;
-@{
-    var title = ((IContent)Model.ContentItem).As<WidgetPart>().Title;
-}
-<div>
-    <h1>@title</h1>
-    @Display(Model.Header)
-    @Display(Model.Content)
-    @Display(Model.Footer)
-</div>
\ No newline at end of file