diff --git a/modules/cms/classes/ThemeManager.php b/modules/cms/classes/ThemeManager.php
new file mode 100644
index 000000000..d3042e940
--- /dev/null
+++ b/modules/cms/classes/ThemeManager.php
@@ -0,0 +1,126 @@
+<?php namespace Cms\Classes;
+
+use File;
+use ApplicationException;
+use System\Models\Parameters;
+use Cms\Classes\Theme as CmsTheme;
+
+/**
+ * Theme manager
+ *
+ * @package october\cms
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class ThemeManager
+{
+    use \October\Rain\Support\Traits\Singleton;
+
+    //
+    // Gateway spawned
+    //
+
+    /**
+     * Returns a collection of themes installed via the update gateway
+     * @return array
+     */
+    public function getInstalled()
+    {
+        return Parameters::get('system::theme.history', []);
+    }
+
+    /**
+     * Checks if a theme has ever been installed before.
+     * @param  string  $name Theme code
+     * @return boolean
+     */
+    public function isInstalled($name)
+    {
+        return array_key_exists($name, Parameters::get('system::theme.history', []));
+    }
+
+    /**
+     * Flags a theme as being installed, so it is not downloaded twice.
+     * @param string $name Theme code
+     */
+    public function setInstalled($code, $dirName = null)
+    {
+        if (!$dirName) {
+            $dirName = strtolower(str_replace('.', '-', $code));
+        }
+
+        $history = Parameters::get('system::theme.history', []);
+        $history[$code] = $dirName;
+        Parameters::set('system::theme.history', $history);
+    }
+
+    /**
+     * Flags a theme as being uninstalled.
+     * @param string $name Theme code
+     */
+    public function setUninstalled($code)
+    {
+        $history = Parameters::get('system::theme.history', []);
+        if (array_key_exists($code, $history)) {
+            unset($history[$code]);
+        }
+
+        Parameters::set('system::theme.history', $history);
+    }
+
+    /**
+     * Returns an installed theme's code from it's dirname.
+     * @return string
+     */
+    public function findByDirName($dirName)
+    {
+        $installed = $this->getInstalled();
+        foreach ($installed as $code => $name) {
+            if ($dirName == $name) {
+                return $code;
+            }
+        }
+
+        return null;
+    }
+
+    //
+    // Management
+    //
+
+    /**
+     * Completely delete a theme from the system.
+     * @param string $id Theme code/namespace
+     * @return void
+     */
+    public function deleteTheme($theme)
+    {
+        if (!$theme) {
+            return false;
+        }
+
+        if (is_string($theme)) {
+            $theme = CmsTheme::load($theme);
+        }
+
+        if ($theme->isActiveTheme()) {
+            throw new ApplicationException(trans('cms::lang.theme.delete_active_theme_failed'));
+        }
+
+        /*
+         * Delete from file system
+         */
+        $themePath = $theme->getPath();
+        if (File::isDirectory($themePath)) {
+            File::deleteDirectory($themePath);
+        }
+
+        /*
+         * Set uninstalled
+         */
+        if ($themeCode = $this->findByDirName($theme->getDirName())) {
+            $this->setUninstalled($themeCode);
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index 4815dc37d..08ba468cd 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -13,6 +13,7 @@ use Cms\Models\ThemeData;
 use Cms\Models\ThemeExport;
 use Cms\Models\ThemeImport;
 use Cms\Classes\Theme as CmsTheme;
+use Cms\Classes\ThemeManager;
 use System\Classes\SettingsManager;
 use Backend\Classes\Controller;
 use Exception;
@@ -71,16 +72,7 @@ class Themes extends Controller
 
     public function index_onDelete()
     {
-        $theme = $this->findThemeObject();
-
-        if ($theme->isActiveTheme()) {
-            throw new ApplicationException(trans('cms::lang.theme.delete_active_theme_failed'));
-        }
-
-        $themePath = $theme->getPath();
-        if (File::isDirectory($themePath)) {
-            File::deleteDirectory($themePath);
-        }
+        ThemeManager::instance()->deleteTheme(post('theme'));
 
         Flash::success(trans('cms::lang.theme.delete_theme_success'));
         return Redirect::refresh();
diff --git a/modules/cms/controllers/themes/_theme_list.htm b/modules/cms/controllers/themes/_theme_list.htm
index f28a3f298..f2a887292 100644
--- a/modules/cms/controllers/themes/_theme_list.htm
+++ b/modules/cms/controllers/themes/_theme_list.htm
@@ -19,14 +19,12 @@
             data-control="popup"
             data-handler="onLoadCreateForm"
             data-size="huge"
-            href="javascript:;"
-            target="_blank">
+            href="javascript:;">
             <?= e(trans('cms::lang.theme.create_new_blank_theme')) ?>
         </a>
         <a
             class="find-more-themes"
-            href="http://octobercms.com/themes"
-            target="_blank">
+            href="<?= Backend::url('system/updates/install/themes') ?>">
             <?= e(trans('cms::lang.theme.find_more_themes')) ?>
         </a>
     </div>
diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index c62ce19dc..6524f842e 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -74,7 +74,7 @@ return [
         'new_directory_name_comment' => 'Provide a new directory name for the duplicated theme.',
         'dir_name_invalid' => 'Name can contain only digits, Latin letters and the following symbols: _-',
         'dir_name_taken' => 'Desired theme directory already exists.',
-        'find_more_themes' => 'Find more themes on OctoberCMS Theme Marketplace',
+        'find_more_themes' => 'Find more themes',
         'return' => 'Return to themes list',
     ],
     'maintenance' => [
diff --git a/modules/system/assets/css/settings.css b/modules/system/assets/css/settings/settings.css
similarity index 100%
rename from modules/system/assets/css/settings.css
rename to modules/system/assets/css/settings/settings.css
diff --git a/modules/system/assets/css/updates/install.css b/modules/system/assets/css/updates/install.css
new file mode 100644
index 000000000..ddf0db7df
--- /dev/null
+++ b/modules/system/assets/css/updates/install.css
@@ -0,0 +1,276 @@
+.product-list-empty {
+  padding: 5px 0;
+  font-size: 16px;
+  color: #999;
+}
+.product-list {
+  margin: 0;
+  padding: 10px 0;
+  overflow: hidden;
+  /* clearfix */
+}
+.product-list li button,
+.product-list li .image,
+.product-list li .details {
+  -webkit-transition: opacity .2s linear;
+  -moz-transition: opacity .2s linear;
+  transition: opacity .2s linear;
+}
+.product-list li button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 20px;
+  height: 20px;
+  opacity: 0;
+  outline: none;
+}
+.product-list li:hover button {
+  opacity: .3;
+}
+.product-list li:hover button:hover {
+  opacity: .8;
+}
+.plugin-list li {
+  list-style: none;
+  position: relative;
+  border-bottom: 1px solid #E6E9E9;
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: hidden;
+}
+.plugin-list li:last-child {
+  border-bottom: none;
+}
+.plugin-list li .image {
+  float: left;
+  margin-right: 15px;
+  margin-left: 5px;
+}
+.plugin-list li .image img {
+  width: 50px;
+  height: 50px;
+}
+.plugin-list li .details p {
+  padding: 0;
+  margin: 3px 0 0 0;
+  color: #808C8D;
+}
+.plugin-list li h4 {
+  padding: 5px 0 0;
+  margin: 0;
+  color: #C03F31;
+  font-weight: 400;
+}
+.theme-list li {
+  float: left;
+  padding: 0;
+  margin: 0 10px 10px 0;
+  list-style: none;
+  border: 1px solid #E6E9E9;
+  background: #fff;
+  position: relative;
+  border-radius: 3px;
+}
+.theme-list li:hover {
+  border-color: transparent;
+}
+.theme-list li {
+  -webkit-transition: border .2s linear;
+  -moz-transition: border .2s linear;
+  transition: border .2s linear;
+}
+.theme-list li .image {
+  padding: 5px;
+}
+.theme-list li .image img {
+  width: 210px;
+  height: 140px;
+}
+.theme-list li:hover .image {
+  opacity: 0;
+}
+.theme-list li .details {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  opacity: 0;
+  padding: 10px;
+  overflow: hidden;
+}
+.theme-list li:hover .details {
+  opacity: 1;
+}
+.theme-list li h4 {
+  padding: 15px 0 0;
+  margin: 0;
+}
+.theme-list li p {
+  padding: 0;
+  margin: 0;
+  color: #999;
+  text-transform: uppercase;
+  font-size: 12px;
+}
+.suggested-products {
+  padding: 0;
+}
+.suggested-products .product {
+  padding: 0;
+}
+.suggested-products .image img {
+  width: 40px;
+  height: 40px;
+  margin-top: 10px;
+}
+.suggested-themes .image img {
+  width: 60px;
+  height: 40px;
+}
+.suggested-products .image {
+  float: left;
+  position: relative;
+}
+.suggested-products .details {
+  margin-left: 50px;
+  padding: 10px 0;
+}
+.suggested-themes .details {
+  margin-left: 70px;
+}
+.suggested-products .details h5 {
+  margin: 0 0 3px;
+  font-size: 14px;
+  color: #C03F31;
+  font-weight: 400;
+}
+.suggested-products .details p {
+  font-size: 12px;
+}
+.suggested-products a {
+  color: #777;
+  background: #fff;
+  padding: 5px;
+  text-decoration: none;
+  display: block;
+  overflow: hidden;
+  border-bottom: 1px solid #E6E9E9;
+}
+.suggested-products a:hover {
+  color: #333;
+  background: #f9f9f9;
+}
+.suggested-products a:hover .image:after {
+  content: "+";
+  color: #999;
+  font-size: 32px;
+  display: block;
+  width: 40px;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  position: absolute;
+  top: 7px;
+  left: 0;
+}
+.suggested-products a:hover .image img {
+  opacity: .5;
+}
+/*!
+ * Typeahead
+ */
+.product-search {
+  position: relative;
+  width: 100%;
+  margin: 0 auto 0 auto;
+  text-align: left;
+  padding-bottom: 15px;
+}
+.twitter-typeahead {
+  width: 100%;
+}
+.typeahead,
+.tt-hint {
+  width: 100%;
+  height: 46px;
+  padding: 8px 12px;
+  font-size: 24px;
+  line-height: 30px;
+  border: 1px solid #024e6a;
+  border-radius: 3px;
+  outline: none;
+}
+.typeahead {
+  background-color: #fff;
+  border-color: #e0e0e0;
+}
+.tt-input {
+  font-weight: 200;
+}
+.tt-input:focus {
+  border-color: #E6E9E9;
+}
+.tt-hint {
+  color: #999;
+  font-weight: 200;
+}
+.tt-dropdown-menu {
+  width: 100%;
+  margin-top: 0;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 3px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+}
+.tt-suggestion {
+  font-size: 14px;
+  line-height: 18px;
+}
+.tt-suggestion + .tt-suggestion {
+  font-size: 14px;
+  border-top: 1px solid #ccc;
+}
+.tt-suggestions .product-details {
+  padding: 5px;
+  overflow: hidden;
+  position: relative;
+}
+.tt-suggestions .product-image {
+  float: left;
+  margin-right: 10px;
+}
+.tt-suggestions .product-image img {
+  height: 45px;
+  width: 45px;
+}
+.tt-suggestions .product-name {
+  font-size: 20px;
+  padding-top: 5px;
+}
+.tt-suggestion.tt-cursor {
+  cursor: pointer;
+}
+.tt-suggestion.tt-cursor .product-details {
+  color: #333;
+  background: #f9f9f9;
+  border-color: #f0f0f0;
+}
+.tt-suggestion.tt-cursor .product-details .product-image:after {
+  content: "+";
+  color: #999;
+  font-size: 38px;
+  display: block;
+  width: 45px;
+  height: 45px;
+  text-align: center;
+  line-height: 45px;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+}
+.tt-suggestion.tt-cursor .product-details .product-image img {
+  opacity: .5;
+}
diff --git a/modules/system/assets/css/updates.css b/modules/system/assets/css/updates/updates.css
similarity index 100%
rename from modules/system/assets/css/updates.css
rename to modules/system/assets/css/updates/updates.css
diff --git a/modules/system/assets/js/updates/install.js b/modules/system/assets/js/updates/install.js
new file mode 100644
index 000000000..1f4c0f462
--- /dev/null
+++ b/modules/system/assets/js/updates/install.js
@@ -0,0 +1,164 @@
+/*
+ * Installs class
+ *
+ * Dependences:
+ * - Waterfall plugin (waterfall.js)
+ */
+
++function ($) { "use strict";
+
+    var InstallProcess = function () {
+
+        // Init
+        this.init()
+
+    }
+
+    InstallProcess.prototype.init = function() {
+        var self = this
+
+        this.dataSet = {}
+
+        $(document).ready(function(){
+
+            self.bindSearch('#pluginSearchInput')
+            self.bindSearch('#themeSearchInput')
+
+            self.bindSuggested('#suggestedPlugins')
+            self.bindSuggested('#suggestedThemes')
+        })
+    }
+
+    //
+    // Searching
+    //
+
+    InstallProcess.prototype.bindSearch = function(el) {
+        var $el = $(el),
+            $form = $el.closest('form'),
+            searchType = $el.data('searchType')
+
+        if ($el.length == 0) return
+
+        // Template for search results
+        var template = Mustache.compile([
+            '<div class="product-details">',
+            '<div class="product-image"><img src="{{image}}" alt=""></div>',
+            '<div class="product-name ">{{name}}</div>',
+            '<div class="product-description text-overflow">{{description}}</div>',
+            '</div>'
+        ].join(''))
+
+        // Source for product search
+        var engine = new Bloodhound({
+            name: 'products',
+            method: 'POST',
+            remote: window.location.pathname + '?search=' + searchType + '&query=%QUERY',
+            datumTokenizer: function(d) {
+                return Bloodhound.tokenizers.whitespace(d.val)
+            },
+            queryTokenizer: Bloodhound.tokenizers.whitespace,
+            limit: 5
+        })
+
+        engine.initialize()
+
+        /*
+         * Bind autocomplete to search field
+         */
+        $(el)
+            .typeahead(null, {
+                displayKey: 'code',
+                source: engine.ttAdapter(),
+                minLength: 3,
+                templates: {
+                    suggestion: template
+                }
+            })
+            .on('typeahead:opened', function(){
+                $(el + ' .tt-dropdown-menu').css('width', $(el).width() + 'px')
+            })
+            .on('typeahead:selected', function(object, datum){
+                $form.submit()
+            })
+            .on('keypress', function(e) {
+                if (e.keyCode == 13) // ENTER key
+                    $form.submit()
+            })
+    }
+
+    InstallProcess.prototype.searchSubmit = function(el) {
+        var
+            $el = $(el),
+            $input = $el.find('.product-search-input.tt-input:first')
+
+        $el.popup()
+
+        $input.typeahead('val', '')
+    }
+
+    //
+    // Suggested products
+    //
+
+    InstallProcess.prototype.bindSuggested = function(el) {
+        var
+            self = this,
+            handler = $(el).data('handler')
+
+        $.request(handler).done(function(data){
+            var result = data.result
+            if (!$.isArray(result)) return
+            self.renderSuggested(el, result)
+        })
+    }
+
+    InstallProcess.prototype.renderSuggested = function(el, suggestedProducts) {
+        var self = this,
+            $el = $(el),
+            $container = $el.closest('.suggested-products-container'),
+            partialView = $(el).data('view')
+
+        if (suggestedProducts.length == 0) {
+            $container.hide()
+        }
+        else {
+            $container.show()
+            $.each(suggestedProducts, function(index, product) {
+                self.renderPartial($el, partialView, product, { append:true })
+            })
+        }
+    }
+
+    //
+    // Helpers
+    //
+
+    InstallProcess.prototype.renderPartial = function($el, name, data, options) {
+        var container = $el,
+            template = $('[data-partial="' + name + '"]'),
+            contents = Mustache.to_html(template.html(), data)
+
+        options = $.extend(true, {
+            append: false
+        }, options)
+
+        if (options.append) container.append(contents)
+        else container.html(contents)
+    }
+
+    if ($.oc === undefined)
+        $.oc = {}
+
+    $.oc.installProcess = new InstallProcess;
+
+}(window.jQuery);
+
+
+/*!
+ * typeahead.js 0.10.1
+ * https://github.com/twitter/typeahead.js
+ * Copyright 2013 Twitter, Inc. and other contributors; Licensed MIT
+ */
+
+!function(a){var b={isMsie:function(){return/(msie|trident)/i.test(navigator.userAgent)?navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2]:!1},isBlankString:function(a){return!a||/^\s*$/.test(a)},escapeRegExChars:function(a){return a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},isString:function(a){return"string"==typeof a},isNumber:function(a){return"number"==typeof a},isArray:a.isArray,isFunction:a.isFunction,isObject:a.isPlainObject,isUndefined:function(a){return"undefined"==typeof a},bind:a.proxy,each:function(b,c){function d(a,b){return c(b,a)}a.each(b,d)},map:a.map,filter:a.grep,every:function(b,c){var d=!0;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?void 0:!1}),!!d):d},some:function(b,c){var d=!1;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?!1:void 0}),!!d):d},mixin:a.extend,getUniqueId:function(){var a=0;return function(){return a++}}(),templatify:function(b){function c(){return String(b)}return a.isFunction(b)?b:c},defer:function(a){setTimeout(a,0)},debounce:function(a,b,c){var d,e;return function(){var f,g,h=this,i=arguments;return f=function(){d=null,c||(e=a.apply(h,i))},g=c&&!d,clearTimeout(d),d=setTimeout(f,b),g&&(e=a.apply(h,i)),e}},throttle:function(a,b){var c,d,e,f,g,h;return g=0,h=function(){g=new Date,e=null,f=a.apply(c,d)},function(){var i=new Date,j=b-(i-g);return c=this,d=arguments,0>=j?(clearTimeout(e),e=null,g=i,f=a.apply(c,d)):e||(e=setTimeout(h,j)),f}},noop:function(){}},c="0.10.1",d=function(){function a(a){this.maxSize=a||100,this.size=0,this.hash={},this.list=new c}function c(){this.head=this.tail=null}function d(a,b){this.key=a,this.val=b,this.prev=this.next=null}return b.mixin(a.prototype,{set:function(a,b){var c,e=this.list.tail;this.size>=this.maxSize&&(this.list.remove(e),delete this.hash[e.key]),(c=this.hash[a])?(c.val=b,this.list.moveToFront(c)):(c=new d(a,b),this.list.add(c),this.hash[a]=c,this.size++)},get:function(a){var b=this.hash[a];return b?(this.list.moveToFront(b),b.val):void 0}}),b.mixin(c.prototype,{add:function(a){this.head&&(a.next=this.head,this.head.prev=a),this.head=a,this.tail=this.tail||a},remove:function(a){a.prev?a.prev.next=a.next:this.head=a.next,a.next?a.next.prev=a.prev:this.tail=a.prev},moveToFront:function(a){this.remove(a),this.add(a)}}),a}(this),e=function(){function a(a){this.prefix=["__",a,"__"].join(""),this.ttlKey="__ttl__",this.keyMatcher=new RegExp("^"+this.prefix)}function c(){return(new Date).getTime()}function d(a){return JSON.stringify(b.isUndefined(a)?null:a)}function e(a){return JSON.parse(a)}var f,g;try{f=window.localStorage,f.setItem("~~~","!"),f.removeItem("~~~")}catch(h){f=null}return g=f&&window.JSON?{_prefix:function(a){return this.prefix+a},_ttlKey:function(a){return this._prefix(a)+this.ttlKey},get:function(a){return this.isExpired(a)&&this.remove(a),e(f.getItem(this._prefix(a)))},set:function(a,e,g){return b.isNumber(g)?f.setItem(this._ttlKey(a),d(c()+g)):f.removeItem(this._ttlKey(a)),f.setItem(this._prefix(a),d(e))},remove:function(a){return f.removeItem(this._ttlKey(a)),f.removeItem(this._prefix(a)),this},clear:function(){var a,b,c=[],d=f.length;for(a=0;d>a;a++)(b=f.key(a)).match(this.keyMatcher)&&c.push(b.replace(this.keyMatcher,""));for(a=c.length;a--;)this.remove(c[a]);return this},isExpired:function(a){var d=e(f.getItem(this._ttlKey(a)));return b.isNumber(d)&&c()>d?!0:!1}}:{get:b.noop,set:b.noop,remove:b.noop,clear:b.noop,isExpired:b.noop},b.mixin(a.prototype,g),a}(),f=function(){function c(b){b=b||{},this._send=b.transport?e(b.transport):a.ajax,this._get=b.rateLimiter?b.rateLimiter(this._get):this._get}function e(c){return function(d,e){function f(a){b.defer(function(){h.resolve(a)})}function g(a){b.defer(function(){h.reject(a)})}var h=a.Deferred();return c(d,e,f,g),h}}var f=0,g={},h=6,i=new d(10);return c.setMaxPendingRequests=function(a){h=a},c.resetCache=function(){i=new d(10)},b.mixin(c.prototype,{_get:function(a,b,c){function d(b){c&&c(b),i.set(a,b)}function e(){f--,delete g[a],k.onDeckRequestArgs&&(k._get.apply(k,k.onDeckRequestArgs),k.onDeckRequestArgs=null)}var j,k=this;(j=g[a])?j.done(d):h>f?(f++,g[a]=this._send(a,b).done(d).always(e)):this.onDeckRequestArgs=[].slice.call(arguments,0)},get:function(a,c,d){var e;return b.isFunction(c)&&(d=c,c={}),(e=i.get(a))?b.defer(function(){d&&d(e)}):this._get(a,c,d),!!e}}),c}(),g=function(){function c(b){b=b||{},b.datumTokenizer&&b.queryTokenizer||a.error("datumTokenizer and queryTokenizer are both required"),this.datumTokenizer=b.datumTokenizer,this.queryTokenizer=b.queryTokenizer,this.datums=[],this.trie=e()}function d(a){return a=b.filter(a,function(a){return!!a}),a=b.map(a,function(a){return a.toLowerCase()})}function e(){return{ids:[],children:{}}}function f(a){for(var b={},c=[],d=0;d<a.length;d++)b[a[d]]||(b[a[d]]=!0,c.push(a[d]));return c}function g(a,b){function c(a,b){return a-b}var d=0,e=0,f=[];for(a=a.sort(c),b=b.sort(c);d<a.length&&e<b.length;)a[d]<b[e]?d++:a[d]>b[e]?e++:(f.push(a[d]),d++,e++);return f}return b.mixin(c.prototype,{bootstrap:function(a){this.datums=a.datums,this.trie=a.trie},add:function(a){var c=this;a=b.isArray(a)?a:[a],b.each(a,function(a){var f,g;f=c.datums.push(a)-1,g=d(c.datumTokenizer(a)),b.each(g,function(a){var b,d,g;for(b=c.trie,d=a.split("");g=d.shift();)b=b.children[g]||(b.children[g]=e()),b.ids.push(f)})})},get:function(a){var c,e,h=this;return c=d(this.queryTokenizer(a)),b.each(c,function(a){var b,c,d,f;if(e&&0===e.length)return!1;for(b=h.trie,c=a.split("");b&&(d=c.shift());)b=b.children[d];return b&&0===c.length?(f=b.ids.slice(0),void(e=e?g(e,f):f)):(e=[],!1)}),e?b.map(f(e),function(a){return h.datums[a]}):[]},serialize:function(){return{datums:this.datums,trie:this.trie}}}),c}(),h=function(){function d(a){var c=a.local||null;return b.isFunction(c)&&(c=c.call(null)),c}function e(d){var e,f;return f={url:null,thumbprint:"",ttl:864e5,filter:null,ajax:{}},(e=d.prefetch||null)&&(e=b.isString(e)?{url:e}:e,e=b.mixin(f,e),e.thumbprint=c+e.thumbprint,e.ajax.type=e.ajax.type||"GET",e.ajax.dataType=e.ajax.dataType||"json",!e.url&&a.error("prefetch requires url to be set")),e}function f(c){function d(a){return function(c){return b.debounce(c,a)}}function e(a){return function(c){return b.throttle(c,a)}}var f,g;return g={url:null,wildcard:"%QUERY",replace:null,rateLimitBy:"debounce",rateLimitWait:300,send:null,filter:null,ajax:{}},(f=c.remote||null)&&(f=b.isString(f)?{url:f}:f,f=b.mixin(g,f),f.rateLimiter=/^throttle$/i.test(f.rateLimitBy)?e(f.rateLimitWait):d(f.rateLimitWait),f.ajax.type=f.ajax.type||"GET",f.ajax.dataType=f.ajax.dataType||"json",delete f.rateLimitBy,delete f.rateLimitWait,!f.url&&a.error("remote requires url to be set")),f}return{local:d,prefetch:e,remote:f}}(),i=(window.Bloodhound=function(){function c(b){b&&(b.local||b.prefetch||b.remote)||a.error("one of local, prefetch, or remote is required"),this.limit=b.limit||5,this.sorter=d(b.sorter),this.dupDetector=b.dupDetector||i,this.local=h.local(b),this.prefetch=h.prefetch(b),this.remote=h.remote(b),this.cacheKey=this.prefetch?this.prefetch.cacheKey||this.prefetch.url:null,this.index=new g({datumTokenizer:b.datumTokenizer,queryTokenizer:b.queryTokenizer}),this.storage=this.cacheKey?new e(this.cacheKey):null}function d(a){function c(b){return b.sort(a)}function d(a){return a}return b.isFunction(a)?c:d}function i(){return!1}var j;return j={data:"data",protocol:"protocol",thumbprint:"thumbprint"},c.tokenizers={whitespace:function(a){return a.split(/\s+/)},nonword:function(a){return a.split(/\W+/)}},b.mixin(c.prototype,{_loadPrefetch:function(b){function c(a){var c;c=b.filter?b.filter(a):a,f.add(c),f._saveToStorage(f.index.serialize(),b.thumbprint,b.ttl)}var d,e,f=this;return(d=this._readFromStorage(b.thumbprint))?(this.index.bootstrap(d),e=a.Deferred().resolve()):e=a.ajax(b.url,b.ajax).done(c),e},_getFromRemote:function(a,b){function c(a){var c=f.remote.filter?f.remote.filter(a):a;b(c)}var d,e,f=this;return a=a||"",e=encodeURIComponent(a),d=this.remote.replace?this.remote.replace(this.remote.url,a):this.remote.url.replace(this.remote.wildcard,e),this.transport.get(d,this.remote.ajax,c)},_saveToStorage:function(a,b,c){this.storage&&(this.storage.set(j.data,a,c),this.storage.set(j.protocol,location.protocol,c),this.storage.set(j.thumbprint,b,c))},_readFromStorage:function(a){var b,c={};return this.storage&&(c.data=this.storage.get(j.data),c.protocol=this.storage.get(j.protocol),c.thumbprint=this.storage.get(j.thumbprint)),b=c.thumbprint!==a||c.protocol!==location.protocol,c.data&&!b?c.data:null},initialize:function(){function b(){d.add(d.local)}var c,d=this;return c=this.prefetch?this._loadPrefetch(this.prefetch):a.Deferred().resolve(),this.local&&c.done(b),this.transport=this.remote?new f(this.remote):null,this.initialize=function(){return c.promise()},c.promise()},add:function(a){this.index.add(a)},get:function(a,c){function d(a){var d=e.slice(0);b.each(a,function(a){var c;return c=b.some(d,function(b){return f.dupDetector(a,b)}),!c&&d.push(a),d.length<f.limit}),c&&c(f.sorter(d))}var e,f=this,g=!1;e=this.index.get(a),e=this.sorter(e).slice(0,this.limit),e.length<this.limit&&this.transport&&(g=this._getFromRemote(a,d)),!g&&c&&c(e)},ttAdapter:function(){return b.bind(this.get,this)}}),c}(),{wrapper:'<span class="twitter-typeahead"></span>',dropdown:'<span class="tt-dropdown-menu"></span>',dataset:'<div class="tt-dataset-%CLASS%"></div>',suggestions:'<span class="tt-suggestions"></span>',suggestion:'<div class="tt-suggestion">%BODY%</div>'}),j={wrapper:{position:"relative",display:"inline-block"},hint:{position:"absolute",top:"0",left:"0",borderColor:"transparent",boxShadow:"none"},input:{position:"relative",verticalAlign:"top",backgroundColor:"transparent"},inputWithNoHint:{position:"relative",verticalAlign:"top"},dropdown:{position:"absolute",top:"100%",left:"0",zIndex:"100",display:"none"},suggestions:{display:"block"},suggestion:{whiteSpace:"nowrap",cursor:"pointer"},suggestionChild:{whiteSpace:"normal"},ltr:{left:"0",right:"auto"},rtl:{left:"auto",right:" 0"}};b.isMsie()&&b.mixin(j.input,{backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"}),b.isMsie()&&b.isMsie()<=7&&b.mixin(j.input,{marginTop:"-1px"});var k=function(){function c(b){b&&b.el||a.error("EventBus initialized without el"),this.$el=a(b.el)}var d="typeahead:";return b.mixin(c.prototype,{trigger:function(a){var b=[].slice.call(arguments,1);this.$el.trigger(d+a,b)}}),c}(),l=function(){function a(a,b,c,d){var e;if(!c)return this;for(b=b.split(i),c=d?h(c,d):c,this._callbacks=this._callbacks||{};e=b.shift();)this._callbacks[e]=this._callbacks[e]||{sync:[],async:[]},this._callbacks[e][a].push(c);return this}function b(b,c,d){return a.call(this,"async",b,c,d)}function c(b,c,d){return a.call(this,"sync",b,c,d)}function d(a){var b;if(!this._callbacks)return this;for(a=a.split(i);b=a.shift();)delete this._callbacks[b];return this}function e(a){var b,c,d,e,g;if(!this._callbacks)return this;for(a=a.split(i),d=[].slice.call(arguments,1);(b=a.shift())&&(c=this._callbacks[b]);)e=f(c.sync,this,[b].concat(d)),g=f(c.async,this,[b].concat(d)),e()&&j(g);return this}function f(a,b,c){function d(){for(var d,e=0;!d&&e<a.length;e+=1)d=a[e].apply(b,c)===!1;return!d}return d}function g(){var a;return a=window.setImmediate?function(a){setImmediate(function(){a()})}:function(a){setTimeout(function(){a()},0)}}function h(a,b){return a.bind?a.bind(b):function(){a.apply(b,[].slice.call(arguments,0))}}var i=/\s+/,j=g();return{onSync:c,onAsync:b,off:d,trigger:e}}(),m=function(a){function c(a,c,d){for(var e,f=[],g=0;g<a.length;g++)f.push(b.escapeRegExChars(a[g]));return e=d?"\\b("+f.join("|")+")\\b":"("+f.join("|")+")",c?new RegExp(e):new RegExp(e,"i")}var d={node:null,pattern:null,tagName:"strong",className:null,wordsOnly:!1,caseSensitive:!1};return function(e){function f(b){var c,d;return(c=h.exec(b.data))&&(wrapperNode=a.createElement(e.tagName),e.className&&(wrapperNode.className=e.className),d=b.splitText(c.index),d.splitText(c[0].length),wrapperNode.appendChild(d.cloneNode(!0)),b.parentNode.replaceChild(wrapperNode,d)),!!c}function g(a,b){for(var c,d=3,e=0;e<a.childNodes.length;e++)c=a.childNodes[e],c.nodeType===d?e+=b(c)?1:0:g(c,b)}var h;e=b.mixin({},d,e),e.node&&e.pattern&&(e.pattern=b.isArray(e.pattern)?e.pattern:[e.pattern],h=c(e.pattern,e.caseSensitive,e.wordsOnly),g(e.node,f))}}(window.document),n=function(){function c(c){var e,f,h,i,j=this;c=c||{},c.input||a.error("input is missing"),e=b.bind(this._onBlur,this),f=b.bind(this._onFocus,this),h=b.bind(this._onKeydown,this),i=b.bind(this._onInput,this),this.$hint=a(c.hint),this.$input=a(c.input).on("blur.tt",e).on("focus.tt",f).on("keydown.tt",h),0===this.$hint.length&&(this.setHintValue=this.getHintValue=this.clearHint=b.noop),b.isMsie()?this.$input.on("keydown.tt keypress.tt cut.tt paste.tt",function(a){g[a.which||a.keyCode]||b.defer(b.bind(j._onInput,j,a))}):this.$input.on("input.tt",i),this.query=this.$input.val(),this.$overflowHelper=d(this.$input)}function d(b){return a('<pre aria-hidden="true"></pre>').css({position:"absolute",visibility:"hidden",whiteSpace:"nowrap",fontFamily:b.css("font-family"),fontSize:b.css("font-size"),fontStyle:b.css("font-style"),fontVariant:b.css("font-variant"),fontWeight:b.css("font-weight"),wordSpacing:b.css("word-spacing"),letterSpacing:b.css("letter-spacing"),textIndent:b.css("text-indent"),textRendering:b.css("text-rendering"),textTransform:b.css("text-transform")}).insertAfter(b)}function e(a,b){return c.normalizeQuery(a)===c.normalizeQuery(b)}function f(a){return a.altKey||a.ctrlKey||a.metaKey||a.shiftKey}var g;return g={9:"tab",27:"esc",37:"left",39:"right",13:"enter",38:"up",40:"down"},c.normalizeQuery=function(a){return(a||"").replace(/^\s*/g,"").replace(/\s{2,}/g," ")},b.mixin(c.prototype,l,{_onBlur:function(){this.resetInputValue(),this.trigger("blurred")},_onFocus:function(){this.trigger("focused")},_onKeydown:function(a){var b=g[a.which||a.keyCode];this._managePreventDefault(b,a),b&&this._shouldTrigger(b,a)&&this.trigger(b+"Keyed",a)},_onInput:function(){this._checkInputValue()},_managePreventDefault:function(a,b){var c,d,e;switch(a){case"tab":d=this.getHintValue(),e=this.getInputValue(),c=d&&d!==e&&!f(b);break;case"up":case"down":c=!f(b);break;default:c=!1}c&&b.preventDefault()},_shouldTrigger:function(a,b){var c;switch(a){case"tab":c=!f(b);break;default:c=!0}return c},_checkInputValue:function(){var a,b,c;a=this.getInputValue(),b=e(a,this.query),c=b?this.query.length!==a.length:!1,b?c&&this.trigger("whitespaceChanged",this.query):this.trigger("queryChanged",this.query=a)},focus:function(){this.$input.focus()},blur:function(){this.$input.blur()},getQuery:function(){return this.query},setQuery:function(a){this.query=a},getInputValue:function(){return this.$input.val()},setInputValue:function(a,b){this.$input.val(a),!b&&this._checkInputValue()},getHintValue:function(){return this.$hint.val()},setHintValue:function(a){this.$hint.val(a)},resetInputValue:function(){this.$input.val(this.query)},clearHint:function(){this.$hint.val("")},getLanguageDirection:function(){return(this.$input.css("direction")||"ltr").toLowerCase()},hasOverflow:function(){var a=this.$input.width()-2;return this.$overflowHelper.text(this.getInputValue()),this.$overflowHelper.width()>=a},isCursorAtEnd:function(){var a,c,d;return a=this.$input.val().length,c=this.$input[0].selectionStart,b.isNumber(c)?c===a:document.selection?(d=document.selection.createRange(),d.moveStart("character",-a),a===d.text.length):!0},destroy:function(){this.$hint.off(".tt"),this.$input.off(".tt"),this.$hint=this.$input=this.$overflowHelper=null}}),c}(),o=function(){function c(c){c=c||{},c.templates=c.templates||{},c.source||a.error("missing source"),c.name&&!f(c.name)&&a.error("invalid dataset name: "+c.name),this.query=null,this.highlight=!!c.highlight,this.name=c.name||b.getUniqueId(),this.source=c.source,this.displayFn=d(c.display||c.displayKey),this.templates=e(c.templates,this.displayFn),this.$el=a(i.dataset.replace("%CLASS%",this.name))}function d(a){function c(b){return b[a]}return a=a||"value",b.isFunction(a)?a:c}function e(a,c){function d(a){return"<p>"+c(a)+"</p>"}return{empty:a.empty&&b.templatify(a.empty),header:a.header&&b.templatify(a.header),footer:a.footer&&b.templatify(a.footer),suggestion:a.suggestion||d}}function f(a){return/^[_a-zA-Z0-9-]+$/.test(a)}var g="ttDataset",h="ttValue",k="ttDatum";return c.extractDatasetName=function(b){return a(b).data(g)},c.extractValue=function(b){return a(b).data(h)},c.extractDatum=function(b){return a(b).data(k)},b.mixin(c.prototype,l,{_render:function(c,d){function e(){return p.templates.empty({query:c,isEmpty:!0})}function f(){function e(b){var c,d,e;return d=p.templates.suggestion(b),e=i.suggestion.replace("%BODY%",d),c=a(e).data(g,p.name).data(h,p.displayFn(b)).data(k,b),c.children().each(function(){a(this).css(j.suggestionChild)}),c}var f,l;return f=a(i.suggestions).css(j.suggestions),l=b.map(d,e),f.append.apply(f,l),p.highlight&&m({node:f[0],pattern:c}),f}function l(){return p.templates.header({query:c,isEmpty:!o})}function n(){return p.templates.footer({query:c,isEmpty:!o})}if(this.$el){var o,p=this;this.$el.empty(),o=d&&d.length,!o&&this.templates.empty?this.$el.html(e()).prepend(p.templates.header?l():null).append(p.templates.footer?n():null):o&&this.$el.html(f()).prepend(p.templates.header?l():null).append(p.templates.footer?n():null),this.trigger("rendered")}},getRoot:function(){return this.$el},update:function(a){function b(b){a===c.query&&c._render(a,b)}var c=this;this.query=a,this.source(a,b)},clear:function(){this._render(this.query||"")},isEmpty:function(){return this.$el.is(":empty")},destroy:function(){this.$el=null}}),c}(),p=function(){function c(c){var e,f,g,h=this;c=c||{},c.menu||a.error("menu is required"),this.isOpen=!1,this.isEmpty=!0,this.datasets=b.map(c.datasets,d),e=b.bind(this._onSuggestionClick,this),f=b.bind(this._onSuggestionMouseEnter,this),g=b.bind(this._onSuggestionMouseLeave,this),this.$menu=a(c.menu).on("click.tt",".tt-suggestion",e).on("mouseenter.tt",".tt-suggestion",f).on("mouseleave.tt",".tt-suggestion",g),b.each(this.datasets,function(a){h.$menu.append(a.getRoot()),a.onSync("rendered",h._onRendered,h)})}function d(a){return new o(a)}return b.mixin(c.prototype,l,{_onSuggestionClick:function(b){this.trigger("suggestionClicked",a(b.currentTarget))},_onSuggestionMouseEnter:function(b){this._removeCursor(),this._setCursor(a(b.currentTarget),!0)},_onSuggestionMouseLeave:function(){this._removeCursor()},_onRendered:function(){function a(a){return a.isEmpty()}this.isEmpty=b.every(this.datasets,a),this.isEmpty?this._hide():this.isOpen&&this._show(),this.trigger("datasetRendered")},_hide:function(){this.$menu.hide()},_show:function(){this.$menu.css("display","block")},_getSuggestions:function(){return this.$menu.find(".tt-suggestion")},_getCursor:function(){return this.$menu.find(".tt-cursor").first()},_setCursor:function(a,b){a.first().addClass("tt-cursor"),!b&&this.trigger("cursorMoved")},_removeCursor:function(){this._getCursor().removeClass("tt-cursor")},_moveCursor:function(a){var b,c,d,e;if(this.isOpen){if(c=this._getCursor(),b=this._getSuggestions(),this._removeCursor(),d=b.index(c)+a,d=(d+1)%(b.length+1)-1,-1===d)return void this.trigger("cursorRemoved");-1>d&&(d=b.length-1),this._setCursor(e=b.eq(d)),this._ensureVisible(e)}},_ensureVisible:function(a){var b,c,d,e;b=a.position().top,c=b+a.outerHeight(!0),d=this.$menu.scrollTop(),e=this.$menu.height()+parseInt(this.$menu.css("paddingTop"),10)+parseInt(this.$menu.css("paddingBottom"),10),0>b?this.$menu.scrollTop(d+b):c>e&&this.$menu.scrollTop(d+(c-e))},close:function(){this.isOpen&&(this.isOpen=!1,this._removeCursor(),this._hide(),this.trigger("closed"))},open:function(){this.isOpen||(this.isOpen=!0,!this.isEmpty&&this._show(),this.trigger("opened"))},setLanguageDirection:function(a){this.$menu.css("ltr"===a?j.ltr:j.rtl)},moveCursorUp:function(){this._moveCursor(-1)},moveCursorDown:function(){this._moveCursor(1)},getDatumForSuggestion:function(a){var b=null;return a.length&&(b={raw:o.extractDatum(a),value:o.extractValue(a),datasetName:o.extractDatasetName(a)}),b},getDatumForCursor:function(){return this.getDatumForSuggestion(this._getCursor().first())},getDatumForTopSuggestion:function(){return this.getDatumForSuggestion(this._getSuggestions().first())},update:function(a){function c(b){b.update(a)}b.each(this.datasets,c)},empty:function(){function a(a){a.clear()}b.each(this.datasets,a),this.isEmpty=!0},isVisible:function(){return this.isOpen&&!this.isEmpty},destroy:function(){function a(a){a.destroy()}this.$menu.off(".tt"),this.$menu=null,b.each(this.datasets,a)}}),c}(),q=function(){function c(c){var e,f,g;c=c||{},c.input||a.error("missing input"),this.autoselect=!!c.autoselect,this.minLength=b.isNumber(c.minLength)?c.minLength:1,this.$node=d(c.input,c.withHint),e=this.$node.find(".tt-dropdown-menu"),f=this.$node.find(".tt-input"),g=this.$node.find(".tt-hint"),this.eventBus=c.eventBus||new k({el:f}),this.dropdown=new p({menu:e,datasets:c.datasets}).onSync("suggestionClicked",this._onSuggestionClicked,this).onSync("cursorMoved",this._onCursorMoved,this).onSync("cursorRemoved",this._onCursorRemoved,this).onSync("opened",this._onOpened,this).onSync("closed",this._onClosed,this).onAsync("datasetRendered",this._onDatasetRendered,this),this.input=new n({input:f,hint:g}).onSync("focused",this._onFocused,this).onSync("blurred",this._onBlurred,this).onSync("enterKeyed",this._onEnterKeyed,this).onSync("tabKeyed",this._onTabKeyed,this).onSync("escKeyed",this._onEscKeyed,this).onSync("upKeyed",this._onUpKeyed,this).onSync("downKeyed",this._onDownKeyed,this).onSync("leftKeyed",this._onLeftKeyed,this).onSync("rightKeyed",this._onRightKeyed,this).onSync("queryChanged",this._onQueryChanged,this).onSync("whitespaceChanged",this._onWhitespaceChanged,this),e.on("mousedown.tt",function(a){b.isMsie()&&b.isMsie()<9&&(f[0].onbeforedeactivate=function(){window.event.returnValue=!1,f[0].onbeforedeactivate=null}),a.preventDefault()})}function d(b,c){var d,f,h,k;d=a(b),f=a(i.wrapper).css(j.wrapper),h=a(i.dropdown).css(j.dropdown),k=d.clone().css(j.hint).css(e(d)),k.val("").removeData().addClass("tt-hint").removeAttr("id name placeholder").prop("disabled",!0).attr({autocomplete:"off",spellcheck:"false"}),d.data(g,{dir:d.attr("dir"),autocomplete:d.attr("autocomplete"),spellcheck:d.attr("spellcheck"),style:d.attr("style")}),d.addClass("tt-input").attr({autocomplete:"off",spellcheck:!1}).css(c?j.input:j.inputWithNoHint);try{!d.attr("dir")&&d.attr("dir","auto")}catch(l){}return d.wrap(f).parent().prepend(c?k:null).append(h)}function e(a){return{backgroundAttachment:a.css("background-attachment"),backgroundClip:a.css("background-clip"),backgroundColor:a.css("background-color"),backgroundImage:a.css("background-image"),backgroundOrigin:a.css("background-origin"),backgroundPosition:a.css("background-position"),backgroundRepeat:a.css("background-repeat"),backgroundSize:a.css("background-size")}}function f(a){var c=a.find(".tt-input");b.each(c.data(g),function(a,d){b.isUndefined(a)?c.removeAttr(d):c.attr(d,a)}),c.detach().removeData(g).removeClass("tt-input").insertAfter(a),a.remove()}var g="ttAttrs";return b.mixin(c.prototype,{_onSuggestionClicked:function(a,b){var c;(c=this.dropdown.getDatumForSuggestion(b))&&this._select(c)},_onCursorMoved:function(){var a=this.dropdown.getDatumForCursor();this.input.clearHint(),this.input.setInputValue(a.value,!0),this.eventBus.trigger("cursorchanged",a.raw,a.datasetName)},_onCursorRemoved:function(){this.input.resetInputValue(),this._updateHint()},_onDatasetRendered:function(){this._updateHint()},_onOpened:function(){this._updateHint(),this.eventBus.trigger("opened")},_onClosed:function(){this.input.clearHint(),this.eventBus.trigger("closed")},_onFocused:function(){this.dropdown.empty(),this.dropdown.open()},_onBlurred:function(){this.dropdown.close()},_onEnterKeyed:function(a,b){var c,d;c=this.dropdown.getDatumForCursor(),d=this.dropdown.getDatumForTopSuggestion(),c?(this._select(c),b.preventDefault()):this.autoselect&&d&&(this._select(d),b.preventDefault())},_onTabKeyed:function(a,b){var c;(c=this.dropdown.getDatumForCursor())?(this._select(c),b.preventDefault()):this._autocomplete()},_onEscKeyed:function(){this.dropdown.close(),this.input.resetInputValue()},_onUpKeyed:function(){var a=this.input.getQuery();!this.dropdown.isOpen&&a.length>=this.minLength&&this.dropdown.update(a),this.dropdown.open(),this.dropdown.moveCursorUp()},_onDownKeyed:function(){var a=this.input.getQuery();!this.dropdown.isOpen&&a.length>=this.minLength&&this.dropdown.update(a),this.dropdown.open(),this.dropdown.moveCursorDown()},_onLeftKeyed:function(){"rtl"===this.dir&&this._autocomplete()},_onRightKeyed:function(){"ltr"===this.dir&&this._autocomplete()},_onQueryChanged:function(a,b){this.input.clearHint(),this.dropdown.empty(),b.length>=this.minLength&&this.dropdown.update(b),this.dropdown.open(),this._setLanguageDirection()},_onWhitespaceChanged:function(){this._updateHint(),this.dropdown.open()},_setLanguageDirection:function(){var a;this.dir!==(a=this.input.getLanguageDirection())&&(this.dir=a,this.$node.css("direction",a),this.dropdown.setLanguageDirection(a))},_updateHint:function(){var a,c,d,e,f,g;a=this.dropdown.getDatumForTopSuggestion(),a&&this.dropdown.isVisible()&&!this.input.hasOverflow()&&(c=this.input.getInputValue(),d=n.normalizeQuery(c),e=b.escapeRegExChars(d),f=new RegExp("^(?:"+e+")(.*$)","i"),g=f.exec(a.value),this.input.setHintValue(c+(g?g[1]:"")))},_autocomplete:function(){var a,b,c;a=this.input.getHintValue(),b=this.input.getQuery(),a&&b!==a&&this.input.isCursorAtEnd()&&(c=this.dropdown.getDatumForTopSuggestion(),c&&this.input.setInputValue(c.value),this.eventBus.trigger("autocompleted",c.raw,c.datasetName))},_select:function(a){this.input.clearHint(),this.input.setQuery(a.value),this.input.setInputValue(a.value,!0),this._setLanguageDirection(),this.eventBus.trigger("selected",a.raw,a.datasetName),this.dropdown.close(),b.defer(b.bind(this.dropdown.empty,this.dropdown))},open:function(){this.dropdown.open()},close:function(){this.dropdown.close()},getQuery:function(){return this.input.getQuery()},setQuery:function(a){this.input.setInputValue(a)},destroy:function(){this.input.destroy(),this.dropdown.destroy(),f(this.$node),this.$node=null}}),c}();!function(){var c,d,e;c=a.fn.typeahead,d="ttTypeahead",e={initialize:function(c,e){function f(){var f,g,h=a(this);b.each(e,function(a){a.highlight=!!c.highlight}),g=new q({input:h,eventBus:f=new k({el:h}),withHint:b.isUndefined(c.hint)?!0:!!c.hint,minLength:c.minLength,autoselect:c.autoselect,datasets:e}),h.data(d,g)}return e=b.isArray(e)?e:[].slice.call(arguments,1),c=c||{},this.each(f)},open:function(){function b(){var b,c=a(this);(b=c.data(d))&&b.open()}return this.each(b)},close:function(){function b(){var b,c=a(this);(b=c.data(d))&&b.close()}return this.each(b)},val:function(b){function c(){var c,e=a(this);(c=e.data(d))&&c.setQuery(b)}function e(a){var b,c;return(b=a.data(d))&&(c=b.getQuery()),c}return arguments.length?this.each(c):e(this.first())},destroy:function(){function b(){var b,c=a(this);(b=c.data(d))&&(b.destroy(),c.removeData(d))}return this.each(b)}},a.fn.typeahead=function(a){return e[a]?e[a].apply(this,[].slice.call(arguments,1)):e.initialize.apply(this,arguments)},a.fn.typeahead.noConflict=function(){return a.fn.typeahead=c,this}}()}(window.jQuery);
diff --git a/modules/system/assets/less/settings.less b/modules/system/assets/less/settings/settings.less
similarity index 96%
rename from modules/system/assets/less/settings.less
rename to modules/system/assets/less/settings/settings.less
index aa216b137..fa9a59f2f 100644
--- a/modules/system/assets/less/settings.less
+++ b/modules/system/assets/less/settings/settings.less
@@ -1,4 +1,4 @@
-@import "../../../backend/assets/less/core/boot.less";
+@import "../../../../backend/assets/less/core/boot.less";
 
 .control-settings {
 
diff --git a/modules/system/assets/less/updates/install.less b/modules/system/assets/less/updates/install.less
new file mode 100644
index 000000000..08c3694ca
--- /dev/null
+++ b/modules/system/assets/less/updates/install.less
@@ -0,0 +1,293 @@
+@import "../../../../backend/assets/less/core/boot.less";
+
+.product-list-empty {
+    padding: 5px 0;
+    font-size: 16px;
+    color: #999;
+}
+.product-list {
+    margin: 0;
+    padding: 10px 0;
+    overflow: hidden; /* clearfix */
+}
+.product-list li button,
+.product-list li .image,
+.product-list li .details {
+    -webkit-transition: opacity .2s linear;
+    -moz-transition: opacity .2s linear;
+    transition: opacity .2s linear;
+}
+.product-list li button {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 20px;
+    height: 20px;
+    opacity: 0;
+    outline: none;
+}
+.product-list li:hover button {
+    opacity: .3;
+}
+.product-list li:hover button:hover {
+    opacity: .8;
+}
+
+.plugin-list {
+
+}
+.plugin-list li {
+    list-style: none;
+    position: relative;
+    border-bottom: 1px solid #E6E9E9;
+    margin-bottom: 10px;
+    padding-bottom: 10px;
+    overflow: hidden;
+}
+.plugin-list li:last-child {
+    border-bottom: none;
+}
+.plugin-list li .image {
+    float: left;
+    margin-right: 15px;
+    margin-left: 5px;
+}
+.plugin-list li .image img {
+    width: 50px;
+    height: 50px;
+}
+.plugin-list li .details p {
+    padding: 0;
+    margin: 3px 0 0 0;
+    color: #808C8D;
+}
+.plugin-list li h4 {
+    padding: 5px 0 0;
+    margin: 0;
+    color: #C03F31;
+    font-weight: 400;
+}
+
+.theme-list li {
+    float: left;
+    padding: 0;
+    margin: 0 10px 10px 0;
+    list-style: none;
+    border: 1px solid #E6E9E9;
+    background: #fff;
+    position: relative;
+    border-radius: 3px;
+}
+.theme-list li:hover {
+    border-color: transparent;
+}
+.theme-list li {
+    -webkit-transition: border .2s linear;
+    -moz-transition: border .2s linear;
+    transition: border .2s linear;
+}
+.theme-list li .image {
+    padding: 5px;
+}
+.theme-list li .image img {
+    width: 210px;
+    height: 140px;
+}
+.theme-list li:hover .image {
+    opacity: 0;
+}
+.theme-list li .details {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    opacity: 0;
+    padding: 10px;
+    overflow: hidden;
+}
+.theme-list li:hover .details {
+    opacity: 1;
+}
+.theme-list li h4 {
+    padding: 15px 0 0;
+    margin: 0;
+}
+.theme-list li p {
+    padding: 0;
+    margin: 0;
+    color: #999;
+    text-transform: uppercase;
+    font-size: 12px;
+}
+
+.suggested-products-container {
+}
+.suggested-products {
+    padding: 0;
+}
+.suggested-products .product {
+    padding: 0;
+}
+.suggested-products .image img {
+    width: 40px;
+    height: 40px;
+    margin-top: 10px;
+}
+.suggested-themes .image img {
+    width: 60px;
+    height: 40px;
+}
+.suggested-products .image {
+    float: left;
+    position: relative;
+}
+.suggested-products .details {
+    margin-left: 50px;
+    padding: 10px 0;
+}
+.suggested-themes .details {
+    margin-left: 70px;
+}
+.suggested-products .details h5 {
+    margin: 0 0 3px;
+    font-size: 14px;
+    color: #C03F31;
+    font-weight: 400;
+}
+.suggested-products .details p {
+    font-size: 12px;
+}
+.suggested-products a {
+    color: #777;
+    background: #fff;
+    padding: 5px;
+    text-decoration: none;
+    display: block;
+    overflow: hidden;
+    border-bottom: 1px solid #E6E9E9;
+}
+.suggested-products a:hover {
+    color: #333;
+    background: #f9f9f9;
+}
+.suggested-products a:hover .image {
+}
+.suggested-products a:hover .image:after {
+    content: "+";
+    color: #999;
+    font-size: 32px;
+    display: block;
+    width: 40px;
+    height: 40px;
+    text-align: center;
+    line-height: 40px;
+    position: absolute;
+    top: 7px;
+    left: 0;
+}
+.suggested-products a:hover .image img {
+    opacity: .5;
+}
+
+/*!
+ * Typeahead
+ */
+
+.product-search {
+    position: relative;
+    width: 100%;
+    margin: 0 auto 0 auto;
+    text-align: left;
+    padding-bottom: 15px;
+}
+
+.twitter-typeahead {
+    width: 100%;
+}
+.typeahead,
+.tt-hint {
+    width: 100%;
+    height: 46px;
+    padding: 8px 12px;
+    font-size: 24px;
+    line-height: 30px;
+    border: 1px solid #024e6a;
+    border-radius: 3px;
+    outline: none;
+}
+.typeahead {
+    background-color: #fff;
+    border-color: #e0e0e0;
+}
+.tt-input {
+    font-weight: 200;
+}
+.tt-input:focus {
+    border-color: #E6E9E9;
+}
+.tt-hint {
+    color: #999;
+    font-weight: 200;
+}
+.tt-dropdown-menu {
+    width: 100%;
+    margin-top: 0;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    border-radius: 3px;
+    -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+    -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+    box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
+.tt-suggestion {
+    font-size: 14px;
+    line-height: 18px;
+}
+.tt-suggestion + .tt-suggestion {
+    font-size: 14px;
+    border-top: 1px solid #ccc;
+}
+.tt-suggestions .product-details {
+    padding: 5px;
+    overflow: hidden;
+    position: relative;
+}
+.tt-suggestions .product-image {
+    float: left;
+    margin-right: 10px;
+}
+.tt-suggestions .product-image img {
+    height: 45px;
+    width: 45px;
+}
+.tt-suggestions .product-name {
+    font-size: 20px;
+    padding-top: 5px;
+}
+.tt-suggestions .product-description {
+}
+
+.tt-suggestion.tt-cursor {
+    cursor: pointer;
+}
+.tt-suggestion.tt-cursor .product-details {
+    color: #333;
+    background: #f9f9f9;
+    border-color: #f0f0f0;
+}
+.tt-suggestion.tt-cursor .product-details .product-image:after {
+    content: "+";
+    color: #999;
+    font-size: 38px;
+    display: block;
+    width: 45px;
+    height: 45px;
+    text-align: center;
+    line-height: 45px;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+}
+.tt-suggestion.tt-cursor .product-details .product-image img {
+    opacity: .5;
+}
diff --git a/modules/system/assets/less/updates.less b/modules/system/assets/less/updates/updates.less
similarity index 94%
rename from modules/system/assets/less/updates.less
rename to modules/system/assets/less/updates/updates.less
index 064effe5b..7e8d28a78 100644
--- a/modules/system/assets/less/updates.less
+++ b/modules/system/assets/less/updates/updates.less
@@ -1,4 +1,4 @@
-@import "../../../backend/assets/less/core/boot.less";
+@import "../../../../backend/assets/less/core/boot.less";
 
 .control-updatelist {
 
diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index 4ed1f59f5..fa06eac42 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -645,4 +645,40 @@ class PluginManager
 
         return $result;
     }
+
+    //
+    // Management
+    //
+
+    /**
+     * Completely roll back and delete a plugin from the system.
+     * @param string $id Plugin code/namespace
+     * @return void
+     */
+    public function deletePlugin($id)
+    {
+        /*
+         * Rollback plugin
+         */
+        UpdateManager::instance()->rollbackPlugin($id);
+
+        /*
+         * Delete from file system
+         */
+        if ($pluginPath = PluginManager::instance()->getPluginPath($id)) {
+            File::deleteDirectory($pluginPath);
+        }
+    }
+
+    /**
+     * Tears down a plugin's database tables and rebuilds them.
+     * @param string $id Plugin code/namespace
+     * @return void
+     */
+    public function refreshPlugin($id)
+    {
+        $manager = UpdateManager::instance();
+        $manager->rollbackPlugin($id);
+        $manager->updatePlugin($id);
+    }
 }
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index ef03695d9..711c8cebc 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -5,14 +5,16 @@ use URL;
 use File;
 use Lang;
 use Http;
+use Cache;
 use Schema;
 use Config;
-use Carbon\Carbon;
+use ApplicationException;
+use Cms\Classes\ThemeManager;
 use System\Models\Parameters;
 use System\Models\PluginVersion;
-use ApplicationException;
 use System\Helpers\Cache as CacheHelper;
 use October\Rain\Filesystem\Zip;
+use Carbon\Carbon;
 use Exception;
 
 /**
@@ -48,6 +50,11 @@ class UpdateManager
      */
     protected $pluginManager;
 
+    /**
+     * @var Cms\Classes\ThemeManager
+     */
+    protected $themeManager;
+
     /**
      * @var System\Classes\VersionManager
      */
@@ -68,12 +75,18 @@ class UpdateManager
      */
     protected $disableCoreUpdates = false;
 
+    /**
+     * @var array Cache of gateway products
+     */
+    protected $productCache;
+
     /**
      * Initialize this singleton.
      */
     protected function init()
     {
         $this->pluginManager = PluginManager::instance();
+        $this->themeManager = ThemeManager::instance();
         $this->versionManager = VersionManager::instance();
         $this->tempDirectory = temp_path();
         $this->baseDirectory = base_path();
@@ -235,7 +248,7 @@ class UpdateManager
          */
         $themes = [];
         foreach (array_get($result, 'themes', []) as $code => $info) {
-            if (!$this->isThemeInstalled($code)) {
+            if (!$this->themeManager->isInstalled($code)) {
                 $themes[$code] = $info;
             }
         }
@@ -492,6 +505,17 @@ class UpdateManager
     // Themes
     //
 
+    /**
+     * Looks up a theme from the update server.
+     * @param string $name Theme name.
+     * @return array Details about the theme.
+     */
+    public function requestThemeDetails($name)
+    {
+        $result = $this->requestServerData('theme/detail', ['name' => $name]);
+        return $result;
+    }
+
     /**
      * Downloads a theme from the update server.
      * @param string $name Theme name.
@@ -516,29 +540,118 @@ class UpdateManager
             throw new ApplicationException(Lang::get('system::lang.zip.extract_failed', ['file' => $filePath]));
         }
 
-        $this->setThemeInstalled($name);
+        $this->themeManager->setInstalled($name);
         @unlink($filePath);
     }
 
-    /**
-     * Checks if a theme has ever been installed before.
-     * @param  string  $name Theme code
-     * @return boolean
-     */
-    public function isThemeInstalled($name)
+    //
+    // Products
+    //
+
+    public function requestProductDetails($codes, $type = null)
     {
-        return array_key_exists($name, Parameters::get('system::theme.history', []));
+        if ($type != 'plugin' && $type != 'theme')
+            $type = 'plugin';
+
+        $codes = (array) $codes;
+        $this->loadProductDetailCache();
+
+        /*
+         * New products requested
+         */
+        $newCodes = array_diff($codes, array_keys($this->productCache[$type]));
+        if (count($newCodes)) {
+            $dataCodes = [];
+            $data = $this->requestServerData($type.'/details', ['names' => $newCodes]);
+            foreach ($data as $product) {
+                $code = array_get($product, 'code', -1);
+                $this->cacheProductDetail($type, $code, $product);
+                $dataCodes[] = $code;
+            }
+
+            /*
+             * Cache unknown products
+             */
+            $unknownCodes = array_diff($newCodes, $dataCodes);
+            foreach ($unknownCodes as $code) {
+                $this->cacheProductDetail($type, $code, -1);
+            }
+
+            $this->saveProductDetailCache();
+        }
+
+        /*
+         * Build details from cache
+         */
+        $result = [];
+        $requestedDetails = array_intersect_key($this->productCache[$type], array_flip($codes));
+
+        foreach ($requestedDetails as $detail) {
+            if ($detail === -1) continue;
+            $result[] = $detail;
+        }
+
+        return $result;
     }
 
     /**
-     * Flags a theme as being installed, so it is not downloaded twice.
-     * @param string $name Theme code
+     * Returns popular themes found on the marketplace.
      */
-    public function setThemeInstalled($name)
+    public function requestPopularProducts($type = null)
     {
-        $history = Parameters::get('system::theme.history', []);
-        $history[$name] = Carbon::now()->timestamp;
-        Parameters::set('system::theme.history', $history);
+        if ($type != 'plugin' && $type != 'theme')
+            $type = 'plugin';
+
+        $cacheKey = 'system-updates-popular-'.$type;
+
+        if (Cache::has($cacheKey)) {
+            return @unserialize(Cache::get($cacheKey)) ?: [];
+        }
+
+        $data = $this->requestServerData($type.'/popular');
+        Cache::put($cacheKey, serialize($data), 60);
+
+        foreach ($data as $product) {
+            $code = array_get($product, 'code', -1);
+            $this->cacheProductDetail($type, $code, $product);
+        }
+
+        $this->saveProductDetailCache();
+
+        return $data;
+    }
+
+    protected function loadProductDetailCache()
+    {
+        $defaultCache = ['theme' => [], 'plugin' => []];
+        $cacheKey = 'system-updates-product-details';
+
+        if (Cache::has($cacheKey)) {
+            $this->productCache = @unserialize(Cache::get($cacheKey)) ?: $defaultCache;
+        }
+        else {
+            $this->productCache = $defaultCache;
+        }
+    }
+
+    protected function saveProductDetailCache()
+    {
+        if ($this->productCache === null) {
+            $this->loadProductDetailCache();
+        }
+
+        $cacheKey = 'system-updates-product-details';
+        $expiresAt = Carbon::now()->addDays(2);
+        Cache::put($cacheKey, serialize($this->productCache), $expiresAt);
+    }
+
+    protected function cacheProductDetail($type, $code, $data)
+    {
+        if ($this->productCache === null) {
+            $this->loadProductDetailCache();
+        }
+
+        $this->productCache[$type][$code] = $data;
     }
 
     //
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 127f02507..3db05e392 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -34,7 +34,7 @@ class Settings extends Controller
             $this->requiredPermissions = null;
         }
 
-        $this->addCss('/modules/system/assets/css/settings.css', 'core');
+        $this->addCss('/modules/system/assets/css/settings/settings.css', 'core');
 
         BackendMenu::setContext('October.System', 'system', 'settings');
     }
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index 61f49301c..2f8646b0e 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -7,7 +7,9 @@ use Flash;
 use Config;
 use Backend;
 use Redirect;
+use Response;
 use BackendMenu;
+use Cms\Classes\ThemeManager;
 use Backend\Classes\Controller;
 use System\Models\Parameters;
 use System\Models\PluginVersion;
@@ -37,7 +39,7 @@ class Updates extends Controller
         parent::__construct();
 
         $this->addJs('/modules/system/assets/js/updates/updates.js', 'core');
-        $this->addCss('/modules/system/assets/css/updates.css', 'core');
+        $this->addCss('/modules/system/assets/css/updates/updates.css', 'core');
 
         BackendMenu::setContext('October.System', 'system', 'updates');
         SettingsManager::setContext('October.System', 'updates');
@@ -67,6 +69,31 @@ class Updates extends Controller
         return $this->asExtension('ListController')->index();
     }
 
+    /**
+     * Install new plugins / themes
+     */
+    public function install($tab = null)
+    {
+        if (get('search')) {
+            return Response::make($this->onSearchProducts());
+        }
+
+        try {
+            $this->bodyClass = 'compact-container breadcrumb-flush';
+            $this->pageTitle = 'Install products';
+
+            $this->addJs('/modules/system/assets/js/updates/install.js', 'core');
+            $this->addCss('/modules/system/assets/css/updates/install.css', 'core');
+
+            $this->vars['activeTab'] = $tab ?: 'plugins';
+            $this->vars['installedPlugins'] = $this->getInstalledPlugins();
+            $this->vars['installedThemes'] = $this->getInstalledThemes();
+        }
+        catch (Exception $ex) {
+            $this->handleError($ex);
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -132,12 +159,12 @@ class Updates extends Controller
             case 'completeUpdate':
                 $manager->update();
                 Flash::success(Lang::get('system::lang.updates.update_success'));
-                return Backend::redirect('system/updates');
+                return Redirect::refresh();
 
             case 'completeInstall':
                 $manager->update();
                 Flash::success(Lang::get('system::lang.install.install_success'));
-                return Backend::redirect('system/updates');
+                return Redirect::refresh();
         }
     }
 
@@ -442,7 +469,7 @@ class Updates extends Controller
     }
 
     /**
-     * Removes or purges plugins from the system.
+     * Rollback and remove plugins from the system.
      * @return void
      */
     public function onRemovePlugins()
@@ -454,18 +481,7 @@ class Updates extends Controller
                     continue;
                 }
 
