diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index 1f7d70e7e..af611917a 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -5,7 +5,7 @@ import 'registerElement';
 
 /* eslint-disable indent */
 
-    var EmbyCheckboxPrototype = Object.create(HTMLInputElement.prototype);
+    let EmbyCheckboxPrototype = Object.create(HTMLInputElement.prototype);
 
     function onKeyDown(e) {
         // Don't submit form on enter
@@ -23,10 +23,10 @@ import 'registerElement';
         }
     }
 
-    var enableRefreshHack = browser.tizen || browser.orsay || browser.operaTv || browser.web0s ? true : false;
+    const enableRefreshHack = browser.tizen || browser.orsay || browser.operaTv || browser.web0s ? true : false;
 
     function forceRefresh(loading) {
-        var elem = this.parentNode;
+        let elem = this.parentNode;
 
         elem.style.webkitAnimationName = 'repaintChrome';
         elem.style.webkitAnimationDelay = (loading === true ? '500ms' : '');
@@ -47,22 +47,22 @@ import 'registerElement';
 
         this.classList.add('emby-checkbox');
 
-        var labelElement = this.parentNode;
+        const labelElement = this.parentNode;
         labelElement.classList.add('emby-checkbox-label');
 
-        var labelTextElement = labelElement.querySelector('span');
+        const labelTextElement = labelElement.querySelector('span');
 
-        var outlineClass = 'checkboxOutline';
+        const outlineClass = 'checkboxOutline';
 
-        var customClass = this.getAttribute('data-outlineclass');
+        const customClass = this.getAttribute('data-outlineclass');
         if (customClass) {
             outlineClass += ' ' + customClass;
         }
 
-        var checkedIcon = this.getAttribute('data-checkedicon') || 'check';
-        var uncheckedIcon = this.getAttribute('data-uncheckedicon') || '';
-        var checkHtml = '<span class="material-icons checkboxIcon checkboxIcon-checked ' + checkedIcon + '"></span>';
-        var uncheckedHtml = '<span class="material-icons checkboxIcon checkboxIcon-unchecked ' + uncheckedIcon + '"></span>';
+        const checkedIcon = this.getAttribute('data-checkedicon') || 'check';
+        const uncheckedIcon = this.getAttribute('data-uncheckedicon') || '';
+        const checkHtml = '<span class="material-icons checkboxIcon checkboxIcon-checked ' + checkedIcon + '"></span>';
+        const uncheckedHtml = '<span class="material-icons checkboxIcon checkboxIcon-unchecked ' + uncheckedIcon + '"></span>';
         labelElement.insertAdjacentHTML('beforeend', '<span class="' + outlineClass + '">' + checkHtml + uncheckedHtml + '</span>');
 
         labelTextElement.classList.add('checkboxLabel');
diff --git a/src/elements/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js
index 9e813ad04..3b7624e74 100644
--- a/src/elements/emby-textarea/emby-textarea.js
+++ b/src/elements/emby-textarea/emby-textarea.js
@@ -7,7 +7,7 @@ import 'emby-input';
 /* eslint-disable indent */
 
     function autoGrow(textarea, maxLines) {
-        var self = this;
+        const self = this;
 
         if (maxLines === undefined) {
             maxLines = 999;
@@ -19,17 +19,17 @@ import 'emby-input';
          * @returns {number}
          */
         self.getOffset = function (textarea) {
-            var style = window.getComputedStyle(textarea, null);
-            var props = ['paddingTop', 'paddingBottom'];
-            var offset = 0;
+            const style = window.getComputedStyle(textarea, null);
+            const props = ['paddingTop', 'paddingBottom'];
+            let offset = 0;
 
-            for (var i = 0; i < props.length; i++) {
+            for (let i = 0; i < props.length; i++) {
                 offset += parseInt(style[props[i]]);
             }
             return offset;
         };
 
-        var offset;
+        let offset;
         function reset() {
             textarea.rows = 1;
             offset = self.getOffset(textarea);
@@ -48,8 +48,8 @@ import 'emby-input';
                 textarea.rows = 3;
                 return;
             }
-            var newHeight = 0;
-            var hasGrown = false;
+            let newHeight = 0;
+            let hasGrown = false;
 
             if ((textarea.scrollHeight - offset) > self.maxAllowedHeight) {
                 textarea.style.overflowY = 'scroll';
@@ -72,17 +72,17 @@ import 'emby-input';
         autogrowFn();
     }
 
-    var EmbyTextAreaPrototype = Object.create(HTMLTextAreaElement.prototype);
+    const EmbyTextAreaPrototype = Object.create(HTMLTextAreaElement.prototype);
 
-    var elementId = 0;
+    let elementId = 0;
 
     if (Object.getOwnPropertyDescriptor && Object.defineProperty) {
 
-        var descriptor = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, 'value');
+        const descriptor = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, 'value');
 
         // descriptor returning null in webos
         if (descriptor && descriptor.configurable) {
-            var baseSetMethod = descriptor.set;
+            const baseSetMethod = descriptor.set;
             descriptor.set = function (value) {
                 baseSetMethod.call(this, value);
 
@@ -113,8 +113,8 @@ import 'emby-input';
         this.rows = 1;
         this.classList.add('emby-textarea');
 
-        var parentNode = this.parentNode;
-        var label = this.ownerDocument.createElement('label');
+        const parentNode = this.parentNode;
+        const label = this.ownerDocument.createElement('label');
         label.innerHTML = this.getAttribute('label') || '';
         label.classList.add('textareaLabel');
 
diff --git a/src/elements/emby-toggle/emby-toggle.js b/src/elements/emby-toggle/emby-toggle.js
index 5b9ab3539..99856923e 100644
--- a/src/elements/emby-toggle/emby-toggle.js
+++ b/src/elements/emby-toggle/emby-toggle.js
@@ -3,7 +3,7 @@ import 'registerElement';
 
 /* eslint-disable indent */
 
-    var EmbyTogglePrototype = Object.create(HTMLInputElement.prototype);
+    const EmbyTogglePrototype = Object.create(HTMLInputElement.prototype);
 
     function onKeyDown(e) {
 
@@ -31,11 +31,11 @@ import 'registerElement';
 
         this.classList.add('mdl-switch__input');
 
-        var labelElement = this.parentNode;
+        const labelElement = this.parentNode;
         labelElement.classList.add('mdl-switch');
         labelElement.classList.add('mdl-js-switch');
 
-        var labelTextElement = labelElement.querySelector('span');
+        const labelTextElement = labelElement.querySelector('span');
 
         labelElement.insertAdjacentHTML('beforeend', '<div class="mdl-switch__trackContainer"><div class="mdl-switch__track"></div><div class="mdl-switch__thumb"><span class="mdl-switch__focus-helper"></span></div></div>');