diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
index a90029b18..d7731fb6a 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
@@ -18,8 +18,8 @@ namespace Orchard.Packaging {
                 .Add(T("Available"), "2", item => item.Action("Modules", "Gallery", new { area = "Orchard.Packaging" })
                     .Permission(StandardPermissions.SiteOwner).LocalNav()));
 
-            builder.Add(T("Settings"), "30", menu => menu
-                .Add(T("Feeds"), "3", item => item.Action("Sources", "Gallery", new { area = "Orchard.Packaging" })
+            builder.Add(T("Configuration"), "50", menu => menu
+                .Add(T("Feeds"), "25", item => item.Action("Sources", "Gallery", new { area = "Orchard.Packaging" })
                     .Permission(StandardPermissions.SiteOwner)));
         }
     }
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
index 37f13cd67..5d4a14d26 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
@@ -1,3 +1,4 @@
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -149,7 +150,8 @@ namespace Orchard.Packaging.Controllers {
                     var sourceExtensions = _packagingSourceManager.GetExtensionList(
                         source,
                         packages => {
-                            packages = packages.Where(p => p.PackageType == packageType);
+                            packages = packages.Where(p => p.PackageType == packageType &&
+                                (string.IsNullOrEmpty(options.SearchText) || p.Id.Contains(options.SearchText)));
 
                             switch (options.Order) {
                                 case PackagingExtensionsOrder.Downloads:
@@ -174,7 +176,8 @@ namespace Orchard.Packaging.Controllers {
                     // count packages separately to prevent loading everything just to count
                     totalCount += _packagingSourceManager.GetExtensionCount(
                         source,
-                        packages => packages.Where(p => p.PackageType == packageType)
+                        packages => packages.Where(p => p.PackageType == packageType &&
+                            (string.IsNullOrEmpty(options.SearchText) || p.Id.Contains(options.SearchText)))
                         );
 
                     extensions = extensions == null ? sourceExtensions : extensions.Concat(sourceExtensions);
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css
index cbf31c7a3..e48d8c62d 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css
@@ -47,7 +47,11 @@
     width: 171px; 
     height: 128px;
 }
+.properties li p {
+    float: left;
+}
 .ratings {
+    float: right;
     background:url(../Content/Images/stars.png) repeat-x;
     height: 14px;
     width: 75px;
@@ -57,4 +61,11 @@
     background: url(../Content/Images/stars.png) repeat-x 0 -14px;
     position: absolute;
     width: 45px;
+}
+.search-actions {
+    float: right;
+    display: inline;
+    height: auto;
+    margin: 0 1.4em 0 0;
+    padding-top: 0;
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs
index 3e366e279..39363f6bc 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingExtensionsViewModel.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Orchard.Packaging.Models;
-using Orchard.Packaging.Services;
 
 namespace Orchard.Packaging.ViewModels {
     public class PackagingExtensionsViewModel {
@@ -13,6 +12,7 @@ namespace Orchard.Packaging.ViewModels {
 
     public class PackagingExtensionsOptions {
         public int? SourceId { get; set; }
+        public string SearchText { get; set; }
         public PackagingExtensionsOrder Order { get; set; }
     }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml
index 1d8ec8281..ea1eaaa3b 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml
@@ -7,7 +7,7 @@
 
     var pageSizes = new List<int?>() { 10, 50, 100 };
     var defaultPageSize = WorkContext.CurrentSite.PageSize;
-    if(!pageSizes.Contains(defaultPageSize)) { 
+    if (!pageSizes.Contains(defaultPageSize)) { 
         pageSizes.Add(defaultPageSize);
     }
 
@@ -24,6 +24,7 @@
             }
         </select>
     </fieldset>
+
     <fieldset class="bulk-actions">
         <label for="filterResults">@T("Sort by:")</label>
         <select id="filterResults" name="@Html.NameOf(m => m.Options.Order)">
@@ -38,19 +39,25 @@
             @foreach(int size in pageSizes.OrderBy(p => p)) {
                 @Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
             }
-        <select>
+        </select>
         <button type="submit">@T("Apply")</button>
     </fieldset>
 
+    <fieldset class="search-actions">
+        <input type="text" id="searchText" name="@Html.NameOf(m => m.Options.SearchText)" />
+
+        <button type="submit">@T("Search")</button>
+    </fieldset>
+
     if (Model.Extensions.Count() > 0) {
         <ul class="contentItems">
         @foreach (var item in Model.Extensions) {
             <li>
                 @{
-                    string iconUrl = @item.IconUrl;
-                    if (string.IsNullOrWhiteSpace(iconUrl)) {
-                        iconUrl = Href("../../Content/Images/ModuleDefaultIcon.png");
-                    }
+            string iconUrl = @item.IconUrl;
+            if (string.IsNullOrWhiteSpace(iconUrl)) {
+                iconUrl = Href("../../Content/Images/ModuleDefaultIcon.png");
+            }
                 }
 
                 <div class="iconThumbnail">
@@ -79,9 +86,10 @@
                                 <li>&nbsp;&#124;&nbsp;@T("Website: ")
                                     @if (!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> } else { @T("Unknown").ToString() }
                                 </li>
-                                <li>&nbsp;&#124;&nbsp;@T("Rating")
-                                    <div class="ratings" style="width:@(15*5)px" title="@T("Ratings: {0} ({1})", item.Rating, item.RatingsCount)">
-                                        <div class="score" style="width:@(15*(item.Rating))px">&nbsp;</div>
+                                <li><div>&nbsp;&#124;&nbsp;@T("Rating: ")
+                                        <div class="ratings" style="width:@(15 * 5)px" title="@T("Ratings: {0} ({1})", item.Rating, item.RatingsCount)">
+                                            <div class="score" style="width:@(15 * (item.Rating))px">&nbsp;</div>
+                                        </div>
                                     </div>
                                 </li>
                             </ul>
@@ -95,6 +103,6 @@
             </li>}
         </ul>
     }
-    
+
     @Display(Model.Pager)
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
index 70668d89d..394495853 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
@@ -3,27 +3,28 @@
 @using System.Linq;
 
 @{
-    Style.Require("PackagingAdmin"); 
+    Style.Require("PackagingAdmin");
 
     var pageSizes = new List<int?>() { 10, 50, 100 };
     var defaultPageSize = WorkContext.CurrentSite.PageSize;
-    if(!pageSizes.Contains(defaultPageSize)) { 
+    if (!pageSizes.Contains(defaultPageSize)) {
         pageSizes.Add(defaultPageSize);
     }
 
     Layout.Title = T("Themes").ToString();
 }
 
-@using ( Html.BeginFormAntiForgeryPost(Url.Action("Themes", "Gallery")) ) {
+@using (Html.BeginFormAntiForgeryPost(Url.Action("Themes", "Gallery"))) {
     <fieldset class="bulk-actions">
-        <label for="filterResults" class="bulk-filter">@T("Feed:")</label>
+        <label for="filterResults" class="bulk-filter">@T("Show")</label>
         <select id="sourceId" name="sourceId">
-            @Html.SelectOption("", Model.SelectedSource == null, T("Any (show all feeds)").ToString())
+            @Html.SelectOption("", Model.SelectedSource == null, T("All feeds").ToString())
             @foreach (var source in Model.Sources) {
                 @Html.SelectOption(source.Id, Model.SelectedSource != null && Model.SelectedSource.Id == source.Id, source.FeedTitle)
             }
         </select>
     </fieldset>
+
     <fieldset class="bulk-actions">
         <label for="filterResults">@T("Sort by:")</label>
         <select id="filterResults" name="@Html.NameOf(m => m.Options.Order)">
@@ -35,28 +36,33 @@
         <label for="pageSize">@T("Show:")</label>
         <select id="pageSize" name="PageSize">
             @Html.SelectOption((int)Model.Pager.PageSize, 0, T("All").ToString())
-            @foreach(int size in pageSizes.OrderBy(p => p)) {
+            @foreach (int size in pageSizes.OrderBy(p => p)) {
                 @Html.SelectOption((int)Model.Pager.PageSize, size, size.ToString())
             }
-        <select>
+        </select>
         <button type="submit">@T("Apply")</button>
     </fieldset>
 
+    <fieldset class="search-actions">
+        <input type="text" id="searchText" name="@Html.NameOf(m => m.Options.SearchText)" value="@Model.Options.SearchText" />
+
+        <button type="submit">@T("Search")</button>
+    </fieldset>
+
     if (Model.Extensions.Count() > 0) {
         <ul class="contentItems theme">
         @foreach (var item in Model.Extensions) {
             <li>
                 @{
-                    string extensionClass = "iconThumbnail";
-                    string iconUrl = @item.IconUrl;
-                    if (!string.IsNullOrWhiteSpace(@item.FirstScreenshot)) {
-                        iconUrl = @item.FirstScreenshot;
-                        extensionClass = "screenshotThumbnail";
-                    }
-                    else if (string.IsNullOrWhiteSpace(iconUrl)) {
-                        iconUrl = Href("../../Content/Images/imagePlaceholder.png");
-                        extensionClass = "screenshotThumbnail";
-                    }
+            string extensionClass = "iconThumbnail";
+            string iconUrl = @item.IconUrl;
+            if (!string.IsNullOrWhiteSpace(@item.FirstScreenshot)) {
+                iconUrl = @item.FirstScreenshot;
+                extensionClass = "screenshotThumbnail";
+            } else if (string.IsNullOrWhiteSpace(iconUrl)) {
+                iconUrl = Href("../../Content/Images/imagePlaceholder.png");
+                extensionClass = "screenshotThumbnail";
+            }
                 }
 
                 <div class="@extensionClass">
@@ -72,7 +78,7 @@
                         </div>
 
                         <div class="related">
-                            @Html.ActionLink(T("Install").ToString(), "Install", new RouteValueDictionary {{"packageId", item.PackageId}, {"version", item.Version}, {"sourceId", item.Source.Id}, {"redirectTo", "Themes"}})@T(" | ")
+                            @Html.ActionLink(T("Install").ToString(), "Install", new RouteValueDictionary { { "packageId", item.PackageId }, { "version", item.Version }, { "sourceId", item.Source.Id }, { "redirectTo", "Themes" } })@T(" | ")
                             <a href="@item.PackageStreamUri">@T("Download")</a>
                         </div>
 
@@ -83,12 +89,12 @@
                                 <li>&nbsp;&#124;&nbsp;@T("Author: {0}", !string.IsNullOrEmpty(item.Authors) ? item.Authors : T("Unknown").ToString())</li>
                                 <li>&nbsp;&#124;&nbsp;@T("Downloads: {0}", item.DownloadCount)</li>
                                 <li>&nbsp;&#124;&nbsp;@T("Website: ")
-                                    @if(!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> }
-                                    else { @T("Unknown").ToString() }
+                                    @if (!string.IsNullOrEmpty(item.ProjectUrl)) { <a href="@item.ProjectUrl">@item.ProjectUrl</a> } else { @T("Unknown").ToString() }
                                 </li>
-                                <li>&nbsp;&#124;&nbsp;@T("Rating")
-                                    <div class="ratings" style="width:@(15*5)px" title="@T("Ratings: {0} ({1})", item.Rating, item.RatingsCount)">
-                                        <div class="score" style="width:@(15*(item.Rating))px">&nbsp;</div>
+                                <li><div>&nbsp;&#124;&nbsp;@T("Rating: ")
+                                        <div class="ratings" style="width:@(15 * 5)px" title="@T("Ratings: {0} ({1})", item.Rating, item.RatingsCount)">
+                                            <div class="score" style="width:@(15 * (item.Rating))px">&nbsp;</div>
+                                        </div>
                                     </div>
                                 </li>
                             </ul>