-                /*
-                 * Rollback plugin
-                 */
-                $pluginCode = $object->code;
-                UpdateManager::instance()->rollbackPlugin($pluginCode);
-
-                /*
-                 * Delete from file system
-                 */
-                if ($pluginPath = PluginManager::instance()->getPluginPath($pluginCode)) {
-                    File::deleteDirectory($pluginPath);
-                }
+                PluginManager::instance()->deletePlugin($object->code);
             }
 
             Flash::success(Lang::get('system::lang.plugins.remove_success'));
@@ -474,6 +490,22 @@ class Updates extends Controller
         return $this->listRefresh('manage');
     }
 
+    /**
+     * Rollback and remove a single plugin from the system.
+     * @return void
+     */
+    public function onRemovePlugin()
+    {
+        if ($pluginCode = post('code')) {
+
+            PluginManager::instance()->deletePlugin($pluginCode);
+
+            Flash::success(Lang::get('system::lang.plugins.remove_success'));
+        }
+
+        return Redirect::refresh();
+    }
+
     /**
      * Rebuilds plugin database migrations.
      * @return void
@@ -482,19 +514,12 @@ class Updates extends Controller
     {
         if (($checkedIds = post('checked')) && is_array($checkedIds) && count($checkedIds)) {
 
-            $manager = UpdateManager::instance();
-
             foreach ($checkedIds as $objectId) {
                 if (!$object = PluginVersion::find($objectId)) {
                     continue;
                 }
 
-                /*
-                 * Refresh plugin
-                 */
-                $pluginCode = $object->code;
-                $manager->rollbackPlugin($pluginCode);
-                $manager->updatePlugin($pluginCode);
+                PluginManager::instance()->refreshPlugin($object->code);
             }
 
             Flash::success(Lang::get('system::lang.plugins.refresh_success'));
