diff --git a/package.json b/package.json
index bda7af3bed..877498178d 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "MIT",
   "dependencies": {
-    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#c345559ab7b8cc9b9bc1421dc22198df0a86740b",
+    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#7bc70c0b75c274166ddba0d647356b6d0b7d696e",
     "lodash": "^3.10.1",
     "moment": "^2.10.6"
   },
diff --git a/src/components/entity-list.js b/src/components/entity-list.js
index 5cb1482747..85a59532a7 100644
--- a/src/components/entity-list.js
+++ b/src/components/entity-list.js
@@ -1,4 +1,4 @@
-import { entityGetters } from 'home-assistant-js';
+import { entityGetters } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/components/events-list.js b/src/components/events-list.js
index 2bc858e5c2..022df0422d 100644
--- a/src/components/events-list.js
+++ b/src/components/events-list.js
@@ -1,4 +1,4 @@
-import { eventGetters } from 'home-assistant-js';
+import { eventGetters } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/components/ha-sidebar.js b/src/components/ha-sidebar.js
index 3aed22ea89..8db1b0da54 100644
--- a/src/components/ha-sidebar.js
+++ b/src/components/ha-sidebar.js
@@ -4,7 +4,7 @@ import {
   authActions,
   navigationActions,
   util
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/components/ha-voice-command-progress.js b/src/components/ha-voice-command-progress.js
index defff0e5d3..020530b357 100644
--- a/src/components/ha-voice-command-progress.js
+++ b/src/components/ha-voice-command-progress.js
@@ -1,4 +1,4 @@
-import { voiceGetters } from 'home-assistant-js';
+import { voiceGetters } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/components/logbook-entry.js b/src/components/logbook-entry.js
index fe5c2f451a..d6108d7dd6 100644
--- a/src/components/logbook-entry.js
+++ b/src/components/logbook-entry.js
@@ -1,4 +1,4 @@
-import { moreInfoActions } from 'home-assistant-js';
+import { moreInfoActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
diff --git a/src/components/relative-ha-datetime.js b/src/components/relative-ha-datetime.js
index f250a3734e..307354f3a1 100644
--- a/src/components/relative-ha-datetime.js
+++ b/src/components/relative-ha-datetime.js
@@ -1,5 +1,5 @@
 import moment from 'moment';
-import { util } from 'home-assistant-js';
+import { util } from '../util/home-assistant-js-instance';
 import Polymer from '../polymer';
 
 const UPDATE_INTERVAL = 60000; // 60 seconds
diff --git a/src/components/services-list.js b/src/components/services-list.js
index 54307fb774..6a06225383 100644
--- a/src/components/services-list.js
+++ b/src/components/services-list.js
@@ -1,4 +1,4 @@
-import { serviceGetters } from 'home-assistant-js';
+import { serviceGetters } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/components/state-cards.html b/src/components/state-cards.html
index fa379740e6..f81512aaa8 100644
--- a/src/components/state-cards.html
+++ b/src/components/state-cards.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../cards/state-card.html">
+<link rel="import" href="../state-summary/state-card.html">
 
 <dom-module id="state-cards">
   <style>
diff --git a/src/components/state-cards.js b/src/components/state-cards.js
index 9fa52cb9f9..846e3e623a 100644
--- a/src/components/state-cards.js
+++ b/src/components/state-cards.js
@@ -1,6 +1,6 @@
 import Polymer from '../polymer';
 
-require('../cards/state-card');
+require('../state-summary/state-card');
 
 export default new Polymer({
   is: 'state-cards',
diff --git a/src/components/stream-status.js b/src/components/stream-status.js
index cbb3358b2a..efba55205f 100644
--- a/src/components/stream-status.js
+++ b/src/components/stream-status.js
@@ -1,4 +1,4 @@
-import { streamGetters, streamActions } from 'home-assistant-js';
+import { streamGetters, streamActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/dialogs/more-info-dialog.html b/src/dialogs/more-info-dialog.html
index e0d31c6898..58a766a7b9 100644
--- a/src/dialogs/more-info-dialog.html
+++ b/src/dialogs/more-info-dialog.html
@@ -5,7 +5,7 @@
 <!-- <link rel="import" href="../../bower_components/neon-animation/animations/slide-up-animation.html">
 <link rel="import" href="../../bower_components/neon-animation/animations/slide-down-animation.html">
  -->
-<link rel="import" href="../cards/state-card-content.html">
+<link rel="import" href="../state-summary/state-card-content.html">
 <link rel="import" href="../components/state-history-charts.html">
 <link rel="import" href="../more-infos/more-info-content.html">
 
diff --git a/src/dialogs/more-info-dialog.js b/src/dialogs/more-info-dialog.js
index d58defb95e..eef892570a 100644
--- a/src/dialogs/more-info-dialog.js
+++ b/src/dialogs/more-info-dialog.js
@@ -4,12 +4,12 @@ import {
   entityHistoryActions,
   moreInfoGetters,
   moreInfoActions
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
-require('../cards/state-card-content');
+require('../state-summary/state-card-content');
 require('../components/state-history-charts');
 require('../more-infos/more-info-content');
 
diff --git a/src/home-assistant.js b/src/home-assistant.js
index 2cc706054e..50174bd89b 100644
--- a/src/home-assistant.js
+++ b/src/home-assistant.js
@@ -4,7 +4,7 @@ import {
   syncGetters,
   localStoragePreferences,
   startLocalStoragePreferencesSync
-} from 'home-assistant-js';
+} from './util/home-assistant-js-instance';
 
 import nuclearObserver from './util/bound-nuclear-behavior';
 import validateAuth from './util/validate-auth';
diff --git a/src/layouts/home-assistant-main.js b/src/layouts/home-assistant-main.js
index cf3893e2fe..9b726d7cf3 100644
--- a/src/layouts/home-assistant-main.js
+++ b/src/layouts/home-assistant-main.js
@@ -2,7 +2,7 @@ import {
   navigationGetters,
   startUrlSync,
   stopUrlSync,
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
diff --git a/src/layouts/login-form.js b/src/layouts/login-form.js
index 5b17b361fb..019f7965e2 100644
--- a/src/layouts/login-form.js
+++ b/src/layouts/login-form.js
@@ -1,6 +1,6 @@
 import Polymer from '../polymer';
 
-import { authGetters } from 'home-assistant-js';
+import { authGetters } from '../util/home-assistant-js-instance';
 
 import nuclearObserver from '../util/bound-nuclear-behavior';
 import validateAuth from '../util/validate-auth';
diff --git a/src/layouts/partial-dev-call-service.js b/src/layouts/partial-dev-call-service.js
index 0e8b3377aa..746446031e 100644
--- a/src/layouts/partial-dev-call-service.js
+++ b/src/layouts/partial-dev-call-service.js
@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
diff --git a/src/layouts/partial-dev-fire-event.js b/src/layouts/partial-dev-fire-event.js
index cc9324e2e0..b6ee12a006 100644
--- a/src/layouts/partial-dev-fire-event.js
+++ b/src/layouts/partial-dev-fire-event.js
@@ -1,4 +1,4 @@
-import { eventActions } from 'home-assistant-js';
+import { eventActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
diff --git a/src/layouts/partial-dev-set-state.js b/src/layouts/partial-dev-set-state.js
index d071cdfefa..4a8c6639e2 100644
--- a/src/layouts/partial-dev-set-state.js
+++ b/src/layouts/partial-dev-set-state.js
@@ -1,4 +1,4 @@
-import { reactor, entityGetters, entityActions } from 'home-assistant-js';
+import { reactor, entityGetters, entityActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
diff --git a/src/layouts/partial-history.js b/src/layouts/partial-history.js
index 65f6412c2c..b4cc065ba4 100644
--- a/src/layouts/partial-history.js
+++ b/src/layouts/partial-history.js
@@ -1,7 +1,7 @@
 import {
   entityHistoryGetters,
   entityHistoryActions
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/layouts/partial-logbook.js b/src/layouts/partial-logbook.js
index 8fc139c1b3..9a1fb1994e 100644
--- a/src/layouts/partial-logbook.js
+++ b/src/layouts/partial-logbook.js
@@ -1,4 +1,4 @@
-import { logbookGetters, logbookActions } from 'home-assistant-js';
+import { logbookGetters, logbookActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/layouts/partial-states.html b/src/layouts/partial-states.html
index d30894c1c4..d3d8f710e9 100644
--- a/src/layouts/partial-states.html
+++ b/src/layouts/partial-states.html
@@ -28,14 +28,6 @@
       line-height: 2em;
       cursor: pointer;
     }
-
-    .interimTranscript {
-      color: darkgrey;
-    }
-
-    .listening paper-spinner {
-      float: right;
-    }
   </style>
 
   <template>
diff --git a/src/layouts/partial-states.js b/src/layouts/partial-states.js
index 2d5a9030df..abbb31c137 100644
--- a/src/layouts/partial-states.js
+++ b/src/layouts/partial-states.js
@@ -8,7 +8,7 @@ import {
   syncActions,
   voiceActions,
   util
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/managers/notification-manager.js b/src/managers/notification-manager.js
index c787d54864..30636315e0 100644
--- a/src/managers/notification-manager.js
+++ b/src/managers/notification-manager.js
@@ -1,4 +1,4 @@
-import { notificationGetters } from 'home-assistant-js';
+import { notificationGetters } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/more-infos/more-info-configurator.js b/src/more-infos/more-info-configurator.js
index 3f8666742c..895d7cf341 100644
--- a/src/more-infos/more-info-configurator.js
+++ b/src/more-infos/more-info-configurator.js
@@ -2,7 +2,7 @@ import {
   streamGetters,
   syncActions,
   serviceActions
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
diff --git a/src/more-infos/more-info-group.html b/src/more-infos/more-info-group.html
index aee8974235..6c0f2a1b52 100644
--- a/src/more-infos/more-info-group.html
+++ b/src/more-infos/more-info-group.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../cards/state-card-content.html">
+<link rel="import" href="../state-summary/state-card-content.html">
 
 <dom-module id="more-info-group">
   <style>
diff --git a/src/more-infos/more-info-group.js b/src/more-infos/more-info-group.js
index 2e26238631..b82e43f791 100644
--- a/src/more-infos/more-info-group.js
+++ b/src/more-infos/more-info-group.js
@@ -1,12 +1,12 @@
 import {
   entityGetters,
   moreInfoGetters
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
-require('../cards/state-card-content');
+require('../state-summary/state-card-content');
 
 export default new Polymer({
   is: 'more-info-group',
diff --git a/src/more-infos/more-info-light.js b/src/more-infos/more-info-light.js
index 7b5996f5f8..552be2e7f4 100644
--- a/src/more-infos/more-info-light.js
+++ b/src/more-infos/more-info-light.js
@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';
diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 65793022fd..1e49d2ed57 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';
diff --git a/src/more-infos/more-info-sun.js b/src/more-infos/more-info-sun.js
index 97d398d93d..1cf160dc0b 100644
--- a/src/more-infos/more-info-sun.js
+++ b/src/more-infos/more-info-sun.js
@@ -1,4 +1,4 @@
-import { util } from 'home-assistant-js';
+import { util } from '../util/home-assistant-js-instance';
 
 import formatTime from '../util/format-time';
 
diff --git a/src/more-infos/more-info-thermostat.js b/src/more-infos/more-info-thermostat.js
index f74eacd0ce..eb240fe452 100644
--- a/src/more-infos/more-info-thermostat.js
+++ b/src/more-infos/more-info-thermostat.js
@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';
diff --git a/src/more-infos/more-info-updater.js b/src/more-infos/more-info-updater.js
index a796d88d15..c5dc2d6492 100644
--- a/src/more-infos/more-info-updater.js
+++ b/src/more-infos/more-info-updater.js
@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 export default new Polymer({
   is: 'more-info-updater',
diff --git a/src/cards/state-card-configurator.html b/src/state-summary/state-card-configurator.html
similarity index 100%
rename from src/cards/state-card-configurator.html
rename to src/state-summary/state-card-configurator.html
diff --git a/src/cards/state-card-configurator.js b/src/state-summary/state-card-configurator.js
similarity index 100%
rename from src/cards/state-card-configurator.js
rename to src/state-summary/state-card-configurator.js
diff --git a/src/cards/state-card-content.html b/src/state-summary/state-card-content.html
similarity index 100%
rename from src/cards/state-card-content.html
rename to src/state-summary/state-card-content.html
diff --git a/src/cards/state-card-content.js b/src/state-summary/state-card-content.js
similarity index 100%
rename from src/cards/state-card-content.js
rename to src/state-summary/state-card-content.js
diff --git a/src/cards/state-card-display.html b/src/state-summary/state-card-display.html
similarity index 100%
rename from src/cards/state-card-display.html
rename to src/state-summary/state-card-display.html
diff --git a/src/cards/state-card-display.js b/src/state-summary/state-card-display.js
similarity index 100%
rename from src/cards/state-card-display.js
rename to src/state-summary/state-card-display.js
diff --git a/src/cards/state-card-media_player.html b/src/state-summary/state-card-media_player.html
similarity index 100%
rename from src/cards/state-card-media_player.html
rename to src/state-summary/state-card-media_player.html
diff --git a/src/cards/state-card-media_player.js b/src/state-summary/state-card-media_player.js
similarity index 100%
rename from src/cards/state-card-media_player.js
rename to src/state-summary/state-card-media_player.js
diff --git a/src/cards/state-card-scene.html b/src/state-summary/state-card-scene.html
similarity index 100%
rename from src/cards/state-card-scene.html
rename to src/state-summary/state-card-scene.html
diff --git a/src/cards/state-card-scene.js b/src/state-summary/state-card-scene.js
similarity index 100%
rename from src/cards/state-card-scene.js
rename to src/state-summary/state-card-scene.js
diff --git a/src/cards/state-card-thermostat.html b/src/state-summary/state-card-thermostat.html
similarity index 100%
rename from src/cards/state-card-thermostat.html
rename to src/state-summary/state-card-thermostat.html
diff --git a/src/cards/state-card-thermostat.js b/src/state-summary/state-card-thermostat.js
similarity index 100%
rename from src/cards/state-card-thermostat.js
rename to src/state-summary/state-card-thermostat.js
diff --git a/src/cards/state-card-toggle.html b/src/state-summary/state-card-toggle.html
similarity index 100%
rename from src/cards/state-card-toggle.html
rename to src/state-summary/state-card-toggle.html
diff --git a/src/cards/state-card-toggle.js b/src/state-summary/state-card-toggle.js
similarity index 95%
rename from src/cards/state-card-toggle.js
rename to src/state-summary/state-card-toggle.js
index d216042f9c..e465394ba5 100644
--- a/src/cards/state-card-toggle.js
+++ b/src/state-summary/state-card-toggle.js
@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
diff --git a/src/cards/state-card.html b/src/state-summary/state-card.html
similarity index 100%
rename from src/cards/state-card.html
rename to src/state-summary/state-card.html
diff --git a/src/cards/state-card.js b/src/state-summary/state-card.js
similarity index 83%
rename from src/cards/state-card.js
rename to src/state-summary/state-card.js
index 5581249c0b..94180e32c1 100644
--- a/src/cards/state-card.js
+++ b/src/state-summary/state-card.js
@@ -1,4 +1,4 @@
-import { moreInfoActions } from 'home-assistant-js';
+import { moreInfoActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
diff --git a/src/util/bound-nuclear-behavior.js b/src/util/bound-nuclear-behavior.js
index 4b44ee9617..c272df7886 100644
--- a/src/util/bound-nuclear-behavior.js
+++ b/src/util/bound-nuclear-behavior.js
@@ -1,4 +1,4 @@
-import { reactor } from 'home-assistant-js';
+import { reactor } from '../util/home-assistant-js-instance';
 
 import nuclearObserver from './nuclear-behavior';
 
diff --git a/src/util/home-assistant-js-instance.js b/src/util/home-assistant-js-instance.js
new file mode 100644
index 0000000000..3d2bc0f18f
--- /dev/null
+++ b/src/util/home-assistant-js-instance.js
@@ -0,0 +1,3 @@
+import HomeAssistant from 'home-assistant-js';
+
+export default new HomeAssistant();
diff --git a/src/util/state-card-type.js b/src/util/state-card-type.js
index 5967b111c6..a39a3e88ff 100644
--- a/src/util/state-card-type.js
+++ b/src/util/state-card-type.js
@@ -1,4 +1,4 @@
-import { reactor, serviceGetters } from 'home-assistant-js';
+import { reactor, serviceGetters } from '../util/home-assistant-js-instance';
 
 const DOMAINS_WITH_CARD = [
   'thermostat', 'configurator', 'scene', 'media_player'];
@@ -6,7 +6,7 @@ const DOMAINS_WITH_CARD = [
 export default function stateCardType(state) {
   if (DOMAINS_WITH_CARD.indexOf(state.domain) !== -1) {
     return state.domain;
-  } else if (reactor.evaluate(serviceGetters.canToggle(state.entityId))) {
+  } else if (reactor.evaluate(serviceGetters.canToggleEntity(state.entityId))) {
     return 'toggle';
   }
   return 'display';
diff --git a/src/util/validate-auth.js b/src/util/validate-auth.js
index ca19a73b94..fdcd568b41 100644
--- a/src/util/validate-auth.js
+++ b/src/util/validate-auth.js
@@ -1,4 +1,4 @@
-import { authActions, localStoragePreferences } from 'home-assistant-js';
+import { authActions, localStoragePreferences } from '../util/home-assistant-js-instance';
 
 export default function(authToken, rememberAuth) {
   authActions.validate(authToken, {