diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index e6b02c59f..ed3cf33c0 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -131,6 +131,9 @@
   <ItemGroup>
     <Content Include="web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Document.cshtml" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Document.cshtml
similarity index 90%
rename from src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml
rename to src/Orchard.Web/Modules/Orchard.Setup/Views/Document.cshtml
index 694dea582..140b20cbb 100644
--- a/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Document.cshtml
@@ -1,23 +1,23 @@
-﻿@using Orchard.Mvc.Html;
-@using Orchard.UI.Resources;
-@{
-    RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
-    Script.Include("html5.js").UseCondition("lt IE 9").AtHead();
-
-    string title = Convert.ToString(Model.Title);
-    string siteName = Convert.ToString(WorkContext.CurrentSite.SiteName);
-}
-<!DOCTYPE html> 
-<html lang="@WorkContext.CurrentCulture" class="static @Html.ClassForPage()"> 
-<head> 
-    <meta charset="utf-8" />
-    <title>@Html.Title(title, siteName)</title> 
-    @Display(Model.Head)
-    <script>        (function (d) { d.className = "dyn" + d.className.substring(6, d.className.length); })(document.documentElement);</script> 
-</head> 
-<body>
-@* Layout (template) is in the Body zone @ the default position (nothing, zero, zilch) *@
-@Display(Model.Body)
-@Display(Model.Tail)
-</body>
+﻿@using Orchard.Mvc.Html;
+@using Orchard.UI.Resources;
+@{
+    RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
+    Script.Include("~/Core/Shapes/Scripts/html5.js").UseCondition("lt IE 9").AtHead();
+
+    string title = Convert.ToString(Model.Title);
+    string siteName = Convert.ToString(WorkContext.CurrentSite.SiteName);
+}
+<!DOCTYPE html> 
+<html lang="@WorkContext.CurrentCulture" class="static @Html.ClassForPage()"> 
+<head> 
+    <meta charset="utf-8" />
+    <title>@Html.Title(title, siteName)</title> 
+    @Display(Model.Head)
+    <script>        (function (d) { d.className = "dyn" + d.className.substring(6, d.className.length); })(document.documentElement);</script> 
+</head> 
+<body>
+@* Layout (template) is in the Body zone @ the default position (nothing, zero, zilch) *@
+@Display(Model.Body)
+@Display(Model.Tail)
+</body>
 </html>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
index d98317d1e..c9fdc1750 100644
--- a/src/Orchard.Web/Themes/Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -109,7 +109,6 @@
     <Content Include="TheAdmin\Styles\images\tableHeaderBackgroundRed.gif" />
     <Content Include="TheAdmin\Styles\site.css" />
     <Content Include="TheAdmin\Theme.txt" />
-    <Content Include="SafeMode\Views\Document.cshtml" />
     <Content Include="TheAdmin\Views\Layout.cshtml" />
   </ItemGroup>
   <ItemGroup>