@@ -548,4 +573,145 @@ class Updates extends Controller
 
         return Backend::redirect('system/updates/manage');
     }
+
+    //
+    // Theme management
+    //
+
+    /**
+     * Validate the theme code and execute the theme installation
+     */
+    public function onInstallTheme()
+    {
+        try {
+            if (!$code = trim(post('code'))) {
+                throw new ApplicationException(Lang::get('system::lang.install.missing_theme_name'));
+            }
+
+            $manager = UpdateManager::instance();
+            $result = $manager->requestThemeDetails($code);
+
+            if (!isset($result['code']) || !isset($result['hash'])) {
+                throw new ApplicationException(Lang::get('system::lang.server.response_invalid'));
+            }
+
+            $name = $result['code'];
+            $hash = $result['hash'];
+            $themes = [$name => $hash];
+            $plugins = [];
+
+            /*
+             * Update steps
+             */
+            $updateSteps = $this->buildUpdateSteps(null, $plugins, $themes);
+
+            /*
+             * Finish up
+             */
+            $updateSteps[] = [
+                'code'  => 'completeInstall',
+                'label' => Lang::get('system::lang.install.install_completing'),
+            ];
+
+            $this->vars['updateSteps'] = $updateSteps;
+
+            return $this->makePartial('execute');
+        }
+        catch (Exception $ex) {
+            $this->handleError($ex);
+            return $this->makePartial('theme_form');
+        }
+    }
+
+    /**
+     * Deletes a single theme from the system.
+     * @return void
+     */
+    public function onRemoveTheme()
+    {
+        if ($themeCode = post('code')) {
+
+            ThemeManager::instance()->deleteTheme($themeCode);
+
+            Flash::success(trans('cms::lang.theme.delete_theme_success'));
+        }
+
+        return Redirect::refresh();
+    }
+
+    //
+    // Product install
+    //
+
+    public function install_onSearchProducts()
+    {
+        $searchType = get('search', 'plugins');
+        $serverUri = $searchType == 'plugins' ? 'plugin/search' : 'theme/search';
+
+        $manager = UpdateManager::instance();
+        return $manager->requestServerData($serverUri, ['query' => get('query')]);
+    }
+
+    public function install_onGetPopularPlugins()
+    {
+        $installed = $this->getInstalledPlugins();
+        $popular = UpdateManager::instance()->requestPopularProducts('plugin');
+        $popular = $this->filterPopularProducts($popular, $installed);
+
+        return ['result' => $popular];
+    }
+
+    public function install_onGetPopularThemes()
+    {
+        $installed = $this->getInstalledThemes();
+        $popular = UpdateManager::instance()->requestPopularProducts('theme');
+        $popular = $this->filterPopularProducts($popular, $installed);
+
+        return ['result' => $popular];
+    }
+
+    protected function getInstalledPlugins()
+    {
+        $installed = PluginVersion::lists('code');
+        $manager = UpdateManager::instance();
+        return $manager->requestProductDetails($installed, 'plugin');
+    }
+
+    protected function getInstalledThemes()
+    {
+        $history = Parameters::get('system::theme.history', []);
+        $manager = UpdateManager::instance();
+        $installed = $manager->requestProductDetails(array_keys($history), 'theme');
+
+        /*
+         * Splice in the directory names
+         */
+        foreach ($installed as $key => $data) {
+            $code = array_get($data, 'code');
+            $installed[$key]['dirName'] = array_get($history, $code, $code);
+        }
+
+        return $installed;
+    }
+
+    /*
+     * Remove installed products from the collection
+     */
+    protected function filterPopularProducts($popular, $installed)
+    {
+        $installedArray = [];
+        foreach ($installed as $product) {
+            $installedArray[] = array_get($product, 'code', -1);
+        }
+
+        foreach ($popular as $key => $product) {
+            $code = array_get($product, 'code');
+            if (in_array($code, $installedArray)) {
+                unset($popular[$key]);
+            }
+        }
+
+        return $popular;
+    }
+
 }
