diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 372e02abc..a5688921d 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -320,6 +320,26 @@
     <Content Include="Settings\Views\Admin\Culture.ascx" />
     <Content Include="Settings\Views\DisplayTemplates\CurrentCulture.ascx" />
     <Content Include="Settings\Views\DisplayTemplates\RemovableCulture.ascx" />
+    <Content Include="Shapes\Module.txt" />
+    <Content Include="Shapes\Scripts\base.js" />
+    <Content Include="Shapes\Scripts\jquery-1.4.2.js" />
+    <Content Include="Shapes\Scripts\jquery-1.4.2.min.js" />
+    <Content Include="Shapes\Scripts\jquery.switchable.js" />
+    <Content Include="Shapes\Styles\Images\detail-view-on.gif" />
+    <Content Include="Shapes\Styles\Images\detail-view.gif" />
+    <Content Include="Shapes\Styles\Images\summary-view-on.gif" />
+    <Content Include="Shapes\Styles\Images\summary-view.gif" />
+    <Content Include="Shapes\Styles\Images\toolBarActiveButtonBackground.gif" />
+    <Content Include="Shapes\Styles\Images\toolBarBackground.gif" />
+    <Content Include="Shapes\Styles\Images\toolBarHoverButtonBackground.gif" />
+    <Content Include="Shapes\Styles\jquery.switchable.css" />
+    <Content Include="Shapes\Styles\special.css" />
+    <Content Include="Shapes\Views\DisplayTemplates\Items\ContentItem.ascx" />
+    <Content Include="Shapes\Views\EditorTemplates\Items\ContentItem.ascx" />
+    <Content Include="Shapes\Views\Header.ascx" />
+    <Content Include="Shapes\Views\HeadPreload.ascx" />
+    <Content Include="Shapes\Views\NotFound.ascx" />
+    <Content Include="Shapes\Views\UI\Switchable.ascx" />
     <Content Include="Web.config" />
     <Content Include="XmlRpc\Module.txt" />
     <Content Include="XmlRpc\Views\Home\Index.aspx" />
@@ -377,6 +397,16 @@
     <None Include="Contents\Views\Content.cshtml" />
     <None Include="Contents\Views\Item\Display.cshtml" />
     <None Include="HomePage\Views\HomePage.cshtml" />
