diff --git a/AzurePackage.proj b/AzurePackage.proj
index 696168b1e..5ae8072d0 100644
--- a/AzurePackage.proj
+++ b/AzurePackage.proj
@@ -48,7 +48,8 @@
     <MSBuild
       Projects="$(SrcFolder)\Orchard.Azure\Orchard.Azure.CloudService.sln"
       Targets="Build"
-      Properties="Configuration=Release;OutputPath=$(CompileFolder);PlatformTarget=x64" />      
+      Properties="Configuration=Release;OutputPath=$(CompileFolder);PlatformTarget=x64;DefineConstants=AZURE" 
+       />      
 
     <MSBuild
       Projects="$(SrcFolder)\Orchard.Azure.sln"
diff --git a/src/Orchard.Azure.Tests/FileSystems/Media/AzureBlobStorageProviderTests.cs b/src/Orchard.Azure.Tests/FileSystems/Media/AzureBlobStorageProviderTests.cs
index 2b2c5baab..e6c948032 100644
--- a/src/Orchard.Azure.Tests/FileSystems/Media/AzureBlobStorageProviderTests.cs
+++ b/src/Orchard.Azure.Tests/FileSystems/Media/AzureBlobStorageProviderTests.cs
@@ -50,7 +50,7 @@ namespace Orchard.Azure.Tests.FileSystems.Media {
 
             Assert.AreEqual(".txt", storageFile.GetFileType());
             Assert.AreEqual("foo.txt", storageFile.GetName());
-            Assert.That(storageFile.GetPath().EndsWith("/default/foo.txt"), Is.True);
+            Assert.AreEqual("foo.txt", storageFile.GetPath());
             Assert.AreEqual(0, storageFile.GetSize());
         }
 
@@ -71,7 +71,8 @@ namespace Orchard.Azure.Tests.FileSystems.Media {
             var files = _azureBlobStorageProvider.ListFiles("");
 
             Assert.AreEqual(1, files.Count());
-            Assert.That(files.First().GetPath().EndsWith("foo2.txt"), Is.True);
+            Assert.That(files.First().GetPath().Equals("foo2.txt"), Is.True);
+            Assert.That(files.First().GetName().Equals("foo2.txt"), Is.True);
         }
 
         [Test]
@@ -82,17 +83,28 @@ namespace Orchard.Azure.Tests.FileSystems.Media {
 
             Assert.AreEqual(1, _azureBlobStorageProvider.ListFiles("").Count());
             Assert.AreEqual(1, _azureBlobStorageProvider.ListFiles("folder").Count());
+            Assert.AreEqual("folder/foo.txt", _azureBlobStorageProvider.ListFiles("folder").First().GetPath());
+            Assert.AreEqual("foo.txt", _azureBlobStorageProvider.ListFiles("folder").First().GetName());
             Assert.AreEqual(1, _azureBlobStorageProvider.ListFiles("folder/folder").Count());
+            Assert.AreEqual("folder/folder/foo.txt", _azureBlobStorageProvider.ListFiles("folder/folder").First().GetPath());
+            Assert.AreEqual("foo.txt", _azureBlobStorageProvider.ListFiles("folder/folder").First().GetName());
         }
 
         [Test]
         [ExpectedException(typeof(ArgumentException))]
         public void CreateFolderThatExistsShouldThrow() {
-            // sebros: In Azure, the folder concept is just about checking files prefix. So until a file exists, a folder is nothing
             _azureBlobStorageProvider.CreateFile("folder/foo.txt");
             _azureBlobStorageProvider.CreateFolder("folder");
         }
 