diff --git a/modules/system/controllers/updates/_install_plugins.htm b/modules/system/controllers/updates/_install_plugins.htm
new file mode 100644
index 000000000..378baf0d3
--- /dev/null
+++ b/modules/system/controllers/updates/_install_plugins.htm
@@ -0,0 +1,102 @@
+
+<div>
+
+    <!-- Search -->
+    <form
+        id="installPluginsForm"
+        data-handler="onInstallPlugin"
+        onsubmit="$.oc.installProcess.searchSubmit(this); return false">
+        <div class="product-search">
+            <input
+                name="code"
+                id="pluginSearchInput"
+                class="product-search-input search-input-lg typeahead"
+                placeholder="search plugins to install..."
+                data-search-type="plugins"
+                />
+        </div>
+    </form>
+
+    <div class="row">
+
+        <div class="col-md-7">
+
+            <!-- Installed plugins -->
+            <div id="pluginList"
+                class="product-list-manager">
+
+                <h4 class="section-header">
+                    <a href="<?= Backend::url('system/updates') ?>">Installed plugins</a>
+                    <small>(<span class="product-counter"><?= count($installedPlugins) ?></span>)</small>
+                </h4>
+
+                <?php if (!count($installedPlugins)): ?>
+                    <div class="product-list-empty">
+                        <p>There are no plugins installed from the marketplace.</p>
+                    </div>
+                <?php else: ?>
+                    <ul class="product-list plugin-list">
+                        <?php foreach ($installedPlugins as $plugin): ?>
+
+                            <li data-code="<?= $plugin['code'] ?>">
+                                <div class="image">
+                                    <img src="<?= $plugin['image'] ?>" alt="">
+                                </div>
+                                <div class="details">
+                                    <h4><?= $plugin['name'] ?></h4>
+                                    <p>by <?= $plugin['author'] ?></p>
+                                </div>
+                                <button
+                                    type="button"
+                                    class="close"
+                                    aria-hidden="true"
+                                    data-request="onRemovePlugin"
+                                    data-request-data="code: '<?= $plugin['code'] ?>'"
+                                    data-request-confirm="Are you sure you want to remove this?"
+                                    data-stripe-load-indicator>
+                                    &times;
+                                </button>
+                            </li>
+
+                        <?php endforeach ?>
+                    </ul>
+                <?php endif ?>
+
+            </div>
+
+        </div>
+        <div class="col-md-5">
+
+            <!-- Recommended extras -->
+            <div class="suggested-products-container">
+                <h4 class="section-header">Recommended</h4>
+                <div class="scroll-panel">
+                    <div
+                        id="suggestedPlugins"
+                        class="suggested-products suggested-plugins"
+                        data-handler="onGetPopularPlugins"
+                        data-view="plugin/suggestion"></div>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
+
+<script type="text/template" data-partial="plugin/suggestion">
+    <div class="product">
+        <a
+            data-control="popup"
+            data-handler="onInstallPlugin"
+            data-request-data="code: '{{code}}'"
+            href="javascript:;">
+            <div class="image"><img src="{{image}}" alt=""></div>
+            <div class="details">
+                <h5 class="text-overflow">{{code}}</h5>
+                <p>{{description}}</p>
+            </div>
+        </a>
+    </div>
+</script>
diff --git a/modules/system/controllers/updates/_install_themes.htm b/modules/system/controllers/updates/_install_themes.htm
new file mode 100644
index 000000000..9ea744a83
--- /dev/null
+++ b/modules/system/controllers/updates/_install_themes.htm
@@ -0,0 +1,104 @@
+
+<div>
+
+    <!-- Search -->
+    <form
+        id="installThemesForm"
+        data-handler="onInstallTheme"
+        onsubmit="$.oc.installProcess.searchSubmit(this); return false">
+        <div class="product-search">
+            <input
+                name="code"
+                id="themeSearchInput"
+                class="product-search-input search-input-lg typeahead"
+                placeholder="search themes to install..."
+                data-search-type="themes"
+                />
+        </div>
+    </form>
+
+    <div class="row">
+
+        <div class="col-md-7">
+
+            <!-- Installed themes -->
+            <div id="themeList"
+                class="product-list-manager"
+                data-handler="onGetInstalledThemes"
+                data-view="product/theme">
+
+                <h4 class="section-header">
+                    <a href="<?= Backend::url('cms/themes') ?>">Installed themes</a>
+                    <small>(<span class="product-counter">0</span>)</small>
+                </h4>
+
+                <?php if (!count($installedThemes)): ?>
+                    <div class="product-list-empty">
+                        <p>There are no themes installed from the marketplace.</p>
+                    </div>
+                <?php else: ?>
+                    <ul class="product-list theme-list">
+                        <?php foreach ($installedThemes as $theme): ?>
+
+                            <li data-code="<?= $theme['code'] ?>">
+                                <div class="image">
+                                    <img src="<?= $theme['image'] ?>" alt="">
+                                </div>
+                                <div class="details">
+                                    <h4><?= $theme['name'] ?></h4>
+                                    <p>by <?= $theme['author'] ?></p>
+                                </div>
+                                <button
+                                    type="button"
+                                    class="close"
+                                    aria-hidden="true"
+                                    data-request="onRemoveTheme"
+                                    data-request-data="code: '<?= $theme['dirName'] ?>'"
+                                    data-request-confirm="Are you sure you want to remove this?"
+                                    data-stripe-load-indicator>
+                                    &times;
+                                </button>
+                            </li>
+
+                        <?php endforeach ?>
+                    </ul>
+                <?php endif ?>
+
+            </div>
+
+        </div>
+        <div class="col-md-5">
+
+            <!-- Recommended extras -->
+            <div class="suggested-products-container">
+                <h4 class="section-header">Recommended</h4>
+                <div class="scroll-panel">
+                    <div
+                        id="suggestedThemes"
+                        class="suggested-products suggested-themes"
+                        data-handler="onGetPopularThemes"
+                        data-view="theme/suggestion"></div>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
+
+<script type="text/template" data-partial="theme/suggestion">
+    <div class="product">
+        <a
+            data-control="popup"
+            data-handler="onInstallTheme"
+            data-request-data="code: '{{code}}'"
+            href="javascript:;">
+            <div class="image"><img src="{{image}}" alt=""></div>
+            <div class="details">
+                <h5 class="text-overflow">{{code}}</h5>
+                <p>{{description}}</p>
+            </div>
+        </a>
+    </div>
+</script>
diff --git a/modules/system/controllers/updates/_list_search.htm b/modules/system/controllers/updates/_list_search.htm
deleted file mode 100644
index edddfa2f1..000000000
--- a/modules/system/controllers/updates/_list_search.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<?= Form::open() ?>
-
-    <div class="input-group" style="width: 207px">
-        <input
-            placeholder="<?= e(trans('backend::lang.list.search_prompt')) ?>"
-            type="text"
-            name="code"
-            value=""
-            class="form-control icon plus growable pull-right"
-            autocomplete="off" />
-
-        <span class="input-group-btn">
-            <button
-                type="submit"
-                class="btn btn-success"
-                id="installPluginButton"
-                data-control="popup"
-                data-handler="onInstallPlugin">
-                <?= e(trans('system::lang.install.plugin_label')) ?>
-            </button>
-        </span>
-    </div>
-
-<?= Form::close() ?>
diff --git a/modules/system/controllers/updates/_list_toolbar.htm b/modules/system/controllers/updates/_list_toolbar.htm
index 8639e2672..c680e089d 100644
--- a/modules/system/controllers/updates/_list_toolbar.htm
+++ b/modules/system/controllers/updates/_list_toolbar.htm
@@ -11,4 +11,9 @@
         class="btn btn-default oc-icon-puzzle-piece">
         <?= e(trans('system::lang.plugins.manage')) ?>
     </a>
