diff --git a/src/components/buttons/ha-call-service-button.html b/src/components/buttons/ha-call-service-button.html
index 02a99ee0ed..678597a7cc 100644
--- a/src/components/buttons/ha-call-service-button.html
+++ b/src/components/buttons/ha-call-service-button.html
@@ -1,6 +1,8 @@
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="./ha-progress-button.html">
 
+<link rel='import' href='../util/hass-mixins.html'>
+
 <dom-module id='ha-call-service-button'>
   <template>
     <ha-progress-button
@@ -12,7 +14,7 @@
 </dom-module>
 
 <script>
-class HaCallServiceButton extends Polymer.Element {
+class HaCallServiceButton extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-call-service-button'; }
 
   static get properties() {
diff --git a/src/components/ha-climate-control.html b/src/components/ha-climate-control.html
index d2bd669d62..662cd4caab 100644
--- a/src/components/ha-climate-control.html
+++ b/src/components/ha-climate-control.html
@@ -2,6 +2,7 @@
 <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='../util/hass-mixins.html'>
 
 <dom-module id="ha-climate-control">
   <template>
@@ -42,7 +43,7 @@
   </template>
 </dom-module>
 <script>
-class HaClimateControl extends Polymer.Element {
+class HaClimateControl extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-climate-control'; }
 
   static get properties() {
@@ -85,7 +86,7 @@ class HaClimateControl extends Polymer.Element {
     }
   }
   valueChanged() {
-    // when the value is changed, trigger a potential even fire in
+    // when the value is changed, trigger a potential event fire in
     // the future, as long as last changed is far enough in the
     // past.
     //
@@ -94,13 +95,13 @@ class HaClimateControl extends Polymer.Element {
     // (like set to red), then animate back to black when the
     // change event is fired, and the signal sent to home-assistant.
     if (this.last_changed) {
-      window.setTimeout(function (val) {
+      window.setTimeout(() => {
         var now = Date.now();
-        if (now - val.last_changed >= 2000) {
-          val.fire('change');
-          val.last_changed = null;
+        if (now - this.last_changed >= 2000) {
+          this.fire('change');
+          this.last_changed = null;
         }
-      }, 2010, this);
+      }, 2010);
     }
   }
 }
diff --git a/src/components/ha-push-notifications-toggle.html b/src/components/ha-push-notifications-toggle.html
index 24aabab6f8..e72cbfd406 100644
--- a/src/components/ha-push-notifications-toggle.html
+++ b/src/components/ha-push-notifications-toggle.html
@@ -1,6 +1,8 @@
 <link rel="import" href="../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../bower_components/paper-toggle-button/paper-toggle-button.html">
 
+<link rel='import' href='../util/hass-mixins.html'>
+
 <dom-module id='ha-push-notifications-toggle'>
   <template>
     <paper-toggle-button
@@ -13,7 +15,7 @@
 </dom-module>
 
 <script>
-class HaPushNotificationsToggle extends Polymer.Element {
+class HaPushNotificationsToggle extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-push-notifications-toggle'; }
 
   static get properties() {