diff --git a/.eslintrc b/.eslintrc
index aae5e9ea19..dd768c0cc4 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -15,7 +15,8 @@
     "prefer-arrow-callback": 0,
     "no-underscore-dangle": 0,
     "no-var": 0,
-    "strict": 0
+    "strict": 0,
+    "prefer-spread": 0
   },
   plugins: [
     "html"
diff --git a/home-assistant-js b/home-assistant-js
index 5540d58870..c2613c48f9 160000
--- a/home-assistant-js
+++ b/home-assistant-js
@@ -1 +1 @@
-Subproject commit 5540d58870f2a090b7f6daf83ca9c74c66964d02
+Subproject commit c2613c48f9f6fd7d62316b31c5e27cfb7e691a94
diff --git a/package.json b/package.json
index 79df99c4f6..50de0901b5 100644
--- a/package.json
+++ b/package.json
@@ -37,20 +37,20 @@
   },
   "devDependencies": {
     "bower": "^1.7.9",
-    "eslint": "^3.1.0",
-    "eslint-config-airbnb-base": "^4.0.2",
-    "eslint-plugin-html": "^1.5.1",
-    "eslint-plugin-import": "^1.11.0",
-    "html-minifier": "^3.0.1",
+    "eslint": "^3.2.2",
+    "eslint-config-airbnb-base": "^5.0.1",
+    "eslint-plugin-html": "^1.5.2",
+    "eslint-plugin-import": "^1.12.0",
+    "html-minifier": "^3.0.2",
     "hydrolysis": "^1.24.1",
-    "polymer-cli": "^0.12.0",
+    "polymer-cli": "^0.13.0",
     "polymer-lint": "^0.8.1",
-    "rollup": "^0.34.1",
+    "rollup": "^0.34.7",
     "rollup-plugin-babel": "^2.6.1",
     "rollup-plugin-buble": "^0.12.1",
-    "rollup-plugin-commonjs": "^3.1.0",
-    "rollup-plugin-multi-entry": "^2.0.0",
-    "rollup-plugin-node-resolve": "^1.7.1",
+    "rollup-plugin-commonjs": "^3.3.1",
+    "rollup-plugin-multi-entry": "^2.0.1",
+    "rollup-plugin-node-resolve": "^2.0.0",
     "rollup-plugin-replace": "^1.1.1",
     "rollup-plugin-uglify": "^1.0.1",
     "rollup-watch": "^2.5.0",
diff --git a/src/components/entity/state-info.html b/src/components/entity/state-info.html
index adf15b5af8..e656484224 100644
--- a/src/components/entity/state-info.html
+++ b/src/components/entity/state-info.html
@@ -1,75 +1,75 @@
-<link rel="import" href="../../../bower_components/polymer/polymer.html">
-
-<link rel="import" href="./state-badge.html">
-<link rel="import" href="../ha-relative-time.html">
-
-<dom-module id="state-info">
-  <template>
-    <style>
-    :host {
-      @apply(--paper-font-body1);
-      min-width: 150px;
-      white-space: nowrap;
-    }
-
-    state-badge {
-      float: left;
-    }
-
-    .info {
-      margin-left: 56px;
-    }
-
-    .name {
-      @apply(--paper-font-common-nowrap);
-      color: var(--primary-text-color);
-      line-height: 40px;
-    }
-
-    .name[in-dialog] {
-      line-height: 20px;
-    }
-
-    .time-ago {
-      @apply(--paper-font-common-nowrap);
-      color: var(--secondary-text-color);
-    }
-    </style>
-
-    <div>
-      <state-badge state-obj='[[stateObj]]'></state-badge>
-
-      <div class='info'>
-        <div class='name' in-dialog$='[[inDialog]]'>[[stateObj.entityDisplay]]</div>
-
-        <template is='dom-if' if='[[inDialog]]'>
-          <div class='time-ago'>
-            <ha-relative-time datetime-obj='[[stateObj.lastChangedAsDate]]'></ha-relative-time>
-          </div>
-        </template>
-
-      </div>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-Polymer({
-  is: 'state-info',
-
-  properties: {
-    detailed: {
-      type: Boolean,
-      value: false,
-    },
-
-    stateObj: {
-      type: Object,
-    },
-
-    inDialog: {
-      type: Boolean,
-    },
-  },
-});
-</script>
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+
+<link rel="import" href="./state-badge.html">
+<link rel="import" href="../ha-relative-time.html">
+
+<dom-module id="state-info">
+  <template>
+    <style>
+    :host {
+      @apply(--paper-font-body1);
+      min-width: 150px;
+      white-space: nowrap;
+    }
+
+    state-badge {
+      float: left;
+    }
+
+    .info {
+      margin-left: 56px;
+    }
+
+    .name {
+      @apply(--paper-font-common-nowrap);
+      color: var(--primary-text-color);
+      line-height: 40px;
+    }
+
+    .name[in-dialog] {
+      line-height: 20px;
+    }
+
+    .time-ago {
+      @apply(--paper-font-common-nowrap);
+      color: var(--secondary-text-color);
+    }
+    </style>
+
+    <div>
+      <state-badge state-obj='[[stateObj]]'></state-badge>
+
+      <div class='info'>
+        <div class='name' in-dialog$='[[inDialog]]'>[[stateObj.entityDisplay]]</div>
+
+        <template is='dom-if' if='[[inDialog]]'>
+          <div class='time-ago'>
+            <ha-relative-time datetime-obj='[[stateObj.lastChangedAsDate]]'></ha-relative-time>
+          </div>
+        </template>
+
+      </div>
+    </div>
+  </template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'state-info',
+
+  properties: {
+    detailed: {
+      type: Boolean,
+      value: false,
+    },
+
+    stateObj: {
+      type: Object,
+    },
+
+    inDialog: {
+      type: Boolean,
+    },
+  },
+});
+</script>
diff --git a/src/state-summary/state-card-display.html b/src/state-summary/state-card-display.html
index a257952782..28e497756d 100755
--- a/src/state-summary/state-card-display.html
+++ b/src/state-summary/state-card-display.html
@@ -1,43 +1,43 @@
-<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">
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-    <style>
-      .state {
-        @apply(--paper-font-body1);
-        color: var(--primary-text-color);
-
-        margin-left: 16px;
-        text-align: right;
-        line-height: 40px;
-      }
-    </style>
-
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <div class='state'>[[stateObj.stateDisplay]]</div>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-Polymer({
-  is: 'state-card-display',
-
-  properties: {
-    inDialog: {
-      type: Boolean,
-      value: false,
-    },
-
-    stateObj: {
-      type: Object,
-    },
-  },
-});
-</script>
+<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">
+  <template>
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+    <style>
+      .state {
+        @apply(--paper-font-body1);
+        color: var(--primary-text-color);
+
+        margin-left: 16px;
+        text-align: right;
+        line-height: 40px;
+      }
+    </style>
+
+    <div class='horizontal justified layout'>
+      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
+      <div class='state'>[[stateObj.stateDisplay]]</div>
+    </div>
+  </template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'state-card-display',
+
+  properties: {
+    inDialog: {
+      type: Boolean,
+      value: false,
+    },
+
+    stateObj: {
+      type: Object,
+    },
+  },
+});
+</script>
diff --git a/src/state-summary/state-card-hvac.html b/src/state-summary/state-card-hvac.html
index 570250373f..79345489fc 100755
--- a/src/state-summary/state-card-hvac.html
+++ b/src/state-summary/state-card-hvac.html
@@ -1,44 +1,44 @@
-<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">
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-    <style>
-      .state {
-        @apply(--paper-font-body1);
-        color: var(--primary-text-color);
-
-        margin-left: 16px;
-        text-transform: capitalize;
-        text-align: right;
-        line-height: 40px;
-      }
-    </style>
-
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <div class='state'>[[stateObj.state]]</div>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-Polymer({
-  is: 'state-card-hvac',
-
-  properties: {
-    inDialog: {
-      type: Boolean,
-      value: false,
-    },
-
-    stateObj: {
-      type: Object,
-    },
-  },
-});
-</script>
+<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">
+  <template>
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+    <style>
+      .state {
+        @apply(--paper-font-body1);
+        color: var(--primary-text-color);
+
+        margin-left: 16px;
+        text-transform: capitalize;
+        text-align: right;
+        line-height: 40px;
+      }
+    </style>
+
+    <div class='horizontal justified layout'>
+      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
+      <div class='state'>[[stateObj.state]]</div>
+    </div>
+  </template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'state-card-hvac',
+
+  properties: {
+    inDialog: {
+      type: Boolean,
+      value: false,
+    },
+
+    stateObj: {
+      type: Object,
+    },
+  },
+});
+</script>
diff --git a/src/state-summary/state-card-toggle.html b/src/state-summary/state-card-toggle.html
index cd63134150..4a1ee99ebc 100755
--- a/src/state-summary/state-card-toggle.html
+++ b/src/state-summary/state-card-toggle.html
@@ -1,44 +1,44 @@
-<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">
-
-<dom-module id="state-card-toggle">
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-    <style>
-      ha-entity-toggle {
-        margin-left: 16px;
-      }
-    </style>
-
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <ha-entity-toggle state-obj="[[stateObj]]" hass='[[hass]]'></ha-entity-toggle>
-    </div>
-
-  </template>
-</dom-module>
-
-<script>
-Polymer({
-  is: 'state-card-toggle',
-
-  properties: {
-    hass: {
-      type: Object,
-    },
-
-    inDialog: {
-      type: Boolean,
-      value: false,
-    },
-
-    stateObj: {
-      type: Object,
-    },
-  },
-});
-</script>
+<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">
+
+<dom-module id="state-card-toggle">
+  <template>
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+    <style>
+      ha-entity-toggle {
+        margin-left: 16px;
+      }
+    </style>
+
+    <div class='horizontal justified layout'>
+      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
+      <ha-entity-toggle state-obj="[[stateObj]]" hass='[[hass]]'></ha-entity-toggle>
+    </div>
+
+  </template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'state-card-toggle',
+
+  properties: {
+    hass: {
+      type: Object,
+    },
+
+    inDialog: {
+      type: Boolean,
+      value: false,
+    },
+
+    stateObj: {
+      type: Object,
+    },
+  },
+});
+</script>