diff --git a/script/sw-precache.js b/script/sw-precache.js
index c82867f97d..00501b8008 100644
--- a/script/sw-precache.js
+++ b/script/sw-precache.js
@@ -19,17 +19,29 @@ function md5(filename) {
     .update(fs.readFileSync(filename)).digest('hex');
 }
 
-var appPaths = ['/', '/states', '/logbook', '/history', '/map',
-    '/devService', '/devState', '/devEvent', '/devInfo', '/devTemplate'];
+var appPaths = {
+  '/': [],
+  '/states': [],
+  '/logbook': [],
+  '/history': [],
+  '/map': ['/partial-map.html'],
+  '/devService': ['/dev-tools.html'],
+  '/devState': ['/dev-tools.html'],
+  '/devEvent': ['/dev-tools.html'],
+  '/devInfo': ['/dev-tools.html'],
+  '/devTemplate': ['/dev-tools.html'],
+};
+
 var fingerprinted = ['frontend.html', 'mdi.html', 'core.js', 'partial-map.html',
                      'dev-tools.html'];
 
 var dynamicUrlToDependencies = {};
 
-// Have all app paths be refreshed based on if frontend changed
-appPaths.forEach(ap => {
-  dynamicUrlToDependencies[ap] = [rootDir + '/frontend.html',
-                                  rootDir + '/partial-map.html'];
+// Have all app paths be refreshed based on if their dependencies changed
+Object.keys(appPaths).forEach(ap => {
+  dynamicUrlToDependencies[ap] = [
+    rootDir + '/frontend.html', rootDir + '/core.js',
+  ] + appPaths[ap].map(val => rootDir + val);
 });
 
 // Create fingerprinted versions of our dependencies.
diff --git a/script/vulcanize.js b/script/vulcanize.js
index d003ccb483..eeb47dfde0 100644
--- a/script/vulcanize.js
+++ b/script/vulcanize.js
@@ -54,11 +54,8 @@ const toProcess = [
         'bower_components/polymer/polymer.html',
         'bower_components/paper-button/paper-button.html',
         'bower_components/paper-input/paper-input.html',
-        'bower_components/paper-icon-button/paper-icon-button.html',
         'bower_components/paper-spinner/paper-spinner.html',
-        'bower_components/paper-toolbar/paper-toolbar.html',
-        'bower_components/paper-menu/paper-menu.html',
-        'bower_components/paper-scroll-header-panel/paper-scroll-header-panel.html',
+        'src/layouts/partial-base.html',
       ],
     })),
   },
diff --git a/src/components/services-list.html b/src/components/services-list.html
index 50ac408340..4b7026502c 100644
--- a/src/components/services-list.html
+++ b/src/components/services-list.html
@@ -1,7 +1,5 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../../bower_components/paper-menu/paper-menu.html">
-
 <dom-module id="services-list">
   <style>
     ul {