diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-configurator.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-configurator.html
index ed44ca50973..0d50c621869 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-configurator.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-configurator.html
@@ -3,7 +3,7 @@
 <link rel="import" href="./state-card-display.html">
 <link rel="import" href="../components/state-info.html">
 
-<dom-module is="state-card-configurator">
+<dom-module id="state-card-configurator">
   <template>
     <state-card-display state-obj="[[stateObj]]"></state-card-display>
 
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-content.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-content.html
index 6c1716ad361..13960a70379 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-content.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-content.html
@@ -6,7 +6,7 @@
 <link rel="import" href="state-card-configurator.html">
 <link rel="import" href="state-card-scene.html">
 
-<dom-module is="state-card-content">
+<dom-module id="state-card-content">
   <style>
     :host {
       display: block;
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-display.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-display.html
index 047596a87fd..a40979dcb66 100755
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-display.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-display.html
@@ -2,7 +2,7 @@
 
 <link rel="import" href="../components/state-info.html">
 
-<dom-module is="state-card-display">
+<dom-module id="state-card-display">
   <style>
   .state {
     margin-left: 16px;
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-scene.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-scene.html
index 051293eb4d2..f7c2fb1a820 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-scene.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-scene.html
@@ -3,7 +3,7 @@
 <link rel="import" href="./state-card-display.html">
 <link rel="import" href="./state-card-toggle.html">
 
-<dom-module is="state-card-scene">
+<dom-module id="state-card-scene">
   <template>
     <template is='dom-if' if=[[allowToggle]]>
       <state-card-toggle state-obj="[[stateObj]]"></state-card-toggle>
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-thermostat.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-thermostat.html
index 0625d0bf536..a1620a3b5e7 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-thermostat.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-thermostat.html
@@ -2,7 +2,7 @@
 
 <link rel="import" href="../components/state-info.html">
 
-<dom-module is="state-card-thermostat">
+<dom-module id="state-card-thermostat">
   <style>
   .state {
     margin-left: 16px;
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
index a445b2c32f2..f542fdcdd59 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
@@ -2,7 +2,7 @@
 
 <link rel="import" href="state-card-content.html">
 
-<dom-module is="state-card">
+<dom-module id="state-card">
   <style>
     :host {
       border-radius: 2px;
diff --git a/homeassistant/components/frontend/www_static/polymer/components/display-time.html b/homeassistant/components/frontend/www_static/polymer/components/display-time.html
index 335366899dc..f6908c8a7ff 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/display-time.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/display-time.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../bower_components/polymer/polymer.html">
 
-<dom-module is="display-time">
+<dom-module id="display-time">
   <template>[[computeTime(dateObj)]]</template>
 </dom-module>
 
diff --git a/homeassistant/components/frontend/www_static/polymer/components/domain-icon.html b/homeassistant/components/frontend/www_static/polymer/components/domain-icon.html
index 9a7b64ad099..d9fe55538d4 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/domain-icon.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/domain-icon.html
@@ -4,7 +4,7 @@
 
 <link rel="import" href="../resources/home-assistant-icons.html">
 
-<dom-module is="domain-icon">
+<dom-module id="domain-icon">
   <template>
     <iron-icon icon="[[computeIcon(domain, state)]]"></iron-icon>
   </template>
diff --git a/homeassistant/components/frontend/www_static/polymer/components/ha-logbook.html b/homeassistant/components/frontend/www_static/polymer/components/ha-logbook.html
index ecd918c5933..ca543ceb028 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/ha-logbook.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/ha-logbook.html
@@ -2,7 +2,7 @@
 
 <link rel="import" href="../components/logbook-entry.html">
 
-<dom-module is="ha-logbook">
+<dom-module id="ha-logbook">
   <style>
     :host {
       display: block;
diff --git a/homeassistant/components/frontend/www_static/polymer/components/logbook-entry.html b/homeassistant/components/frontend/www_static/polymer/components/logbook-entry.html
index 5cbfa2152b9..4e8d2bfee50 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/logbook-entry.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/logbook-entry.html
@@ -4,7 +4,7 @@
 <link rel="import" href="display-time.html">
 <link rel="import" href="relative-ha-datetime.html">
 
-<dom-module is="logbook-entry">
+<dom-module id="logbook-entry">
   <style>
     :host {
       display: block;
diff --git a/homeassistant/components/frontend/www_static/polymer/components/relative-ha-datetime.html b/homeassistant/components/frontend/www_static/polymer/components/relative-ha-datetime.html
index 1c860161d53..2017dd874f6 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/relative-ha-datetime.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/relative-ha-datetime.html
@@ -2,7 +2,7 @@
 
 <link rel="import" href="../resources/moment-js.html">
 
-<dom-module is="relative-ha-datetime">
+<dom-module id="relative-ha-datetime">
   <template>
     <span>[[relativeTime]]</span>
   </template>
diff --git a/homeassistant/components/frontend/www_static/polymer/components/services-list.html b/homeassistant/components/frontend/www_static/polymer/components/services-list.html
index 85878e619c0..89ef2962dcb 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/services-list.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/services-list.html
@@ -4,7 +4,7 @@
 
 <link rel="import" href="domain-icon.html">
 
-<dom-module id="services-list" attributes="cbServiceClicked">
+<dom-module id="services-list">
   <style>
     ul {
       margin: 0;
diff --git a/homeassistant/components/frontend/www_static/polymer/components/state-badge.html b/homeassistant/components/frontend/www_static/polymer/components/state-badge.html
index 3e016dda23f..05735f92070 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/state-badge.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/state-badge.html
@@ -3,7 +3,7 @@
 
 <link rel="import" href="domain-icon.html">
 
-<dom-module is="state-badge">
+<dom-module id="state-badge">
   <style>
   :host {
     position: relative;
diff --git a/homeassistant/components/frontend/www_static/polymer/components/state-cards.html b/homeassistant/components/frontend/www_static/polymer/components/state-cards.html
index b3d7831a9ae..c479792d98c 100755
--- a/homeassistant/components/frontend/www_static/polymer/components/state-cards.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/state-cards.html
@@ -2,7 +2,7 @@
 
 <link rel="import" href="../cards/state-card.html">
 
-<dom-module is="state-cards" attributes="states" noscript>
+<dom-module id="state-cards">
   <style>
   :host {
     display: block;
diff --git a/homeassistant/components/frontend/www_static/polymer/components/state-info.html b/homeassistant/components/frontend/www_static/polymer/components/state-info.html
index 1e442c07e7a..97aeaee680c 100755
--- a/homeassistant/components/frontend/www_static/polymer/components/state-info.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/state-info.html
@@ -4,7 +4,7 @@
 <link rel="import" href="state-badge.html">
 <link rel="import" href="relative-ha-datetime.html">
 
-<dom-module is="state-info">
+<dom-module id="state-info">
   <style>
   state-badge {
     float: left;
diff --git a/homeassistant/components/frontend/www_static/polymer/components/stream-status.html b/homeassistant/components/frontend/www_static/polymer/components/stream-status.html
index 13189f72564..b1c67cee9a6 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/stream-status.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/stream-status.html
@@ -5,7 +5,7 @@
 
 <link rel="import" href="../bower_components/iron-icons/notification-icons.html">
 
-<dom-module is="stream-status">
+<dom-module id="stream-status">
   <style>
   :host {
     display: inline-block;
diff --git a/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html b/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html
index da128bc75fa..38d7a3d72db 100644
--- a/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html
+++ b/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html
@@ -8,7 +8,7 @@
 
 <!-- <link rel="import" href="../bower_components/core-style/core-style.html"> -->
 
-<dom-module is="partial-base">
+<dom-module id="partial-base">
 <template>
   <paper-header-panel class='fit'>
     <paper-toolbar>
diff --git a/homeassistant/components/frontend/www_static/polymer/layouts/partial-logbook.html b/homeassistant/components/frontend/www_static/polymer/layouts/partial-logbook.html
index 4bfd1ef17d5..bab8fbf1c3d 100644
--- a/homeassistant/components/frontend/www_static/polymer/layouts/partial-logbook.html
+++ b/homeassistant/components/frontend/www_static/polymer/layouts/partial-logbook.html
@@ -6,7 +6,7 @@
 
 <link rel="import" href="../components/ha-logbook.html">
 
-<dom-module is="partial-logbook">
+<dom-module id="partial-logbook">
   <style>
     .content {
       background-color: white;
diff --git a/homeassistant/components/frontend/www_static/polymer/layouts/partial-states.html b/homeassistant/components/frontend/www_static/polymer/layouts/partial-states.html
index 44b7366e577..58a5e652260 100644
--- a/homeassistant/components/frontend/www_static/polymer/layouts/partial-states.html
+++ b/homeassistant/components/frontend/www_static/polymer/layouts/partial-states.html
@@ -7,7 +7,7 @@
 
 <link rel="import" href="../components/state-cards.html">
 
-<dom-module is="partial-states">
+<dom-module id="partial-states">
   <style>
     .listening {
       position: absolute;