diff --git a/package.json b/package.json
index 9f61ee419f..8c67ab7bd6 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "html-minifier": "^3.0.1",
     "hydrolysis": "^1.24.1",
     "polymer-cli": "^0.12.0",
+    "polymer-lint": "^0.8.1",
     "rollup": "^0.34.1",
     "rollup-plugin-babel": "^2.6.1",
     "rollup-plugin-buble": "^0.12.1",
diff --git a/panels/dev-event/ha-panel-dev-event.html b/panels/dev-event/ha-panel-dev-event.html
index 9533e5df7a..41b6a17b4b 100644
--- a/panels/dev-event/ha-panel-dev-event.html
+++ b/panels/dev-event/ha-panel-dev-event.html
@@ -1,6 +1,7 @@
-
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
 <link rel="import" href="../../bower_components/paper-input/paper-input.html">
 <link rel="import" href="../../bower_components/paper-input/paper-textarea.html">
@@ -10,7 +11,7 @@
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 
 <link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/resources/home-assistant-style.html">
+<link rel="import" href="../../src/resources/ha-style.html">
 
 <link rel="import" href="./events-list.html">
 
diff --git a/panels/dev-info/ha-panel-dev-info.html b/panels/dev-info/ha-panel-dev-info.html
index 589b95b231..17c783d450 100644
--- a/panels/dev-info/ha-panel-dev-info.html
+++ b/panels/dev-info/ha-panel-dev-info.html
@@ -8,7 +8,7 @@
 
 <link rel="import" href="../../src/components/ha-menu-button.html">
 <link rel="import" href="../../src/util/hass-behavior.html">
-<link rel="import" href="../../src/resources/home-assistant-style.html">
+<link rel="import" href="../../src/resources/ha-style.html">
 
 <dom-module id="ha-panel-dev-info">
   <template>
diff --git a/panels/dev-service/ha-panel-dev-service.html b/panels/dev-service/ha-panel-dev-service.html
index 0e9685cce1..e0781f5965 100644
--- a/panels/dev-service/ha-panel-dev-service.html
+++ b/panels/dev-service/ha-panel-dev-service.html
@@ -1,4 +1,3 @@
-
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
@@ -10,7 +9,7 @@
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 
 <link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/resources/home-assistant-style.html">
+<link rel="import" href="../../src/resources/ha-style.html">
 
 <link rel="import" href="./services-list.html">
 
diff --git a/panels/dev-state/ha-panel-dev-state.html b/panels/dev-state/ha-panel-dev-state.html
index f10c22670d..bc61b5bf13 100644
--- a/panels/dev-state/ha-panel-dev-state.html
+++ b/panels/dev-state/ha-panel-dev-state.html
@@ -1,4 +1,3 @@
-
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
@@ -12,7 +11,7 @@
 
 <link rel="import" href="../../src/components/ha-menu-button.html">
 <link rel="import" href="../../src/util/hass-behavior.html">
-<link rel="import" href="../../src/resources/home-assistant-style.html">
+<link rel="import" href="../../src/resources/ha-style.html">
 
 <dom-module id="ha-panel-dev-state">
   <template>
diff --git a/panels/dev-template/ha-panel-dev-template.html b/panels/dev-template/ha-panel-dev-template.html
index 8f5f421ef1..c886b79d6f 100644
--- a/panels/dev-template/ha-panel-dev-template.html
+++ b/panels/dev-template/ha-panel-dev-template.html
@@ -1,4 +1,3 @@
-
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
 <link rel="import" href="../../bower_components/paper-input/paper-textarea.html">
@@ -10,7 +9,7 @@
 
 <link rel="import" href="../../src/components/ha-menu-button.html">
 <link rel="import" href="../../src/util/hass-behavior.html">
-<link rel="import" href="../../src/resources/home-assistant-style.html">
+<link rel="import" href="../../src/resources/ha-style.html">
 
 <dom-module id="ha-panel-dev-template">
   <template>
diff --git a/panels/history/ha-panel-history.html b/panels/history/ha-panel-history.html
index 4ba7480395..f1b04d7a70 100644
--- a/panels/history/ha-panel-history.html
+++ b/panels/history/ha-panel-history.html
@@ -10,7 +10,7 @@
 <link rel="import" href="../../src/resources/pikaday-js.html">
 <link rel="import" href="../../src/components/ha-menu-button.html">
 <link rel="import" href="../../src/util/hass-behavior.html">
-<link rel="import" href="../../src/resources/home-assistant-style.html">
+<link rel="import" href="../../src/resources/ha-style.html">
 
 <dom-module id="ha-panel-history">
   <template>