+    <a
+        href="<?= Backend::url('system/updates/install') ?>"
+        class="btn btn-success oc-icon-plus">
+        Install plugins
+    </a>
 </div>
\ No newline at end of file
diff --git a/modules/system/controllers/updates/_theme_form.htm b/modules/system/controllers/updates/_theme_form.htm
new file mode 100644
index 000000000..8729e8974
--- /dev/null
+++ b/modules/system/controllers/updates/_theme_form.htm
@@ -0,0 +1,47 @@
+<?= Form::open(['id' => 'themeForm']) ?>
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="popup">&times;</button>
+        <h4 class="modal-title"><?= e(trans('system::lang.install.theme_label')) ?></h4>
+    </div>
+    <div class="modal-body">
+
+        <?php if ($this->fatalError): ?>
+            <p class="flash-message static error"><?= $fatalError ?></p>
+        <?php endif ?>
+
+        <div class="form-group">
+            <label for="themeCode"><?= e(trans('system::lang.theme.name.label')) ?></label>
+            <input
+                name="code"
+                type="text"
+                class="form-control"
+                id="themeCode"
+                value="<?= post('code') ?>" />
+            <p class="help-block"><?= e(trans('system::lang.theme.name.help')) ?></p>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button
+            type="submit"
+            class="btn btn-primary"
+            data-dismiss="popup"
+            data-control="popup"
+            data-handler="onInstallTheme">
+            <?= e(trans('system::lang.install.theme_label')) ?>
+        </button>
+        <button
+            type="button"
+            class="btn btn-default"
+            data-dismiss="popup">
+            <?= e(trans('backend::lang.form.cancel')) ?>
+        </button>
+    </div>
+    <script>
+        setTimeout(
+            function(){ $('#themeCode').select() },
+            310
+        )
+    </script>
+<?= Form::close() ?>
\ No newline at end of file
diff --git a/modules/system/controllers/updates/config_list.yaml b/modules/system/controllers/updates/config_list.yaml
index 02b043b32..5bda9f802 100644
--- a/modules/system/controllers/updates/config_list.yaml
+++ b/modules/system/controllers/updates/config_list.yaml
@@ -9,4 +9,3 @@ noRecordsMessage: backend::lang.list.no_records
 
 toolbar:
     buttons: list_toolbar
