diff --git a/src/cards/ha-camera-card.html b/src/cards/ha-camera-card.html
index b979dea3ba..423865c01a 100644
--- a/src/cards/ha-camera-card.html
+++ b/src/cards/ha-camera-card.html
@@ -37,7 +37,7 @@
       }
     </style>
 
-    <img src='[[cameraFeedSrc]]' class='camera-feed' hidden='[[!imageLoaded]]'
+    <img src='[[cameraFeedSrc]]' class='camera-feed' hidden$='[[!imageLoaded]]'
       on-load='imageLoadSuccess' on-error='imageLoadFail' alt='[[stateObj.entityDisplay]]'>
     <div class='caption'>
       [[stateObj.entityDisplay]]
diff --git a/src/components/ha-menu-button.html b/src/components/ha-menu-button.html
index c80cfe6f8a..fddd538c3a 100644
--- a/src/components/ha-menu-button.html
+++ b/src/components/ha-menu-button.html
@@ -1,3 +1,6 @@
+<link rel='import' href='../../bower_components/polymer/polymer.html'>
+<link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
+
 <dom-module id='ha-menu-button'>
   <template>
     <style>
diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html
index be8accbfd4..c9a7f1ee26 100644
--- a/src/components/ha-sidebar.html
+++ b/src/components/ha-sidebar.html
@@ -8,6 +8,7 @@
 <link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
 
 <link rel='import' href='../components/stream-status.html'>
+<link rel='import' href='../util/hass-behavior.html'>
 
 <dom-module id='ha-sidebar'>
   <template>
diff --git a/src/components/ha-view-tabs.html b/src/components/ha-view-tabs.html
index cd6f81fb3f..965aad0880 100644
--- a/src/components/ha-view-tabs.html
+++ b/src/components/ha-view-tabs.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
 
+<link rel='import' href='../util/hass-behavior.html'>
+
 <dom-module id="ha-view-tabs">
   <template>
     <style>
diff --git a/src/components/state-info.html b/src/components/state-info.html
index 8585acb937..5d27c20088 100644
--- a/src/components/state-info.html
+++ b/src/components/state-info.html
@@ -66,6 +66,10 @@ Polymer({
     stateObj: {
       type: Object,
     },
+
+    inDialog: {
+      type: Boolean,
+    },
   },
 });
 </script>
diff --git a/src/components/stream-status.html b/src/components/stream-status.html
index fdcb06d1bd..cfd38851dd 100644
--- a/src/components/stream-status.html
+++ b/src/components/stream-status.html
@@ -3,6 +3,8 @@
 <link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
 <link rel="import" href="../../bower_components/paper-toggle-button/paper-toggle-button.html">
 
+<link rel='import' href='../util/hass-behavior.html'>
+
 <dom-module id="stream-status">
   <template>
     <style>
diff --git a/src/dialogs/ha-voice-command-dialog.html b/src/dialogs/ha-voice-command-dialog.html
index f726522ef6..ef42bd7537 100644
--- a/src/dialogs/ha-voice-command-dialog.html
+++ b/src/dialogs/ha-voice-command-dialog.html
@@ -5,6 +5,8 @@
 <link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
 <link rel="import" href="../../bower_components/paper-spinner/paper-spinner.html">
 
+<link rel='import' href='../util/hass-behavior.html'>
+
 <dom-module id="ha-voice-command-dialog">
   <template>
     <style>
diff --git a/src/dialogs/more-info-dialog.html b/src/dialogs/more-info-dialog.html
index 3f1f85f1b2..52e8694fa9 100644
--- a/src/dialogs/more-info-dialog.html
+++ b/src/dialogs/more-info-dialog.html
@@ -9,6 +9,8 @@
 <link rel="import" href="../components/state-history-charts.html">
 <link rel="import" href="../more-infos/more-info-content.html">
 
+<link rel='import' href='../util/hass-behavior.html'>
+
 <dom-module id="more-info-dialog">
   <template>
     <style>
