diff --git a/bower.json b/bower.json
index 1f762d592e..42b03d36b9 100644
--- a/bower.json
+++ b/bower.json
@@ -4,43 +4,14 @@
   "authors": [
     "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>"
   ],
-  "main": "splash-login.html",
+  "main": "src/home-assistant.html",
   "license": "MIT",
   "private": true,
-  "ignore": [
-    "bower_components"
-  ],
   "devDependencies": {
-    "polymer": "Polymer/polymer#^1.1.0",
-    "webcomponentsjs": "Polymer/webcomponentsjs#^0.7.12",
-    "paper-header-panel": "PolymerElements/paper-header-panel#^1.0.0",
-    "paper-toolbar": "PolymerElements/paper-toolbar#^1.0.4",
-    "paper-menu": "PolymerElements/paper-menu#^1.1.0",
-    "iron-input": "PolymerElements/iron-input#^1.0.5",
-    "iron-icons": "PolymerElements/iron-icons#^1.0.3",
-    "iron-image": "PolymerElements/iron-image#^1.0.0",
-    "paper-toast": "PolymerElements/paper-toast#^1.0.0",
-    "paper-dialog": "PolymerElements/paper-dialog#^1.0.0",
-    "paper-dialog-scrollable": "polymerelements/paper-dialog-scrollable#^1.0.0",
-    "paper-spinner": "PolymerElements/paper-spinner#^1.0.0",
-    "paper-button": "PolymerElements/paper-button#^1.0.0",
-    "paper-input": "PolymerElements/paper-input#^1.0.12",
-    "paper-toggle-button": "PolymerElements/paper-toggle-button#^1.0.0",
-    "paper-icon-button": "PolymerElements/paper-icon-button#^1.0.0",
-    "paper-item": "PolymerElements/paper-item#^1.0.0",
-    "paper-slider": "PolymerElements/paper-slider#^1.0.0",
-    "paper-checkbox": "PolymerElements/paper-checkbox#^1.0.0",
-    "paper-drawer-panel": "PolymerElements/paper-drawer-panel#^1.0.0",
-    "paper-scroll-header-panel": "polymerelements/paper-scroll-header-panel#^1.0.0",
-    "google-apis": "GoogleWebComponents/google-apis#0.8-preview",
-    "layout": "Polymer/layout",
-    "paper-styles": "polymerelements/paper-styles#^1.0.11",
-    "pikaday": "~1.3.3",
-    "iron-media-query": "polymerelements/iron-media-query#~1.0.2",
-    "leaflet-map": "~1.1.0"
-  },
-  "resolutions": {
-    "polymer": "^1.0.0",
-    "webcomponentsjs": "^0.7.0"
+    "polymer": "Polymer/polymer#^1.1.5",
+    "pikaday": "1.3.3",
+    "leaflet-map": "1.1.0",
+    "iron-elements": "PolymerElements/iron-elements#~1.0.4",
+    "paper-elements": "PolymerElements/paper-elements#~1.0.5"
   }
 }
diff --git a/src/components/ha-label-badge.html b/src/components/ha-label-badge.html
index 2b87b7d04a..1811d3f4ef 100644
--- a/src/components/ha-label-badge.html
+++ b/src/components/ha-label-badge.html
@@ -1,5 +1,4 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
-<link rel='import' href='../../bower_components/layout/layout.html'>
 <link rel='import' href='../../bower_components/iron-image/iron-image.html'>
 <link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
 
diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html
index 83e04513e6..1b78229b67 100644
--- a/src/components/ha-sidebar.html
+++ b/src/components/ha-sidebar.html
@@ -1,6 +1,4 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
-<link rel='import' href='../../bower_components/layout/layout.html'>
-
 <link rel='import' href='../../bower_components/paper-header-panel/paper-header-panel.html'>
 <link rel='import' href='../../bower_components/paper-toolbar/paper-toolbar.html'>
 <link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
diff --git a/src/home-assistant.html b/src/home-assistant.html
index 12e39c8bcd..56a242730e 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.html
@@ -1,5 +1,5 @@
 <link rel='import' href='../bower_components/polymer/polymer.html'>
-
+<link rel='import' href='../bower_components/iron-flex-layout/classes/iron-flex-layout.html'>
 <link rel='import' href='../bower_components/paper-styles/typography.html'>
 
 <link rel='import' href='resources/home-assistant-icons.html'>
diff --git a/src/layouts/home-assistant-main.html b/src/layouts/home-assistant-main.html
index b92da60c8e..f04b191f70 100644
--- a/src/layouts/home-assistant-main.html
+++ b/src/layouts/home-assistant-main.html
@@ -1,5 +1,4 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
-<link rel='import' href='../../bower_components/layout/layout.html'>
 <link rel='import' href='../../bower_components/paper-drawer-panel/paper-drawer-panel.html'>
 <link rel='import' href='../../bower_components/iron-media-query/iron-media-query.html'>
 <link rel='import' href='../layouts/partial-zone.html'>
diff --git a/src/layouts/login-form.html b/src/layouts/login-form.html
index 47e6f20e49..efc894cfd8 100644
--- a/src/layouts/login-form.html
+++ b/src/layouts/login-form.html
@@ -1,5 +1,4 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/layout/layout.html">
 
 <link rel="import" href="../../bower_components/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">