diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.cshtml
index 652feef47..cf10b0d50 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Fields/Common.TextField.cshtml
@@ -1,3 +1,3 @@
 @model Orchard.Core.Common.Fields.TextField
-@using Orchard.Utility.Extensions
+@using Orchard.Utility.Extensions;
 <p class="text-field"><span class="name">@Model.Name.CamelFriendly():</span> @Model.Value</p>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.cshtml
index 45bdd3478..7340291dc 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.cshtml
@@ -1,5 +1,5 @@
 @model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <div class="manage">
     @Html.ItemEditLinkWithReturnUrl(T("Edit").ToString(), Model.BodyPart.ContentItem)
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.cshtml
index 9a9ee2c1d..8c4356c0c 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.cshtml
@@ -1,5 +1,5 @@
 @model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 @/* begin: knowingly broken HTML (hence the ManageWrapperPre and ManageWrapperPost templates)
 we need "wrapper templates" (among other functionality) in the future of UI composition
 please do not delete or the front end will be broken when the user is authenticated. */
diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.cshtml
index c9182ef28..930523ad4 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.cshtml
@@ -1,3 +1,3 @@
 @model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <div class="managewrapper">
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml
index 64c03cd9b..aa05472da 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml
@@ -1,5 +1,5 @@
 @model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 @/*//doing excerpt generation on the way out for now so we don't stick ourselves with needing to regen excerpts for existing data
     //also, doing this here, inline, until we have a pluggable processing model (both in and out)
     //also, ...this is ugly*/
diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml
index b3b4584d8..0592419bf 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml
@@ -1,3 +1,3 @@
 @model BodyDisplayViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 @Model.Html
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml
index d5cbe0eee..fa8036d7e 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Core.Common.ViewModels.CommonMetadataViewModel
-@using Orchard.Core.Common.Extensions
+@using Orchard.Core.Common.Extensions;
 @if (Model.Creator != null) {
 <div class="metadata">
     <div class="posted">@T("Published by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T))</div>
diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.cshtml
index dc7e33c1a..580c02232 100644
--- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Body.cshtml
@@ -1,5 +1,5 @@
 @model BodyEditorViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <fieldset>
     <label>@T("Body")</label>
     @Html.Partial("EditorTemplates/" + Model.TextEditorTemplate, Model)
diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.cshtml
index 1548db8f3..6afd59c02 100644
--- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.cshtml
@@ -1,5 +1,5 @@
 @model ContainerEditorViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <fieldset>
     @Html.HiddenFor(m=>m.ContainerId)
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml
index 15e469413..87035578a 100644
--- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml
@@ -1,5 +1,5 @@
 @model OwnerEditorViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 <fieldset>
     @Html.LabelFor(m=>m.Owner)
     @Html.EditorFor(m=>m.Owner)
diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.cshtml
index a85559433..b4aab5ad4 100644
--- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.cshtml
@@ -1,3 +1,3 @@
 @model BodyEditorViewModel
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Core.Common.ViewModels;
 @Html.TextArea("Text", Model.Text, 25, 80, new { @class = Model.Format })
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml
index 48443cf55..7b357f372 100644
--- a/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml
@@ -1,4 +1,4 @@
-@using Orchard.Core.Contents.ViewModels
+@using Orchard.Core.Contents.ViewModels;
 @{
     var typeDisplayName = Model.TypeDisplayName;
     var pageTitle = T("Manage Content");
diff --git a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml
index e2d93ff18..cdd1c59f8 100644
--- a/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.ContentManagement
-@using Orchard.Utility.Extensions
+@using Orchard.ContentManagement;
+@using Orchard.Utility.Extensions;
 @{
     Script.Require("ShapesBase");
 }
diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
index f6850e19e..a082c49f0 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.ContentManagement
-@using Orchard.Utility.Extensions
+@using Orchard.ContentManagement;
+@using Orchard.Utility.Extensions;
 @{
 	ContentItem contentItem = Model.ContentItem;
 	var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
diff --git a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
index 6dd93bcb7..64214837e 100644
--- a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
+++ b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
@@ -1,5 +1,5 @@
 @model AddLocalizationViewModel
-@using Orchard.Core.Localization.ViewModels
+@using Orchard.Core.Localization.ViewModels;
 @{
     dynamic content = Model.Content;
     content.Zones.primary.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0");
diff --git a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml
index d68535ac5..0bde72b23 100644
--- a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml
+++ b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml
@@ -1,6 +1,6 @@
 @model MessageSettingsPartViewModel
-@using Orchard.Core.Messaging.Models
-@using Orchard.Core.Messaging.ViewModels
+@using Orchard.Core.Messaging.Models;
+@using Orchard.Core.Messaging.ViewModels;
 <fieldset>
     <legend>@T("Messaging")</legend>
     <div>
diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
index 9efc403b4..eb9698417 100644
--- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
@@ -1,7 +1,7 @@
 @model NavigationManagementViewModel
-@using Orchard.ContentManagement
-@using Orchard.Core.Navigation.Models
-@using Orchard.Core.Navigation.ViewModels
+@using Orchard.ContentManagement;
+@using Orchard.Core.Navigation.Models;
+@using Orchard.Core.Navigation.ViewModels;
 
 <h1>@Html.TitleForPage(T("Manage Main Menu").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
diff --git a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml
index 1e1a048f9..5d7b94c8a 100644
--- a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts/Navigation.EditMenuPart.cshtml
@@ -1,6 +1,6 @@
 @model MenuPart
-@using Orchard.Core.Navigation.Models
-@using Orchard.Core.Navigation.ViewModels
+@using Orchard.Core.Navigation.Models;
+@using Orchard.Core.Navigation.ViewModels;
 @{
     Script.Require("ShapesBase");
 }
diff --git a/src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml b/src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml
index 6dee247ed..d41f9bda4 100644
--- a/src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml
+++ b/src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml
@@ -1,5 +1,5 @@
 @model DisplayReportViewModel
-@using Orchard.Core.Reports.ViewModels
+@using Orchard.Core.Reports.ViewModels;
 <h1>@Html.TitleForPage(T("Display Report").ToString())</h1>
 @using(Html.BeginFormAntiForgeryPost()) {
 	@Html.ValidationSummary()
diff --git a/src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml
index 01ac13e91..90249bf4d 100644
--- a/src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml
@@ -1,5 +1,5 @@
 @model ReportsAdminIndexViewModel
-@using Orchard.Core.Reports.ViewModels
+@using Orchard.Core.Reports.ViewModels;
 <h1>@Html.TitleForPage(T("Manage Reports").ToString())</h1>
 @using(Html.BeginFormAntiForgeryPost()) {
 	@Html.ValidationSummary()
diff --git a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
index 44ea24b54..0b26db83a 100644
--- a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
+++ b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Core.Routable.ViewModels.RoutableEditorViewModel
-@using Orchard.Utility.Extensions
+@using Orchard.Utility.Extensions;
 @{ Script.Require("Slugify"); }
 
 <fieldset>
diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml b/src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml
index 82e1eaa3e..9dde5e792 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml
@@ -1,5 +1,5 @@
 @model SiteCulturesViewModel
-@using Orchard.Core.Settings.ViewModels
+@using Orchard.Core.Settings.ViewModels;
 <h1>@Html.TitleForPage(T("Cultures").ToString())</h1>
 <p class="breadcrumb">@Html.ActionLink(T("Manage Settings").Text, "index")@T(" &#62; ")@T("Supported Cultures")</p>
 <h3>@T("Available Cultures")</h3>
diff --git a/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml b/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml
index 696374e97..39954f3f0 100644
--- a/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts/Settings.SiteSettingsPart.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Core.Settings.ViewModels.SiteSettingsPartViewModel
-@using Orchard.Settings
+@using Orchard.Settings;
 @{
 	var resourceDebugMode = new SelectList(new object[] {
 		new { Id = (int)ResourceDebugMode.FromAppSetting, Text = "Use web.config setting" },
diff --git a/src/Orchard.Web/Core/Shapes/Views/Document.cshtml b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
index ba46a0fd9..98759ff34 100644
--- a/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
+++ b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Mvc.Html
-@using Orchard.UI.Resources
+@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")});
 }
diff --git a/src/Orchard.Web/Core/Shapes/Views/User.cshtml b/src/Orchard.Web/Core/Shapes/Views/User.cshtml
index f9bc647c5..f11a5ca62 100644
--- a/src/Orchard.Web/Core/Shapes/Views/User.cshtml
+++ b/src/Orchard.Web/Core/Shapes/Views/User.cshtml
@@ -1,4 +1,4 @@
-@using System.Web.Mvc
+@using System.Web.Mvc;
         <div class="user-display">
 @if (Request.IsAuthenticated) {
         @T("Welcome, <strong>{0}</strong>!", WorkContext.CurrentUser.UserName)
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml
index 34be7b760..181ea0445 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel
-@using Orchard.Mvc.Html
+@using Orchard.Mvc.Html;
 
 @if ((Model.IsPublished && Model.ScheduledArchiveUtc.HasValue && Model.ScheduledArchiveUtc.Value > DateTime.UtcNow)) { 
 <ul class="pageStatus">
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
index 538e603eb..1d2c1b6a5 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel
-@using System.Web.Mvc.Html
+@using System.Web.Mvc.Html;
 @{
     Style.Require("jQueryUtils_TimePicker");
     Style.Require("jQueryUI_DatePicker");
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml
index 591eb2680..f67493b8d 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml
@@ -1,4 +1,4 @@
-@using Orchard.Blogs.Extensions
+@using Orchard.Blogs.Extensions;
 <h1>@Html.TitleForPage(T("Manage Blogs").ToString())</h1>
 @if (Model.ContentItems.Items.Count > 0) { 
 <div class="actions"><a class="add button primaryAction" href="@Url.BlogCreate()">@T("New Blog")</a></div>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml
index 34b3fa14c..b8e34dcfc 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.ViewModels
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.ViewModels;
 @{
     BlogPostArchiveViewModel model = Model.Archives;
     Style.Require("BlogsArchives");
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.cshtml
index 99291fe1b..3f1d1f716 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogPost/ListByArchive.cshtml
@@ -1,4 +1,4 @@
-@using Orchard.Blogs.Extensions
+@using Orchard.Blogs.Extensions;
 <h1 class="page-title">@Html.TitleForPage(T("Archives").Text, (string)Model.ArchiveData.Year.ToString(), (string)(Model.ArchiveData.Month > 0 ? new DateTime(Model.ArchiveData.Year, Model.ArchiveData.Month, 1).ToString("MMMM") : null), (string)(Model.ArchiveData.Day > 0 ? Model.ArchiveData.Day.ToString() : null))</h1>
 <div class="archive-trail">
 @T("Archives") / 
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml
index e707e3f2b..ec9924e89 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml
@@ -1,4 +1,4 @@
-@using Orchard.Blogs.Extensions
+@using Orchard.Blogs.Extensions;
 @{
     Style.Require("BlogsAdmin");
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml
index c567e668a..e71d4bc6b 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Core.Contents.ViewModels
-@using Orchard.Utility.Extensions
+@using Orchard.Core.Contents.ViewModels;
+@using Orchard.Utility.Extensions;
 @if (Model.Items.Count > 0) {
     using (Html.BeginFormAntiForgeryPost(Url.Action("List", "Admin", new { area = "Contents", id = "" }))) {
     <fieldset class="bulk-actions">
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml
index a70e25b6e..3847f90ce 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
 <h1><a href="@Url.BlogForAdmin((string)Model.Slug)">@Html.TitleForPage((string)Model.Title)</a></h1>
 @Display(Model.manage)
 <div class="manage"><a href="@Url.BlogPostCreate((BlogPart)Model.ContentItem.Get(typeof(BlogPart)))" class="add button primaryAction">@T("New Post")</a></div>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml
index 9706d8c52..e99cc1c67 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.UI.Resources
+@using Orchard.Blogs.Extensions;
+@using Orchard.UI.Resources;
 @{
     RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) });
     RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) });
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
index 42697f22e..dfc127ab1 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
@@ -1,4 +1,4 @@
-@using Orchard.Blogs.Models
+@using Orchard.Blogs.Models;
 @{
     Html.AddTitleParts((string)Model.Title);
     BlogPostPart blogPost = Model.ContentItem.Get(typeof(BlogPostPart));
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml
index 87722010e..abb445ea0 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.Blog.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
 <h2>@Html.Link((string)Model.Title, Url.Blog((string)Model.Slug))</h2>
 @if (!string.IsNullOrEmpty((string)Model.Description)) {
     <p>@Model.Description</p>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml
index be565384a..f788fb89e 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml
@@ -1,8 +1,8 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
-@using Orchard.Core.Common.Extensions
-@using Orchard.Core.Common.Models
-@using Orchard.Core.Common.ViewModels
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
+@using Orchard.Core.Common.Extensions;
+@using Orchard.Core.Common.Models;
+@using Orchard.Core.Common.ViewModels;
 <h2>@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h2>
 <div class="meta">@Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T) | @Display(Model.meta)</div>
 <div class="content">@Display(Model.primary)</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml
index 4aedc8254..a1cb5f13e 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.Blog.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
 <div class="summary">
     <div class="related">
         <a href="@Url.Blog((string)Model.Slug)" title="@T("View")">@T("View")</a>@T(" | ")
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml
index 6678a2e21..e3a8ac0ba 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml
@@ -1,7 +1,7 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.Blogs.Models
-@using Orchard.ContentManagement
-@using Orchard.Utility.Extensions
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
+@using Orchard.ContentManagement;
+@using Orchard.Utility.Extensions;
 @{
 	ContentItem contentItem = Model.ContentItem;
 	var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml
index 89449f6f4..824e11983 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Comments.ViewModels.CommentsDetailsViewModel
-@using Orchard.Comments.Models
-@using Orchard.Comments.ViewModels
+@using Orchard.Comments.Models;
+@using Orchard.Comments.ViewModels;
 
 <h1>@Html.TitleForPage(T("Comments for {0}", Model.DisplayNameForCommentedItem).ToString())</h1>
 <div class="manage">
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 497c76545..62a826b00 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Comments.ViewModels.CommentsEditViewModel
-@using Orchard.Comments.Models
+@using Orchard.Comments.Models;
 
 <h1>@Html.TitleForPage(T("Edit Comment").ToString())</h1>
 @using(Html.BeginFormAntiForgeryPost()) { 
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 fb9dc2d53..d028b4fac 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Comments.ViewModels.CommentsIndexViewModel
-@using Orchard.Comments.Models
-@using Orchard.Comments.ViewModels
+@using Orchard.Comments.Models;
+@using Orchard.Comments.ViewModels;
 
 <h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1>
 @using(Html.BeginFormAntiForgeryPost()) { 
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml
index 3675fb42c..f52ac112d 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml
@@ -1,8 +1,8 @@
 @model Orchard.Comments.Models.CommentsPart
-@using Orchard.Comments.Models
-@using Orchard.Comments
-@using Orchard.Security
-@using Orchard.Utility.Extensions
+@using Orchard.Comments.Models;
+@using Orchard.Comments;
+@using Orchard.Security;
+@using Orchard.Utility.Extensions;
 
 @if (Model.Comments.Count > 0) { 
 <h2 id="comments">@T.Plural("1 Comment", "{0} Comments", Model.Comments.Count)</h2>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml
index e74dec37c..e6eafe670 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml
@@ -1,4 +1,4 @@
 @model Orchard.Comments.ViewModels.CommentCountViewModel
-@using Orchard.Comments.ViewModels
+@using Orchard.Comments.ViewModels;
 
 <span class="commentcount">@T.Plural("1 Comment", "{0} Comments", Model.CommentCount)</span>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml
index 3361f9d54..26bc8188d 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Comments.ViewModels.CommentCountViewModel
-@using Orchard.Comments.ViewModels
-@using Orchard.Comments.Extensions
+@using Orchard.Comments.ViewModels;
+@using Orchard.Comments.Extensions;
 
 <span class="commentcount">@Html.CommentSummaryLinks(T, Model.Item, Model.CommentCount, Model.PendingCount)</span>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml
index 5f19c245f..083a213b9 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml
@@ -1,7 +1,7 @@
 @model Orchard.Comments.Models.CommentsPart
-@using Orchard.Comments.Models
-@using Orchard.Comments.Extensions
-@using Orchard.Localization
+@using Orchard.Comments.Models;
+@using Orchard.Comments.Extensions;
+@using Orchard.Localization;
 
 <fieldset>
     <legend>@T("Comments") 
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml
index e1821785d..1a418d81f 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Comments.Models.CommentSettingsPartRecord
-@using Orchard.Comments.Models
+@using Orchard.Comments.Models;
 
 <fieldset>
     <legend>@T("Comments")</legend>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
index 25de5545d..9de2d99ae 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
@@ -1,5 +1,5 @@
 @model IEnumerable<Orchard.Comments.Models.CommentPart>
-@using Orchard.Comments.Models
+@using Orchard.Comments.Models;
 
 <ul class="comments">
 @foreach (var comment in Model) { 
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml
index 78621a9a5..19d636de7 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.ContentTypes.ViewModels.EditTypeViewModel
-@using Orchard.Core.Contents.Settings
+@using Orchard.Core.Contents.Settings;
 <div class="summary">
     <div class="properties">
         <h3>@Model.DisplayName</h3>@{ var creatable = Model.Settings.GetModel<ContentTypeSettings>().Creatable; }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml
index e0facc518..46f9fdcbe 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml
@@ -1,5 +1,5 @@
 @model SettingsDictionary
-@using Orchard.ContentManagement.MetaData.Models
+@using Orchard.ContentManagement.MetaData.Models;
 @if (Model.Any()) {
     @/*<h4>@T("Global Settings")</h4>*/
     <dl class="settings">@foreach (var setting in Model) {
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml
index 763428577..9d0cfe71d 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml
@@ -1,5 +1,5 @@
 @model SettingsDictionary
-@using Orchard.ContentManagement.MetaData.Models
+@using Orchard.ContentManagement.MetaData.Models;
 @if (Model.Any()) {
     <fieldset>
     @{ 
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml
index 160afff9e..a996198eb 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/Smtp.SiteSettings.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Email.Models.SmtpSettingsPart
-@using System.Net.Mail
+@using System.Net.Mail;
 
 <fieldset>
     <legend>@T("SMTP")</legend>
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml
index 16d13e884..f559dff71 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml
@@ -1,5 +1,5 @@
-@using Orchard
-@using Orchard.DisplayManagement.Descriptors
+@using Orchard;
+@using Orchard.DisplayManagement.Descriptors;
 @{
 	var workContext = ViewContext.GetWorkContext();
 	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml
index 917a1c009..e05941f9b 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Media.ViewModels.MediaItemAddViewModel
-@using Orchard.Media.Helpers
-@using Orchard.Media.Models
+@using Orchard.Media.Helpers;
+@using Orchard.Media.Models;
 @{ Style.Require("MediaAdmin"); }
 
 <h1>@Html.TitleForPage(T("Add Media").ToString())</h1>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml
index 10fe65007..4783387d6 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Media.ViewModels.MediaFolderCreateViewModel
-@using Orchard.Media.Helpers
-@using Orchard.Media.Models
+@using Orchard.Media.Helpers;
+@using Orchard.Media.Models;
 @{ Style.Require("MediaAdmin"); }
 
 <h1>@Html.TitleForPage(T("Add a Folder").ToString())</h1>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml
index 370c3421f..374b177ca 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Media.ViewModels.MediaFolderEditViewModel
-@using Orchard.Media.Helpers
-@using Orchard.Media.Models
+@using Orchard.Media.Helpers;
+@using Orchard.Media.Models;
 @{ Style.Require("MediaAdmin"); }
 
 <h1>@Html.TitleForPage(T("Manage Folder").ToString())</h1>
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 d0eb844d1..e3b0d0a56 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Media.ViewModels.MediaItemEditViewModel
-@using Orchard.Media.Helpers
-@using Orchard.Media.Models
+@using Orchard.Media.Helpers;
+@using Orchard.Media.Models;
 @{ Style.Require("MediaAdmin"); }
 
 <h1>@Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())</h1>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml
index 419e1005e..267c889f7 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Media.ViewModels.MediaFolderEditPropertiesViewModel
-@using Orchard.Media.Helpers
-@using Orchard.Media.Models
+@using Orchard.Media.Helpers;
+@using Orchard.Media.Models;
 @{ Style.Require("MediaAdmin"); }
 
 <h1>@Html.TitleForPage(T("Folder Properties").ToString())</h1>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
index 608893131..e8e8b50c8 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
@@ -1,5 +1,5 @@
 @model ModuleAddViewModel
-@using Orchard.Modules.ViewModels
+@using Orchard.Modules.ViewModels;
 @{
     Style.Require("ModulesAdmin");
 }
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 c4c3347b4..06f6d07cb 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
@@ -1,9 +1,9 @@
 @model FeaturesViewModel
-@using Orchard.Localization
-@using Orchard.Modules.Extensions
-@using Orchard.Modules.ViewModels
-@using Orchard.Utility.Extensions
-@using Orchard.Modules.Models
+@using Orchard.Localization;
+@using Orchard.Modules.Extensions;
+@using Orchard.Modules.ViewModels;
+@using Orchard.Utility.Extensions;
+@using Orchard.Modules.Models;
 
 @{
     Style.Require("ModulesAdmin");
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
index 494b041fb..42fb37faa 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml
@@ -1,7 +1,7 @@
 @model ModulesIndexViewModel
-@using Orchard.Modules.Extensions
-@using Orchard.Mvc.Html
-@using Orchard.Modules.ViewModels
+@using Orchard.Modules.Extensions;
+@using Orchard.Mvc.Html;
+@using Orchard.Modules.ViewModels;
 
 @{
     Style.Require("ModulesAdmin");
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml
index 2a6d4efbc..4b37b0682 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Environment.Configuration.ShellSettings
-@using Orchard.MultiTenancy.Extensions
+@using Orchard.MultiTenancy.Extensions;
 
 @using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { 
 	@Html.HiddenFor(ss => ss.Name) 
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForInvalid.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForInvalid.cshtml
index f7b1b22ed..5c55803f9 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForInvalid.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForInvalid.cshtml
@@ -1,4 +1,4 @@
 @model Orchard.Environment.Configuration.ShellSettings
-@using Orchard.MultiTenancy.Extensions
+@using Orchard.MultiTenancy.Extensions;
 
 @Html.ActionLink(T("Make Valid*").ToString(), "_setup", new {tenantName = Model.Name, area = "Orchard.MultiTenancy"})
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml
index ef3ceaed0..2e328bcd1 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Environment.Configuration.ShellSettings
-@using Orchard.MultiTenancy.Extensions
+@using Orchard.MultiTenancy.Extensions;
 
 @using(Html.BeginFormAntiForgeryPost(Url.Action("disable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { 
 	@Html.HiddenFor(ss => ss.Name)
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForUninitialized.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForUninitialized.cshtml
index 1031123c8..bd0749dac 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForUninitialized.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForUninitialized.cshtml
@@ -1,4 +1,4 @@
 @model Orchard.Environment.Configuration.ShellSettings
-@using Orchard.MultiTenancy.Extensions
+@using Orchard.MultiTenancy.Extensions;
 
 @Html.Link(T("Set Up").ToString(), Url.Tenant(Model))
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
index 72e186a12..0aecbcc75 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.MultiTenancy.ViewModels.TenantEditViewModel
-@using Orchard.Environment.Configuration
+@using Orchard.Environment.Configuration;
 
 <h1>@Html.TitleForPage(T("Edit Tenant").ToString())</h1> 
 @using (Html.BeginFormAntiForgeryPost()) { 
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
index 65edce358..f54d4bedd 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.MultiTenancy.ViewModels.TenantsIndexViewModel
-@using Orchard.MultiTenancy.Extensions
+@using Orchard.MultiTenancy.Extensions;
 
 @{ Style.Require("MultiTenancyAdmin"); }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml
index 75353742e..a42a6fbda 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml
@@ -1,5 +1,5 @@
 @model RoleCreateViewModel
-@using Orchard.Roles.ViewModels
+@using Orchard.Roles.ViewModels;
 <h1>@Html.TitleForPage(T("Add Role").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
     Html.ValidationSummary();
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml
index 5b290e72a..b80b1a24f 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml
@@ -1,5 +1,5 @@
 @model RoleEditViewModel
-@using Orchard.Roles.ViewModels
+@using Orchard.Roles.ViewModels;
 <h1>@Html.TitleForPage(T("Edit Role").ToString())</h1>
 @using(Html.BeginFormAntiForgeryPost()) {
     Html.ValidationSummary();
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
index fb40e7635..16fc00388 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
@@ -1,5 +1,5 @@
 @model RolesIndexViewModel
-@using Orchard.Roles.ViewModels
+@using Orchard.Roles.ViewModels;
 
 <h1>@Html.TitleForPage(T("Manage Roles").ToString())</h1>
 @using(Html.BeginFormAntiForgeryPost()) {
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml
index b8f8a28b8..07e19c24a 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml
@@ -1,5 +1,5 @@
 @model UserRolesViewModel
-@using Orchard.Roles.ViewModels
+@using Orchard.Roles.ViewModels;
 <fieldset>
     <legend>@T("Roles")</legend>
     @if (Model.Roles.Count > 0) {
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
index 74477ff3d..09a76ab1e 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Search.ViewModels.SearchSettingsViewModel
-@using Orchard.Search.ViewModels
+@using Orchard.Search.ViewModels;
 
 <fieldset>
     <legend>@T("Search")</legend>
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.cshtml
index c260b2e8a..ece06e4dd 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Search.ViewModels.SearchViewModel
-@using Orchard.Search.ViewModels
+@using Orchard.Search.ViewModels;
 
 @using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) { 
     <fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
index a1daff806..41b6c4592 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
@@ -1,5 +1,7 @@
 @model Orchard.Setup.ViewModels.SetupViewModel
 
+@Html.Partial("~/Themes/Classic/Theme.txt2")
+
 <h1>@Html.TitleForPage(T("Get Started").ToString())</h1>
 
 @using (Html.BeginFormAntiForgeryPost()) {
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
index e32bea943..f076ac19b 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
@@ -1,6 +1,6 @@
 @model Orchard.Tags.ViewModels.TagsAdminIndexViewModel
 
-@using Orchard.Tags.ViewModels
+@using Orchard.Tags.ViewModels;
 
 <h1>@Html.TitleForPage(T("Manage Tags").ToString()) </h1>
 
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Search.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Search.cshtml
index 0915a1e17..c90d2161b 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Search.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Search.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Tags.ViewModels.TagsAdminSearchViewModel
-@using Orchard.ContentManagement
+@using Orchard.ContentManagement;
 
 <h1>@Html.TitleForPage(T("List of contents tagged with {0}", Model.TagName).ToString())</h1>
 <table class="items">
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml
index e50093e6c..c99996f93 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.Users.ViewModels.UsersIndexViewModel
-@using Orchard.Users.Models
+@using Orchard.Users.Models;
 
 <h1>@Html.TitleForPage(T("Manage Users").ToString()) </h1>
 @using (Html.BeginFormAntiForgeryPost()) { 
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index f837f9eca..eebce664c 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -188,7 +188,7 @@
     <Content Include="Themes\Classic\Theme.png" />
     <Content Include="Themes\Classic\Theme.txt" />
     <Content Include="Themes\Classic\Views\Footer.cshtml" />
-    <Content Include="Themes\Classic\Views\Layout.ascx" />
+    <None Include="Themes\Classic\Views\Layout.cshtml" />
     <Content Include="Themes\Contoso\Content\Images\bkg.jpg" />
     <Content Include="Themes\Contoso\Content\Images\comment-arrow.png" />
     <Content Include="Themes\Contoso\Content\Images\content-bkg.png" />
diff --git a/src/Orchard.Web/Themes/Classic/Views/Layout.cshtml b/src/Orchard.Web/Themes/Classic/Views/Layout.cshtml
index ec7105b3a..f4fff7312 100644
--- a/src/Orchard.Web/Themes/Classic/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/Classic/Views/Layout.cshtml
@@ -1,14 +1,15 @@
-@using Orchard.UI.Resources
+@using Orchard.UI.Resources;
+
 @{
     Style.Include("site.css");
     Style.Include("blog.css");
 }
 <div id="wrapper">
-@// HTML.Include will render a div with a class="user-display"
-@// Can use this -> {Html.Include("User");}
-@// or the following. At least they appear to do the same thing currently. The first is a standard Html.Include, the second "displays the (New) User shape"
+@* HTML.Include will render a div with a class="user-display" *@
+@* Can use this -> {Html.Include("User");} *@
+@* or the following. At least they appear to do the same thing currently. The first is a standard Html.Include, the second "displays the (New) User shape" *@
 @Display.User()
-@// Top Navigation and branding
+@* Top Navigation and branding *@
 <div id="headercontainer">
     <div id="header">
         <h1>@WorkContext.CurrentSite.SiteName</h1>
@@ -21,14 +22,14 @@
 
 <div id="main">
         <div id="content">
-        @// Main Content
+        @* Main Content *@
 @Display(Model.Content)
         </div>
         <div id="sidebar">
 @Display(Model.search)
 @Display(Model.sidebar)
         </div>
-        @// End Content
+        @* End Content *@
 @Display.Footer(Navigation:Model.Navigation)
     </div>
 </div>
diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml
index 2fbc04bb5..3be2b0c58 100644
--- a/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/ClassicDark/Views/Layout.cshtml
@@ -1,4 +1,4 @@
-@using Orchard.UI.Resources
+@using Orchard.UI.Resources;
 @{
 	Style.Include("site.css");
 	Style.Include("blog.css");
diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml b/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml
index 018cc617e..5c6c111a9 100644
--- a/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml
+++ b/src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Mvc.Html
-@using Orchard.UI.Resources
+@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")});
 }
@@ -12,8 +12,8 @@
      //todo: (heskew) have resource modules that can be leaned on (like a jQuery module that knows about various CDNs and jQuery's version and min naming schemes)
      //todo: (heskew) this is an interim solution to inlude jQuery in every page and still allow that to be overriden in some theme by it containing a headScripts partial
      }
-     @//Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);
-     @//Html.Zone("head", ":metas :styles :scripts"); %>
+     @*Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);*@
+     @*Html.Zone("head", ":metas :styles :scripts"); %>*@
 	 @Display(Model.Head)
     <script>(function(d){d.className="dyn "+d.className.substring(7,d.length);})(document.documentElement);</script> 
 </head> 
diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Layout.cshtml b/src/Orchard.Web/Themes/SafeMode/Views/Layout.cshtml
index 2a6cbd3a1..8da098958 100644
--- a/src/Orchard.Web/Themes/SafeMode/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/SafeMode/Views/Layout.cshtml
@@ -1,4 +1,4 @@
-@using Orchard.UI.Resources
+@using Orchard.UI.Resources;
 @{
     Script.Require("jQuery");
     Script.Require("ShapesBase");
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml
index 399f26b92..24f145784 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml
@@ -1,5 +1,5 @@
-@using Orchard
-@using Orchard.DisplayManagement.Descriptors
+@using Orchard;
+@using Orchard.DisplayManagement.Descriptors;
 @{
 	var workContext = ViewContext.GetWorkContext();
 	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
index 52bb8daf6..8cfabed11 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
@@ -1,9 +1,9 @@
 @model dynamic
-@using Orchard.Security
-@using Orchard.DisplayManagement.Descriptors
-@using Orchard.UI.Resources
-@using Orchard
-@using Orchard.ContentManagement
+@using Orchard.Security;
+@using Orchard.DisplayManagement.Descriptors;
+@using Orchard.UI.Resources;
+@using Orchard;
+@using Orchard.ContentManagement;
 
 @{
     Style.Include("site.css");
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml
index b1081ad42..13e131baa 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Mvc.Html
-@using Orchard.UI.Resources
+@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")});
 }
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
index 9706d8c52..e99cc1c67 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
@@ -1,5 +1,5 @@
-@using Orchard.Blogs.Extensions
-@using Orchard.UI.Resources
+@using Orchard.Blogs.Extensions;
+@using Orchard.UI.Resources;
 @{
     RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) });
     RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) });