diff --git a/panels/iframe/ha-panel-iframe.html b/panels/iframe/ha-panel-iframe.html
index c0fd889fee..e666ee2dd3 100644
--- a/panels/iframe/ha-panel-iframe.html
+++ b/panels/iframe/ha-panel-iframe.html
@@ -3,7 +3,7 @@
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 
 <link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/resources/home-assistant-style.html">
+<link rel="import" href="../../src/resources/ha-style.html">
 
 <dom-module id='ha-panel-iframe'>
   <template>
diff --git a/panels/logbook/ha-panel-logbook.html b/panels/logbook/ha-panel-logbook.html
index 1116af65f9..da4fdfe2d2 100644
--- a/panels/logbook/ha-panel-logbook.html
+++ b/panels/logbook/ha-panel-logbook.html
@@ -11,7 +11,7 @@
 <link rel="import" href="../../src/components/ha-menu-button.html">
 <link rel="import" href="../../src/resources/pikaday-js.html">
 <link rel="import" href="../../src/util/hass-behavior.html">
-<link rel="import" href="../../src/resources/home-assistant-style.html">
+<link rel="import" href="../../src/resources/ha-style.html">
 
 <link rel="import" href="./ha-logbook.html">
 
diff --git a/panels/map/ha-panel-map.html b/panels/map/ha-panel-map.html
index 16628bb233..055907a8e3 100644
--- a/panels/map/ha-panel-map.html
+++ b/panels/map/ha-panel-map.html
@@ -1,7 +1,5 @@
-
 <link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel='import' href='../../bower_components/paper-toolbar/paper-toolbar.html'>
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
+
 <link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
 
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
diff --git a/src/cards/ha-entities-card.html b/src/cards/ha-entities-card.html
index 371419cf0d..f2ee5b7c69 100644
--- a/src/cards/ha-entities-card.html
+++ b/src/cards/ha-entities-card.html
@@ -1,5 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel='import' href='../components/ha-card.html'>
 <link rel='import' href='../components/entity/ha-entity-toggle.html'>
 <link rel='import' href='../state-summary/state-card-content.html'>
diff --git a/src/cards/ha-media_player-card.html b/src/cards/ha-media_player-card.html
index 795b0450b3..26637e5fac 100644
--- a/src/cards/ha-media_player-card.html
+++ b/src/cards/ha-media_player-card.html
@@ -1,4 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/paper-material/paper-material.html">
 <link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
 
diff --git a/src/components/ha-cards.html b/src/components/ha-cards.html
index 49b2cd2bbd..f474ed38dd 100644
--- a/src/components/ha-cards.html
+++ b/src/components/ha-cards.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="./ha-demo-badge.html">
 <link rel="import" href="../cards/ha-badges-card.html">
 <link rel="import" href="../cards/ha-card-chooser.html">
diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html
index 9c05a440ff..daf070f8ee 100644
--- a/src/components/ha-sidebar.html
+++ b/src/components/ha-sidebar.html
@@ -1,6 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
-<link rel='import' href='../../bower_components/paper-menu/paper-menu.html'>
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
+<link rel='import' href='../../bower_components/paper-menu/paper-menu.html'>
 <link rel='import' href='../../bower_components/paper-item/paper-item.html'>
 <link rel='import' href='../../bower_components/paper-item/paper-icon-item.html'>
 <link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
diff --git a/src/home-assistant.html b/src/home-assistant.html
index 3f8267c4e2..47ceb3d785 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.html
@@ -1,4 +1,5 @@
 <link rel='import' href='../bower_components/polymer/polymer.html'>
+<!-- imported as first element so we can render the placeholder -->
 <link rel='import' href='../bower_components/paper-spinner/paper-spinner.html'>
 <link rel='import' href='./util/roboto.html'>
 <link rel='import' href='../bower_components/paper-styles/typography.html'>
@@ -8,7 +9,7 @@
 <link rel='import' href='./util/hass-behavior.html'>
 <link rel='import' href='./layouts/login-form.html'>
 <link rel='import' href='./layouts/home-assistant-main.html'>
-<link rel='import' href='./resources/home-assistant-style.html'>
+<link rel='import' href='./resources/ha-style.html'>
 <link rel="import" href="./resources/panel-imports.html">
 
 <dom-module id='home-assistant'>
diff --git a/src/layouts/login-form.html b/src/layouts/login-form.html
index 8cfd7c7de0..fe3b299fbd 100644
--- a/src/layouts/login-form.html
+++ b/src/layouts/login-form.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
 <link rel="import" href="../../bower_components/paper-input/paper-input-container.html">
diff --git a/src/layouts/partial-cards.html b/src/layouts/partial-cards.html
index df54615752..f770853356 100644
--- a/src/layouts/partial-cards.html
+++ b/src/layouts/partial-cards.html
@@ -1,11 +1,15 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
 <link rel="import" href="../../bower_components/iron-pages/iron-pages.html">
