diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
index 9456c9336..e14226ad4 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
@@ -60,7 +60,7 @@
   <ItemGroup>
     <Content Include="Content\Admin\images\scheduled.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\datetime.css" />
+    <Content Include="Styles\orchard-archivelater-datetime.css" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Web.config" />
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/ResourceManifest.cs
index 301d84005..7e77ea2be 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/ResourceManifest.cs
@@ -7,7 +7,7 @@ using Orchard.UI.Resources;
 namespace Orchard.ArchiveLater {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("ArchiveLater_DatePicker").SetUrl("datetime.css");
+            builder.Add().DefineStyle("ArchiveLater_DatePicker").SetUrl("orchard-archivelater-datetime.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/datetime.css b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/orchard-archivelater-datetime.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/datetime.css
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/Styles/orchard-archivelater-datetime.css
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 612917f0a..650910b18 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -103,9 +103,9 @@
     <Content Include="Content\Admin\images\published.gif" />
     <Content Include="Content\Admin\images\scheduled.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Scripts\archives.js" />
-    <Content Include="Styles\admin.css" />
-    <Content Include="Styles\archives.css" />
+    <Content Include="Scripts\orchard-blogs-archives.js" />
+    <Content Include="Styles\orchard-blogs-admin.css" />
+    <Content Include="Styles\orchard-blogs-archives.css" />
     <Content Include="Views\BlogAdmin\Create.cshtml" />
     <Content Include="Views\BlogAdmin\Edit.cshtml" />
     <Content Include="Views\BlogAdmin\Item.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs
index 7706fc4b5..45e350ac7 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs
@@ -4,10 +4,10 @@ namespace Orchard.Blogs {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineStyle("BlogsAdmin").SetUrl("admin.css");
-            manifest.DefineStyle("BlogsArchives").SetUrl("archives.css");
+            manifest.DefineStyle("BlogsAdmin").SetUrl("orchard-blogs-admin.css");
+            manifest.DefineStyle("BlogsArchives").SetUrl("orchard-blogs-archives.css");
 
-            manifest.DefineScript("BlogsArchives").SetUrl("archives.js").SetDependencies("jQuery");
+            manifest.DefineScript("BlogsArchives").SetUrl("orchard-blogs-archives.js").SetDependencies("jQuery");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/archives.js b/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/orchard-blogs-archives.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Scripts/archives.js
rename to src/Orchard.Web/Modules/Orchard.Blogs/Scripts/orchard-blogs-archives.js
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/archives.css b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-archives.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Styles/archives.css
rename to src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-archives.css
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
index 3c9a5da73..5e580fe26 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Drivers\CommentsContainerPartDriver.cs" />
     <Compile Include="Drivers\CommentSettingsPartDriver.cs" />
     <Compile Include="Drivers\CommentsPartDriver.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Shapes.cs" />
     <Compile Include="Models\ClosedCommentsRecord.cs" />
     <Compile Include="Models\CommentPart.cs" />
@@ -97,7 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-comments-admin.css" />
     <Content Include="Views\Admin\Details.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Comments/ResourceManifest.cs
new file mode 100644
index 000000000..9424c9d3d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Comments/ResourceManifest.cs
@@ -0,0 +1,10 @@
+using Orchard.UI.Resources;
+
+namespace Orchard.Comments {
+    public class ResourceManifest : IResourceManifestProvider {
+        public void BuildManifests(ResourceManifestBuilder builder) {
+            var manifest = builder.Add();
+            manifest.DefineStyle("Admin").SetUrl("orchard-comments-admin.css");
+        }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Comments/Styles/orchard-comments-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Comments/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Comments/Styles/orchard-comments-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
index d7cbc72b6..a0f5fb09c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
@@ -11,7 +11,7 @@
         </div>
         <div>
             <label for="Email">@T("Email")</label>
-            <input id="Email" class="text" name="Email" type="text" value="@Model.Email" />				
+            <input id="Email" class="text" name="Email" type="text" value="@Model.Email" />
         </div>
         <div>
             <label for="SiteName">@T("Url")</label>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
index fc9f235fb..aecc00f7c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
@@ -4,7 +4,7 @@
 @using Orchard.Mvc.Html;
 @using Orchard.Utility.Extensions;
 @{
-    Style.Include("admin.css");
+    Style.Require("Admin");
     Script.Require("ShapesBase");
 }
 <h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
index bafffc9bc..b64a34b4e 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-contenttypes-admin.css" />
     <Content Include="Views\Admin\AddFieldTo.cshtml" />
     <Content Include="Views\Admin\AddPartsTo.cshtml" />
     <Content Include="Views\Admin\CreatePart.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ResourceManifest.cs
index 5333fa530..e8e4ee9df 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ResourceManifest.cs
@@ -7,7 +7,7 @@ using Orchard.UI.Resources;
 namespace Orchard.ContentTypes {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("ContentTypesAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("ContentTypesAdmin").SetUrl("orchard-contenttypes-admin.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/orchard-contenttypes-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/orchard-contenttypes-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
index 9dab01502..cb841e072 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
@@ -61,8 +61,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
-    <Content Include="Styles\base.css" />
+    <Content Include="Styles\orchard-localization-admin.css" />
+    <Content Include="Styles\orchard-localization-base.css" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Styles\Web.config">
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Localization/ResourceManifest.cs
index 3077f4e42..9782bf2d2 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/ResourceManifest.cs
@@ -4,8 +4,8 @@ namespace Orchard.Localization {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineStyle("Localization").SetUrl("base.css");
-            manifest.DefineStyle("LocalizationAdmin").SetUrl("admin.css");
+            manifest.DefineStyle("Localization").SetUrl("orchard-localization-base.css");
+            manifest.DefineStyle("LocalizationAdmin").SetUrl("orchard-localization-admin.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Localization/Styles/orchard-localization-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Localization/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Localization/Styles/orchard-localization-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Styles/base.css b/src/Orchard.Web/Modules/Orchard.Localization/Styles/orchard-localization-base.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Localization/Styles/base.css
rename to src/Orchard.Web/Modules/Orchard.Localization/Styles/orchard-localization-base.css
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
index 22c75db3e..10ef3e857 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
@@ -81,7 +81,7 @@
   <ItemGroup>
     <Content Include="Content\Admin\images\folder.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-media-admin.css" />
     <Content Include="Content\Site.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Media/ResourceManifest.cs
index dfd6a6009..ed339f5cd 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/ResourceManifest.cs
@@ -1,11 +1,9 @@
-using Orchard.Localization;
-using Orchard.UI.Navigation;
-using Orchard.UI.Resources;
+using Orchard.UI.Resources;
 
 namespace Orchard.Media {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("MediaAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("MediaAdmin").SetUrl("orchard-media-admin.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Media/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Media/Styles/orchard-media-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index 0528748b2..300a2c7c4 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -83,7 +83,7 @@
   <ItemGroup>
     <Content Include="Content\Admin\images\disabled.gif" />
     <Content Include="Content\Admin\images\enabled.gif" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-modules-admin.css" />
     <Content Include="Views\Admin\Features.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Modules/ResourceManifest.cs
index ef7366a20..ab12cf440 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/ResourceManifest.cs
@@ -7,7 +7,7 @@ using Orchard.UI.Resources;
 namespace Orchard.Modules {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("ModulesAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("ModulesAdmin").SetUrl("orchard-modules-admin.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css b/src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
index 0233f402b..350a06865 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
@@ -70,7 +70,7 @@
     <Content Include="Content\Admin\images\disabled.gif" />
     <Content Include="Content\Admin\images\enabled.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-multitenancy-admin.css" />
     <Content Include="Views\Admin\Add.cshtml" />
     <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Views\Admin\DisplayTemplates\ActionsForUninitialized.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/ResourceManifest.cs
index 201577eef..110849e87 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/ResourceManifest.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Orchard.UI.Resources;
 
 namespace Orchard.MultiTenancy {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("MultiTenancyAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("MultiTenancyAdmin").SetUrl("orchard-multitenancy-admin.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/orchard-multitenancy-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.MultiTenancy/Styles/orchard-multitenancy-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
index 0b508d971..0a74fabfd 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
@@ -87,7 +87,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-packaging-admin.css" />
     <Content Include="Views\Gallery\AddSource.cshtml" />
     <Content Include="Views\Gallery\Modules.cshtml" />
     <Content Include="Views\Gallery\Sources.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Packaging/ResourceManifest.cs
index ba08efacc..f5d87113a 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/ResourceManifest.cs
@@ -5,7 +5,7 @@ namespace Orchard.Packaging {
     [OrchardFeature("Gallery")]
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("PackagingAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("PackagingAdmin").SetUrl("orchard-packaging-admin.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Packaging/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj
index 4d655de45..c0bdc79e1 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj
@@ -83,7 +83,7 @@
     <Content Include="Content\Admin\images\published.gif" />
     <Content Include="Content\Admin\images\scheduled.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\datetime.css" />
+    <Content Include="Styles\orchard-publishlater-datetime.css" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\EditorTemplates\Parts\PublishLater.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.PublishLater/ResourceManifest.cs
index 242fc9ae0..cc06556c5 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/ResourceManifest.cs
@@ -7,7 +7,7 @@ using Orchard.UI.Resources;
 namespace Orchard.PublishLater {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("PublishLater_DatePicker").SetUrl("datetime.css");
+            builder.Add().DefineStyle("PublishLater_DatePicker").SetUrl("orchard-publishlater-datetime.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/datetime.css b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/orchard-publishlater-datetime.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.PublishLater/Styles/datetime.css
rename to src/Orchard.Web/Modules/Orchard.PublishLater/Styles/orchard-publishlater-datetime.css
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
index de001d392..6974be751 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -70,8 +70,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
-    <Content Include="Styles\search.css" />
+    <Content Include="Styles\orchard-search-admin.css" />
+    <Content Include="Styles\orchard-search-search.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Search/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Search/ResourceManifest.cs
index e3e081244..924c94164 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/ResourceManifest.cs
@@ -7,8 +7,8 @@ using Orchard.UI.Resources;
 namespace Orchard.Search {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("SearchAdmin").SetUrl("admin.css"); // todo: this does not appear to be used anywhere
-            builder.Add().DefineStyle("Search").SetUrl("search.css");
+            builder.Add().DefineStyle("SearchAdmin").SetUrl("orchard-search-admin.css"); // todo: this does not appear to be used anywhere
+            builder.Add().DefineStyle("Search").SetUrl("orchard-search-search.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Search/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Styles/search.css b/src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-search.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Search/Styles/search.css
rename to src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-search.css
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
index 2ac3ab8f5..e019d6461 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
@@ -77,7 +77,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-tags-admin.css" />
     <Content Include="Views\Web.config" />
     <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Tags/ResourceManifest.cs
index e09968be9..6c8a5907e 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/ResourceManifest.cs
@@ -3,7 +3,7 @@ using Orchard.UI.Resources;
 namespace Orchard.Tags {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("TagsAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("TagsAdmin").SetUrl("orchard-tags-admin.css");
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Tags/Styles/orchard-tags-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Tags/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Tags/Styles/orchard-tags-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index 61fffbea7..7e66d29d1 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -69,7 +69,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\orchard.ico" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-themes-admin.css" />
     <Content Include="Views\Admin\Index.cshtml" />
     <Content Include="Views\Admin\Install.cshtml" />
     <Content Include="Views\ThemePreview.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
index 884143c24..ca9e46c13 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
@@ -5,7 +5,7 @@ namespace Orchard.Themes {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineStyle("ThemesAdmin").SetUrl("admin.css");
+            manifest.DefineStyle("ThemesAdmin").SetUrl("orchard-themes-admin.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/admin.css b/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index 19f798c0a..d01a15371 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -82,7 +82,7 @@
     <Content Include="Content\Admin\images\moveup.gif" />
     <Content Include="Content\Admin\images\movedown.gif" />
     <Content Include="Module.txt" />
-    <Content Include="Styles\admin.css" />
+    <Content Include="Styles\orchard-widgets-admin.css" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Widgets/ResourceManifest.cs
index 818280685..51724e692 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/ResourceManifest.cs
@@ -3,7 +3,7 @@
 namespace Orchard.Widgets {
     public class ResourceManifest : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("WidgetsAdmin").SetUrl("admin.css");
+            builder.Add().DefineStyle("WidgetsAdmin").SetUrl("orchard-widgets-admin.css");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css