+    <None Include="Shapes\Views\Document.aspx_" />
+    <None Include="Shapes\Views\Document.cshtml" />
+    <None Include="Shapes\Views\Layout.ascx_" />
+    <None Include="Shapes\Views\Menu.ascx_" />
+    <None Include="Shapes\Views\Menu.cshtml" />
+    <None Include="Shapes\Views\MenuItem.cshtml" />
+    <None Include="Shapes\Views\Messages.ascx_" />
+    <None Include="Shapes\Views\User.ascx_" />
+    <Content Include="Shapes\Views\Web.config" />
+    <None Include="Shapes\Views\Zone.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/src/Orchard.Web/Core/Shapes/Module.txt b/src/Orchard.Web/Core/Shapes/Module.txt
new file mode 100644
index 000000000..72f151f2d
--- /dev/null
+++ b/src/Orchard.Web/Core/Shapes/Module.txt
@@ -0,0 +1,11 @@
+name: Shapes
+antiforgery: enabled
+author: The Orchard Team
+website: http://orchardproject.net
+version: 0.5.0
+orchardversion: 0.5.0
+description: The shapes module contains core shape templates and display hooks.
+features:
+    Shapes:
+        Description: Core shape templates and display hooks.
+        Category: Core
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js b/src/Orchard.Web/Core/Shapes/Scripts/base.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
rename to src/Orchard.Web/Core/Shapes/Scripts/base.js
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.2.js b/src/Orchard.Web/Core/Shapes/Scripts/jquery-1.4.2.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.2.js
rename to src/Orchard.Web/Core/Shapes/Scripts/jquery-1.4.2.js
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.2.min.js b/src/Orchard.Web/Core/Shapes/Scripts/jquery-1.4.2.min.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.2.min.js
rename to src/Orchard.Web/Core/Shapes/Scripts/jquery-1.4.2.min.js
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery.switchable.js b/src/Orchard.Web/Core/Shapes/Scripts/jquery.switchable.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery.switchable.js
rename to src/Orchard.Web/Core/Shapes/Scripts/jquery.switchable.js
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/detail-view-on.gif b/src/Orchard.Web/Core/Shapes/Styles/Images/detail-view-on.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/detail-view-on.gif
rename to src/Orchard.Web/Core/Shapes/Styles/Images/detail-view-on.gif
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/detail-view.gif b/src/Orchard.Web/Core/Shapes/Styles/Images/detail-view.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/detail-view.gif
rename to src/Orchard.Web/Core/Shapes/Styles/Images/detail-view.gif
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/summary-view-on.gif b/src/Orchard.Web/Core/Shapes/Styles/Images/summary-view-on.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/summary-view-on.gif
rename to src/Orchard.Web/Core/Shapes/Styles/Images/summary-view-on.gif
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/summary-view.gif b/src/Orchard.Web/Core/Shapes/Styles/Images/summary-view.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/summary-view.gif
rename to src/Orchard.Web/Core/Shapes/Styles/Images/summary-view.gif
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarActiveButtonBackground.gif b/src/Orchard.Web/Core/Shapes/Styles/Images/toolBarActiveButtonBackground.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarActiveButtonBackground.gif
rename to src/Orchard.Web/Core/Shapes/Styles/Images/toolBarActiveButtonBackground.gif
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarBackground.gif b/src/Orchard.Web/Core/Shapes/Styles/Images/toolBarBackground.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarBackground.gif
rename to src/Orchard.Web/Core/Shapes/Styles/Images/toolBarBackground.gif
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarHoverButtonBackground.gif b/src/Orchard.Web/Core/Shapes/Styles/Images/toolBarHoverButtonBackground.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarHoverButtonBackground.gif
rename to src/Orchard.Web/Core/Shapes/Styles/Images/toolBarHoverButtonBackground.gif
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/jquery.switchable.css b/src/Orchard.Web/Core/Shapes/Styles/jquery.switchable.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/jquery.switchable.css
rename to src/Orchard.Web/Core/Shapes/Styles/jquery.switchable.css
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/special.css b/src/Orchard.Web/Core/Shapes/Styles/special.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/special.css
rename to src/Orchard.Web/Core/Shapes/Styles/special.css
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/DisplayTemplates/Items/ContentItem.ascx b/src/Orchard.Web/Core/Shapes/Views/DisplayTemplates/Items/ContentItem.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/DisplayTemplates/Items/ContentItem.ascx
rename to src/Orchard.Web/Core/Shapes/Views/DisplayTemplates/Items/ContentItem.ascx
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Document.aspx_ b/src/Orchard.Web/Core/Shapes/Views/Document.aspx_
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Document.aspx_
rename to src/Orchard.Web/Core/Shapes/Views/Document.aspx_
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Document.cshtml b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Document.cshtml
rename to src/Orchard.Web/Core/Shapes/Views/Document.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/EditorTemplates/Items/ContentItem.ascx b/src/Orchard.Web/Core/Shapes/Views/EditorTemplates/Items/ContentItem.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/EditorTemplates/Items/ContentItem.ascx
rename to src/Orchard.Web/Core/Shapes/Views/EditorTemplates/Items/ContentItem.ascx
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/HeadPreload.ascx b/src/Orchard.Web/Core/Shapes/Views/HeadPreload.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/HeadPreload.ascx
rename to src/Orchard.Web/Core/Shapes/Views/HeadPreload.ascx
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx b/src/Orchard.Web/Core/Shapes/Views/Header.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx
rename to src/Orchard.Web/Core/Shapes/Views/Header.ascx
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Layout.ascx_ b/src/Orchard.Web/Core/Shapes/Views/Layout.ascx_
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Layout.ascx_
rename to src/Orchard.Web/Core/Shapes/Views/Layout.ascx_
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Menu.ascx_ b/src/Orchard.Web/Core/Shapes/Views/Menu.ascx_
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Menu.ascx_
rename to src/Orchard.Web/Core/Shapes/Views/Menu.ascx_
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Menu.cshtml b/src/Orchard.Web/Core/Shapes/Views/Menu.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Menu.cshtml
rename to src/Orchard.Web/Core/Shapes/Views/Menu.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/MenuItem.cshtml b/src/Orchard.Web/Core/Shapes/Views/MenuItem.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/MenuItem.cshtml
rename to src/Orchard.Web/Core/Shapes/Views/MenuItem.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx_ b/src/Orchard.Web/Core/Shapes/Views/Messages.ascx_
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx_
rename to src/Orchard.Web/Core/Shapes/Views/Messages.ascx_
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/NotFound.ascx b/src/Orchard.Web/Core/Shapes/Views/NotFound.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/NotFound.ascx
rename to src/Orchard.Web/Core/Shapes/Views/NotFound.ascx
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/UI/Switchable.ascx b/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/UI/Switchable.ascx
rename to src/Orchard.Web/Core/Shapes/Views/UI/Switchable.ascx
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/User.ascx_ b/src/Orchard.Web/Core/Shapes/Views/User.ascx_
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/User.ascx_
rename to src/Orchard.Web/Core/Shapes/Views/User.ascx_
diff --git a/src/Orchard.Web/Core/Shapes/Views/Web.config b/src/Orchard.Web/Core/Shapes/Views/Web.config
new file mode 100644
index 000000000..bf2230060
--- /dev/null
+++ b/src/Orchard.Web/Core/Shapes/Views/Web.config
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <add path="*" verb="*"
+          type="System.Web.HttpNotFoundHandler"/>
+    </httpHandlers>
+
+    <!--
+        Enabling request validation in view pages would cause validation to occur
+        after the input has already been processed by the controller. By default
+        MVC performs request validation before a controller processes the input.
+        To change this behavior apply the ValidateInputAttribute to a
+        controller or action.
+    -->
+    <pages
+        validateRequest="false"
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <controls>
+        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" namespace="System.Web.Mvc" tagPrefix="mvc" />
+      </controls>
+    </pages>
+  </system.web>
+
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
+    <handlers>
+      <remove name="BlockViewHandler"/>
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
+    </handlers>
+  </system.webServer>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Zone.cshtml b/src/Orchard.Web/Core/Shapes/Views/Zone.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Views/Zone.cshtml
rename to src/Orchard.Web/Core/Shapes/Views/Zone.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 7c413db23..3fa423002 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -63,6 +63,7 @@ namespace Orchard.Setup.Services {
                 string[] hardcoded = {
                     "Orchard.Framework",
                     "Common",
+                    "Shapes",
                     //"PublishLater",
                     "Contents",
                     //"ContentsLocation",
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index ac1af72c6..9164d4f29 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -88,41 +88,14 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\orchard.ico" />
-    <Content Include="Scripts\base.js" />
-    <Content Include="Scripts\jquery.switchable.js" />
     <Content Include="Styles\admin.css" />
-    <Content Include="Styles\Images\detail-view-on.gif" />
-    <Content Include="Styles\Images\detail-view.gif" />
-    <Content Include="Styles\Images\summary-view-on.gif" />
-    <Content Include="Styles\Images\summary-view.gif" />
-    <Content Include="Styles\Images\toolBarActiveButtonBackground.gif" />
-    <Content Include="Styles\Images\toolBarBackground.gif" />
-    <Content Include="Styles\Images\toolBarHoverButtonBackground.gif" />
-    <Content Include="Styles\jquery.switchable.css" />
-    <Content Include="Styles\special.css" />
     <Content Include="Views\Admin\Index.aspx" />
     <Content Include="Views\Admin\Install.aspx" />
     <Content Include="Views\Admin\ThemePreview.ascx" />
-    <Content Include="Views\DisplayTemplates\Items\ContentItem.ascx" />
-    <None Include="Views\Document.aspx_" />
-    <Content Include="Views\EditorTemplates\Items\ContentItem.ascx" />
-    <Content Include="Views\Header.ascx" />
-    <Content Include="Views\HeadPreload.ascx" />
-    <None Include="Views\Layout.ascx_" />
-    <None Include="Views\Menu.ascx_" />
-    <None Include="Views\Menu.cshtml" />
-    <None Include="Views\MenuItem.cshtml" />
-    <None Include="Views\Messages.ascx_" />
-    <Content Include="Views\NotFound.ascx" />
-    <Content Include="Views\UI\Switchable.ascx" />
-    <None Include="Views\User.ascx_" />
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Scripts\jquery-1.4.2.js" />
-    <Content Include="Scripts\jquery-1.4.2.min.js" />
-    <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -131,8 +104,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Views\Document.cshtml" />
-    <None Include="Views\Zone.cshtml" />
+    <Content Include="Views\Web.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />