diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config
index f2f307586..dd900f1a0 100644
--- a/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config
+++ b/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config
@@ -2,9 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*.aspx" verb="*" type="System.Web.HttpNotFoundHandler"/>
-      <add path="*.ascx" verb="*" type="System.Web.HttpNotFoundHandler"/>
-      <add path="*.master" verb="*" type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -28,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*.aspx,*.ascx,*.master" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Common/Views/Web.config b/src/Orchard.Web/Core/Common/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Core/Common/Views/Web.config
+++ b/src/Orchard.Web/Core/Common/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Contents/Views/Web.config b/src/Orchard.Web/Core/Contents/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Core/Contents/Views/Web.config
+++ b/src/Orchard.Web/Core/Contents/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Dashboard/Views/Web.config b/src/Orchard.Web/Core/Dashboard/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Core/Dashboard/Views/Web.config
+++ b/src/Orchard.Web/Core/Dashboard/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Localization/Styles/Web.config b/src/Orchard.Web/Core/Localization/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Core/Localization/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Core/Localization/Views/Web.config b/src/Orchard.Web/Core/Localization/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Core/Localization/Views/Web.config
+++ b/src/Orchard.Web/Core/Localization/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Messaging/Views/Web.config b/src/Orchard.Web/Core/Messaging/Views/Web.config
index e065d8735..f7f177dd6 100644
--- a/src/Orchard.Web/Core/Messaging/Views/Web.config
+++ b/src/Orchard.Web/Core/Messaging/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
 </configuration>
diff --git a/src/Orchard.Web/Core/Navigation/Views/Web.config b/src/Orchard.Web/Core/Navigation/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Core/Navigation/Views/Web.config
+++ b/src/Orchard.Web/Core/Navigation/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index f74e81b86..13ee83647 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -371,6 +371,21 @@
     <Content Include="Localization\Views\Parts\Localization.ContentTranslations.SummaryAdmin.cshtml" />
     <Content Include="Contents\Views\Items\Content.Summary.cshtml" />
     <Content Include="Shapes\Views\Pager.cshtml" />
+    <Content Include="Shapes\Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Shapes\Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Routable\Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Localization\Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Settings\Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </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/Reports/Views/Web.config b/src/Orchard.Web/Core/Reports/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Core/Reports/Views/Web.config
+++ b/src/Orchard.Web/Core/Reports/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Routable/Scripts/Web.config b/src/Orchard.Web/Core/Routable/Scripts/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Core/Routable/Scripts/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Core/Routable/Views/Web.config b/src/Orchard.Web/Core/Routable/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Core/Routable/Views/Web.config
+++ b/src/Orchard.Web/Core/Routable/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Settings/Styles/Web.config b/src/Orchard.Web/Core/Settings/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Core/Settings/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Core/Settings/Views/Web.config b/src/Orchard.Web/Core/Settings/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Core/Settings/Views/Web.config
+++ b/src/Orchard.Web/Core/Settings/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Core/Shapes/Scripts/Web.config b/src/Orchard.Web/Core/Shapes/Scripts/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Core/Shapes/Scripts/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Core/Shapes/Styles/Web.config b/src/Orchard.Web/Core/Shapes/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Core/Shapes/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Core/Shapes/Views/Web.config b/src/Orchard.Web/Core/Shapes/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Core/Shapes/Views/Web.config
+++ b/src/Orchard.Web/Core/Shapes/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
index d63ddfbbf..8e940f29b 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
@@ -106,6 +106,16 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.ArchiveLater/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/Web.config
index 1295710ba..9a4455a74 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 1b1b04662..559c464e6 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -163,6 +163,15 @@
     <Content Include="Views\Parts\Blogs.BlogPost.List.cshtml" />
     <Content Include="Views\Parts\Blogs.RecentBlogPosts.cshtml" />
     <Content Include="Views\Parts\Blogs.Blog.BlogPostCount.cshtml" />
+    <Content Include="Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/StaticFilesWebConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/StaticFilesWebConfig.txt
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/StaticFilesWebConfig.txt
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ViewsWebConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ViewsWebConfig.txt
index 7022197d4..260e8318d 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ViewsWebConfig.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ViewsWebConfig.txt
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
 </configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
index b3439bfc2..63f71accc 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -23,7 +23,7 @@ namespace Orchard.CodeGeneration.Commands {
             "", "Content", "Styles", "Scripts", "Views", "Zones"
         };
         private static readonly string[] _moduleDirectories = new [] {
-            "", "Properties", "Controllers", "Views", "Models", "Scripts"
+            "", "Properties", "Controllers", "Views", "Models", "Scripts", "Styles"
         };
 
         private const string ModuleName = "CodeGeneration";
@@ -227,6 +227,10 @@ namespace Orchard.CodeGeneration.Commands {
 
             File.WriteAllText(modulePath + "Views\\Web.config", File.ReadAllText(_codeGenTemplatePath + "ViewsWebConfig.txt"));
             content.Add(modulePath + "Views\\Web.config");
+            File.WriteAllText(modulePath + "Scripts\\Web.config", File.ReadAllText(_codeGenTemplatePath + "StaticFilesWebConfig.txt"));
+            content.Add(modulePath + "Scripts\\Web.config");
+            File.WriteAllText(modulePath + "Styles\\Web.config", File.ReadAllText(_codeGenTemplatePath + "StaticFilesWebConfig.txt"));
+            content.Add(modulePath + "Styles\\Web.config");
 
             string templateText = File.ReadAllText(_codeGenTemplatePath + "ModuleAssemblyInfo.txt");
             templateText = templateText.Replace("$$ModuleName$$", moduleName);
@@ -270,6 +274,10 @@ namespace Orchard.CodeGeneration.Commands {
             var webConfig = themePath + "Views\\Web.config";
             File.WriteAllText(webConfig, File.ReadAllText(_codeGenTemplatePath + "\\ViewsWebConfig.txt"));
             createdFiles.Add(webConfig);
+            File.WriteAllText(themePath + "Scripts\\Web.config", File.ReadAllText(_codeGenTemplatePath + "StaticFilesWebConfig.txt"));
+            createdFiles.Add(themePath + "Scripts\\Web.config");
+            File.WriteAllText(themePath + "Styles\\Web.config", File.ReadAllText(_codeGenTemplatePath + "StaticFilesWebConfig.txt"));
+            createdFiles.Add(themePath + "Styles\\Web.config");
 
             var templateText = File.ReadAllText(_codeGenTemplatePath + "\\ThemeManifest.txt").Replace("$$ThemeName$$", themeName);
             if (string.IsNullOrEmpty(baseTheme)) {
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
index c1705330a..7bf3d42ab 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
@@ -76,6 +76,7 @@
     <Compile Include="Services\CodeGenerationCommandInterpreter.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="CodeGenerationTemplates\StaticFilesWebConfig.txt" />
     <Content Include="CodeGenerationTemplates\ThemeManifest.txt" />
     <Content Include="Module.txt" />
     <Content Include="CodeGenerationTemplates\Controller.txt" />
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Comments/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
index 0dfae91f7..dcb481c1b 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -126,7 +126,11 @@
     </Content>
     <Content Include="Views\Web.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Web.config
index 3e2ccce91..271dd8ba1 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Web.config
@@ -3,7 +3,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -28,8 +27,6 @@
     <validation validateIntegratedModeConfiguration="false" />
     
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Email/Views/Web.config
index e065d8735..f7f177dd6 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Email/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
 </configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Web.config
index c397ca482..53bb749f4 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Web.config
@@ -3,7 +3,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -28,8 +27,6 @@
     <validation validateIntegratedModeConfiguration="false" />
     
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
     </handlers>
   </system.webServer>
 </configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Indexing/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
index 510d90e22..c05016a4d 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
@@ -114,6 +114,16 @@
     <Content Include="Views\Admin\EditProperties.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.Media/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Migrations/Views/Web.config
index c397ca482..53bb749f4 100644
--- a/src/Orchard.Web/Modules/Orchard.Migrations/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Views/Web.config
@@ -3,7 +3,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -28,8 +27,6 @@
     <validation validateIntegratedModeConfiguration="false" />
     
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
     </handlers>
   </system.webServer>
 </configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index e256af8af..de341021d 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -107,7 +107,16 @@
     <Content Include="Views\Admin\Features.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.Modules/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Modules/styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Content/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
index 016579f15..08c09b778 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
@@ -101,6 +101,16 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.MultiTenancy/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
index ef1c9d653..507a9889e 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
@@ -108,9 +108,7 @@
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Content\" />
     <Folder Include="Models\" />
-    <Folder Include="Scripts\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -124,6 +122,21 @@
   <ItemGroup>
     <Content Include="Views\Gallery\Themes.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.Packaging/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Scripts/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Scripts/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Web.config
index 3e2ccce91..271dd8ba1 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Web.config
@@ -3,7 +3,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -28,8 +27,6 @@
     <validation validateIntegratedModeConfiguration="false" />
     
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Content/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj
index 40a706eda..05e35b33d 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj
@@ -83,7 +83,11 @@
     <Compile Include="Services\PublishLaterService.cs" />
     <Compile Include="ViewModels\PublishLaterViewModel.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
@@ -123,6 +127,11 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.PublishLater/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
index 2391a5824..a7e4b54fa 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
@@ -112,6 +112,11 @@
   <ItemGroup>
     <Content Include="Placement.info" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.Roles/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
index 4fe19f383..affcf4bf7 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -109,6 +109,11 @@
   <ItemGroup>
     <Content Include="Placement.info" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.Search/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Search/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index 676a70308..7b94e495a 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -109,6 +109,16 @@
   <ItemGroup>
     <Content Include="Views\Web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.Themes/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Views/Web.config
index bf2230060..dd900f1a0 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Users/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
index e78ca1397..6694e6de6 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
@@ -123,6 +123,11 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Content/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index ea6196de0..df01b5954 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -127,6 +127,16 @@
     <Content Include="Views\Items\Content-WidgetPage.cshtml" />
     <Content Include="Views\Widget.Wrapper.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.Widgets/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Web.config
index d52f8e346..1f92a3531 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
index 92c94d542..7e5b2b5e0 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
@@ -112,6 +112,16 @@
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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.jQuery/Scripts/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Scripts/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Styles/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/Web.config b/src/Orchard.Web/Modules/TinyMce/Scripts/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
index 9e5c17b6d..a66089192 100644
--- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
+++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
@@ -159,6 +159,11 @@
     <Content Include="Scripts\plugins\searchreplace\searchreplace.htm" />
     <Content Include="Web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </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/TinyMce/Views/Web.config b/src/Orchard.Web/Modules/TinyMce/Views/Web.config
index 5c6614a80..37513c05c 100644
--- a/src/Orchard.Web/Modules/TinyMce/Views/Web.config
+++ b/src/Orchard.Web/Modules/TinyMce/Views/Web.config
@@ -2,8 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -27,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 6098750bf..9708d1750 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -134,11 +134,13 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <None Include="Media\web.config" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Default.aspx" />
     <Content Include="Global.asax" />
+    <Content Include="Media\OrchardLogo.png" />
     <Content Include="Refresh.html" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
diff --git a/src/Orchard.Web/Themes/SafeMode/Content/Web.config b/src/Orchard.Web/Themes/SafeMode/Content/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Themes/SafeMode/Content/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/Web.config b/src/Orchard.Web/Themes/SafeMode/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Themes/SafeMode/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/Web.config b/src/Orchard.Web/Themes/TheAdmin/Scripts/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/Web.config b/src/Orchard.Web/Themes/TheAdmin/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Web.config b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Web.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <!-- iis6 - for any request in this location, return via managed static file handler -->
+      <add path="*" verb="*" type="System.Web.StaticFileHandler" />
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <handlers accessPolicy="Script,Read">
+      <!--
+      iis7 - for any request to a file exists on disk, return it via native http module.
+      accessPolicy 'Script' is to allow for a managed 404 page.
+      -->
+      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
+    </handlers>
+  </system.webServer>
+</configuration>
diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
index 7d12ed2ce..e5e154151 100644
--- a/src/Orchard.Web/Themes/Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -58,9 +58,15 @@
     <Content Include="TheThemeMachine\Styles\Site.css" />
     <Content Include="TheThemeMachine\Theme.png" />
     <Content Include="TheThemeMachine\Theme.txt" />
-    <Content Include="Web.config">
+    <Content Include="SafeMode\Content\Web.config">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="SafeMode\Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+    <None Include="Web.config">
+      <SubType>Designer</SubType>
+    </None>
     <Content Include="TheAdmin\Views\Menu.cshtml" />
     <Content Include="TheThemeMachine\Views\Branding.cshtml" />
     <Content Include="TheThemeMachine\Views\BadgeOfHonor.cshtml" />
@@ -94,7 +100,22 @@
     <Content Include="TheThemeMachine\Views\Layout.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="TheAdmin\Views\Pager.cshtml" />
+    <Content Include="TheThemeMachine\Views\Pager.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TheThemeMachine\Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TheAdmin\Scripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TheAdmin\Styles\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config
index ae3d47d77..dd900f1a0 100644
--- a/src/Orchard.Web/Themes/Web.config
+++ b/src/Orchard.Web/Themes/Web.config
@@ -2,11 +2,6 @@
 <configuration>
   <system.web>
     <httpHandlers>
-      <add path="*.aspx" verb="*" type="System.Web.HttpNotFoundHandler"/>
-      <add path="*.ascx" verb="*" type="System.Web.HttpNotFoundHandler"/>
-      <add path="*.master" verb="*" type="System.Web.HttpNotFoundHandler"/>
-      <add path="*.cshtml" verb="*" type="System.Web.HttpNotFoundHandler"/>
-      <add path="*.info" verb="*" type="System.Web.HttpNotFoundHandler"/>
     </httpHandlers>
 
     <!--
@@ -30,8 +25,6 @@
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*.aspx,*.ascx,*.master,*.cshtml,*.info" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
     </handlers>
   </system.webServer>
   <runtime>
diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config
index be12b290a..f13bd04f3 100644
--- a/src/Orchard.Web/Web.config
+++ b/src/Orchard.Web/Web.config
@@ -104,12 +104,13 @@
         <add namespace="Orchard.Mvc.Html"/>
       </namespaces>
     </pages>
+
     <httpHandlers>
-      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-      
-      <!-- Block access to module and theme definition files -->
-      <add verb="*" path="module.txt" validate="false" type="System.Web.HttpNotFoundHandler" />
-      <add verb="*" path="theme.txt" validate="false" type="System.Web.HttpNotFoundHandler" />
+      <!-- see below -->
+      <clear />
+      <add path="default.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" validate="true" />
+      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
+
     </httpHandlers>
   </system.web>
   <!-- 
@@ -117,17 +118,15 @@
         Information Services 7.0.  It is not necessary for previous version of IIS.
   -->
   <system.webServer>
-    <validation validateIntegratedModeConfiguration="false"/>
-    <modules runAllManagedModulesForAllRequests="true">
-    </modules>
-    <handlers>
-      <remove name="MvcHttpHandler"/>
-      <remove name="UrlRoutingHandler"/>
-      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
 
-      <!-- Block access to module and theme definition files -->
-      <add name="moduleHttpNotFoundHandler" preCondition="integratedMode" verb="*" path="module.txt" type="System.Web.HttpNotFoundHandler" />
-      <add name="themeHttpNotFoundHandler" preCondition="integratedMode" verb="*" path="theme.txt" type="System.Web.HttpNotFoundHandler" />
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules runAllManagedModulesForAllRequests="true" />
+    <handlers accessPolicy="Script">
+      <!-- clear all handlers, prevents executing code file extensions, prevents returning any file contents -->
+      <clear/>
+      <!-- Return 404 for all requests via managed handler. The url routing handler will substitute the mvc request handler when routes match. -->
+      <add name="Default" path="default.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" preCondition="integratedMode" requireAccess="Script"/>
+      <add name="NotFound" path="*" verb="*" type="System.Web.HttpNotFoundHandler" preCondition="integratedMode" requireAccess="Script"/>
     </handlers>
   </system.webServer>
   <runtime>