+
 <link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
+<link rel="import" href="../../bower_components/paper-tabs/paper-tab.html">
 
 <link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-scroll-effects/app-scroll-effects.html">
+<link rel="import" href="../../bower_components/app-layout/app-scroll-effects/effects/waterfall.html">
 <link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 
diff --git a/src/layouts/partial-panel-resolver.html b/src/layouts/partial-panel-resolver.html
index d52cc6bd3f..1efb7fbb77 100644
--- a/src/layouts/partial-panel-resolver.html
+++ b/src/layouts/partial-panel-resolver.html
@@ -1,10 +1,12 @@
 <link rel='import' href='../../bower_components/paper-spinner/paper-spinner.html'>
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
 
 <link rel='import' href='../components/ha-menu-button.html'>
 <link rel='import' href='../util/hass-behavior.html'>
-<link rel="import" href="../resources/home-assistant-style.html">
+<link rel="import" href="../resources/ha-style.html">
 
 <dom-module id='partial-panel-resolver'>
   <template>
diff --git a/src/more-infos/more-info-alarm_control_panel.html b/src/more-infos/more-info-alarm_control_panel.html
index b8d2c6ecce..687bcc1976 100644
--- a/src/more-infos/more-info-alarm_control_panel.html
+++ b/src/more-infos/more-info-alarm_control_panel.html
@@ -1,5 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel='import' href='../../bower_components/paper-button/paper-button.html'>
 <link rel='import' href='../../bower_components/paper-input/paper-input.html'>
 
diff --git a/src/more-infos/more-info-configurator.html b/src/more-infos/more-info-configurator.html
index 01950c69c7..028ecb978a 100644
--- a/src/more-infos/more-info-configurator.html
+++ b/src/more-infos/more-info-configurator.html
@@ -1,4 +1,8 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+<link rel='import' href='../../bower_components/iron-input/iron-input.html'>
+
 <link rel='import' href='../../bower_components/paper-spinner/paper-spinner.html'>
 <link rel='import' href='../../bower_components/paper-button/paper-button.html'>
 <link rel='import' href='../../bower_components/paper-input/paper-input-container.html'>
diff --git a/src/more-infos/more-info-default.html b/src/more-infos/more-info-default.html
index e23d9846f7..107af5d2c9 100644
--- a/src/more-infos/more-info-default.html
+++ b/src/more-infos/more-info-default.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <dom-module id="more-info-default">
   <template>
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
diff --git a/src/more-infos/more-info-hvac.html b/src/more-infos/more-info-hvac.html
index 70bb1cb905..6647443b96 100644
--- a/src/more-infos/more-info-hvac.html
+++ b/src/more-infos/more-info-hvac.html
@@ -1,4 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel='import' href='../../bower_components/paper-slider/paper-slider.html'>
 <link rel='import' href='../../bower_components/paper-menu/paper-menu.html'>
 <link rel='import' href='../../bower_components/paper-item/paper-item.html'>
diff --git a/src/more-infos/more-info-light.html b/src/more-infos/more-info-light.html
index 9321b455bb..3c36a18b2d 100644
--- a/src/more-infos/more-info-light.html
+++ b/src/more-infos/more-info-light.html
@@ -1,5 +1,6 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
-<link rel='import' href='../../bower_components/paper-slider/paper-slider.html'>
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
 
 <link rel='import' href='../components/ha-labeled-slider.html'>
 <link rel='import' href='../components/ha-color-picker.html'>
diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index df75c6f99b..7e908e8769 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -1,5 +1,9 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
+<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
+
 <link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
 <link rel='import' href='../../bower_components/paper-slider/paper-slider.html'>
 <link rel='import' href='../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html'>
diff --git a/src/more-infos/more-info-script.html b/src/more-infos/more-info-script.html
index 7cce919413..435e22bb9a 100644
--- a/src/more-infos/more-info-script.html
+++ b/src/more-infos/more-info-script.html
@@ -1,5 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <dom-module id='more-info-script'>
   <template>
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
diff --git a/src/more-infos/more-info-sun.html b/src/more-infos/more-info-sun.html
index ce266df5f5..d0dfec7135 100644
--- a/src/more-infos/more-info-sun.html
+++ b/src/more-infos/more-info-sun.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../components/ha-relative-time.html">
 
 <dom-module id="more-info-sun">
diff --git a/src/more-infos/more-info-thermostat.html b/src/more-infos/more-info-thermostat.html
index a8efaac860..3d7a78469d 100644
--- a/src/more-infos/more-info-thermostat.html
+++ b/src/more-infos/more-info-thermostat.html
@@ -1,4 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel='import' href='../../bower_components/paper-slider/paper-slider.html'>
 <link rel='import' href='../../bower_components/paper-toggle-button/paper-toggle-button.html'>
 
