diff --git a/src/Orchard.Profile/profiling-setup-commands.txt b/src/Orchard.Profile/profiling-setup-commands.txt
index 312f31de7..e92196cf8 100644
--- a/src/Orchard.Profile/profiling-setup-commands.txt
+++ b/src/Orchard.Profile/profiling-setup-commands.txt
@@ -1,3 +1,3 @@
-setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,ContentsLocation,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Futures.Widgets,Orchard.Media,Orchard.Tags,Orchard.DevTools
+setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,ContentsLocation,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.DevTools
 add profiling data
 feature disable Orchard.DevTools
diff --git a/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs b/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
index 3fda688ac..b1b02311c 100644
--- a/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
+++ b/src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
@@ -41,6 +41,7 @@ namespace Orchard.Tests.DisplayManagement {
             public string Author { get; set; }
             public string HomePage { get; set; }
             public string Tags { get; set; }
+            public string Zones { get; set; }
         }
 
 
diff --git a/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po b/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po
index 67218a326..a1e053307 100644
--- a/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po
+++ b/src/Orchard.Web/Core/App_Data/Localization/en-US/orchard.core.po
@@ -93,16 +93,6 @@ msgstr "Invalid serial number for shell descriptor"
 msgid "Manage Settings"
 msgstr "Manage Settings"
 
-#: ~/Modules/Futures.Widgets/Controllers/AdminController.cs
-#| msgid : "Designer notes not found."
-msgid "Designer notes not found."
-msgstr "Designer notes not found."
-
-#: ~/Modules/Futures.Widgets/Views/Admin/Edit.ascx
-#| msgid : "Edit Widget"
-msgid "Edit Widget"
-msgstr "Edit Widget"
-
 #: ~/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
 #| msgid : "Not allowed to create blogs"
 msgid "Not allowed to create blogs"
@@ -1953,6 +1943,26 @@ msgstr "Edit"
 msgid "Remove"
 msgstr "Remove"
 
+#: ~/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
+#| msgid : "Manage Layers"
+msgid "Manage Layers"
+msgstr "Manage Layers"
+
+#: ~/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
+#| msgid : "Add a new layer"
+msgid "Add a new layer"
+msgstr "Add a new layer"
+
+#: ~/Modules/Orchard.Widgets/AdminMenu.cs
+#| msgid : "Manage Widgets"
+msgid "Manage Widgets"
+msgstr "Manage Widgets"
+
+#: ~/Modules/Orchard.Widgets/AdminMenu.cs
+#| msgid : "Widgets"
+msgid "Widgets"
+msgstr "Widgets"
+
 #: ~/Themes/Classic/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx
 #| msgid : "nobody(?)"
 msgid "nobody(?)"