-    search: list_search
\ No newline at end of file
diff --git a/modules/system/controllers/updates/install.htm b/modules/system/controllers/updates/install.htm
new file mode 100644
index 000000000..5043e13da
--- /dev/null
+++ b/modules/system/controllers/updates/install.htm
@@ -0,0 +1,49 @@
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url('system/updates') ?>"><?= e(trans('system::lang.updates.menu_label')) ?></a></li>
+        <li><?= e(trans($this->pageTitle)) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <div class="control-tabs content-tabs tabs-flush" data-control="tab">
+        <ul class="nav nav-tabs">
+            <li class="<?= $activeTab == 'plugins' ? 'active' : '' ?>">
+                <a
+                    href="#tabPlugins"
+                    data-tab-url="<?= Backend::url('system/updates/install/plugins') ?>">
+                    Plugins
+                </a>
+            </li>
+            <li class="<?= $activeTab == 'themes' ? 'active' : '' ?>">
+                <a
+                    href="#tabThemes"
+                    data-tab-url="<?= Backend::url('system/updates/install/themes') ?>">
+                    Themes
+                </a>
+            </li>
+        </ul>
+        <div class="tab-content">
+            <div class="tab-pane <?= $activeTab == 'plugins' ? 'active' : '' ?>">
+                <div class="padded-container">
+                    <?= $this->makePartial('install_plugins') ?>
+                </div>
+            </div>
+            <div class="tab-pane <?= $activeTab == 'themes' ? 'active' : '' ?>">
+                <div class="padded-container">
+                    <?= $this->makePartial('install_themes') ?>
+                </div>
+            </div>
+        </div>
+    </div>
+
+<?php else: ?>
+
+    <div class="padded-container">
+        <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+        <p><a href="<?= Backend::url('system/updates') ?>" class="btn btn-default"><?= e(trans('system::lang.settings.return')) ?></a></p>
+        <p><a href="<?= Backend::url('cms/themes') ?>" class="btn btn-default"><?= e(trans('cms::lang.theme.return')) ?></a></p>
+    </div>
+
+<?php endif ?>
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 440086139..6c5e9e02e 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -52,6 +52,12 @@ return [
             'my_settings' => 'My Settings'
         ]
     ],
