diff --git a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs
index 12b8334a3..65ca517ae 100644
--- a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs
+++ b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs
@@ -2,6 +2,7 @@
 using Orchard.ContentManagement;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
+using Orchard.Mvc;
 using Orchard.Themes;
 
 namespace Orchard.Core.Contents.Controllers {
@@ -24,8 +25,7 @@ namespace Orchard.Core.Contents.Controllers {
         public ActionResult Display(int id) {
             var contentItem = _contentManager.Get(id, VersionOptions.Published);
             dynamic model = _contentManager.BuildDisplay(contentItem);
-            // Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
-            return View((object)model);
+            return new ShapeResult(this, model);
         }
 
         // /Contents/Item/Preview/72
@@ -41,8 +41,7 @@ namespace Orchard.Core.Contents.Controllers {
                 return new HttpUnauthorizedResult();
 
             dynamic model = _contentManager.BuildDisplay(contentItem);
-            // Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
-            return View("Display", (object)model);
+            return new ShapeResult(this, model);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml
index 1af6b9171..6964cbd90 100644
--- a/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml
@@ -5,5 +5,6 @@
 <h1>@Html.TitleForPage((string)pageTitle.Text)</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml
index 7cd4e1a3d..cf8cb8b92 100644
--- a/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml
@@ -8,5 +8,6 @@
 <h1>@Html.TitleForPage(pageTitle)</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/Item/Display.cshtml b/src/Orchard.Web/Core/Contents/Views/Item/Display.cshtml
deleted file mode 100644
index 631e9eb0f..000000000
--- a/src/Orchard.Web/Core/Contents/Views/Item/Display.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@Display(Model)
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 198aed3e4..6722ce7b8 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -335,10 +335,8 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="Contents\Views\Content.ControlWrapper.cshtml" />
-    <Content Include="Contents\Views\Item\Display.cshtml" />
     <Content Include="Navigation\Placement.info" />
     <Content Include="Routable\Views\Parts.RoutableTitle.cshtml" />
-    <Content Include="Routable\Views\Item\Display.cshtml" />
     <Content Include="Routable\Views\Routable.HomePage.cshtml" />
     <Content Include="Contents\Views\Content.Summary.cshtml" />
     <Content Include="Shapes\Views\Pager.cshtml" />
diff --git a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs
index 4cc16d9d3..aa557164a 100644
--- a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs
+++ b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs
@@ -9,6 +9,7 @@ using Orchard.Core.Routable.Services;
 using Orchard.Data;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
+using Orchard.Mvc;
 using Orchard.Services;
 using Orchard.Themes;
 
@@ -59,8 +60,7 @@ namespace Orchard.Core.Routable.Controllers {
             }
 
             dynamic model = _contentManager.BuildDisplay(hits.Single());
-            // Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
-            return View((object)model);
+            return new ShapeResult(this, model);
         }
 
         public ActionResult Slugify(string contentType, int? id, int? containerId) {
diff --git a/src/Orchard.Web/Core/Routable/Views/Item/Display.cshtml b/src/Orchard.Web/Core/Routable/Views/Item/Display.cshtml
deleted file mode 100644
index 631e9eb0f..000000000
--- a/src/Orchard.Web/Core/Routable/Views/Item/Display.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@Display(Model)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
index 6e6dbbb44..1e6215a69 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
@@ -8,6 +8,7 @@ using Orchard.Core.Feeds;
 using Orchard.Core.Routable.Services;
 using Orchard.DisplayManagement;
 using Orchard.Logging;
+using Orchard.Mvc;
 using Orchard.Services;
 using Orchard.Themes;
 using Orchard.UI.Navigation;
@@ -92,8 +93,7 @@ namespace Orchard.Blogs.Controllers {
             var totalItemCount = _blogPostService.PostCount(blogPart);
             blog.Content.Add(Shape.Pager(pager).TotalItemCount(totalItemCount), "Content:after");
 
-            // Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
-            return View((object)blog);
+            return new ShapeResult(this, blog);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
index 86e399152..ae679af55 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
@@ -7,6 +7,7 @@ using Orchard.ContentManagement;
 using Orchard.Core.Feeds;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
+using Orchard.Mvc;
 using Orchard.Security;
 using Orchard.Themes;
 
@@ -51,8 +52,7 @@ namespace Orchard.Blogs.Controllers {
                 return HttpNotFound();
 
             dynamic model = _services.ContentManager.BuildDisplay(postPart);
-            // Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
-            return View((object)model);
+            return new ShapeResult(this, model);
         }
 
         public ActionResult ListByArchive(string blogPath, string archiveData) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 4fb25b07d..215532f54 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -115,9 +115,7 @@
     <Content Include="Views\BlogAdmin\List.cshtml" />
     <Content Include="Views\BlogPostAdmin\Create.cshtml" />
     <Content Include="Views\BlogPostAdmin\Edit.cshtml" />
-    <Content Include="Views\BlogPost\Item.cshtml" />
     <Content Include="Views\BlogPost\ListByArchive.cshtml" />
-    <Content Include="Views\Blog\Item.cshtml" />
     <Content Include="Views\Blog\List.cshtml" />
     <Content Include="Views\Parts.Blogs.Blog.Manage.cshtml" />
     <Content Include="Views\Parts.Blogs.Blog.Description.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml
deleted file mode 100644
index 631e9eb0f..000000000
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@Display(Model)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.cshtml
index 859c95591..927dcb9ba 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Create New Blog").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.cshtml
index 3b0bf1ea8..cf5924fec 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Blog Properties").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.cshtml
index c924a4211..689c95f24 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.cshtml
@@ -1,4 +1,5 @@
 @{
     Html.AddTitleParts(T("Manage Blog").ToString());
 }
-@Display(Model)
\ No newline at end of file
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
+    @Display(Model)
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/Item.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/Item.cshtml
deleted file mode 100644
index 631e9eb0f..000000000
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/Item.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@Display(Model)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Create.cshtml
index ff7e3d534..7a54cee20 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Create.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Create New Blog Post").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Edit.cshtml
index 4c905b255..a6fde554b 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPostAdmin/Edit.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Edit Blog Post").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/Placement.info b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/Placement.info
new file mode 100644
index 000000000..0eab3bada
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/Placement.info
@@ -0,0 +1,17 @@
+<Placement>
+  <!-- Customize where the shapes are rendered -->
+
+  <!-- 
+  <Place Parts_Blogs_BlogArchives="Content:before"/>
+  <Place Parts_Blogs_RecentBlogPosts="Content:after"/>
+  <Match ContentType="Blog">
+    <Match DisplayType="Summary">
+      <Place Parts_Blogs_Blog_Description="Content:before"
+             Parts_Blogs_Blog_BlogPostCount="Meta:3"/>
+    </Match>
+  </Match>
+  <Match Path="/About">
+    <Place Parts_Common_Metadata="-"/>
+  </Match>
+-->
+</Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
index 245c39bba..b3a836035 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -312,6 +312,9 @@ namespace Orchard.CodeGeneration.Commands {
             File.WriteAllBytes(themePath + "Theme.png", File.ReadAllBytes(_codeGenTemplatePath + "Theme.png"));
             createdFiles.Add(themePath + "Theme.png");
 
+            File.WriteAllText(themePath + "Placement.info", File.ReadAllText(_codeGenTemplatePath + "Placement.info"));
+            createdFiles.Add(themePath + "Placement.info");
+
             // create new csproj for the theme
             if (projectGuid != null) {
                 var itemGroup = CreateProjectItemGroup(themePath, createdFiles, createdFolders);
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
index 70df50651..b490060bf 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
@@ -79,6 +79,9 @@
   <ItemGroup>
     <Content Include="CodeGenerationTemplates\ModuleRootWebConfig.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="CodeGenerationTemplates\Placement.info" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
index f54c58d89..11c1227fc 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
@@ -66,7 +66,7 @@ namespace Orchard.Users.Controllers {
                     users = users.Where(u => u.RegistrationStatus == UserStatus.Pending);
                     break;
                 case UsersFilter.EmailPending:
-                    users = users.Where(u => u.EmailStatus == UserStatus.Approved);
+                    users = users.Where(u => u.EmailStatus == UserStatus.Pending);
                     break;
             }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
index 2577c0386..487b4dc6b 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Add User").ToString()) </h1>
-@using (Html.BeginFormAntiForgeryPost()) { 
-    @Html.ValidationSummary() 
+@using (Html.BeginFormAntiForgeryPost()) {
+    @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
index f2903b46b..b85c6ef34 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Edit User").ToString()) </h1>
 @using (Html.BeginFormAntiForgeryPost()) { 
     @Html.ValidationSummary() 
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
  } 
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/AddLayer.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/AddLayer.cshtml
index 8cadd5d83..29068296a 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/AddLayer.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/AddLayer.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Add Layer").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/AddWidget.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/AddWidget.cshtml
index 0647070aa..690feb610 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/AddWidget.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/AddWidget.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Add Widget").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
index 95f9d7da5..40525d7f5 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Edit Layer").ToString())</h1>
-    @using (Html.BeginFormAntiForgeryPost()) {
+@using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
index ddb5ce9c9..d186acdb0 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
@@ -1,5 +1,6 @@
 <h1>@Html.TitleForPage(T("Edit Widget").ToString())</h1>
-    @using (Html.BeginFormAntiForgeryPost()) {
+@using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
+    // Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type
     @Display(Model)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Placement.info b/src/Orchard.Web/Themes/TheThemeMachine/Placement.info
new file mode 100644
index 000000000..0eab3bada
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Placement.info
@@ -0,0 +1,17 @@
+<Placement>
+  <!-- Customize where the shapes are rendered -->
+
+  <!-- 
+  <Place Parts_Blogs_BlogArchives="Content:before"/>
+  <Place Parts_Blogs_RecentBlogPosts="Content:after"/>
+  <Match ContentType="Blog">
+    <Match DisplayType="Summary">
+      <Place Parts_Blogs_Blog_Description="Content:before"
+             Parts_Blogs_Blog_BlogPostCount="Meta:3"/>
+    </Match>
+  </Match>
+  <Match Path="/About">
+    <Place Parts_Common_Metadata="-"/>
+  </Match>
+-->
+</Placement>
diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
index edd3c2d09..8af254cc7 100644
--- a/src/Orchard.Web/Themes/Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -116,6 +116,9 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="TheThemeMachine\Placement.info" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard/ContentManagement/DefaultContentDisplay.cs b/src/Orchard/ContentManagement/DefaultContentDisplay.cs
index cb03ce034..2f59d16c5 100644
--- a/src/Orchard/ContentManagement/DefaultContentDisplay.cs
+++ b/src/Orchard/ContentManagement/DefaultContentDisplay.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Web;
 using System.Web.Routing;
 using ClaySharp.Implementation;
 using Orchard.ContentManagement.Handlers;
@@ -100,6 +101,7 @@ namespace Orchard.ContentManagement {
                 //var theme = workContext.CurrentTheme;
                 var theme = _themeService.Value.GetRequestTheme(_requestContext);
                 var shapeTable = _shapeTableManager.GetShapeTable(theme.Id);
+                var request = _requestContext.HttpContext.Request;
 
                 ShapeDescriptor descriptor;
                 if (shapeTable.Descriptors.TryGetValue(partShapeType, out descriptor)) {
@@ -107,6 +109,7 @@ namespace Orchard.ContentManagement {
                         ContentType = context.ContentItem.ContentType,
                         DisplayType = displayType,
                         Differentiator = differentiator,
+                        Path = request.Path.Substring((request.ApplicationPath ?? "").Length)
                     };
                     var location = descriptor.Placement(placementContext);
                     return location ?? defaultLocation;
diff --git a/src/Orchard/DisplayManagement/Descriptors/ShapeAlterationBuilder.cs b/src/Orchard/DisplayManagement/Descriptors/ShapeAlterationBuilder.cs
index 5bb361e0f..f5799ac8d 100644
--- a/src/Orchard/DisplayManagement/Descriptors/ShapeAlterationBuilder.cs
+++ b/src/Orchard/DisplayManagement/Descriptors/ShapeAlterationBuilder.cs
@@ -111,5 +111,6 @@ namespace Orchard.DisplayManagement.Descriptors {
         public string ContentType { get; set; }
         public string DisplayType { get; set; }
         public string Differentiator { get; set; }
+        public string Path { get; set; }
     }
 }
diff --git a/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs b/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
index b7761a785..3275b32ae 100644
--- a/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
+++ b/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
@@ -98,6 +98,12 @@ namespace Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy {
                         return ctx => (ctx.DisplayType ?? "").StartsWith(prefix) && predicate(ctx);
                     }
                     return ctx => (ctx.DisplayType == expression) && predicate(ctx);
+                case "Path":
+                    if (expression.EndsWith("*")) {
+                        var prefix = expression.Substring(0, expression.Length - 1);
+                        return ctx => (ctx.Path ?? "").StartsWith(prefix, StringComparison.OrdinalIgnoreCase) && predicate(ctx);
+                    }
+                    return ctx => (ctx.Path.Equals(expression, StringComparison.OrdinalIgnoreCase)) && predicate(ctx);
             }
             return predicate;
         }