diff --git a/src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs b/src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs
index 34cbb05ab..e0d35b2e9 100644
--- a/src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs
+++ b/src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs
@@ -1,7 +1,7 @@
 namespace Orchard.Core.Contents.Settings {
     public class ContentTypeSettings {
         /// <summary>
-        /// This setting is used to display a Content Type in Content Mamagement menu like
+        /// This setting is used to display a Content Type in Content Management menu like
         /// </summary>
         public bool Creatable { get; set; }
     }
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs
deleted file mode 100644
index 660213447..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Mvc;
-using Futures.Widgets.Models;
-using Futures.Widgets.ViewModels;
-using Orchard;
-using Orchard.ContentManagement;
-using Orchard.Core.Common.Models;
-using Orchard.Localization;
-using Orchard.Services;
-using Orchard.Settings;
-using Orchard.UI.Notify;
-
-namespace Futures.Widgets.Controllers {
-    [ValidateInput(false)]
-    public class AdminController : Controller, IUpdateModel {
-        private readonly IEnumerable<IHtmlFilter> _htmlFilters;
-
-        public AdminController(IOrchardServices services, IEnumerable<IHtmlFilter> htmlFilters) {
-            _htmlFilters = htmlFilters;
-            Services = services;
-            T = NullLocalizer.Instance;
-        }
-
-        private IOrchardServices Services { get; set; }
-        protected virtual ISite CurrentSite { get; set; }
-        public Localizer T{ get; set;}
-
-        public ActionResult AddWidget(string zoneName, string themeName, string returnUrl) {
-            var hasWidgetsRecord = CurrentSite.As<WidgetsPart>().Record;
-
-            var virtualPath = "~/Themes/" + themeName + "/Zones/" + zoneName + ".html";
-            var physicalPath = Server.MapPath(virtualPath);
-
-            if (!System.IO.File.Exists(physicalPath)) {
-                Services.Notifier.Error(T("Designer notes not found."));
-                return Redirect(returnUrl);
-            }
-
-            var fileText = _htmlFilters
-                .Aggregate(System.IO.File.ReadAllText(physicalPath), (text, filter) => filter.ProcessContent(text));
-
-            var widget = Services.ContentManager.Create<WidgetPart>("HtmlWidget", init => {
-                init.Record.Scope = hasWidgetsRecord;
-                init.Record.Zone = zoneName;
-                init.Record.Position = "1";
-                init.As<BodyPart>().Text = fileText;
-            });
-
-            return RedirectToAction("Edit", new { widget.ContentItem.Id, returnUrl });
-        }
-
-        public ActionResult Edit(int id, string returnUrl) {
-            var widget = Services.ContentManager.Get(id);
-            var viewModel = new WidgetEditViewModel {
-                Widget = Services.ContentManager.BuildEditorModel(widget),
-                ReturnUrl = returnUrl,
-            };
-            return View(viewModel);
-        }
-
-        [HttpPost, ActionName("Edit")]
-        public ActionResult EditPOST(int id, string returnUrl) {
-            var widget = Services.ContentManager.Get(id);
-            var viewModel = new WidgetEditViewModel {
-                Widget = Services.ContentManager.UpdateEditorModel(widget, this),
-                ReturnUrl = returnUrl,
-            };
-            if (ModelState.IsValid == false) {
-                return View(viewModel);
-            }
-            if (string.IsNullOrEmpty(returnUrl)) {
-                return RedirectToAction("Edit", new { id });
-            }
-            return Redirect(returnUrl);
-        }
-
-
-        bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
-            return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
-        }
-
-        void IUpdateModel.AddModelError(string key, LocalizedString errorMessage) {
-            ModelState.AddModelError(key, errorMessage.ToString());
-        }
-    }
-}
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Controllers/WidgetDriver.cs b/src/Orchard.Web/Modules/Futures.Widgets/Controllers/WidgetDriver.cs
deleted file mode 100644
index 226c08f12..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/Controllers/WidgetDriver.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Web.Routing;
-using Futures.Widgets.Models;
-using Orchard.ContentManagement.Drivers;
-
-namespace Futures.Widgets.Controllers {
-    public class WidgetDriver : ContentItemDriver<Widget> {
-        protected override RouteValueDictionary GetEditorRouteValues(Widget item) {
-            return new RouteValueDictionary {
-                                                {"Area", "Futures.Widgets"},
-                                                {"Controller", "Admin"},
-                                                {"Action", "Edit"},
-                                                {"Id", item.ContentItem.Id}
-                                            };
-        }
-
-        protected override bool UseDefaultTemplate {
-            get { return true; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs b/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs
deleted file mode 100644
index 42536c9a3..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Orchard.ContentManagement.MetaData;
-using Orchard.Data.Migration;
-
-namespace Futures.Widgets.DataMigrations {
-    public class WidgetsDataMigration : DataMigrationImpl {
-
-        public int Create() {
-            //CREATE TABLE Futures_Widgets_HasWidgetsRecord (Id INTEGER not null, primary key (Id));
-            SchemaBuilder.CreateTable("WidgetsPartRecord", table => table
-                .Column<int>("Id", column => column.PrimaryKey())
-                );
-
-            //CREATE TABLE Futures_Widgets_WidgetRecord (Id INTEGER not null, Zone TEXT, Position TEXT, Scope_id INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("WidgetPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("Zone")
-                .Column<string>("Position")
-                .Column<int>("Scope_id")
-                );
-
-            return 1;
-        }
-
-        public int UpdateFrom1() {
-            ContentDefinitionManager.AlterTypeDefinition("HtmlWidget",
-                cfg => cfg
-                    .WithPart("WidgetPart")
-                    .WithPart("BodyPart")
-                );
-
-            return 2;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Handlers/WidgetsPartHandler.cs b/src/Orchard.Web/Modules/Futures.Widgets/Handlers/WidgetsPartHandler.cs
deleted file mode 100644
index d6dfe0d1b..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/Handlers/WidgetsPartHandler.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Linq;
-using Futures.Widgets.Models;
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Data;
-
-namespace Futures.Widgets.Handlers {
-    public class WidgetsPartHandler : ContentHandler {
-        public WidgetsPartHandler(
-            IRepository<WidgetsPartRecord> widgetsRepository,
-            IRepository<WidgetPartRecord> widgetRepository) {
-
-            Filters.Add(new ActivatingFilter<WidgetsPart>("Site"));
-
-            // providing standard storage support for widget records
-            Filters.Add(StorageFilter.For(widgetsRepository));
-            Filters.Add(StorageFilter.For(widgetRepository));
-
-            OnLoaded<WidgetsPart>(
-                (ctx, part) => part.WidgetField.Loader(
-                                   () => ctx.ContentManager
-                                             .Query<WidgetPart, WidgetPartRecord>()
-                                             .Where(x => x.Scope == part.Record)
-                                             .List().ToList()));
-        }
-    }
-}
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetPart.cs b/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetPart.cs
deleted file mode 100644
index 10b75be45..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetPart.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Orchard.ContentManagement;
-
-namespace Futures.Widgets.Models {
-    public class WidgetPart : ContentPart<WidgetPartRecord> {
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetsPart.cs b/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetsPart.cs
deleted file mode 100644
index ed6ab382b..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetsPart.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using Orchard.ContentManagement;
-using Orchard.Core.Common.Utilities;
-
-namespace Futures.Widgets.Models {
-    public class WidgetsPart : ContentPart<WidgetsPartRecord> {
-        public LazyField<IList<WidgetPart>> WidgetField = new LazyField<IList<WidgetPart>>();
-        public IList<WidgetPart> Widgets { get { return WidgetField.Value; } set { WidgetField.Value = value; } }
-    }
-}
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetsPartRecord.cs b/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetsPartRecord.cs
deleted file mode 100644
index a6cc3ba73..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetsPartRecord.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Orchard.ContentManagement.Records;
-
-namespace Futures.Widgets.Models {
-    public class WidgetsPartRecord : ContentPartRecord {
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Module.txt b/src/Orchard.Web/Modules/Futures.Widgets/Module.txt
deleted file mode 100644
index 60fe64be1..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/Module.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Widgets
-antiforgery: enabled
-author: The Orchard Team
-website: http://orchardproject.net
-version: 0.5.0
-orchardversion: 0.5.0
-description: A prototype implementation of Orchard widgets that only allows for editable global text regions.
-features:
-    Futures.Widgets:
-        Description: Widgets container with simple inline content editing widget.
-        Category: Widget
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/ViewModels/WidgetEditViewModel.cs b/src/Orchard.Web/Modules/Futures.Widgets/ViewModels/WidgetEditViewModel.cs
deleted file mode 100644
index ac510a24a..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/ViewModels/WidgetEditViewModel.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace Futures.Widgets.ViewModels {
-    public class WidgetEditViewModel  {
-        public dynamic Widget { get; set; }
-        public string ReturnUrl { get; set;}
-    }
-}
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.cshtml
deleted file mode 100644
index ade5e31cf..000000000
--- a/src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.cshtml
+++ /dev/null
@@ -1,9 +0,0 @@
-@model Futures.Widgets.ViewModels.WidgetEditViewModel
-
-<h1>@Html.TitleForPage(T("Edit Widget").ToString())</h1>
-
-@using (Html.BeginFormAntiForgeryPost()) { 
-    @Html.ValidationSummary()
-    @Display(Model.Widget)
-	@Html.HiddenFor(m => m.ReturnUrl)
-} 
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 1255bd59f..cfb379e2f 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -91,8 +91,7 @@ namespace Orchard.Setup.Services {
                     "Orchard.Comments",
                     "Orchard.Tags",
                     "Orchard.Media",
-                    "Futures.Widgets",
-
+                    "Orchard.Widgets",
                     "Orchard.DevTools",
                     "Orchard.jQuery"
                 };
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
index a01a216f9..362b3d0ce 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
@@ -115,6 +115,7 @@ namespace Orchard.Setup {
                 public string Author { get; set; }
                 public string HomePage { get; set; }
                 public string Tags { get; set; }
+                public string Zones { get; set; }
             }
 
             private readonly SafeModeTheme _theme = new SafeModeTheme {
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs b/src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
index a37d52819..3f650246c 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
@@ -45,18 +45,18 @@ namespace Orchard.Themes.DesignerNotes {
             var accessAdminPanel = _authorizationService.TryCheckAccess(
                 StandardPermissions.AccessAdminPanel, CurrentUser, null);
             if (accessAdminPanel) {
-                //Temporary: Don't show "edit" button if "Futures.Widgets" is not enabled.
+                //Temporary: Don't show "edit" button if "Orchard.Widgets" is not enabled.
                 accessAdminPanel = _shellDescriptorManager
                     .GetShellDescriptor()
                     .Features
-                    .Any(f => f.Name == "Futures.Widgets");
+                    .Any(f => f.Name == "Orchard.Widgets");
             }
 
             var writer = context.Html.ViewContext.Writer;
             if (accessAdminPanel) {
                 writer.Write("<div class=\"managewrapper\"><div class=\"manage\">");
                 writer.Write(context.Html.ActionLink(T("Edit").ToString(), "AddWidget", new {
-                                                                                  Area = "Futures.Widgets",
+                                                                                  Area = "Orchard.Widgets",
                                                                                   Controller = "Admin",
                                                                                   context.ZoneName,
                                                                                   theme.ThemeName,
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs b/src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs
index dcbf87c91..6b5b2f8f0 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs
@@ -7,5 +7,6 @@
         public string Author { get; set; }
         public string HomePage { get; set; }
         public string Tags { get; set; }
+        public string Zones { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs b/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
index 2733847f4..8bf2e49eb 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
@@ -72,7 +72,8 @@ namespace Orchard.Themes.Services {
                                          HomePage = descriptor.WebSite ?? String.Empty,
                                          ThemeName = descriptor.Name,
                                          Version = descriptor.Version ?? String.Empty,
-                                         Tags = descriptor.Tags ?? String.Empty
+                                         Tags = descriptor.Tags ?? String.Empty,
+                                         Zones = descriptor.Zones ?? String.Empty,
                                      };
                 }
             }
@@ -90,7 +91,8 @@ namespace Orchard.Themes.Services {
                                                 HomePage = descriptor.WebSite ?? String.Empty,
                                                 ThemeName = descriptor.Name,
                                                 Version = descriptor.Version ?? String.Empty,
-                                                Tags = descriptor.Tags ?? String.Empty
+                                                Tags = descriptor.Tags ?? String.Empty,
+                                                Zones = descriptor.Zones ?? String.Empty,
                                             };
                     if (!theme.Tags.Contains("hidden")) {
                         themes.Add(theme);
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Widgets/AdminMenu.cs
new file mode 100644
index 000000000..d30656957
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/AdminMenu.cs
@@ -0,0 +1,15 @@
+using Orchard.Localization;
+using Orchard.UI.Navigation;
+
+namespace Orchard.Widgets {
+    public class AdminMenu : INavigationProvider {
+        public Localizer T { get; set; }
+        public string MenuName { get { return "admin"; } }
+
+        public void GetNavigation(NavigationBuilder builder) {
+            builder.Add(T("Widgets"), "10",
+                        menu => menu
+                                    .Add(T("Manage Widgets"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Widgets" }).Permission(Permissions.ManageWidgets)));
+        }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
new file mode 100644
index 000000000..1d2cc8e31
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
@@ -0,0 +1,21 @@
+using System.Web.Mvc;
+using Orchard.Localization;
+using Orchard.Settings;
+
+namespace Orchard.Widgets.Controllers {
+    [ValidateInput(false)]
+    public class AdminController : Controller {
+        public AdminController(IOrchardServices services) {
+            Services = services;
+            T = NullLocalizer.Instance;
+        }
+
+        private IOrchardServices Services { get; set; }
+        protected virtual ISite CurrentSite { get; set; }
+        public Localizer T { get; set; }
+
+        public ActionResult Index() {
+            return View();
+        }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
similarity index 50%
rename from src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs
rename to src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
index 7e639b4eb..2fcf4b879 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
@@ -1,13 +1,11 @@
-using System.Web.Mvc;
-using Futures.Widgets.Models;
-using Orchard;
+using System;
+using System.Web.Mvc;
 using Orchard.ContentManagement;
 using Orchard.Mvc.Filters;
-using Orchard.Settings;
 using Orchard.UI.Admin;
 
-namespace Futures.Widgets {
-    public class WidgetFilter : FilterProvider, IActionFilter {
+namespace Orchard.Widgets.Filters {
+    public class WidgetFilter : FilterProvider, IResultFilter {
         private readonly IContentManager _contentManager;
         private readonly IWorkContextAccessor _workContextAccessor;
 
@@ -16,10 +14,10 @@ namespace Futures.Widgets {
             _workContextAccessor = workContextAccessor;
         }
 
-        public void OnActionExecuting(ActionExecutingContext filterContext) {
+        public void OnResultExecuting(ResultExecutingContext filterContext) {
         }
 
-        public void OnActionExecuted(ActionExecutedContext filterContext) {
+        public void OnResultExecuted(ResultExecutedContext filterContext) {
             var workContext = _workContextAccessor.GetContext(filterContext);
 
             if (workContext == null ||
@@ -29,17 +27,11 @@ namespace Futures.Widgets {
                 return;
             }
 
-            var siteWidgets = workContext.CurrentSite.As<WidgetsPart>();
-            if (siteWidgets == null) {
-                return;
-            }
-
-            var zones = workContext.Page.Zones;
-            foreach (var widget in siteWidgets.Widgets) {
-                var widgetShape = _contentManager.BuildDisplayModel(widget);
-
-                zones[widget.Record.Zone].Add(widgetShape, widget.Record.Position);
-            }
+            // Get Layers
+            // Get LayerZones
+            // Get WidgetParts
+            // BuildDisplayModel
+            // Add to Zone.
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/Layer.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/Layer.cs
new file mode 100644
index 000000000..21b3da5c8
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/Layer.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement;
+
+namespace Orchard.Widgets.Models {
+    public class Layer : ContentItem {
+        public IList<LayerZone> LayerZones = new List<LayerZone>();
+        public LayerPart LayerPart = new LayerPart();
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs
new file mode 100644
index 000000000..22b743b5f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs
@@ -0,0 +1,6 @@
+using Orchard.ContentManagement;
+
+namespace Orchard.Widgets.Models {
+    public class LayerPart : ContentPart<LayerPartRecord> {
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPartRecord.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPartRecord.cs
new file mode 100644
index 000000000..b444f0cdb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPartRecord.cs
@@ -0,0 +1,9 @@
+using Orchard.ContentManagement.Records;
+
+namespace Orchard.Widgets.Models {
+    public class LayerPartRecord : ContentPartRecord {
+        public virtual string Name { get; set; }
+        public virtual string Description { get; set; }
+        public virtual string Rule { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerZone.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerZone.cs
new file mode 100644
index 000000000..84fb95a1b
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerZone.cs
@@ -0,0 +1,7 @@
+using System.Collections.Generic;
+
+namespace Orchard.Widgets.Models {
+    public class LayerZone {
+        public IList<WidgetPart> WidgetParts = new List<WidgetPart>();
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs
new file mode 100644
index 000000000..1d5f0e75e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs
@@ -0,0 +1,6 @@
+using Orchard.ContentManagement;
+
+namespace Orchard.Widgets.Models {
+    public class WidgetPart : ContentPart<WidgetPartRecord> {
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetPartRecord.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPartRecord.cs
similarity index 50%
rename from src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetPartRecord.cs
rename to src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPartRecord.cs
index e9ea11038..1a1b29fa8 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Models/WidgetPartRecord.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPartRecord.cs
@@ -1,9 +1,8 @@
 using Orchard.ContentManagement.Records;
 
-namespace Futures.Widgets.Models {
+namespace Orchard.Widgets.Models {
     public class WidgetPartRecord : ContentPartRecord {
-        public virtual WidgetsPartRecord Scope { get; set; }
-        public virtual string Zone { get; set; }
+        public virtual string Title { get; set; }
         public virtual string Position { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Module.txt b/src/Orchard.Web/Modules/Orchard.Widgets/Module.txt
new file mode 100644
index 000000000..4810af1eb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Module.txt
@@ -0,0 +1,11 @@
+name: Widgets
+antiforgery: enabled
+author: The Orchard Team
+website: http://orchardproject.net
+version: 0.5.0
+orchardversion: 0.5.0
+description: An implementation of widgets for Orchard.
+features:
+    Orchard.Widgets:
+        Description: An implementation of widgets.
+        Category: Widget
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
similarity index 70%
rename from src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
rename to src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index bb9265413..6db38d860 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -3,21 +3,17 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>
+    </ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E65E5633-C0FF-453C-A906-481C14F969D6}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <ProjectGuid>{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}</ProjectGuid>
+    <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Futures.Widgets</RootNamespace>
-    <AssemblyName>Futures.Widgets</AssemblyName>
+    <RootNamespace>Orchard.Widgets</RootNamespace>
+    <AssemblyName>Orchard.Widgets</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -27,7 +23,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,57 +31,67 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Routing" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Mobile" />
-    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Handlers\WidgetsPartHandler.cs" />
-    <Compile Include="DataMigrations\WidgetsDataMigration.cs" />
-    <Compile Include="Models\WidgetsPartRecord.cs" />
-    <Compile Include="Models\WidgetsPart.cs" />
+    <Compile Include="Models\Layer.cs" />
+    <Compile Include="Models\LayerPart.cs" />
+    <Compile Include="Models\LayerPartRecord.cs" />
+    <Compile Include="Models\LayerZone.cs" />
     <Compile Include="Models\WidgetPart.cs" />
     <Compile Include="Models\WidgetPartRecord.cs" />
+    <Compile Include="Permissions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ViewModels\WidgetEditViewModel.cs" />
-    <Compile Include="WidgetFilter.cs" />
+    <Compile Include="Filters\WidgetFilter.cs" />
+    <Compile Include="Services\IWidgetService.cs" />
+    <Compile Include="Services\WidgetService.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
-      <Name>Orchard.Framework</Name>
-    </ProjectReference>
+    <Folder Include="App_Data\" />
+    <Folder Include="Handlers\" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
+      <Name>Orchard.Framework</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="App_Data\" />
+    <None Include="Views\Admin\Index.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
@@ -103,13 +108,14 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>17593</DevelopmentServerPort>
+          <DevelopmentServerPort>48009</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Permissions.cs
new file mode 100644
index 000000000..22ced69a4
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Permissions.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using Orchard.Environment.Extensions.Models;
+using Orchard.Security.Permissions;
+
+namespace Orchard.Widgets {
+    public class Permissions : IPermissionProvider {
+        public static readonly Permission ManageWidgets = new Permission { Description = "Managing Widgets", Name = "ManageWidgets" };
+
+        public virtual Feature Feature { get; set; }
+
+        public IEnumerable<Permission> GetPermissions() {
+            return new Permission[] {
+                ManageWidgets,
+            };
+        }
+
+        public IEnumerable<PermissionStereotype> GetDefaultStereotypes() {
+            return new[] {
+                new PermissionStereotype {
+                    Name = "Administrator",
+                    Permissions = new[] {ManageWidgets}
+                },
+            };
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs
similarity index 71%
rename from src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs
rename to src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs
index d34b7591c..9dee58195 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs
@@ -1,15 +1,16 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Futures.Widgets")]
+[assembly: AssemblyTitle("Orchard.Widgets")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Futures.Widgets")]
-[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
+[assembly: AssemblyCompany("MSIT")]
+[assembly: AssemblyProduct("Orchard.Widgets")]
+[assembly: AssemblyCopyright("Copyright © MSIT 2010")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -19,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8c179868-e814-4277-a0af-b71707c3bff4")]
+[assembly: Guid("c326e210-8edd-45ba-a686-02c1370c3ad1")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -30,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.5.0")]
-[assembly: AssemblyFileVersion("0.5.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Services/IWidgetService.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Services/IWidgetService.cs
new file mode 100644
index 000000000..68f9d8611
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Services/IWidgetService.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+using Orchard.Widgets.Models;
+
+namespace Orchard.Widgets.Services {
+    public interface IWidgetService : IDependency {
+        IEnumerable<Layer> GetLayers();
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetService.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetService.cs
new file mode 100644
index 000000000..fa2990e7f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetService.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using Orchard.Logging;
+using Orchard.Settings;
+using Orchard.Widgets.Models;
+
+namespace Orchard.Widgets.Services {
+    public class WidgetService : IWidgetService {
+        public WidgetService() {
+            Logger = NullLogger.Instance;
+        }
+
+        public ILogger Logger { get; set; }
+        protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
+
+        #region IWidgetService Members
+
+        public IEnumerable<Layer> GetLayers() {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
new file mode 100644
index 000000000..312dbe70f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
@@ -0,0 +1,6 @@
+<h1>@Html.TitleForPage(T("Manage Layers").ToString()) </h1>
+@using (Html.BeginFormAntiForgeryPost()) { 
+    @Html.ValidationSummary()
+    <div class="manage">@Html.ActionLink(T("Add a new layer").ToString(), "Create", new { }, new { @class = "button primaryAction" })</div>
+    <p>Layers ...</p>
+} 
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Web.config
similarity index 100%
rename from src/Orchard.Web/Modules/Futures.Widgets/Views/Web.config
rename to src/Orchard.Web/Modules/Orchard.Widgets/Views/Web.config
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config
similarity index 67%
rename from src/Orchard.Web/Modules/Futures.Widgets/Web.config
rename to src/Orchard.Web/Modules/Orchard.Widgets/Web.config
index f16b37029..e041a3c7c 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 
 <configuration>
   <system.web>
@@ -21,12 +21,12 @@
     </pages>
   </system.web>
   <system.web.extensions/>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-				<bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/src/Orchard.Web/Themes/Classic/Theme.txt b/src/Orchard.Web/Themes/Classic/Theme.txt
index f8f804413..c8d9a11c1 100644
--- a/src/Orchard.Web/Themes/Classic/Theme.txt
+++ b/src/Orchard.Web/Themes/Classic/Theme.txt
@@ -4,3 +4,4 @@ description: Theme using serif.
 version: 1.0
 tags: Classic, Serif 
 website: http://www.orchardproject.net
+zones: Sidebar
\ No newline at end of file
diff --git a/src/Orchard.sln b/src/Orchard.sln
index d37cab7bb..8241a9e1a 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{74E681ED
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{383DBA32-4A3E-48D1-AAC3-75377A694452}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Futures", "Futures", "{E75A4CE4-CAA6-41E4-B951-33ACC60DC77C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Web", "Orchard.Web\Orchard.Web.csproj", "{50B779EA-EC00-4699-84C0-03B395C365D2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Framework", "Orchard\Orchard.Framework.csproj", "{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}"
@@ -78,11 +76,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Indexing", "Orchard
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Search", "Orchard.Web\Modules\Orchard.Search\Orchard.Search.csproj", "{4BE4EB01-AC56-4048-924E-2CA77F509ABA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Futures.Widgets", "Orchard.Web\Modules\Futures.Widgets\Futures.Widgets.csproj", "{E65E5633-C0FF-453C-A906-481C14F969D6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene", "Orchard.Web\Modules\Lucene\Lucene.csproj", "{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Experimental", "Orchard.Web\Modules\Orchard.Experimental\Orchard.Experimental.csproj", "{AB3C207C-0126-4143-8D62-1119DF80D366}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Widgets", "Orchard.Web\Modules\Orchard.Widgets\Orchard.Widgets.csproj", "{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.CodeGeneration", "Orchard.Web\Modules\Orchard.CodeGeneration\Orchard.CodeGeneration.csproj", "{C0C45321-B51D-4D8D-9B7B-AA4C2E0B2962}"
 EndProject
@@ -415,16 +411,6 @@ Global
 		{4BE4EB01-AC56-4048-924E-2CA77F509ABA}.FxCop|Any CPU.Build.0 = Release|Any CPU
 		{4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.Coverage|Any CPU.Build.0 = Release|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.FxCop|Any CPU.Build.0 = Release|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E65E5633-C0FF-453C-A906-481C14F969D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
 		{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
 		{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
@@ -435,16 +421,16 @@ Global
 		{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.FxCop|Any CPU.Build.0 = Release|Any CPU
 		{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.Coverage|Any CPU.Build.0 = Release|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.FxCop|Any CPU.Build.0 = Release|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB3C207C-0126-4143-8D62-1119DF80D366}.Release|Any CPU.Build.0 = Release|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.Coverage|Any CPU.Build.0 = Release|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.FxCop|Any CPU.Build.0 = Release|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C0C45321-B51D-4D8D-9B7B-AA4C2E0B2962}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
 		{C0C45321-B51D-4D8D-9B7B-AA4C2E0B2962}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
 		{C0C45321-B51D-4D8D-9B7B-AA4C2E0B2962}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
@@ -479,7 +465,7 @@ Global
 		{EA2B9121-EF54-40A6-A53E-6593C86EE696} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{4BE4EB01-AC56-4048-924E-2CA77F509ABA} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
-		{AB3C207C-0126-4143-8D62-1119DF80D366} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
+		{194D3CCC-1153-474D-8176-FDE8D7D0D0BD} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{C0C45321-B51D-4D8D-9B7B-AA4C2E0B2962} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
 		{ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
 		{F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
@@ -492,6 +478,5 @@ Global
 		{33B1BC8D-E292-4972-A363-22056B207156} = {383DBA32-4A3E-48D1-AAC3-75377A694452}
 		{8A4E42CE-79F8-4BE2-8B1E-A6B83432123B} = {383DBA32-4A3E-48D1-AAC3-75377A694452}
 		{0DFA2E10-96C8-4E05-BC10-B710B97ECCDE} = {383DBA32-4A3E-48D1-AAC3-75377A694452}
-		{E65E5633-C0FF-453C-A906-481C14F969D6} = {E75A4CE4-CAA6-41E4-B951-33ACC60DC77C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs b/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
index 5bf1b4a46..4fa5c4e20 100644
--- a/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
+++ b/src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
@@ -123,6 +123,7 @@ namespace Orchard.Environment.Extensions.Folders {
                 WebSite = GetValue(fields, "website"),
                 Tags = GetValue(fields, "tags"),
                 AntiForgery = GetValue(fields, "antiforgery"),
+                Zones = GetValue(fields, "zones"),
             };
             extensionDescriptor.Features = GetFeaturesForExtension(GetMapping(fields, "features"), extensionDescriptor);
             return extensionDescriptor;
diff --git a/src/Orchard/Environment/Extensions/Models/ExtensionDescriptor.cs b/src/Orchard/Environment/Extensions/Models/ExtensionDescriptor.cs
index 99cd687c9..ec8a96347 100644
--- a/src/Orchard/Environment/Extensions/Models/ExtensionDescriptor.cs
+++ b/src/Orchard/Environment/Extensions/Models/ExtensionDescriptor.cs
@@ -26,6 +26,7 @@ namespace Orchard.Environment.Extensions.Models {
         public string WebSite { get; set; }
         public string Tags { get; set; }
         public string AntiForgery { get; set; }
+        public string Zones { get; set; }
 
         public IEnumerable<FeatureDescriptor> Features { get; set; }
     }
diff --git a/src/Orchard/Themes/ITheme.cs b/src/Orchard/Themes/ITheme.cs
index fe56949e2..b144049d6 100644
--- a/src/Orchard/Themes/ITheme.cs
+++ b/src/Orchard/Themes/ITheme.cs
@@ -10,5 +10,6 @@
         string Author { get; set; }
         string HomePage { get; set; }
         string Tags { get; set; }
+        string Zones { get; set; }
     }
 }