diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml
index 388ce7a2c..00ae966bd 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml
@@ -1,20 +1,21 @@
+@model Orchard.Experimental.ViewModels.CommandsExecuteViewModel
 <h1>
     @Html.TitleForPage(T("Command line").ToString())
 </h1>
 <div>
     @using (Html.BeginFormAntiForgeryPost(Url.Action("Execute"))) {
-        Html.ValidationSummary()
+        @Html.ValidationSummary()
         <ul>
             @for (int index = 0; index != (Model.History ?? new string[0]).Length; ++index) {
-            <li>
-                @Model.History[index]
-                @Html.HiddenFor(m => m.History[index])
-            </li>
-            }
+				<li>
+					@Model.History[index]
+					@Html.HiddenFor(m => m.History[index])
+				</li>
+			}
         </ul>
         @Html.LabelFor(m => m.CommandLine, T("Command Line"))
         @Html.TextBoxFor(m => m.CommandLine, new { style = "width:100%;" })
         @Html.ValidationMessageFor(m => m.CommandLine)
         <pre>@Model.Results</pre>
     }
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml
index aea6c14ec..62843e179 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml
@@ -3,7 +3,7 @@
 @Display(Model.Metadata.ChildContent)
 @{
 	var workContext = ViewContext.GetWorkContext();
-	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);
+	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.Name);
 <!--    
 	<ul>
 		@foreach(var binding in shapeTable.Bindings) {
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml
index f559dff71..120644bbe 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml
@@ -2,7 +2,7 @@
 @using Orchard.DisplayManagement.Descriptors;
 @{
 	var workContext = ViewContext.GetWorkContext();
-	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);
+	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.Name);
 	var descriptor = shapeTable.Descriptors[Model.Metadata.Type];	
 }