+    'theme' => [
+        'name' => [
+            'label' => 'Theme Name',
+            'help' => 'Name the theme by its unique code. For example, RainLab.Vanilla'
+        ]
+    ],
     'plugin' => [
         'unnamed' => 'Unnamed plugin',
         'name' => [
@@ -156,7 +162,9 @@ return [
     'install' => [
         'project_label' => 'Attach to Project',
         'plugin_label' => 'Install Plugin',
+        'theme_label' => 'Install Theme',
         'missing_plugin_name' => 'Please specify a Plugin name to install.',
+        'missing_theme_name' => 'Please specify a Theme name to install.',
         'install_completing' => 'Finishing installation process',
         'install_success' => 'The plugin has been installed successfully.'
     ],
diff --git a/modules/system/models/pluginversion/columns.yaml b/modules/system/models/pluginversion/columns.yaml
index 5bd7b41e5..8d49f9085 100644
--- a/modules/system/models/pluginversion/columns.yaml
+++ b/modules/system/models/pluginversion/columns.yaml
@@ -4,20 +4,20 @@
 
 columns:
 
-  name:
-    label: system::lang.updates.plugin_name
-    sortable: false
+    name:
+        label: system::lang.updates.plugin_name
+        sortable: false
 
-  description:
-    label: system::lang.updates.plugin_description
-    sortable: false
+    description:
+        label: system::lang.updates.plugin_description
+        sortable: false
 
-  version:
-    label: system::lang.updates.plugin_version
-    sortable: false
+    version:
+        label: system::lang.updates.plugin_version
+        sortable: false
 
-  author:
-    label: system::lang.updates.plugin_author
-    sortable: false
-    type: partial
-    path: column_author
\ No newline at end of file
+    author:
+        label: system::lang.updates.plugin_author
+        sortable: false
+        type: partial
+        path: column_author
\ No newline at end of file