+        [Test]
+        public void ListFolderShouldAcceptNullPath() {
+            _azureBlobStorageProvider.CreateFolder("folder");
+            Assert.AreEqual(1, _azureBlobStorageProvider.ListFolders(null).Count());
+            Assert.AreEqual("folder", _azureBlobStorageProvider.ListFolders(null).First().GetName());
+            Assert.AreEqual("folder", _azureBlobStorageProvider.ListFolders(null).First().GetPath());
+        }
+
         [Test]
         public void DeleteFolderShouldDeleteFilesAlso() {
             _azureBlobStorageProvider.CreateFile("folder/foo1.txt");
diff --git a/src/Orchard.Azure/AzureFileSystem.cs b/src/Orchard.Azure/AzureFileSystem.cs
index 6de706353..598974b68 100644
--- a/src/Orchard.Azure/AzureFileSystem.cs
+++ b/src/Orchard.Azure/AzureFileSystem.cs
@@ -8,11 +8,15 @@ using Microsoft.WindowsAzure.StorageClient;
 using Orchard.FileSystems.Media;
 
 namespace Orchard.Azure {
-    public class AzureFileSystem {
+    public class AzureFileSystem
+    {
+        private const string FolderEntry = "$$$ORCHARD$$$.$$$";
+
         public string ContainerName { get; protected set; }
 
         private readonly CloudStorageAccount _storageAccount;
         private readonly string _root;
+        private readonly string _absoluteRoot;
         public CloudBlobClient BlobClient { get; private set; }
         public CloudBlobContainer Container { get; private set; }
 
@@ -25,6 +29,7 @@ namespace Orchard.Azure {
             _storageAccount = storageAccount;
             ContainerName = containerName;
             _root = String.IsNullOrEmpty(root) || root == "/" ? String.Empty : root + "/";
+            _absoluteRoot = _storageAccount.BlobEndpoint.AbsoluteUri + containerName + "/" + root + "/";
 
             using ( new HttpContextWeaver() ) {
 
@@ -46,66 +51,65 @@ namespace Orchard.Azure {
         }
 
         private static void EnsurePathIsRelative(string path) {
-            if ( path.StartsWith("/") || path.StartsWith("http://"))
+            if (path.StartsWith("/") || path.StartsWith("http://"))
                 throw new ArgumentException("Path must be relative");
         }
 
         public IStorageFile GetFile(string path) {
             EnsurePathIsRelative(path);
-            path = String.Concat(_root, path);
 
-            using ( new HttpContextWeaver() )
-            {
-                Container.EnsureBlobExists(path);
-                return new AzureBlobFileStorage(Container.GetBlockBlobReference(path));
+            using ( new HttpContextWeaver() ) {
+                Container.EnsureBlobExists(String.Concat(_root, path));
+                return new AzureBlobFileStorage(Container.GetBlockBlobReference(path), _absoluteRoot);
             }
         }
 
         public bool FileExists(string path) {
-            using ( new HttpContextWeaver() )
-            {
-                path = String.Concat(_root, path);
-                return Container.BlobExists(path);
+            using ( new HttpContextWeaver() ) {
+                return Container.BlobExists(String.Concat(_root, path));
             }
         }
 
         public IEnumerable<IStorageFile> ListFiles(string path) {
+            path = path ?? String.Empty;
+            
             EnsurePathIsRelative(path);
 
             string prefix = String.Concat(Container.Name, "/", _root, path);
+            
             if ( !prefix.EndsWith("/") )
                 prefix += "/";
-            using ( new HttpContextWeaver() )
-            {
-                foreach (var blobItem in BlobClient.ListBlobsWithPrefix(prefix).OfType<CloudBlockBlob>())
-                {
-                    yield return new AzureBlobFileStorage(blobItem);
+
+            using ( new HttpContextWeaver() ) {
+                foreach (var blobItem in BlobClient.ListBlobsWithPrefix(prefix).OfType<CloudBlockBlob>()) {
+                    // ignore directory entries
+                    if(blobItem.Uri.AbsoluteUri.EndsWith(FolderEntry))
+                        continue;
+
+                    yield return new AzureBlobFileStorage(blobItem, _absoluteRoot);
                 }
             }
         }
 
         public IEnumerable<IStorageFolder> ListFolders(string path) {
+            path = path ?? String.Empty;
+
             EnsurePathIsRelative(path);
-            path = String.Concat(_root, path);
-            using ( new HttpContextWeaver() )
-            {
-                if (!Container.DirectoryExists(path))
-                {
-                    try
-                    {
-                        CreateFolder(path);
+            using ( new HttpContextWeaver() ) {
+                if ( !Container.DirectoryExists(String.Concat(_root, path)) ) {
+                    try {
+                        CreateFolder(String.Concat(_root, path));
                     }
-                    catch (Exception ex)
-                    {
+                    catch ( Exception ex ) {
                         throw new ArgumentException(string.Format("The folder could not be created at path: {0}. {1}",
                                                                   path, ex));
                     }
                 }
 
-                return Container.GetDirectoryReference(path)
+                return Container.GetDirectoryReference(String.Concat(_root, path))
                     .ListBlobs()
                     .OfType<CloudBlobDirectory>()
-                    .Select<CloudBlobDirectory, IStorageFolder>(d => new AzureBlobFolderStorage(d))
+                    .Select<CloudBlobDirectory, IStorageFolder>(d => new AzureBlobFolderStorage(d, _absoluteRoot))
                     .ToList();
             }
         }
@@ -113,23 +117,20 @@ namespace Orchard.Azure {
         public void CreateFolder(string path)
         {
             EnsurePathIsRelative(path);
-            path = String.Concat(_root, path);
-            using (new HttpContextWeaver())
-            {
-                Container.EnsureDirectoryDoesNotExist(path);
-                Container.GetDirectoryReference(path);
+            using (new HttpContextWeaver()) {
+                Container.EnsureDirectoryDoesNotExist(String.Concat(_root, path));
+
+                // Creating a virtually hidden file to make the directory an existing concept
+                CreateFile(path + "/" + FolderEntry);
             }
         }
 
         public void DeleteFolder(string path) {
             EnsurePathIsRelative(path);
-            path = String.Concat(_root, path);
 
-            using ( new HttpContextWeaver() )
-            {
-                Container.EnsureDirectoryExists(path);
-                foreach (var blob in Container.GetDirectoryReference(path).ListBlobs())
-                {
+            using ( new HttpContextWeaver() ) {
+                Container.EnsureDirectoryExists(String.Concat(_root, path));
+                foreach ( var blob in Container.GetDirectoryReference(String.Concat(_root, path)).ListBlobs() ) {
                     if (blob is CloudBlob)
                         ((CloudBlob) blob).Delete();
 
@@ -141,7 +142,6 @@ namespace Orchard.Azure {
 
         public void RenameFolder(string path, string newPath) {
             EnsurePathIsRelative(path);
-
             EnsurePathIsRelative(newPath);
 
             if ( !path.EndsWith("/") )
@@ -149,20 +149,16 @@ namespace Orchard.Azure {
 
             if ( !newPath.EndsWith("/") )
                 newPath += "/";
-            using ( new HttpContextWeaver() )
-            {
-                foreach (var blob in Container.GetDirectoryReference(_root + path).ListBlobs())
-                {
-                    if (blob is CloudBlob)
-                    {
+            using ( new HttpContextWeaver() ) {
+                foreach (var blob in Container.GetDirectoryReference(_root + path).ListBlobs()) {
+                    if (blob is CloudBlob) {
                         string filename = Path.GetFileName(blob.Uri.ToString());
                         string source = String.Concat(path, filename);
                         string destination = String.Concat(newPath, filename);
                         RenameFile(source, destination);
                     }
 
-                    if (blob is CloudBlobDirectory)
-                    {
+                    if (blob is CloudBlobDirectory) {
                         string foldername = blob.Uri.Segments.Last();
                         string source = String.Concat(path, foldername);
                         string destination = String.Concat(newPath, foldername);
@@ -174,29 +170,24 @@ namespace Orchard.Azure {
 
         public void DeleteFile(string path) {
             EnsurePathIsRelative(path);
-            path = String.Concat(_root, path);
-
-            using ( new HttpContextWeaver() )
-            {
+            
+            using ( new HttpContextWeaver() ) {
                 Container.EnsureBlobExists(path);
-                var blob = Container.GetBlockBlobReference(path);
+                var blob = Container.GetBlockBlobReference(String.Concat(_root, path));
                 blob.Delete();
             }
         }
 
         public void RenameFile(string path, string newPath) {
             EnsurePathIsRelative(path);
-            path = String.Concat(_root, path);
-
             EnsurePathIsRelative(newPath);
-            newPath = String.Concat(_root, newPath);
-            using ( new HttpContextWeaver() )
-            {
-                Container.EnsureBlobExists(path);
-                Container.EnsureBlobDoesNotExist(newPath);
 
-                var blob = Container.GetBlockBlobReference(path);
-                var newBlob = Container.GetBlockBlobReference(newPath);
+            using ( new HttpContextWeaver() ) {
+                Container.EnsureBlobExists(String.Concat(_root, path));
+                Container.EnsureBlobDoesNotExist(String.Concat(_root, newPath));
+
+                var blob = Container.GetBlockBlobReference(String.Concat(_root, path));
+                var newBlob = Container.GetBlockBlobReference(String.Concat(_root, newPath));
                 newBlob.CopyFromBlob(blob);
                 blob.Delete();
             }
@@ -204,36 +195,36 @@ namespace Orchard.Azure {
 
         public IStorageFile CreateFile(string path) {
             EnsurePathIsRelative(path);
-            path = String.Concat(_root, path);
 
-            if ( Container.BlobExists(path) ) {
+            if ( Container.BlobExists(String.Concat(_root, path)) ) {
                 throw new ArgumentException("File " + path + " already exists");
             }
 
-            var blob = Container.GetBlockBlobReference(path);
+            var blob = Container.GetBlockBlobReference(String.Concat(_root, path));
             blob.OpenWrite().Dispose(); // force file creation
-            return new AzureBlobFileStorage(blob);
+            return new AzureBlobFileStorage(blob, _absoluteRoot);
         }
 
         public string GetPublicUrl(string path) {
             EnsurePathIsRelative(path);
-            path = String.Concat(_root, path);
-            using ( new HttpContextWeaver() )
-            {
-                Container.EnsureBlobExists(path);
-                return Container.GetBlockBlobReference(path).Uri.ToString();
+            
+            using ( new HttpContextWeaver() ) {
+                Container.EnsureBlobExists(String.Concat(_root, path));
+                return Container.GetBlockBlobReference(String.Concat(_root, path)).Uri.ToString();
             }
         }
 
         private class AzureBlobFileStorage : IStorageFile {
             private readonly CloudBlockBlob _blob;
+            private readonly string _rootPath;
 
-            public AzureBlobFileStorage(CloudBlockBlob blob) {
+            public AzureBlobFileStorage(CloudBlockBlob blob, string rootPath) {
                 _blob = blob;
+                _rootPath = rootPath;
             }
 
             public string GetPath() {
-                return _blob.Uri.ToString();
+                return _blob.Uri.ToString().Substring(_rootPath.Length+1);
             }
 
             public string GetName() {
@@ -264,17 +255,19 @@ namespace Orchard.Azure {
 
         private class AzureBlobFolderStorage : IStorageFolder {
             private readonly CloudBlobDirectory _blob;
+            private readonly string _rootPath;
 
-            public AzureBlobFolderStorage(CloudBlobDirectory blob) {
+            public AzureBlobFolderStorage(CloudBlobDirectory blob, string rootPath) {
                 _blob = blob;
+                _rootPath = rootPath;
             }
 
             public string GetName() {
-                return Path.GetDirectoryName(_blob.Uri.ToString());
+                return Path.GetDirectoryName(GetPath() + "/");
             }
 
             public string GetPath() {
-                return _blob.Uri.ToString();
+                return _blob.Uri.ToString().Substring(_rootPath.Length + 1).TrimEnd('/');
             }
 
             public long GetSize() {
@@ -287,7 +280,7 @@ namespace Orchard.Azure {
 
             public IStorageFolder GetParent() {
                 if ( _blob.Parent != null ) {
-                    return new AzureBlobFolderStorage(_blob.Parent);
+                    return new AzureBlobFolderStorage(_blob.Parent, _rootPath);
                 }
                 throw new ArgumentException("Directory " + _blob.Uri + " does not have a parent directory");
             }
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs b/src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs
index 832917606..ad0306387 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs
+++ b/src/Orchard.Azure/Orchard.Azure.Web/WebRole.cs
@@ -8,6 +8,11 @@ namespace Orchard.Azure.Web {
         public override bool OnStart() {
             DiagnosticMonitor.Start("DiagnosticsConnectionString");
 
+            CloudStorageAccount.SetConfigurationSettingPublisher(    
+                (configName, configSetter) =>    
+                    configSetter(RoleEnvironment.GetConfigurationSettingValue(configName))    
+                );
+
             // For information on handling configuration changes
             // see the MSDN topic at http://go.microsoft.com/fwlink/?LinkId=166357.
             RoleEnvironment.Changing += RoleEnvironmentChanging;
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.Tests/DataMigration/SchemaBuilderTests.cs b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
index fdbc736fc..bc9e28ff7 100644
--- a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
+++ b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
@@ -26,6 +26,7 @@ namespace Orchard.Tests.DataMigration {
         private string _tempFolder;
         private SchemaBuilder _schemaBuilder;
         private DefaultDataMigrationInterpreter _interpreter;
+        private ISession _session;
 
         [SetUp]
         public void Setup() {
@@ -38,7 +39,7 @@ namespace Orchard.Tests.DataMigration {
 
             var builder = new ContainerBuilder();
 
-            var session = _sessionFactory.OpenSession();
+            _session = _sessionFactory.OpenSession();
             builder.RegisterInstance(appDataFolder).As<IAppDataFolder>();
             builder.RegisterType<SqlCeDataServicesProvider>().As<IDataServicesProvider>();
             builder.RegisterType<DataServicesProviderFactory>().As<IDataServicesProviderFactory>();
@@ -46,7 +47,7 @@ namespace Orchard.Tests.DataMigration {
             builder.RegisterType<DefaultDataMigrationInterpreter>().As<IDataMigrationInterpreter>();
             builder.RegisterType<SessionConfigurationCache>().As<ISessionConfigurationCache>();
             builder.RegisterType<SessionFactoryHolder>().As<ISessionFactoryHolder>();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(session)).As<ISessionLocator>();
+            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();
             builder.RegisterInstance(new ShellBlueprint { Records = Enumerable.Empty<RecordBlueprint>() }).As<ShellBlueprint>();
             builder.RegisterInstance(new ShellSettings { Name = "temp", DataProvider = "SqlCe", DataTablePrefix = "TEST" }).As<ShellSettings>();
             builder.RegisterModule(new DataModule());
@@ -133,10 +134,24 @@ namespace Orchard.Tests.DataMigration {
                 .AlterTable("User", table => table
                     .AddColumn("Age", DbType.Int32))
                 .AlterTable("User", table => table
-                    .AlterColumn("Lastname", column => column.WithDefault("John")))
+                    .AlterColumn("Lastname", column => column.WithDefault("Doe")))
                 .AlterTable("User", table => table
                     .DropColumn("Firstname")
                 );
+
+            // creating a new row should assign a default value to Firstname and Age
+            _schemaBuilder
+                .ExecuteSql("insert into TEST_User VALUES (DEFAULT, DEFAULT)");
+
+            // ensure wehave one record woth the default value
+            var command = _session.Connection.CreateCommand();
+            command.CommandText = "SELECT count(*) FROM TEST_User WHERE Lastname = 'Doe'";
+            Assert.That(command.ExecuteScalar(), Is.EqualTo(1));
+
+            // ensure this is not a false positive
+            command = _session.Connection.CreateCommand();
+            command.CommandText = "SELECT count(*) FROM TEST_User WHERE Lastname = 'Foo'";
+            Assert.That(command.ExecuteScalar(), Is.EqualTo(0));
         }
 
         [Test]
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/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
index 0dc8901ed..610bf27e4 100644
--- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
@@ -8,6 +8,7 @@ using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Models;
+using Orchard.ContentManagement.Records;
 using Orchard.Core.Common.Models;
 using Orchard.Core.Contents.Settings;
 using Orchard.Core.Contents.ViewModels;
@@ -67,12 +68,14 @@ namespace Orchard.Core.Contents.Controllers {
 
             switch (model.Options.OrderBy) {
                 case ContentsOrder.Modified:
+                    //query = query.OrderByDescending<ContentPartRecord, int>(ci => ci.ContentItemRecord.Versions.Single(civr => civr.Latest).Id);
                     query = query.OrderByDescending<CommonPartRecord, DateTime?>(cr => cr.ModifiedUtc);
                     break;
                 case ContentsOrder.Published:
                     query = query.OrderByDescending<CommonPartRecord, DateTime?>(cr => cr.PublishedUtc);
                     break;
                 case ContentsOrder.Created:
+                    //query = query.OrderByDescending<ContentPartRecord, int>(ci => ci.Id);
                     query = query.OrderByDescending<CommonPartRecord, DateTime?>(cr => cr.CreatedUtc);
                     break;
             }
@@ -189,24 +192,39 @@ namespace Orchard.Core.Contents.Controllers {
             return View(model);
         }
 
+        [HttpPost, ActionName("Create")]
+        [FormValueRequired("submit.Save")]
+        public ActionResult CreatePOST(string id) {
+            return CreatePOST(id, contentItem => {
+                if (!contentItem.Has<IPublishingControlAspect>() && !contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
+                    _contentManager.Publish(contentItem);
+            });
+        }
 
         [HttpPost, ActionName("Create")]
-        public ActionResult CreatePOST(string id) {
+        [FormValueRequired("submit.Publish")]
+        public ActionResult CreateAndPublishPOST(string id) {
+            return CreatePOST(id, contentItem => _contentManager.Publish(contentItem));
+        }
+
+        private ActionResult CreatePOST(string id, Action<ContentItem> conditionallyPublish) {
             var contentItem = _contentManager.New(id);
 
             if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Couldn't create content")))
                 return new HttpUnauthorizedResult();
 
-            _contentManager.Create(contentItem, VersionOptions.Draft);
-            var model = _contentManager.UpdateEditor(contentItem, this);
+            var isDraftable = contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable;
+            _contentManager.Create(
+                contentItem,
+                isDraftable ? VersionOptions.Draft : VersionOptions.Published);
 
+            var model = _contentManager.UpdateEditor(contentItem, this);
             if (!ModelState.IsValid) {
                 _transactionManager.Cancel();
                 return View(model);
             }
 
-            if (!contentItem.Has<IPublishingControlAspect>())
-                _contentManager.Publish(contentItem);
+            conditionallyPublish(contentItem);
 
             Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)
                 ? T("Your content has been created.")
@@ -229,7 +247,21 @@ namespace Orchard.Core.Contents.Controllers {
         }
 
         [HttpPost, ActionName("Edit")]
+        [FormValueRequired("submit.Save")]
         public ActionResult EditPOST(int id, string returnUrl) {
+            return EditPOST(id, returnUrl, contentItem => {
+                if (!contentItem.Has<IPublishingControlAspect>() && !contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
+                    _contentManager.Publish(contentItem);
+            });
+        }
+
+        [HttpPost, ActionName("Edit")]
+        [FormValueRequired("submit.Publish")]
+        public ActionResult EditAndPublishPOST(int id, string returnUrl) {
+            return EditPOST(id, returnUrl, contentItem => _contentManager.Publish(contentItem));
+        }
+
+        private ActionResult EditPOST(int id, string returnUrl, Action<ContentItem> conditionallyPublish) {
             var contentItem = _contentManager.Get(id, VersionOptions.DraftRequired);
 
             if (contentItem == null)
@@ -244,9 +276,7 @@ namespace Orchard.Core.Contents.Controllers {
                 return View("Edit", model);
             }
 
-            //need to go about this differently - to know when to publish (IPlublishableAspect ?)
-            if (!contentItem.Has<IPublishingControlAspect>())
-                _contentManager.Publish(contentItem);
+            conditionallyPublish(contentItem);
 
             Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)
                 ? T("Your content has been saved.")
diff --git a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs b/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
index 5c25bcc7b..44fba0439 100644
--- a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
+++ b/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
@@ -1,5 +1,7 @@
-using Orchard.ContentManagement;
+using System.Collections.Generic;
+using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
+using Orchard.Core.Contents.Settings;
 
 namespace Orchard.Core.Contents.Drivers {
     public class ContentsDriver : ContentPartDriver<ContentPart> {
@@ -13,5 +15,18 @@ namespace Orchard.Core.Contents.Drivers {
                              () => shapeHelper.Parts_Contents_Publish_SummaryAdmin(ContentPart: part))
                 );
         }
+
+        protected override DriverResult Editor(ContentPart part, dynamic shapeHelper) {
+            var results = new List<DriverResult> { ContentShape("Content_SaveButton", saveButton => saveButton) };
+
+            if (part.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
+                results.Add(ContentShape("Content_PublishButton", publishButton => publishButton));
+
+            return Combined(results.ToArray());
+        }
+
+        protected override DriverResult Editor(ContentPart part, IUpdateModel updater, dynamic shapeHelper) {
+            return Editor(part, updater);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Placement.info b/src/Orchard.Web/Core/Contents/Placement.info
index 8cc668cba..3d99c94b2 100644
--- a/src/Orchard.Web/Core/Contents/Placement.info
+++ b/src/Orchard.Web/Core/Contents/Placement.info
@@ -4,6 +4,9 @@
         Parts_Contents_Publish
         Parts_Contents_Publish_SummaryAdmin
     -->
+    <!-- edit "shape" -->
+    <Place Content_PublishButton="Sidebar:20"/>
+    <Place Content_SaveButton="Sidebar:22"/>
     <Match DisplayType="Detail">
         <Place Parts_Contents_Publish="Content:5"/>
     </Match>
diff --git a/src/Orchard.Web/Core/Contents/Views/Content.PublishButton.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.PublishButton.cshtml
new file mode 100644
index 000000000..b8f48a08f
--- /dev/null
+++ b/src/Orchard.Web/Core/Contents/Views/Content.PublishButton.cshtml
@@ -0,0 +1,3 @@
+<fieldset class="publish-button">
+    <button type="submit" name="submit.Publish" value="submit.Publish">@T("Publish Now")</button>
+</fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/Content.SaveButton.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.SaveButton.cshtml
new file mode 100644
index 000000000..cab18005a
--- /dev/null
+++ b/src/Orchard.Web/Core/Contents/Views/Content.SaveButton.cshtml
@@ -0,0 +1,3 @@
+<fieldset class="save-button">
+    <button class="primaryAction" type="submit" name="submit.Save" value="submit.Save">@T("Save")</button>
+</fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
index e0f0cd87b..af834ed7e 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
@@ -4,9 +4,5 @@
     </div>
     <div class="secondary">
         @Display(Model.Sidebar)
-        @* todo: (heskew) remove when the CommonPart is adding the save button *@
-        <fieldset>
-            <button class="primaryAction" type="submit" name="submit.Save" value="submit.Save">@T("Save")</button>
-        </fieldset>
     </div>
 </div>
\ No newline at end of file
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/Placement.info b/src/Orchard.Web/Core/Localization/Placement.info
index d06608e6c..963f7a8c7 100644
--- a/src/Orchard.Web/Core/Localization/Placement.info
+++ b/src/Orchard.Web/Core/Localization/Placement.info
@@ -6,7 +6,7 @@
         Parts_Localization_ContentTranslations_SummaryAdmin
     -->
     <!-- edit shape just gets default placement -->
-    <Place Parts_Localization_ContentTranslations_Edit="Content:before.1"/>
+    <Place Parts_Localization_ContentTranslations_Edit="Content:0"/>
     <Match DisplayType="Detail">
         <Place Parts_Localization_ContentTranslations="Content:2"/>
     </Match>
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..130141afa 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -274,12 +274,8 @@
     <Content Include="Settings\Views\Admin\Index.cshtml" />
     <Content Include="Settings\Views\Admin\Culture.cshtml" />
     <Content Include="Contents\Views\Items\Content.Edit.cshtml" />
-    <Content Include="Routable\Placement.info">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Settings\Placement.info">
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="Routable\Placement.info" />
+    <Content Include="Settings\Placement.info" />
     <Content Include="Settings\Views\DisplayTemplates\CurrentCulture.cshtml" />
     <Content Include="Settings\Views\DisplayTemplates\RemovableCulture.cshtml" />
     <Content Include="Shapes\Module.txt" />
@@ -298,7 +294,6 @@
     <Content Include="Shapes\Views\HeadPreload.cshtml" />
     <Content Include="Shapes\Views\Message.cshtml" />
     <Content Include="Shapes\Views\NotFound.cshtml" />
-    <Content Include="Shapes\Views\UI\Switchable.cshtml" />
     <Content Include="Web.config" />
     <Content Include="XmlRpc\Module.txt" />
     <Content Include="Settings\Views\EditorTemplates\Parts\Settings.SiteSettingsPart.cshtml" />
@@ -359,18 +354,31 @@
     <Content Include="Contents\Views\Content.ControlWrapper.cshtml" />
     <Content Include="Contents\Views\Item\Display.cshtml" />
     <Content Include="Localization\Placement.info" />
-    <Content Include="Messaging\Placement.info">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Navigation\Placement.info">
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="Messaging\Placement.info" />
+    <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="Localization\Views\Parts\Localization.ContentTranslations.SummaryAdmin.cshtml" />
     <Content Include="Contents\Views\Items\Content.Summary.cshtml" />
     <Content Include="Shapes\Views\Pager.cshtml" />
+    <Content Include="Contents\Views\Content.SaveButton.cshtml" />
+    <Content Include="Contents\Views\Content.PublishButton.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/ResourceManifest.cs b/src/Orchard.Web/Core/Shapes/ResourceManifest.cs
index cb6505345..656acaf5c 100644
--- a/src/Orchard.Web/Core/Shapes/ResourceManifest.cs
+++ b/src/Orchard.Web/Core/Shapes/ResourceManifest.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Orchard.UI.Resources;
 
 namespace Orchard.Core.Shapes {
@@ -11,6 +7,11 @@ namespace Orchard.Core.Shapes {
             manifest.DefineScript("ShapesBase").SetUrl("base.js").SetDependencies("jQuery");
             manifest.DefineStyle("Shapes").SetUrl("site.css"); // todo: missing
             manifest.DefineStyle("ShapesSpecial").SetUrl("special.css");
+
+            manifest.DefineScript("Switchable").SetUrl("jquery.switchable.js")
+                .SetDependencies("jQuery")
+                .SetDependencies("ShapesBase");
+            manifest.DefineStyle("Switchable").SetUrl("jquery.switchable.css");
         }
     }
 }
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/UI/Switchable.cshtml b/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml
deleted file mode 100644
index 8f3d5b92c..000000000
--- a/src/Orchard.Web/Core/Shapes/Views/UI/Switchable.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-@{
-    Style.Require("Switchable");
-    Script.Require("Switchable");
-}
-@string.Format("{0} switchable", Model)
\ No newline at end of file
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/Media/web.config b/src/Orchard.Web/Media/web.config
new file mode 100644
index 000000000..b4210f3e0
--- /dev/null
+++ b/src/Orchard.Web/Media/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/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 1bad3749b..de39cc240 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -162,6 +162,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 c7d6fcf48..a5daf85ad 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 9586788e5..48430edc9 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -119,7 +119,11 @@
     <Content Include="Views\EditorTemplates\Settings.cshtml" />
     <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/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
index 42be7e649..14d2898fe 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
@@ -3,10 +3,13 @@ using System.Collections.Generic;
 using System.IO;
 using System.Web;
 using System.Web.Mvc;
+using JetBrains.Annotations;
+using Orchard.ContentManagement;
 using Orchard.Localization;
 using Orchard.Media.Models;
 using Orchard.Media.Services;
 using Orchard.Media.ViewModels;
+using Orchard.Settings;
 using Orchard.UI.Notify;
 using Orchard.Utility.Extensions;
 
@@ -153,6 +156,15 @@ namespace Orchard.Media.Controllers {
                 if (!ModelState.IsValid)
                     return View(viewModel);
 
+                // first validate them all
+                foreach (string fileName in Request.Files) {
+                    HttpPostedFileBase file = Request.Files[fileName];
+                    if (!_mediaService.FileAllowed(file)) {
+                        ModelState.AddModelError("File", T("That file type is not allowed.").ToString());
+                        return View(viewModel);
+                    }
+                }
+                // then save them
                 foreach (string fileName in Request.Files) {
                     HttpPostedFileBase file = Request.Files[fileName];
                     _mediaService.UploadMediaFile(viewModel.MediaPath, file);
@@ -195,10 +207,11 @@ namespace Orchard.Media.Controllers {
             }
         }
 
-        public ActionResult EditMedia(string name, string caption, DateTime lastUpdated, long size, string folderName, string mediaPath) {
+        public ActionResult EditMedia(string name, DateTime lastUpdated, long size, string folderName, string mediaPath) {
             var model = new MediaItemEditViewModel();
             model.Name = name;
-            model.Caption = caption ?? String.Empty;
+            // todo: reimplement
+            //model.Caption = caption ?? String.Empty;
             model.LastUpdated = lastUpdated;
             model.Size = size;
             model.FolderName = folderName;
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs
new file mode 100644
index 000000000..dd480a4c9
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs
@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+using Orchard.Data;
+using Orchard.ContentManagement.Handlers;
+using Orchard.Media.Models;
+
+namespace Orchard.Media.Handlers {
+    [UsedImplicitly]
+    public class MediaSettingsPartHandler : ContentHandler {
+        public MediaSettingsPartHandler(IRepository<MediaSettingsPartRecord> repository) {
+            Filters.Add(new ActivatingFilter<MediaSettingsPart>("Site"));
+            Filters.Add(StorageFilter.For(repository));
+            Filters.Add(new TemplateFilterForRecord<MediaSettingsPartRecord>("MediaSettings", "Parts/Media.MediaSettings"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Media/Migrations.cs
new file mode 100644
index 000000000..0830945b6
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Migrations.cs
@@ -0,0 +1,16 @@
+using Orchard.Data.Migration;
+using Orchard.Media.Models;
+
+namespace Orchard.Media {
+    public class MediaDataMigration : DataMigrationImpl {
+        public int Create() {
+            SchemaBuilder.CreateTable("MediaSettingsPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("UploadAllowedFileTypeWhitelist", c => c.WithDefault(MediaSettingsPartRecord.DefaultWhitelist).WithLength(255))
+                );
+
+            return 1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPart.cs
new file mode 100644
index 000000000..39228bf9c
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPart.cs
@@ -0,0 +1,11 @@
+using Orchard.ContentManagement;
+using System;
+
+namespace Orchard.Media.Models {
+    public class MediaSettingsPart : ContentPart<MediaSettingsPartRecord> {
+        public string UploadAllowedFileTypeWhitelist {
+            get { return Record.UploadAllowedFileTypeWhitelist; }
+            set { Record.UploadAllowedFileTypeWhitelist = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPartRecord.cs b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPartRecord.cs
new file mode 100644
index 000000000..758732576
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Models/MediaSettingsPartRecord.cs
@@ -0,0 +1,16 @@
+using System.Net.Mail;
+using Orchard.ContentManagement.Records;
+using System.ComponentModel.DataAnnotations;
+
+namespace Orchard.Media.Models {
+    public class MediaSettingsPartRecord : ContentPartRecord {
+        internal const string DefaultWhitelist = "jpg jpeg gif png txt doc docx xls xlsx pdf ppt pptx pps ppsx odt ods odp";
+        private string _whitelist = DefaultWhitelist;
+
+        [StringLength(255)]
+        public virtual string UploadAllowedFileTypeWhitelist {
+            get { return _whitelist; }
+            set { _whitelist = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
index 3bebf0e29..5c165af9b 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
@@ -71,6 +71,10 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Handlers\MediaSettingsPartHandler.cs" />
+    <Compile Include="Migrations.cs" />
+    <Compile Include="Models\MediaSettingsPart.cs" />
+    <Compile Include="Models\MediaSettingsPartRecord.cs" />
     <Compile Include="ResourceManifest.cs" />
     <Compile Include="Helpers\MediaHelpers.cs" />
     <Compile Include="Permissions.cs" />
@@ -113,6 +117,17 @@
     <Content Include="Views\Admin\EditProperties.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Parts\Media.MediaSettings.cshtml" />
+    <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/Services/IMediaService.cs b/src/Orchard.Web/Modules/Orchard.Media/Services/IMediaService.cs
index f8472cebf..2bba6e61c 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Services/IMediaService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Services/IMediaService.cs
@@ -13,5 +13,6 @@ namespace Orchard.Media.Services {
         void DeleteFile(string name, string folderName);
         void RenameFile(string name, string newName, string folderName);
         string UploadMediaFile(string folderName, HttpPostedFileBase postedFile);
+        bool FileAllowed(HttpPostedFileBase postedFile);
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs b/src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
index fad1229b9..bce9f1e9e 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
@@ -5,9 +5,12 @@ using System.Text;
 using System.Web;
 using ICSharpCode.SharpZipLib.Zip;
 using JetBrains.Annotations;
+using Orchard.ContentManagement;
 using Orchard.FileSystems.Media;
 using Orchard.Logging;
 using Orchard.Media.Models;
+using Orchard.Security;
+using Orchard.Settings;
 
 namespace Orchard.Media.Services {
     [UsedImplicitly]
@@ -21,6 +24,9 @@ namespace Orchard.Media.Services {
         }
 
         public ILogger Logger { get; set; }
+        protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
+        protected virtual IUser CurrentUser { get; [UsedImplicitly] private set; }
+
 
         public string GetPublicUrl(string path) {
             return _storageProvider.GetPublicUrl(path);
@@ -82,18 +88,18 @@ namespace Orchard.Media.Services {
         }
 
         public void RenameFile(string name, string newName, string folderName) {
-            _storageProvider.RenameFile(folderName + "\\" + name, folderName + "\\" + newName);
+            if (FileAllowed(newName, false)) {
+                _storageProvider.RenameFile(folderName + "\\" + name, folderName + "\\" + newName);
+            }
         }
 
         public string UploadMediaFile(string folderName, HttpPostedFileBase postedFile) {
-
             if (postedFile.FileName.EndsWith(".zip")) {
                 UnzipMediaFileArchive(folderName, postedFile);
                 // Don't save the zip file.
                 return _storageProvider.GetPublicUrl(folderName);
             }
-            
-            if (postedFile.ContentLength > 0) {
+            if (FileAllowed(postedFile) && postedFile.ContentLength > 0) {
                 var filePath = Path.Combine(folderName, Path.GetFileName(postedFile.FileName));
                 var inputStream = postedFile.InputStream;
 
@@ -104,6 +110,41 @@ namespace Orchard.Media.Services {
             return null;
         }
 
+        private bool FileAllowed(string name, bool allowZip) {
+            if (string.IsNullOrWhiteSpace(name)) {
+                return false;
+            }
+            var mediaSettings = CurrentSite.As<MediaSettingsPart>();
+            var allowedExtensions = mediaSettings.UploadAllowedFileTypeWhitelist.ToLowerInvariant().Split(' ');
+            var ext = (Path.GetExtension(name) ?? "").TrimStart('.').ToLowerInvariant();
+            if (string.IsNullOrWhiteSpace(ext)) {
+                return false;
+            }
+            // whitelist does not apply to the superuser
+            if (CurrentUser == null || !CurrentSite.SuperUser.Equals(CurrentUser.UserName, StringComparison.Ordinal)) {
+                // zip files at the top level are allowed since this is how you upload multiple files at once.
+                if (allowZip && ext.Equals("zip", StringComparison.OrdinalIgnoreCase)) {
+                    return true;
+                }
+                // must be in the whitelist
+                if (Array.IndexOf(allowedExtensions, ext) == -1) {
+                    return false;
+                }
+            }
+            // blacklist always applies
+            if (string.Equals(name.Trim(), "web.config", StringComparison.OrdinalIgnoreCase)) {
+                return false;
+            }
+            return true;
+        }
+
+        public bool FileAllowed(HttpPostedFileBase postedFile) {
+            if (postedFile == null) {
+                return false;
+            }
+            return FileAllowed(postedFile.FileName, true);
+        }
+
         private void SaveStream(string filePath, Stream inputStream) {
             var file = _storageProvider.CreateFile(filePath);
             var outputStream = file.OpenWrite();
@@ -139,12 +180,17 @@ namespace Orchard.Media.Services {
                         var entryName = Path.Combine(targetFolder, entry.Name);
                         var directoryName = Path.GetDirectoryName(entryName);
 
-                        try { _storageProvider.CreateFolder(directoryName); }
-                        catch {
-                            // no handling needed - this is to force the folder to exist if it doesn't
-                        }
+                        // skip disallowed files
+                        if (FileAllowed(entry.Name, false)) {
+                            try {
+                                _storageProvider.CreateFolder(directoryName);
+                            }
+                            catch {
+                                // no handling needed - this is to force the folder to exist if it doesn't
+                            }
 
-                        SaveStream(entryName, fileInflater);
+                            SaveStream(entryName, fileInflater);
+                        }
                     }
                 }
             }
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/ViewModels/MediaItemAddViewModel.cs b/src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaItemAddViewModel.cs
index b71641e71..eadef0eff 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaItemAddViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/ViewModels/MediaItemAddViewModel.cs
@@ -1,4 +1,6 @@
-namespace Orchard.Media.ViewModels {
+using Orchard.Media.Models;
+
+namespace Orchard.Media.ViewModels {
     public class MediaItemAddViewModel {
         public string FolderName { get; set; }
         public string MediaPath { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
index 6f1ac4f0d..9dee177e3 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
@@ -19,7 +19,7 @@
         @Html.ValidationSummary()
         <div class="primary">
 		    <div>
-		    <img src="@Model.PublicUrl" class="previewImage" alt="@Model.Caption" />
+		    <img src="@Model.PublicUrl" class="previewImage"/>
 		    </div>
 		    <fieldset>
 		        @* todo: make these real (including markup) *@
@@ -32,7 +32,7 @@
 			    </div>
 			    <div>
 			        <label for="embedPath">@T("Embed:")</label>
-			        <input id="embedPath" class="textMedium" name="embedPath" type="text" readonly="readonly" value="&lt;img src=&quot;@Href("~/Media/" + Model.RelativePath + "/" + Model.Name)&quot; @* width=&quot;500&quot; height=&quot;375&quot; *@ alt=&quot;@Model.Caption&quot; /&gt;" />
+			        <input id="embedPath" class="textMedium" name="embedPath" type="text" readonly="readonly" value="&lt;img src=&quot;@Model.PublicUrl&quot; @* width=&quot;500&quot; height=&quot;375&quot; *@ /&gt;" />
 			        <span class="hint">@T("Copy this html to add this image to your site.")</span>
 			      </div>
 			  
@@ -42,9 +42,6 @@
 			        <input id="NewName" class="textMedium" name="NewName" type="text" value="@Model.Name"/>
 			    </div>
                 <div>
-			        <label for="Caption">@T("Caption")</label>
-			        <input id="Caption" class="textMedium" name="Caption" type="text" value="@Model.Caption"/>
-			        <span class="hint">@T("This will be used for the image alt tag.")</span>
 			        <input type="hidden" id="LastUpdated" name="LastUpdated" value="@Model.LastUpdated"/>
 			        <input type="hidden" id="Size" name="Size" value="@Model.Size"/>
 			        <input type="hidden" id="FolderName" name="FolderName" value="@Model.FolderName"/>
@@ -58,7 +55,7 @@
 	    @*
         <div class="secondary" style="border:1px solid #ff0000;">
 		    <h2>@T("Preview")</h2>
-		    <div><img src="@Href("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))" class="previewImage" alt="@Model.Caption" /></div>
+		    <div><img src="@Href("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))" class="previewImage" /></div>
 		    <ul>
 		        @// todo: make these real (including markup)
 			    <li><label>@T("Dimensions: <span>500 x 375 pixels</span>")</label></li>
@@ -66,7 +63,7 @@
 			    <li><label>@T("Added on: <span>{0} by Orchard User</span>", Model.LastUpdated)</label></li>
 			    <li>
 			        <label for="embedPath">@T("Embed:")</label>
-			        <input id="embedPath" class="text" name="embedPath" type="text" readonly="readonly" value="@T("<img src=\"{0}\" width=\"{1}\" height=\"{2}\" alt=\"{3}\" />", ResolveUrl("~/Media/" + Model.RelativePath + "/" + Model.Name), 500, 375, Model.Caption)" />
+			        <input id="embedPath" class="text" name="embedPath" type="text" readonly="readonly" value="@T("<img src=\"{0}\" width=\"{1}\" height=\"{2}\" />", ResolveUrl("~/Media/" + Model.RelativePath + "/" + Model.Name), 500, 375)" />
 			        <span class="hint">@T("Copy this html to add this image to your site.")</p>
 			    </li>
 		    </ul>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.MediaSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.MediaSettings.cshtml
new file mode 100644
index 000000000..5cc0a1d31
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.MediaSettings.cshtml
@@ -0,0 +1,9 @@
+@model Orchard.Media.Models.MediaSettingsPartRecord
+
+<fieldset>
+    <legend>@T("Media Settings")</legend>
+    <div>
+        @Html.LabelFor(m => m.UploadAllowedFileTypeWhitelist, T("Upload allowed file types (list of extensions separated by spaces)")) 
+        @Html.TextBoxFor(m => m.UploadAllowedFileTypeWhitelist, new { @class = "textMedium" }) 
+    </div>
+</fieldset>
\ No newline at end of file
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 ff839c0d7..9bacc6bc8 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -106,7 +106,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/Admin/Features.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
index 673f34b24..839aa448d 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
@@ -4,14 +4,15 @@
 @using Orchard.Modules.ViewModels;
 @using Orchard.Utility.Extensions;
 @using Orchard.Modules.Models;
-
 @{
     Style.Require("ModulesAdmin");
+    Style.Require("Switchable");
+    Script.Require("Switchable");
 }
 
 <h1>@Html.TitleForPage(T("Manage Features").ToString())</h1>
 @if (Model.Features.Count() > 0) {
-<ul class="features summary-view">@{
+<ul class="features summary-view switchable">@{
     var featureGroups = Model.Features.OrderBy(f => f.Descriptor.Category, new DoghouseComparer("Core")).GroupBy(f => f.Descriptor.Category);
     foreach (var featureGroup in featureGroups) {
         var categoryName = LocalizedString.TextOrDefault(featureGroup.First().Descriptor.Category, T("Uncategorized"));
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 e6dfd3eba..76aeae4ed 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
@@ -100,6 +100,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 2d26b8dec..8b9868e5c 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">
@@ -121,6 +119,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/Drivers/PublishLaterPartDriver.cs b/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
index a8ba7544a..5724829e3 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
@@ -7,7 +7,6 @@ using Orchard.PublishLater.Services;
 using Orchard.PublishLater.ViewModels;
 using Orchard.Localization;
 using System.Globalization;
-using Orchard.Core.Localization.Services;
 
 namespace Orchard.PublishLater.Drivers {
     public class PublishLaterPartDriver : ContentPartDriver<PublishLaterPart> {
@@ -49,8 +48,8 @@ namespace Orchard.PublishLater.Drivers {
             // date and time are formatted using the same patterns as DateTimePicker is, preventing other cultures issues
             var model = new PublishLaterViewModel(part) {
                 ScheduledPublishUtc = part.ScheduledPublishUtc.Value,
-                ScheduledPublishDate = part.ScheduledPublishUtc.Value.HasValue ? part.ScheduledPublishUtc.Value.Value.ToLocalTime().ToString(DatePattern, CultureInfo.InvariantCulture) : String.Empty,
-                ScheduledPublishTime = part.ScheduledPublishUtc.Value.HasValue ? part.ScheduledPublishUtc.Value.Value.ToLocalTime().ToString(TimePattern, CultureInfo.InvariantCulture) : String.Empty
+                ScheduledPublishDate = part.ScheduledPublishUtc.Value.HasValue && !part.IsPublished() ? part.ScheduledPublishUtc.Value.Value.ToLocalTime().ToString(DatePattern, CultureInfo.InvariantCulture) : String.Empty,
+                ScheduledPublishTime = part.ScheduledPublishUtc.Value.HasValue && !part.IsPublished() ? part.ScheduledPublishUtc.Value.Value.ToLocalTime().ToString(TimePattern, CultureInfo.InvariantCulture) : String.Empty
             };
 
             return ContentShape("Parts_PublishLater_Edit",
@@ -60,27 +59,24 @@ namespace Orchard.PublishLater.Drivers {
             var model = new PublishLaterViewModel(part);
 
             updater.TryUpdateModel(model, Prefix, null, null);
-            switch (model.Command) {
-                case "PublishNow":
-                    _commonService.Publish(model.ContentItem);
-                    break;
-                case "PublishLater":
-                    DateTime scheduled;
-                    string parseDateTime = String.Concat(model.ScheduledPublishDate, " ", model.ScheduledPublishTime);
-                    
-                    // use an english culture as it is the one used by jQuery.datepicker by default
-                    if (DateTime.TryParse(parseDateTime, CultureInfo.GetCultureInfo("en-US"), DateTimeStyles.AssumeLocal, out scheduled)) {
-                        model.ScheduledPublishUtc = part.ScheduledPublishUtc.Value = scheduled.ToUniversalTime();
-                        _publishLaterService.Publish(model.ContentItem, model.ScheduledPublishUtc.Value);
-                    }
-                    else {
-                        updater.AddModelError(Prefix, T("{0} is an invalid date and time", parseDateTime));
-                    }
 
-                    break;
-                case "SaveDraft":
-                    break;
+            if (!string.IsNullOrWhiteSpace(model.ScheduledPublishDate) && !string.IsNullOrWhiteSpace(model.ScheduledPublishTime)) {
+                DateTime scheduled;
+                string parseDateTime = String.Concat(model.ScheduledPublishDate, " ", model.ScheduledPublishTime);
+
+                // use an english culture as it is the one used by jQuery.datepicker by default
+                if (DateTime.TryParse(parseDateTime, CultureInfo.GetCultureInfo("en-US"), DateTimeStyles.AssumeLocal, out scheduled)) {
+                    model.ScheduledPublishUtc = part.ScheduledPublishUtc.Value = scheduled.ToUniversalTime();
+                    _publishLaterService.Publish(model.ContentItem, model.ScheduledPublishUtc.Value);
+                }
+                else {
+                    updater.AddModelError(Prefix, T("{0} is an invalid date and time", parseDateTime));
+                }
             }
+            else if (!string.IsNullOrWhiteSpace(model.ScheduledPublishDate) || !string.IsNullOrWhiteSpace(model.ScheduledPublishTime)) {
+                updater.AddModelError(Prefix, T("Both the date and time need to be specified for when this is to be published. If you don't want to schedule publishing then clear both the date and time fields."));
+            }
+
             return ContentShape("Parts_PublishLater_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
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/Placement.info b/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
index f321cd6a5..e1671d67b 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
@@ -7,7 +7,7 @@
     -->
     <!-- edit shape just get default placement -->
     <!-- edit "shape" -->
-    <Place Parts_PublishLater_Edit="Sidebar:1"/>
+    <Place Parts_PublishLater_Edit="Sidebar:23"/><!-- immediately following the contents module's save button -->
     <!-- default positioning -->
     <Match DisplayType="SummaryAdmin">
         <Place Parts_PublishLater_Metadata_SummaryAdmin="Meta:1"/>
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/Styles/datetime.css b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/datetime.css
index 21684b460..af6b87158 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/datetime.css
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/datetime.css
@@ -7,8 +7,8 @@ html.dyn input.hinted {
     font-style:italic;
 }
 input#PublishLater_ScheduledPublishDate {
-    width:50%;
+    width:49%;
 }
 input#PublishLater_ScheduledPublishTime {
-    width:36%;
+    width:43%;
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/ViewModels/PublishLaterViewModel.cs b/src/Orchard.Web/Modules/Orchard.PublishLater/ViewModels/PublishLaterViewModel.cs
index 3961d56c4..4c5392c16 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/ViewModels/PublishLaterViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/ViewModels/PublishLaterViewModel.cs
@@ -11,7 +11,6 @@ namespace Orchard.PublishLater.ViewModels {
             _publishLaterPart = publishLaterPart;
         }
 
-        public string Command { get; set; }
         public ContentItem ContentItem { get { return _publishLaterPart.ContentItem; } }
 
         public bool IsPublished {
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
index 5b7681ce3..1ac58b8ee 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
@@ -4,48 +4,36 @@
     Script.Require("jQueryUI_DatePicker");
     Style.Require("PublishLater_DatePicker");
     Style.Require("jQueryUtils_TimePicker");
-    Style.Require("jQueryUI_DatePicker");
+    Style.Require("jQueryUI_DatePicker"); 
 }
-<fieldset>
+<fieldset class="publish-later-datetime">
     <legend>@T("Publish Settings")</legend>
-    <div>
-        @Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_SaveDraft") })
-        <label class="forcheckbox" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_SaveDraft")">@T("Save Draft")</label>
-    </div>
-    <div>
-        @Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishNow") })
-        <label class="forcheckbox" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishNow")">@T("Publish Now")</label>
-    </div>
-    <div>
-        @Html.RadioButton("Command", "PublishLater", Model.ScheduledPublishUtc != null, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater") })
-        <label class="forcheckbox" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")">@T("Publish Later")</label>
-    </div>
-    <div>
-        <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishDate")">@T("Date")</label>
-        @Html.EditorFor(m => m.ScheduledPublishDate)
-        <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishTime")">@T("Time")</label>
-        @Html.EditorFor(m => m.ScheduledPublishTime)
-    </div>
+    <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishDate")">@T("Date")</label>
+    @Html.EditorFor(m => m.ScheduledPublishDate)
+    <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishTime")">@T("Time")</label>
+    @Html.EditorFor(m => m.ScheduledPublishTime)
 </fieldset>
 @using(Script.Foot()) {
 <script type="text/javascript">
 //<![CDATA[
     $(function () {
+        var clearHint = function ($this) { if ($this.val() == $this.data("hint")) { $this.removeClass("hinted").val("") } };
+        var resetHint = function ($this) { setTimeout(function () { if (!$this.val()) { $this.addClass("hinted").val($this.data("hint")) } }, 300) };
         @* todo: (heskew) make a plugin *@
         $("label.forpicker").each(function () {
             var $this = $(this);
             var pickerInput = $("#" + $this.attr("for"));
-            pickerInput.data("hint", $this.text());
             if (!pickerInput.val()) {
+                pickerInput.data("hint", $this.text());
                 pickerInput.addClass("hinted")
-            .val(pickerInput.data("hint"))
-            .focus(function () { var $this = $(this); if ($this.val() == $this.data("hint")) { $this.removeClass("hinted").val("") } })
-            .blur(function () { var $this = $(this); setTimeout(function () { if (!$this.val()) { $this.addClass("hinted").val($this.data("hint")) } }, 300) });
+                    .val(pickerInput.data("hint"))
+                    .focus(function() {clearHint($(this));})
+                    .blur(function() {resetHint($(this));});
+                $this.closest("form").submit(function() {clearHint(pickerInput); pickerInput = 0;});
             }
         });
         $('#@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishDate")').datepicker({ showAnim: "" }).focus(function () { $('#@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")').attr("checked", "checked") });
         $('#@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishTime")').timepickr().focus(function () { $('#@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")').attr("checked", "checked") });
-
     })
 //]]>
 </script>
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 3da13ed25..12638ae72 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
@@ -111,6 +111,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 c8387cc74..349b88e5f 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -106,6 +106,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 655a14554..1c8eaf9af 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -108,6 +108,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/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
index 720cd4688..884143c24 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
@@ -6,9 +6,6 @@ namespace Orchard.Themes {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
             manifest.DefineStyle("ThemesAdmin").SetUrl("admin.css");
-            // todo: used by core\shapes -- move it?
-            manifest.DefineScript("Switchable").SetUrl("jquery.switchable.js").SetDependencies("jQuery");
-            manifest.DefineStyle("Switchable").SetUrl("jquery.switchable.css");
 
             // todo: include and define the min.js version too
             // todo: move EasySlider to common location, although it does not appear to be used anywhere right now
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 83673764a..a375dcbd1 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
@@ -122,6 +122,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/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
index 362228de1..d3c8ccb8d 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
@@ -19,6 +19,6 @@
     @Display(Model.User)
 
     <fieldset>
-        <input class="button primaryAction" type="submit" value="@T("Save") " />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
  } 
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 d599039a4..f8bd1b93c 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -126,6 +126,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 4ec031205..d9d0a43ee 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
@@ -111,6 +111,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 2d87f211c..77afab906 100644
--- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
+++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
@@ -158,6 +158,11 @@
     <Content Include="Scripts\plugins\searchreplace\langs\en_dlg.js" />
     <Content Include="Scripts\plugins\searchreplace\searchreplace.htm" />
   </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/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 8ae765e65..865e0ee9f 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -128,13 +128,13 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14
 .sections .primary {
     display:inline;
     float:left;
-    width:74.543%;
+    width:69.452%;
 }
 .sections .secondary {
     display:inline;
     float:left;
     margin-left:1.71%;
-    width:23.629%;
+    width:28.721%;
 }
 
 /* Headings and defaults
@@ -842,6 +842,29 @@ table .button {
 .settings legend {
     margin:0 0 -.4em 0;
 }
+/* Core Contents and Orchard.PublishLater */
+fieldset.save-button {
+    clear:none;
+    float:left;
+    padding-right:0;
+    width:auto;
+}
+fieldset.publish-later-datetime {
+    clear:none;
+    float:left;
+    min-width:13.6em;
+    padding-left:6px;
+    padding-right:0;
+    width:68%;
+}
+fieldset.publish-later-datetime legend {
+    display:none;
+}
+fieldset.publish-later-datetime input {
+    padding:1px;
+    text-align:center;
+    color:#666;
+}
 
 /* Fields
 ----------------------------------------------------------*/
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>
diff --git a/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs b/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
index 7f0817619..94109df69 100644
--- a/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
+++ b/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
@@ -1,4 +1,5 @@
-using System;
+#if !AZURE
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -45,7 +46,7 @@ namespace Orchard.FileSystems.Media {
 
         public string GetPublicUrl(string path) {
 
-            return _publicPath + path.Replace(Path.DirectorySeparatorChar, '/');
+            return Map(_publicPath + path.Replace(Path.DirectorySeparatorChar, '/'));
         }
 
         public IStorageFile GetFile(string path) {
@@ -248,4 +249,5 @@ namespace Orchard.FileSystems.Media {
         }
 
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/src/Tools/PackageIndexReferenceImplementation/Controllers/FeedController.cs b/src/Tools/PackageIndexReferenceImplementation/Controllers/FeedController.cs
index 06d6ef74b..9bcdaf383 100644
--- a/src/Tools/PackageIndexReferenceImplementation/Controllers/FeedController.cs
+++ b/src/Tools/PackageIndexReferenceImplementation/Controllers/FeedController.cs
@@ -16,6 +16,9 @@ using PackageIndexReferenceImplementation.Services;
 namespace PackageIndexReferenceImplementation.Controllers {
     [HandleError]
     public class FeedController : Controller {
+        private const string VersionTag = "Version";
+        private const string ExtensionsNamespace = "http://orchardproject.net";
+
         private readonly FeedStorage _feedStorage;
         private readonly MediaStorage _mediaStorage;
 
@@ -104,7 +107,12 @@ namespace PackageIndexReferenceImplementation.Controllers {
             }
 
             if ( !string.IsNullOrEmpty(packageProperties.Version) ) {
-                item.ElementExtensions.Add("Version", "http://orchardproject.net", packageProperties.Version);
+                var versionExtensions = item.ElementExtensions.Where(e => e.OuterName == VersionTag && e.OuterNamespace == ExtensionsNamespace);
+                foreach(var versionExtension in versionExtensions) {
+                    item.ElementExtensions.Remove(versionExtension);
+                }
+
+                item.ElementExtensions.Add(VersionTag, ExtensionsNamespace, packageProperties.Version);
             }
 
             var mediaIdentifier = packageProperties.Identifier + "-" + packageProperties.Version + ".zip";