diff --git a/src/layouts/login-form.html b/src/layouts/login-form.html
index ecdf1825e0..8cfd7c7de0 100644
--- a/src/layouts/login-form.html
+++ b/src/layouts/login-form.html
@@ -7,6 +7,8 @@
 <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='../util/hass-behavior.html'>
+
 <dom-module id="login-form">
   <template>
     <style is="custom-style" include="iron-flex iron-positioning"></style>
diff --git a/src/layouts/partial-cards.html b/src/layouts/partial-cards.html
index 6798d4787c..470d6d3b0c 100644
--- a/src/layouts/partial-cards.html
+++ b/src/layouts/partial-cards.html
@@ -2,6 +2,7 @@
 <link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
 <link rel="import" href="../../bower_components/paper-scroll-header-panel/paper-scroll-header-panel.html">
 <link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel='import' href='../../bower_components/paper-toolbar/paper-toolbar.html'>
 
 <link rel="import" href="../components/ha-cards.html">
 <link rel="import" href="../components/ha-view-tabs.html">
diff --git a/src/layouts/partial-panel-resolver.html b/src/layouts/partial-panel-resolver.html
index a0bc993aaf..862411f95b 100644
--- a/src/layouts/partial-panel-resolver.html
+++ b/src/layouts/partial-panel-resolver.html
@@ -1,3 +1,5 @@
+<link rel='import' href='../util/hass-behavior.html'>
+
 <script>
 Polymer({
   is: 'partial-panel-resolver',
diff --git a/src/managers/notification-manager.html b/src/managers/notification-manager.html
index 2c28f9de5c..9843ea1a7b 100644
--- a/src/managers/notification-manager.html
+++ b/src/managers/notification-manager.html
@@ -2,6 +2,8 @@
 
 <link rel="import" href="../../bower_components/paper-toast/paper-toast.html">
 
+<link rel='import' href='../util/hass-behavior.html'>
+
 <dom-module id="notification-manager">
   <template>
     <style>
diff --git a/src/more-infos/more-info-alarm_control_panel.html b/src/more-infos/more-info-alarm_control_panel.html
index 736f1c63b1..b8d2c6ecce 100644
--- a/src/more-infos/more-info-alarm_control_panel.html
+++ b/src/more-infos/more-info-alarm_control_panel.html
@@ -8,12 +8,29 @@
     <style is="custom-style" include="iron-flex"></style>
 
     <div class='layout horizontal'>
-      <paper-input label='code' value='{{enteredCode}}' pattern='[[codeFormat]]' type='password' hidden='[[!codeInputVisible]]' disabled='[[!codeInputEnabled]]'></paper-input>
+      <paper-input
+        label='code'
+        value='{{enteredCode}}'
+        pattern='[[codeFormat]]'
+        type='password'
+        hidden$='[[!codeInputVisible]]'
+        disabled='[[!codeInputEnabled]]'
+      ></paper-input>
     </div>
     <div class='layout horizontal'>
-      <paper-button on-tap='handleDisarmTap' hidden='[[!disarmButtonVisible]]' disabled='[[!codeValid]]'>Disarm</paper-button>
-      <paper-button on-tap='handleHomeTap' hidden='[[!armHomeButtonVisible]]' disabled=[[!codeValid]]>Arm Home</paper-button>
-      <paper-button on-tap='handleAwayTap' hidden='[[!armAwayButtonVisible]]' disabled='[[!codeValid]]'>Arm Away</paper-button>
+      <paper-button
+        on-tap='handleDisarmTap'
+        hidden$='[[!disarmButtonVisible]]'
+        disabled='[[!codeValid]]'
+      >Disarm</paper-button>
+      <paper-button
+        on-tap='handleHomeTap'
+        hidden$='[[!armHomeButtonVisible]]'
+        disabled=[[!codeValid]]>Arm Home</paper-button>
+      <paper-button
+        on-tap='handleAwayTap'
+        hidden$='[[!armAwayButtonVisible]]'
+        disabled='[[!codeValid]]'>Arm Away</paper-button>
     </div>
   </template>
 </dom-module>
diff --git a/src/more-infos/more-info-configurator.html b/src/more-infos/more-info-configurator.html
index 1c70cec538..21a9d93670 100644
--- a/src/more-infos/more-info-configurator.html
+++ b/src/more-infos/more-info-configurator.html
@@ -1,8 +1,11 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
 <link rel='import' href='../../bower_components/paper-button/paper-button.html'>
+<link rel='import' href='../../bower_components/paper-input/paper-input-container.html'>
 
 <link rel='import' href='../components/loading-box.html'>
 
+<link rel='import' href='../util/hass-behavior.html'>
+
 <dom-module id='more-info-configurator'>
   <template>
     <style is="custom-style" include="iron-flex"></style>
diff --git a/src/more-infos/more-info-group.html b/src/more-infos/more-info-group.html
index 4f4f6a8b57..85348ccc39 100644
--- a/src/more-infos/more-info-group.html
+++ b/src/more-infos/more-info-group.html
@@ -2,6 +2,8 @@
 
 <link rel="import" href="../state-summary/state-card-content.html">
 
+<link rel='import' href='../util/hass-behavior.html'>
+
 <dom-module id="more-info-group">
   <template>
     <style>
diff --git a/src/more-infos/more-info-hvac.html b/src/more-infos/more-info-hvac.html
index 51f503e10b..628fec760f 100644
--- a/src/more-infos/more-info-hvac.html
+++ b/src/more-infos/more-info-hvac.html
@@ -1,5 +1,8 @@
 <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/paper-menu/paper-menu.html'>
+<link rel='import' href='../../bower_components/paper-item/paper-item.html'>
+<link rel='import' href='../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html'>
 <link rel='import' href='../../bower_components/paper-toggle-button/paper-toggle-button.html'>
 
 <dom-module id='more-info-hvac'>
diff --git a/src/more-infos/more-info-lock.html b/src/more-infos/more-info-lock.html
index b696dac21c..07c096abb6 100644
--- a/src/more-infos/more-info-lock.html
+++ b/src/more-infos/more-info-lock.html
@@ -11,7 +11,7 @@
       }
     </style>
 
-    <div hidden='[[!stateObj.attributes.code_format]]'>
+    <div hidden$='[[!stateObj.attributes.code_format]]'>
       <paper-input label='code' value='{{enteredCode}}' pattern='[[stateObj.attributes.code_format]]' type='password'></paper-input>
       <paper-button on-tap='handleUnlockTap' hidden$='[[!isLocked]]'>Unlock</paper-button>
       <paper-button on-tap='handleLockTap' hidden$=[[isLocked]]>Lock</paper-button>
diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index 9d519a019c..1ba5537f60 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -1,6 +1,10 @@
 <link rel='import' href='../../bower_components/polymer/polymer.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'>
+<link rel='import' href='../../bower_components/paper-menu/paper-menu.html'>
+<link rel='import' href='../../bower_components/paper-item/paper-item.html'>
 
 <dom-module id='more-info-media_player'>
   <template>
diff --git a/src/state-summary/state-card-input_select.html b/src/state-summary/state-card-input_select.html
index b463dca4be..3ae6577be3 100644
--- a/src/state-summary/state-card-input_select.html
+++ b/src/state-summary/state-card-input_select.html
@@ -1,5 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 <link rel="import" href="../../bower_components/paper-dropdown-menu/paper-dropdown-menu.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="../components/entity/state-badge.html">
 
diff --git a/src/util/hass-behavior.html b/src/util/hass-behavior.html
index 21f5f17c77..121bb83377 100644
--- a/src/util/hass-behavior.html
+++ b/src/util/hass-behavior.html
@@ -1,4 +1,5 @@
 <script>
+/** @polymerBehavior NameSpace.Behavior */
 window.hassBehavior = {
   attached: function attached() {
     var hass = this.hass;