diff --git a/src/more-infos/more-info-updater.html b/src/more-infos/more-info-updater.html
index 079a2cd19c..031ed3c2b8 100644
--- a/src/more-infos/more-info-updater.html
+++ b/src/more-infos/more-info-updater.html
@@ -2,17 +2,14 @@
 
 <dom-module id="more-info-updater">
   <template>
-    <style is="custom-style" include="iron-flex"></style>
     <style>
       .link {
         color: #03A9F4;
       }
     </style>
 
-    <div class='layout vertical'>
-
+    <div>
       <a class='link' href='https://home-assistant.io/getting-started/updating/' target='_blank'>Update Instructions</a>
-
     </div>
   </template>
 </dom-module>
@@ -22,6 +19,14 @@ Polymer({
   is: 'more-info-updater',
 
   properties: {
+    stateObj: {
+      type: Object,
+    },
+  },
+
+  computeReleaseNotes: function (stateObj) {
+    return (stateObj.attributes.release_notes ||
+            'https://home-assistant.io/getting-started/updating/');
   },
 });
 </script>
diff --git a/src/resources/home-assistant-style.html b/src/resources/ha-style.html
similarity index 100%
rename from src/resources/home-assistant-style.html
rename to src/resources/ha-style.html
diff --git a/src/state-summary/state-card-configurator.html b/src/state-summary/state-card-configurator.html
index c9c876dbb5..764810e971 100644
--- a/src/state-summary/state-card-configurator.html
+++ b/src/state-summary/state-card-configurator.html
@@ -1,4 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
 
 <link rel="import" href="../components/entity/state-info.html">
diff --git a/src/state-summary/state-card-display.html b/src/state-summary/state-card-display.html
index fd7f529b2d..a257952782 100755
--- a/src/state-summary/state-card-display.html
+++ b/src/state-summary/state-card-display.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-display">
diff --git a/src/state-summary/state-card-hvac.html b/src/state-summary/state-card-hvac.html
index 24c01893f6..570250373f 100755
--- a/src/state-summary/state-card-hvac.html
+++ b/src/state-summary/state-card-hvac.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-hvac">
diff --git a/src/state-summary/state-card-input_slider.html b/src/state-summary/state-card-input_slider.html
index 68a0c5dd0c..7946ea0a01 100644
--- a/src/state-summary/state-card-input_slider.html
+++ b/src/state-summary/state-card-input_slider.html
@@ -1,4 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/paper-slider/paper-slider.html">
 
 <link rel="import" href="../components/entity/state-info.html">
diff --git a/src/state-summary/state-card-media_player.html b/src/state-summary/state-card-media_player.html
index 4fd233a12e..47ac07e22c 100644
--- a/src/state-summary/state-card-media_player.html
+++ b/src/state-summary/state-card-media_player.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-media_player">
diff --git a/src/state-summary/state-card-rollershutter.html b/src/state-summary/state-card-rollershutter.html
index 07d07476fa..5c57a93988 100644
--- a/src/state-summary/state-card-rollershutter.html
+++ b/src/state-summary/state-card-rollershutter.html
@@ -1,4 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
 
 <link rel="import" href="../components/entity/state-info.html">
diff --git a/src/state-summary/state-card-scene.html b/src/state-summary/state-card-scene.html
index 9fbf326ff3..651b896c5b 100644
--- a/src/state-summary/state-card-scene.html
+++ b/src/state-summary/state-card-scene.html
@@ -1,4 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
 
 <link rel="import" href="../components/entity/state-info.html">
diff --git a/src/state-summary/state-card-script.html b/src/state-summary/state-card-script.html
index abfe368d11..51c72ec6e3 100644
--- a/src/state-summary/state-card-script.html
+++ b/src/state-summary/state-card-script.html
@@ -1,4 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
+
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
 
 <link rel="import" href="../components/entity/state-info.html">
diff --git a/src/state-summary/state-card-thermostat.html b/src/state-summary/state-card-thermostat.html
index 53cf3769fb..a0884efa00 100644
--- a/src/state-summary/state-card-thermostat.html
+++ b/src/state-summary/state-card-thermostat.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-thermostat">
diff --git a/src/state-summary/state-card-toggle.html b/src/state-summary/state-card-toggle.html
index 02d0a0fc95..cd63134150 100755
--- a/src/state-summary/state-card-toggle.html
+++ b/src/state-summary/state-card-toggle.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
+<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+
 <link rel="import" href="../components/entity/state-info.html">
 <link rel="import" href="../components/entity/ha-entity-toggle.html">