diff --git a/src/controllers/dashboard/general.js b/src/controllers/dashboard/general.js
index 2defc6d449..8e30749aba 100644
--- a/src/controllers/dashboard/general.js
+++ b/src/controllers/dashboard/general.js
@@ -24,7 +24,7 @@ import 'emby-button';
 
     function onSubmit() {
         loading.show();
-        var form = this;
+        const form = this;
         $(form).parents('.page');
         ApiClient.getServerConfiguration().then(function (config) {
             config.ServerName = $('#txtServerName', form).val();
@@ -32,7 +32,7 @@ import 'emby-button';
             config.CachePath = form.querySelector('#txtCachePath').value;
             config.MetadataPath = $('#txtMetadataPath', form).val();
             config.MetadataNetworkPath = $('#txtMetadataNetworkPath', form).val();
-            var requiresReload = config.UICulture !== currentLanguage;
+            let requiresReload = config.UICulture !== currentLanguage;
             ApiClient.updateServerConfiguration(config).then(function() {
                 ApiClient.getNamedConfiguration(brandingConfigKey).then(function(brandingConfig) {
                     brandingConfig.LoginDisclaimer = form.querySelector('#txtLoginDisclaimer').value;
@@ -61,13 +61,13 @@ import 'emby-button';
         return false;
     }
 
-    var currentBrandingOptions;
-    var currentLanguage;
-    var brandingConfigKey = 'branding';
+    let currentBrandingOptions;
+    let currentLanguage;
+    const brandingConfigKey = 'branding';
     export default function (view, params) {
         $('#btnSelectCachePath', view).on('click.selectDirectory', function () {
             import('directorybrowser').then(({default: directoryBrowser}) => {
-                var picker = new directoryBrowser();
+                const picker = new directoryBrowser();
                 picker.show({
                     callback: function (path) {
                         if (path) {
@@ -84,7 +84,7 @@ import 'emby-button';
         });
         $('#btnSelectMetadataPath', view).on('click.selectDirectory', function () {
             import('directorybrowser').then(({default: directoryBrowser}) => {
-                var picker = new directoryBrowser();
+                const picker = new directoryBrowser();
                 picker.show({
                     path: $('#txtMetadataPath', view).val(),
                     networkSharePath: $('#txtMetadataNetworkPath', view).val(),
@@ -108,9 +108,9 @@ import 'emby-button';
         });
         $('.dashboardGeneralForm', view).off('submit', onSubmit).on('submit', onSubmit);
         view.addEventListener('viewshow', function () {
-            var promiseConfig = ApiClient.getServerConfiguration();
-            var promiseLanguageOptions = ApiClient.getJSON(ApiClient.getUrl('Localization/Options'));
-            var promiseSystemInfo = ApiClient.getSystemInfo();
+            const promiseConfig = ApiClient.getServerConfiguration();
+            const promiseLanguageOptions = ApiClient.getJSON(ApiClient.getUrl('Localization/Options'));
+            const promiseSystemInfo = ApiClient.getSystemInfo();
             Promise.all([promiseConfig, promiseLanguageOptions, promiseSystemInfo]).then(function (responses) {
                 loadPage(view, responses[0], responses[1], responses[2]);
             });
@@ -120,6 +120,6 @@ import 'emby-button';
                 view.querySelector('#txtCustomCss').value = config.CustomCss || '';
             });
         });
-    };
+    }
 
 /* eslint-enable indent */
diff --git a/src/controllers/dashboard/librarydisplay.js b/src/controllers/dashboard/librarydisplay.js
index 95475cfb9b..54ed028a3a 100644
--- a/src/controllers/dashboard/librarydisplay.js
+++ b/src/controllers/dashboard/librarydisplay.js
@@ -3,7 +3,6 @@ import loading from 'loading';
 import libraryMenu from 'libraryMenu';
 import 'emby-checkbox';
 import 'emby-button';
-import 'emby-button';
 
 /* eslint-disable indent */
 
@@ -39,7 +38,7 @@ import 'emby-button';
 
         view.querySelector('form').addEventListener('submit', function(e) {
             loading.show();
-            var form = this;
+            const form = this;
             ApiClient.getServerConfiguration().then(function(config) {
                 config.EnableFolderView = form.querySelector('.chkFolderView').checked;
                 config.EnableGroupingIntoCollections = form.querySelector('.chkGroupMoviesIntoCollections').checked;
@@ -69,6 +68,6 @@ import 'emby-button';
                 }
             });
         });
-    };
+    }
 
     /* eslint-enable indent */
diff --git a/src/controllers/dashboard/metadataImages.js b/src/controllers/dashboard/metadataImages.js
index 6573d9858d..cbfe05419c 100644
--- a/src/controllers/dashboard/metadataImages.js
+++ b/src/controllers/dashboard/metadataImages.js
@@ -9,10 +9,10 @@ import 'listViewStyle';
 
     function populateLanguages(select) {
         return ApiClient.getCultures().then(function(languages) {
-            var html = '';
+            let html = '';
             html += "<option value=''></option>";
-            for (var i = 0, length = languages.length; i < length; i++) {
-                var culture = languages[i];
+            for (let i = 0, length = languages.length; i < length; i++) {
+                const culture = languages[i];
                 html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
             }
             select.innerHTML = html;
@@ -21,10 +21,10 @@ import 'listViewStyle';
 
     function populateCountries(select) {
         return ApiClient.getCountries().then(function(allCountries) {
-            var html = '';
+            let html = '';
             html += "<option value=''></option>";
-            for (var i = 0, length = allCountries.length; i < length; i++) {
-                var culture = allCountries[i];
+            for (let i = 0, length = allCountries.length; i < length; i++) {
+                const culture = allCountries[i];
                 html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
             }
             select.innerHTML = html;
@@ -32,9 +32,9 @@ import 'listViewStyle';
     }
 
     function loadPage(page) {
-        var promises = [ApiClient.getServerConfiguration(), populateLanguages(page.querySelector('#selectLanguage')), populateCountries(page.querySelector('#selectCountry'))];
+        const promises = [ApiClient.getServerConfiguration(), populateLanguages(page.querySelector('#selectLanguage')), populateCountries(page.querySelector('#selectCountry'))];
         Promise.all(promises).then(function(responses) {
-            var config = responses[0];
+            const config = responses[0];
             page.querySelector('#selectLanguage').value = config.PreferredMetadataLanguage || '';
             page.querySelector('#selectCountry').value = config.MetadataCountryCode || '';
             loading.hide();
@@ -42,7 +42,7 @@ import 'listViewStyle';
     }
 
     function onSubmit() {
-        var form = this;
+        const form = this;
         return loading.show(), ApiClient.getServerConfiguration().then(function(config) {
             config.PreferredMetadataLanguage = form.querySelector('#selectLanguage').value;
             config.MetadataCountryCode = form.querySelector('#selectCountry').value;
diff --git a/src/controllers/dashboard/metadatanfo.js b/src/controllers/dashboard/metadatanfo.js
index 0659d477cb..f1b768d18b 100644
--- a/src/controllers/dashboard/metadatanfo.js
+++ b/src/controllers/dashboard/metadatanfo.js
@@ -6,7 +6,7 @@ import globalize from 'globalize';
 /* eslint-disable indent */
 
     function loadPage(page, config, users) {
-        var html = '<option value="" selected="selected">' + globalize.translate('OptionNone') + '</option>';
+        let html = '<option value="" selected="selected">' + globalize.translate('OptionNone') + '</option>';
         html += users.map(function (user) {
             return '<option value="' + user.Id + '">' + user.Name + '</option>';
         }).join('');
@@ -20,7 +20,7 @@ import globalize from 'globalize';
 
     function onSubmit() {
         loading.show();
-        var form = this;
+        const form = this;
         ApiClient.getNamedConfiguration(metadataKey).then(function (config) {
             config.UserId = $('#selectUser', form).val() || null;
             config.ReleaseDateFormat = $('#selectReleaseDateFormat', form).val();
@@ -36,7 +36,7 @@ import globalize from 'globalize';
     }
 
     function showConfirmMessage(config) {
-        var msg = [];
+        const msg = [];
         msg.push(globalize.translate('MetadataSettingChangeHelp'));
 
         import('alert').then(({default: alert}) => {
@@ -62,15 +62,15 @@ import globalize from 'globalize';
         }];
     }
 
-    var metadataKey = 'xbmcmetadata';
+    const metadataKey = 'xbmcmetadata';
     $(document).on('pageinit', '#metadataNfoPage', function () {
         $('.metadataNfoForm').off('submit', onSubmit).on('submit', onSubmit);
     }).on('pageshow', '#metadataNfoPage', function () {
         libraryMenu.setTabs('metadata', 3, getTabs);
         loading.show();
-        var page = this;
-        var promise1 = ApiClient.getUsers();
-        var promise2 = ApiClient.getNamedConfiguration(metadataKey);
+        const page = this;
+        const promise1 = ApiClient.getUsers();
+        const promise2 = ApiClient.getNamedConfiguration(metadataKey);
         Promise.all([promise1, promise2]).then(function (responses) {
             loadPage(page, responses[1], responses[0]);
         });
diff --git a/src/controllers/dashboard/streaming.js b/src/controllers/dashboard/streaming.js
index 15d6c89209..c54fbea472 100644
--- a/src/controllers/dashboard/streaming.js
+++ b/src/controllers/dashboard/streaming.js
@@ -12,7 +12,7 @@ import globalize from 'globalize';
 
     function onSubmit() {
         loading.show();
-        var form = this;
+        const form = this;
         ApiClient.getServerConfiguration().then(function (config) {
             config.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat($('#txtRemoteClientBitrateLimit', form).val() || '0'));
             ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
@@ -39,7 +39,7 @@ import globalize from 'globalize';
     }).on('pageshow', '#streamingSettingsPage', function () {
         loading.show();
         libraryMenu.setTabs('playback', 2, getTabs);
-        var page = this;
+        const page = this;
         ApiClient.getServerConfiguration().then(function (config) {
             loadPage(page, config);
         });