diff --git a/notebook/static/notebook/js/notebook.js b/notebook/static/notebook/js/notebook.js
index 42eb3344b..ffa0fae22 100644
--- a/notebook/static/notebook/js/notebook.js
+++ b/notebook/static/notebook/js/notebook.js
@@ -30,9 +30,7 @@ define([
     './celltoolbarpresets/attachments',
     './scrollmanager',
     './commandpalette',
-    // FIXME: shortcut-editor uses preact,
-    // which doesn't boewr install
-    // 'notebook/js/shortcuteditor',
+    './shortcuteditor',
 ], function (
     $,
     IPython,
@@ -57,10 +55,11 @@ define([
     slideshow_celltoolbar,
     attachments_celltoolbar,
     scrollmanager,
-    commandpalette
-    // ShortcutEditor
+    commandpalette,
+    shortcuteditor
 ) {
 
+    var ShortcutEditor = shortcuteditor.ShortcutEditor;
     var _SOFT_SELECTION_CLASS = 'jupyter-soft-selected';
 
     function soft_selected(cell){
@@ -443,7 +442,7 @@ define([
 
     Notebook.prototype.show_shortcuts_editor = function() {
         // FIXME: ShortcutEditor disabled for now
-        // new ShortcutEditor(this);
+        new ShortcutEditor(this);
     };
 
     /**
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 0c34b5e17..e9c56c865 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -16,7 +16,10 @@
     {% endblock %}
     <link rel="stylesheet" href="{{ base_url }}custom/custom.css" type="text/css" />
     <script src="{{static_url("components/es6-promise/promise.min.js")}}" type="text/javascript" charset="utf-8"></script>
-    <script src="{{static_url("components/requirejs/require.js") }}" type="text/javascript" charset="utf-8"></script>
+    <script src="{{static_url('components/preact/dist/preact.min.js')}}" type="text/javascript"></script>
+    <script src="{{static_url('components/proptypes/index.js')}}" type="text/javascript"></script>
+    <script src="{{static_url('components/preact-compat/dist/preact-compat.min.js')}}" type="text/javascript"></script>
+    <script src="{{static_url('components/requirejs/require.js') }}" type="text/javascript" charset="utf-8"></script>
     <script>
       require.config({
           {% if version_hash %}
@@ -39,11 +42,11 @@
             termjs: 'components/xterm.js/dist/xterm',
             typeahead: 'components/jquery-typeahead/dist/jquery.typeahead.min',
           },
-	  map: { // for backward compatibility
-	    "*": {
-		"jqueryui": "jquery-ui",
-	    }
-	  },
+          map: { // for backward compatibility
+              "*": {
+                  "jqueryui": "jquery-ui",
+              }
+          },
           shim: {
             typeahead: {
               deps: ["jquery"],
diff --git a/package.json b/package.json
index 603923bfd..4385ad4a8 100644
--- a/package.json
+++ b/package.json
@@ -16,5 +16,9 @@
     "bower": "*",
     "less": "~2",
     "requirejs": "^2.1.17"
+  },
+  "dependencies": {
+    "preact": "^7.1.0",
+    "preact-compat": "^3.9.4"
   }
 }
diff --git a/setupbase.py b/setupbase.py
index ba2d2c384..a148c8c6f 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -14,9 +14,10 @@ This includes:
 from __future__ import print_function
 
 import os
+import pipes
+import shutil
 import sys
 
-import pipes
 from distutils import log
 from distutils.cmd import Command
 from fnmatch import fnmatch
@@ -342,6 +343,15 @@ class Bower(Command):
             return True
         if not os.path.exists(self.bower_dir):
             return True
+        
+        # check npm packages
+        for pkg in ['preact', 'preact-compat', 'proptypes']:
+            npm_pkg = os.path.join(self.node_modules, pkg)
+            bower_pkg = os.path.join(self.bower_dir, pkg)
+            if not os.path.exists(npm_pkg) or not os.path.exists(bower_pkg):
+                return True
+            if mtime(bower_pkg) < mtime(npm_pkg):
+                return True
         return mtime(self.bower_dir) < mtime(pjoin(repo_root, 'bower.json'))
 
     def should_run_npm(self):
@@ -351,7 +361,17 @@ class Bower(Command):
         if not os.path.exists(self.node_modules):
             return True
         return mtime(self.node_modules) < mtime(pjoin(repo_root, 'package.json'))
-    
+
+    def npm_components(self):
+        """Stage npm frontend dependencies into components"""
+        for pkg in ['preact', 'preact-compat', 'proptypes']:
+            npm_pkg = os.path.join(self.node_modules, pkg)
+            bower_pkg = os.path.join(self.bower_dir, pkg)
+            log.info("Staging %s -> %s" % (npm_pkg, bower_pkg))
+            if os.path.exists(bower_pkg):
+                shutil.rmtree(bower_pkg)
+            shutil.copytree(npm_pkg, bower_pkg)
+
     def run(self):
         if not self.should_run():
             print("bower dependencies up to date")
@@ -375,6 +395,7 @@ class Bower(Command):
             print("Failed to run bower: %s" % e, file=sys.stderr)
             print("You can install js dependencies with `npm install`", file=sys.stderr)
             raise
+        self.npm_components()
         os.utime(self.bower_dir, None)
         # update package data in case this created new files
         update_package_data(self.distribution)
@@ -444,6 +465,7 @@ class CompileJS(Command):
     
     def sources(self, name):
         """Generator yielding .js sources that an application depends on"""
+        yield pjoin(repo_root, 'tools', 'build-main.js')
         yield pjoin(static, name, 'js', 'main.js')
 
         for sec in [name, 'base', 'auth']:
@@ -549,11 +571,11 @@ def css_js_prerelease(command, strict=False):
                     # die if strict or any targets didn't build
                     prefix = os.path.commonprefix([repo_root + os.sep] + missing)
                     missing = [ m[len(prefix):] for m in missing ]
-                    log.warning("rebuilding js and css failed. The following required files are missing: %s" % missing)
+                    log.warn("rebuilding js and css failed. The following required files are missing: %s" % missing)
                     raise e
                 else:
-                    log.warning("rebuilding js and css failed (not a problem)")
-                    log.warning(str(e))
+                    log.warn("rebuilding js and css failed (not a problem)")
+                    log.warn(str(e))
 
             # check again for missing targets, just in case:
             missing = [ t for t in targets if not os.path.exists(t) ]
diff --git a/tools/build-main.js b/tools/build-main.js
index 74fc6cd78..44b5b7013 100644
--- a/tools/build-main.js
+++ b/tools/build-main.js
@@ -54,7 +54,7 @@ var rjs_config = {
     "jquery-ui": {
       deps: ["jquery"],
       exports: "$"
-    }
+    },
   },
 
   exclude: [