diff --git a/.eslintrc.js b/.eslintrc.js
index baf6d0e084..765db89daa 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -28,7 +28,7 @@ module.exports = {
     ],
     rules: {
         'block-spacing': ['error'],
-        'brace-style': ['error'],
+        'brace-style': ['error', "1tbs", { "allowSingleLine": true }],
         'comma-dangle': ['error', 'never'],
         'comma-spacing': ['error'],
         'eol-last': ['error'],
@@ -39,7 +39,10 @@ module.exports = {
         'no-multi-spaces': ['error'],
         'no-multiple-empty-lines': ['error', { 'max': 1 }],
         'no-trailing-spaces': ['error'],
+        'no-unused-expressions': ['error', { 'allowShortCircuit': true, 'allowTernary': true, 'allowTaggedTemplates': true }],
+        "no-unused-vars": ["error", { "vars": "all", "args": "none", "ignoreRestSiblings": true }],
         'one-var': ['error', 'never'],
+        'padded-blocks': ['error', 'never'],
         'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }],
         'semi': ['error'],
         'space-before-blocks': ['error'],
@@ -98,9 +101,8 @@ module.exports = {
             },
             rules: {
                 // TODO: Fix warnings and remove these rules
-                'no-redeclare': ['warn'],
-                'no-unused-vars': ['warn'],
-                'no-useless-escape': ['warn'],
+                'no-redeclare': ['off'],
+                'no-useless-escape': ['off'],
                 // TODO: Remove after ES6 migration is complete
                 'import/no-unresolved': ['off']
             },
diff --git a/package.json b/package.json
index e0a16bc55f..1d5bd016c6 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,9 @@
     "autoprefixer": "^9.8.5",
     "babel-eslint": "^11.0.0-beta.2",
     "babel-loader": "^8.0.6",
-    "browser-sync": "^2.26.10",
+    "browser-sync": "^2.26.12",
     "copy-webpack-plugin": "^5.1.1",
-    "css-loader": "^3.6.0",
+    "css-loader": "^4.0.0",
     "cssnano": "^4.1.10",
     "del": "^5.1.0",
     "eslint": "^6.8.0",
@@ -76,7 +76,6 @@
     "query-string": "^6.13.1",
     "resize-observer-polyfill": "^1.5.1",
     "screenfull": "^5.0.2",
-    "shaka-player": "^2.5.13",
     "sortablejs": "^1.10.2",
     "swiper": "^5.4.5",
     "webcomponents.js": "^0.7.24",
@@ -158,11 +157,11 @@
           "src/components/syncPlay/playbackPermissionManager.js",
           "src/components/syncPlay/syncPlayManager.js",
           "src/components/syncPlay/timeSyncManager.js",
-          "src/controllers/auth/addserver.js",
-          "src/controllers/auth/forgotpassword.js",
-          "src/controllers/auth/forgotpasswordpin.js",
-          "src/controllers/auth/login.js",
-          "src/controllers/auth/selectserver.js",
+          "src/controllers/session/addServer/index.js",
+          "src/controllers/session/forgotPassword/index.js",
+          "src/controllers/session/redeemPassword/index.js",
+          "src/controllers/session/login/index.js",
+          "src/controllers/sessopm/selectServer/index.js",
           "src/controllers/dashboard/apikeys.js",
           "src/controllers/dashboard/dashboard.js",
           "src/controllers/dashboard/devices/device.js",
@@ -179,7 +178,7 @@
           "src/controllers/dashboard/metadatanfo.js",
           "src/controllers/dashboard/networking.js",
           "src/controllers/dashboard/playback.js",
-          "src/controllers/dashboard/plugins/repositories.js",
+          "src/controllers/dashboard/plugins/repositories/index.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtask.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtasks.js",
           "src/controllers/dashboard/serveractivity.js",
@@ -190,8 +189,8 @@
           "src/controllers/dashboard/users/userparentalcontrol.js",
           "src/controllers/dashboard/users/userpasswordpage.js",
           "src/controllers/dashboard/users/userprofilespage.js",
-          "src/controllers/playback/nowplaying.js",
-          "src/controllers/playback/videoosd.js",
+          "src/controllers/playback/queue/index.js",
+          "src/controllers/playback/video/index.js",
           "src/controllers/searchpage.js",
           "src/controllers/shows/episodes.js",
           "src/controllers/shows/tvgenres.js",
@@ -200,18 +199,18 @@
           "src/controllers/shows/tvshows.js",
           "src/controllers/shows/tvstudios.js",
           "src/controllers/shows/tvupcoming.js",
-          "src/controllers/user/display.js",
-          "src/controllers/user/home.js",
-          "src/controllers/user/menu.js",
-          "src/controllers/user/playback.js",
-          "src/controllers/user/profile.js",
-          "src/controllers/user/subtitles.js",
-          "src/controllers/user/subtitles.js",
-          "src/controllers/wizard/finish.js",
-          "src/controllers/wizard/remoteaccess.js",
-          "src/controllers/wizard/settings.js",
-          "src/controllers/wizard/start.js",
-          "src/controllers/wizard/user.js",
+          "src/controllers/user/display/index.js",
+          "src/controllers/user/home/index.js",
+          "src/controllers/user/menu/index.js",
+          "src/controllers/user/playback/index.js",
+          "src/controllers/user/profile/index.js",
+          "src/controllers/user/subtitles/index.js",
+          "src/controllers/user/subtitles/index.js",
+          "src/controllers/wizard/finish/index.js",
+          "src/controllers/wizard/remote/index.js",
+          "src/controllers/wizard/settings/index.js",
+          "src/controllers/wizard/start/index.js",
+          "src/controllers/wizard/user/index.js",
           "src/elements/emby-button/emby-button.js",
           "src/elements/emby-button/paper-icon-button-light.js",
           "src/elements/emby-checkbox/emby-checkbox.js",
diff --git a/src/assets/css/site.css b/src/assets/css/site.css
index f6326f4c9e..38e056df89 100644
--- a/src/assets/css/site.css
+++ b/src/assets/css/site.css
@@ -133,3 +133,13 @@ div[data-role=page] {
 .w-100 {
     width: 100%;
 }
+
+.margin-auto-x {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.margin-auto-y {
+    margin-top: auto;
+    margin-bottom: auto;
+}
diff --git a/src/bundle.js b/src/bundle.js
index dd1ff6548b..ae2a59f0d5 100644
--- a/src/bundle.js
+++ b/src/bundle.js
@@ -78,12 +78,6 @@ _define('webcomponents', function() {
     return webcomponents;
 });
 
-// shaka
-var shaka = require('shaka-player');
-_define('shaka', function() {
-    return shaka;
-});
-
 // libass-wasm
 var libassWasm = require('libass-wasm');
 _define('JavascriptSubtitlesOctopus', function() {
diff --git a/src/components/actionSheet/actionSheet.js b/src/components/actionSheet/actionSheet.js
index a68d6a6acd..937cd2afe5 100644
--- a/src/components/actionSheet/actionSheet.js
+++ b/src/components/actionSheet/actionSheet.js
@@ -9,7 +9,6 @@ import 'scrollStyles';
 import 'listViewStyle';
 
 function getOffsets(elems) {
-
     let results = [];
 
     if (!document) {
@@ -31,7 +30,6 @@ function getOffsets(elems) {
 }
 
 function getPosition(options, dlg) {
-
     const windowSize = dom.getWindowSize();
     const windowHeight = windowSize.innerHeight;
     const windowWidth = windowSize.innerWidth;
@@ -80,7 +78,6 @@ function centerFocus(elem, horiz, on) {
 }
 
 export function show(options) {
-
     // items
     // positionTo
     // showCancel
@@ -98,7 +95,6 @@ export function show(options) {
         isFullscreen = true;
         dialogOptions.autoFocus = true;
     } else {
-
         dialogOptions.modal = false;
         dialogOptions.entryAnimation = options.entryAnimation;
         dialogOptions.exitAnimation = options.exitAnimation;
@@ -136,7 +132,6 @@ export function show(options) {
     let icons = [];
     let itemIcon;
     for (const item of options.items) {
-
         itemIcon = item.icon || (item.selected ? 'check' : null);
 
         if (itemIcon) {
@@ -161,7 +156,6 @@ export function show(options) {
     }
 
     if (options.title) {
-
         html += '<h1 class="actionSheetTitle">' + options.title + '</h1>';
     }
     if (options.text) {
@@ -197,7 +191,6 @@ export function show(options) {
         const item = options.items[i];
 
         if (item.divider) {
-
             html += '<div class="actionsheetDivider"></div>';
             continue;
         }
@@ -255,8 +248,6 @@ export function show(options) {
         });
     }
 
-    // Seeing an issue in some non-chrome browsers where this is requiring a double click
-    //var eventName = browser.firefox ? 'mousedown' : 'click';
     let selectedId;
 
     let timeout;
@@ -267,26 +258,20 @@ export function show(options) {
     }
 
     return new Promise(function (resolve, reject) {
-
         let isResolved;
 
         dlg.addEventListener('click', function (e) {
-
             const actionSheetMenuItem = dom.parentWithClass(e.target, 'actionSheetMenuItem');
 
             if (actionSheetMenuItem) {
                 selectedId = actionSheetMenuItem.getAttribute('data-id');
 
                 if (options.resolveOnClick) {
-
                     if (options.resolveOnClick.indexOf) {
-
                         if (options.resolveOnClick.indexOf(selectedId) !== -1) {
-
                             resolve(selectedId);
                             isResolved = true;
                         }
-
                     } else {
                         resolve(selectedId);
                         isResolved = true;
@@ -295,11 +280,9 @@ export function show(options) {
 
                 dialogHelper.close(dlg);
             }
-
         });
 
         dlg.addEventListener('close', function () {
-
             if (layoutManager.tv) {
                 centerFocus(dlg.querySelector('.actionSheetScroller'), false, false);
             }
diff --git a/src/components/activitylog.js b/src/components/activitylog.js
index 2d5a21756f..9834255003 100644
--- a/src/components/activitylog.js
+++ b/src/components/activitylog.js
@@ -3,7 +3,6 @@ import globalize from 'globalize';
 import dom from 'dom';
 import * as datefns from 'date-fns';
 import dfnshelper from 'dfnshelper';
-import userSettings from 'userSettings';
 import serverNotifications from 'serverNotifications';
 import connectionManager from 'connectionManager';
 import 'emby-button';
@@ -69,6 +68,7 @@ import 'listViewStyle';
         const minDate = new Date();
         const hasUserId = 'false' !== elem.getAttribute('data-useractivity');
 
+        // TODO: Use date-fns
         if (hasUserId) {
             minDate.setTime(minDate.getTime() - 24 * 60 * 60 * 1000); // one day back
         } else {
diff --git a/src/components/alert.js b/src/components/alert.js
index 5d396e3a62..1420c7f428 100644
--- a/src/components/alert.js
+++ b/src/components/alert.js
@@ -10,7 +10,6 @@ import globalize from 'globalize';
     }
 
     export default function (text, title) {
-
         let options;
         if (typeof text === 'string') {
             options = {
diff --git a/src/components/alphaPicker/alphaPicker.js b/src/components/alphaPicker/alphaPicker.js
index 4bc8af56f0..95b5881677 100644
--- a/src/components/alphaPicker/alphaPicker.js
+++ b/src/components/alphaPicker/alphaPicker.js
@@ -26,7 +26,6 @@ import 'material-icons';
     }
 
     function getAlphaPickerButtonClassName(vertical) {
-
         let alphaPickerButtonClassName = 'alphaPickerButton';
 
         if (layoutManager.tv) {
@@ -45,14 +44,12 @@ import 'material-icons';
     }
 
     function mapLetters(letters, vertical) {
-
         return letters.map(l => {
             return getLetterButton(l, vertical);
         });
     }
 
     function render(element, options) {
-
         element.classList.add('alphaPicker');
 
         if (layoutManager.tv) {
@@ -137,7 +134,6 @@ import 'material-icons';
             }
 
             function onAlphaPickerInKeyboardModeClick(e) {
-
                 const alphaPickerButton = dom.parentWithClass(e.target, 'alphaPickerButton');
 
                 if (alphaPickerButton) {
@@ -153,7 +149,6 @@ import 'material-icons';
             }
 
             function onAlphaPickerClick(e) {
-
                 const alphaPickerButton = dom.parentWithClass(e.target, 'alphaPickerButton');
 
                 if (alphaPickerButton) {
@@ -167,7 +162,6 @@ import 'material-icons';
             }
 
             function onAlphaPickerFocusIn(e) {
-
                 if (alphaFocusTimeout) {
                     clearTimeout(alphaFocusTimeout);
                     alphaFocusTimeout = null;
@@ -182,13 +176,11 @@ import 'material-icons';
             }
 
             function onItemsFocusIn(e) {
-
                 const item = dom.parentWithClass(e.target, itemClass);
 
                 if (item) {
                     const prefix = item.getAttribute('data-prefix');
                     if (prefix && prefix.length) {
-
                         itemFocusValue = prefix[0];
                         if (itemFocusTimeout) {
                             clearTimeout(itemFocusTimeout);
@@ -199,9 +191,7 @@ import 'material-icons';
             }
 
             this.enabled = function (enabled) {
-
                 if (enabled) {
-
                     if (itemsContainer) {
                         itemsContainer.addEventListener('focus', onItemsFocusIn, true);
                     }
@@ -215,9 +205,7 @@ import 'material-icons';
                     } else {
                         element.addEventListener('click', onAlphaPickerClick.bind(this));
                     }
-
                 } else {
-
                     if (itemsContainer) {
                         itemsContainer.removeEventListener('focus', onItemsFocusIn, true);
                     }
@@ -235,14 +223,12 @@ import 'material-icons';
         }
 
         value(value, applyValue) {
-
             const element = this.options.element;
             let btn;
             let selected;
 
             if (value !== undefined) {
                 if (value != null) {
-
                     value = value.toUpperCase();
                     this._currentValue = value;
 
@@ -295,33 +281,27 @@ import 'material-icons';
         }
 
         visible(visible) {
-
             const element = this.options.element;
             element.style.visibility = visible ? 'visible' : 'hidden';
         }
 
         values() {
-
             const element = this.options.element;
             const elems = element.querySelectorAll('.alphaPickerButton');
             const values = [];
             for (let i = 0, length = elems.length; i < length; i++) {
-
                 values.push(elems[i].getAttribute('data-value'));
-
             }
 
             return values;
         }
 
         focus() {
-
             const element = this.options.element;
             focusManager.autoFocus(element, true);
         }
 
         destroy() {
-
             const element = this.options.element;
             this.enabled(false);
             element.classList.remove('focuscontainer-x');
diff --git a/src/components/appFooter/appFooter.js b/src/components/appFooter/appFooter.js
index af50ef7bf9..c60aa1a27c 100644
--- a/src/components/appFooter/appFooter.js
+++ b/src/components/appFooter/appFooter.js
@@ -1,4 +1,3 @@
-import browser from 'browser';
 import 'css!./appFooter';
 
 function render(options) {
diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index 8054279c92..138d58e5c0 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -16,7 +16,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
             show('/settings/settings.html');
         },
         showNowPlaying: function () {
-            show('/nowplaying.html');
+            show('queue');
         }
     };
 
@@ -153,20 +153,14 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
         };
 
         if (!isBackNav) {
-            // Don't force a new view for home due to the back menu
-            //if (route.type !== 'home') {
             onNewViewNeeded();
             return;
-            //}
         }
         viewManager.tryRestoreView(currentRequest, function () {
-
-            // done
             currentRouteInfo = {
                 route: route,
                 path: ctx.path
             };
-
         }).catch(function (result) {
             if (!result || !result.cancelled) {
                 onNewViewNeeded();
@@ -197,12 +191,10 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
     }
 
     function onRequestFail(e, data) {
-
         var apiClient = this;
 
         if (data.status === 403) {
             if (data.errorCode === 'ParentalControl') {
-
                 var isCurrentAllowed = currentRouteInfo ? (currentRouteInfo.route.anonymous || currentRouteInfo.route.startup) : true;
 
                 // Bounce to the login screen, but not if a password entry fails, obviously
@@ -210,7 +202,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
                     showForcedLogoutMessage(globalize.translate('AccessRestrictedTryAgainLater'));
                     appRouter.showLocalLogin(apiClient.serverId());
                 }
-
             }
         }
     }
@@ -237,7 +228,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
         if (navigator.connection) {
             var max = navigator.connection.downlinkMax;
             if (max && max > 0 && max < Number.POSITIVE_INFINITY) {
-
                 max /= 8;
                 max *= 1000000;
                 max *= 0.7;
@@ -255,7 +245,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
     }
 
     function onApiClientCreated(e, newApiClient) {
-
         newApiClient.normalizeImageOptions = normalizeImageOptions;
 
         if (browser.iOS) {
@@ -269,12 +258,10 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
     }
 
     function initApiClient(apiClient) {
-
         onApiClientCreated({}, apiClient);
     }
 
     function initApiClients() {
-
         connectionManager.getApiClients().forEach(initApiClient);
 
         events.on(connectionManager, 'apiclientcreated', onApiClientCreated);
@@ -290,7 +277,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
 
     var firstConnectionResult;
     function start(options) {
-
         loading.show();
 
         initApiClients();
@@ -302,53 +288,29 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
             enableAutoLogin: appSettings.enableAutoLogin()
 
         }).then(function (result) {
-
             firstConnectionResult = result;
 
             options = options || {};
 
             page({
                 click: options.click !== false,
-                hashbang: options.hashbang !== false,
-                enableHistory: enableHistory()
+                hashbang: options.hashbang !== false
             });
         }).catch().then(function() {
             loading.hide();
         });
     }
 
-    function enableHistory() {
-
-        //if (browser.edgeUwp) {
-        //    return false;
-        //}
-
-        // shows status bar on navigation
-        if (browser.xboxOne) {
-            return false;
-        }
-
-        // Does not support history
-        if (browser.orsay) {
-            return false;
-        }
-
-        return true;
-    }
-
     function enableNativeHistory() {
         return false;
     }
 
     function authenticate(ctx, route, callback) {
-
         var firstResult = firstConnectionResult;
         if (firstResult) {
-
             firstConnectionResult = null;
 
             if (firstResult.State !== 'SignedIn' && !route.anonymous) {
-
                 handleConnectionResult(firstResult);
                 return;
             }
@@ -377,7 +339,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
         }
 
         if (apiClient && apiClient.isLoggedIn()) {
-
             console.debug('appRouter - user is authenticated');
 
             if (route.isDefaultRoute) {
@@ -385,11 +346,8 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
                 loadUserSkinWithOptions(ctx);
                 return;
             } else if (route.roles) {
-
                 validateRoles(apiClient, route.roles).then(function () {
-
                     callback();
-
                 }, beginConnectionWizard);
                 return;
             }
@@ -431,7 +389,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
     var isDummyBackToHome;
 
     function loadContent(ctx, route, html, request) {
-
         html = globalize.translateHtml(html, route.dictionary);
         request.view = html;
 
@@ -491,7 +448,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
     }
 
     function getWindowLocationSearch(win) {
-
         var currentPath = currentRouteInfo ? (currentRouteInfo.path || '') : '';
 
         var index = currentPath.indexOf('?');
@@ -535,9 +491,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
         if (!document.querySelector('.dialogContainer') && startPages.indexOf(curr.type) !== -1) {
             return false;
         }
-        if (enableHistory()) {
-            return history.length > 1;
-        }
+
         return (page.len || 0) > 0;
     }
 
@@ -644,7 +598,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
     function pushState(state, title, url) {
         state.navigate = false;
         history.pushState(state, title, url);
-
     }
 
     function setBaseRoute() {
diff --git a/src/components/apphost.js b/src/components/apphost.js
index f200b9a642..d447c7ea45 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -257,12 +257,6 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g
             features.push('fullscreenchange');
         }
 
-        if (browser.chrome || browser.edge && !browser.slow) {
-            if (!browser.noAnimation && !browser.edgeUwp && !browser.xboxOne) {
-                features.push('imageanalysis');
-            }
-        }
-
         if (browser.tv || browser.xboxOne || browser.ps4 || browser.mobile) {
             features.push('physicalvolumecontrol');
         }
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index a6d0b10662..edb9db28ba 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -291,12 +291,10 @@ import 'programStyles';
             const primaryImageAspectRatio = imageLoader.getPrimaryImageAspectRatio(items);
 
             if (['auto', 'autohome', 'autooverflow', 'autoVertical'].includes(options.shape)) {
-
                 const requestedShape = options.shape;
                 options.shape = null;
 
                 if (primaryImageAspectRatio) {
-
                     if (primaryImageAspectRatio >= 3) {
                         options.shape = 'banner';
                         options.coverImage = true;
@@ -394,7 +392,6 @@ import 'programStyles';
                     }
 
                     if (newIndexValue !== currentIndexValue) {
-
                         if (hasOpenRow) {
                             html += '</div>';
                             hasOpenRow = false;
@@ -402,7 +399,6 @@ import 'programStyles';
                         }
 
                         if (hasOpenSection) {
-
                             html += '</div>';
 
                             if (isVertical) {
@@ -426,7 +422,6 @@ import 'programStyles';
                 }
 
                 if (options.rows && itemsInRow === 0) {
-
                     if (hasOpenRow) {
                         html += '</div>';
                         hasOpenRow = false;
@@ -686,7 +681,6 @@ import 'programStyles';
             let valid = 0;
 
             for (let i = 0; i < lines.length; i++) {
-
                 let currentCssClass = cssClass;
                 let text = lines[i];
 
@@ -713,7 +707,6 @@ import 'programStyles';
             }
 
             if (forceLines) {
-
                 let linesLength = maxLines || Math.min(lines.length, maxLines || lines.length);
 
                 while (valid < linesLength) {
@@ -745,7 +738,6 @@ import 'programStyles';
             let airTimeText = '';
 
             if (item.StartDate) {
-
                 try {
                     let date = datetime.parseISO8601Date(item.StartDate);
 
@@ -792,7 +784,6 @@ import 'programStyles';
             const showOtherText = isOuterFooter ? !overlayText : overlayText;
 
             if (isOuterFooter && options.cardLayout && layoutManager.mobile) {
-
                 if (options.cardFooterAside !== 'none') {
                     html += '<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu"><span class="material-icons more_vert"></span></button>';
                 }
@@ -807,9 +798,7 @@ import 'programStyles';
 
             if (showOtherText) {
                 if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) {
-
                     if (isOuterFooter && item.Type === 'Episode' && item.SeriesName) {
-
                         if (item.SeriesId) {
                             lines.push(getTextActionButton({
                                 Id: item.SeriesId,
@@ -822,15 +811,12 @@ import 'programStyles';
                             lines.push(item.SeriesName);
                         }
                     } else {
-
                         if (isUsingLiveTvNaming(item)) {
-
                             lines.push(item.Name);
 
                             if (!item.EpisodeTitle) {
                                 titleAdded = true;
                             }
-
                         } else {
                             const parentTitle = item.SeriesName || item.Series || item.Album || item.AlbumArtist || '';
 
@@ -848,7 +834,6 @@ import 'programStyles';
             }
 
             if (showMediaTitle) {
-
                 const name = options.showTitle === 'auto' && !item.IsFolder && item.MediaType === 'Photo' ? '' : itemHelper.getDisplayName(item, {
                     includeParentInfo: options.includeParentInfoInTitle
                 });
@@ -865,7 +850,6 @@ import 'programStyles';
 
             if (showOtherText) {
                 if (options.showParentTitle && parentTitleUnderneath) {
-
                     if (isOuterFooter && item.AlbumArtists && item.AlbumArtists.length) {
                         item.AlbumArtists[0].Type = 'MusicArtist';
                         item.AlbumArtists[0].IsFolder = true;
@@ -899,7 +883,6 @@ import 'programStyles';
                 }
 
                 if (options.showPremiereDate) {
-
                     if (item.PremiereDate) {
                         try {
                             lines.push(datetime.toLocaleDateString(
@@ -908,7 +891,6 @@ import 'programStyles';
                             ));
                         } catch (err) {
                             lines.push('');
-
                         }
                     } else {
                         lines.push('');
@@ -916,14 +898,10 @@ import 'programStyles';
                 }
 
                 if (options.showYear || options.showSeriesYear) {
-
                     if (item.Type === 'Series') {
                         if (item.Status === 'Continuing') {
-
                             lines.push(globalize.translate('SeriesYearToPresent', item.ProductionYear || ''));
-
                         } else {
-
                             if (item.EndDate && item.ProductionYear) {
                                 const endYear = datetime.parseISO8601Date(item.EndDate).getFullYear();
                                 lines.push(item.ProductionYear + ((endYear === item.ProductionYear) ? '' : (' - ' + endYear)));
@@ -937,9 +915,7 @@ import 'programStyles';
                 }
 
                 if (options.showRuntime) {
-
                     if (item.RunTimeTicks) {
-
                         lines.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
                     } else {
                         lines.push('');
@@ -947,14 +923,11 @@ import 'programStyles';
                 }
 
                 if (options.showAirTime) {
-
                     lines.push(getAirTimeText(item, options.showAirDateTime, options.showAirEndTime) || '');
                 }
 
                 if (options.showChannelName) {
-
                     if (item.ChannelId) {
-
                         lines.push(getTextActionButton({
 
                             Id: item.ChannelId,
@@ -971,7 +944,6 @@ import 'programStyles';
                 }
 
                 if (options.showCurrentProgram && item.Type === 'TvChannel') {
-
                     if (item.CurrentProgram) {
                         lines.push(item.CurrentProgram.Name);
                     } else {
@@ -980,7 +952,6 @@ import 'programStyles';
                 }
 
                 if (options.showCurrentProgramTime && item.Type === 'TvChannel') {
-
                     if (item.CurrentProgram) {
                         lines.push(getAirTimeText(item.CurrentProgram, false, true) || '');
                     } else {
@@ -990,7 +961,6 @@ import 'programStyles';
 
                 if (options.showSeriesTimerTime) {
                     if (item.RecordAnyTime) {
-
                         lines.push(globalize.translate('Anytime'));
                     } else {
                         lines.push(datetime.getDisplayTime(item.StartDate));
@@ -1025,7 +995,6 @@ import 'programStyles';
             }
 
             if (html) {
-
                 if (!isOuterFooter || logoUrl || options.cardLayout) {
                     html = '<div class="' + footerClass + '">' + html;
 
@@ -1071,27 +1040,21 @@ import 'programStyles';
             let childText;
 
             if (item.Type === 'Playlist') {
-
                 childText = '';
 
                 if (item.RunTimeTicks) {
-
                     let minutes = item.RunTimeTicks / 600000000;
 
                     minutes = minutes || 1;
 
                     childText += globalize.translate('ValueMinutes', Math.round(minutes));
-
                 } else {
                     childText += globalize.translate('ValueMinutes', 0);
                 }
 
                 counts.push(childText);
-
             } else if (item.Type === 'Genre' || item.Type === 'Studio') {
-
                 if (item.MovieCount) {
-
                     childText = item.MovieCount === 1 ?
                         globalize.translate('ValueOneMovie') :
                         globalize.translate('ValueMovieCount', item.MovieCount);
@@ -1100,7 +1063,6 @@ import 'programStyles';
                 }
 
                 if (item.SeriesCount) {
-
                     childText = item.SeriesCount === 1 ?
                         globalize.translate('ValueOneSeries') :
                         globalize.translate('ValueSeriesCount', item.SeriesCount);
@@ -1108,18 +1070,14 @@ import 'programStyles';
                     counts.push(childText);
                 }
                 if (item.EpisodeCount) {
-
                     childText = item.EpisodeCount === 1 ?
                         globalize.translate('ValueOneEpisode') :
                         globalize.translate('ValueEpisodeCount', item.EpisodeCount);
 
                     counts.push(childText);
                 }
-
             } else if (item.Type === 'MusicGenre' || options.context === 'MusicArtist') {
-
                 if (item.AlbumCount) {
-
                     childText = item.AlbumCount === 1 ?
                         globalize.translate('ValueOneAlbum') :
                         globalize.translate('ValueAlbumCount', item.AlbumCount);
@@ -1127,7 +1085,6 @@ import 'programStyles';
                     counts.push(childText);
                 }
                 if (item.SongCount) {
-
                     childText = item.SongCount === 1 ?
                         globalize.translate('ValueOneSong') :
                         globalize.translate('ValueSongCount', item.SongCount);
@@ -1135,16 +1092,13 @@ import 'programStyles';
                     counts.push(childText);
                 }
                 if (item.MusicVideoCount) {
-
                     childText = item.MusicVideoCount === 1 ?
                         globalize.translate('ValueOneMusicVideo') :
                         globalize.translate('ValueMusicVideoCount', item.MusicVideoCount);
 
                     counts.push(childText);
                 }
-
             } else if (item.Type === 'Series') {
-
                 childText = item.RecursiveItemCount === 1 ?
                     globalize.translate('ValueOneEpisode') :
                     globalize.translate('ValueEpisodeCount', item.RecursiveItemCount);
@@ -1163,6 +1117,7 @@ import 'programStyles';
         function importRefreshIndicator() {
             if (!refreshIndicatorLoaded) {
                 refreshIndicatorLoaded = true;
+                /* eslint-disable-next-line no-unused-expressions */
                 import('emby-itemrefreshindicator');
             }
         }
@@ -1197,13 +1152,11 @@ import 'programStyles';
             let shape = options.shape;
 
             if (shape === 'mixed') {
-
                 shape = null;
 
                 const primaryImageAspectRatio = item.PrimaryImageAspectRatio;
 
                 if (primaryImageAspectRatio) {
-
                     if (primaryImageAspectRatio >= 1.33) {
                         shape = 'mixedBackdrop';
                     } else if (primaryImageAspectRatio > 0.71) {
@@ -1295,7 +1248,6 @@ import 'programStyles';
             }
 
             if (overlayText) {
-
                 logoUrl = null;
 
                 footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter';
@@ -1404,7 +1356,6 @@ import 'programStyles';
                 indicatorsHtml += indicators.getTypeIndicator(item);
 
                 if (options.showGroupCount) {
-
                     indicatorsHtml += indicators.getChildCountIndicatorHtml(item, {
                         minCount: 1
                     });
@@ -1498,14 +1449,15 @@ import 'programStyles';
             const userData = item.UserData || {};
 
             if (itemHelper.canMarkPlayed(item)) {
+                /* eslint-disable-next-line no-unused-expressions */
                 import('emby-playstatebutton');
                 html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>';
             }
 
             if (itemHelper.canRate(item)) {
-
                 const likes = userData.Likes == null ? '' : userData.Likes;
 
+                /* eslint-disable-next-line no-unused-expressions */
                 import('emby-ratingbutton');
                 html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>';
             }
@@ -1583,7 +1535,6 @@ import 'programStyles';
             const html = buildCardsHtmlInternal(items, options);
 
             if (html) {
-
                 if (options.itemsContainer.cardBuilderHtml !== html) {
                     options.itemsContainer.innerHTML = html;
 
@@ -1596,7 +1547,6 @@ import 'programStyles';
 
                 imageLoader.lazyChildren(options.itemsContainer);
             } else {
-
                 options.itemsContainer.innerHTML = html;
                 options.itemsContainer.cardBuilderHtml = null;
             }
@@ -1620,7 +1570,6 @@ import 'programStyles';
             indicatorsElem = card.querySelector('.cardIndicators');
 
             if (!indicatorsElem) {
-
                 const cardImageContainer = card.querySelector('.cardImageContainer');
                 indicatorsElem = document.createElement('div');
                 indicatorsElem.classList.add('cardIndicators');
@@ -1644,11 +1593,9 @@ import 'programStyles';
             let itemProgressBar = null;
 
             if (userData.Played) {
-
                 playedIndicator = card.querySelector('.playedIndicator');
 
                 if (!playedIndicator) {
-
                     playedIndicator = document.createElement('div');
                     playedIndicator.classList.add('playedIndicator');
                     playedIndicator.classList.add('indicator');
@@ -1657,10 +1604,8 @@ import 'programStyles';
                 }
                 playedIndicator.innerHTML = '<span class="material-icons indicatorIcon check"></span>';
             } else {
-
                 playedIndicator = card.querySelector('.playedIndicator');
                 if (playedIndicator) {
-
                     playedIndicator.parentNode.removeChild(playedIndicator);
                 }
             }
@@ -1668,7 +1613,6 @@ import 'programStyles';
                 countIndicator = card.querySelector('.countIndicator');
 
                 if (!countIndicator) {
-
                     countIndicator = document.createElement('div');
                     countIndicator.classList.add('countIndicator');
                     indicatorsElem = ensureIndicators(card, indicatorsElem);
@@ -1676,10 +1620,8 @@ import 'programStyles';
                 }
                 countIndicator.innerHTML = userData.UnplayedItemCount;
             } else if (enableCountIndicator) {
-
                 countIndicator = card.querySelector('.countIndicator');
                 if (countIndicator) {
-
                     countIndicator.parentNode.removeChild(countIndicator);
                 }
             }
@@ -1691,7 +1633,6 @@ import 'programStyles';
             });
 
             if (progressHtml) {
-
                 itemProgressBar = card.querySelector('.itemProgressBar');
 
                 if (!itemProgressBar) {
@@ -1710,7 +1651,6 @@ import 'programStyles';
 
                 itemProgressBar.innerHTML = progressHtml;
             } else {
-
                 itemProgressBar = card.querySelector('.itemProgressBar');
                 if (itemProgressBar) {
                     itemProgressBar.parentNode.removeChild(itemProgressBar);
diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js
index c6ee9ba3c5..0215f8d8e5 100644
--- a/src/components/cardbuilder/chaptercardbuilder.js
+++ b/src/components/cardbuilder/chaptercardbuilder.js
@@ -14,7 +14,6 @@ import browser from 'browser';
     const enableFocusTransform = !browser.slow && !browser.edge;
 
      function buildChapterCardsHtml(item, chapters, options) {
-
         // TODO move card creation code to Card component
 
         let className = 'card itemAction chapterCard';
@@ -35,7 +34,6 @@ import browser from 'browser';
         let shape = (options.backdropShape || 'backdrop');
 
         if (videoStream.Width && videoStream.Height) {
-
             if ((videoStream.Width / videoStream.Height) <= 1.2) {
                 shape = (options.squareShape || 'square');
             }
@@ -53,7 +51,6 @@ import browser from 'browser';
         const apiClient = connectionManager.getApiClient(item.ServerId);
 
         for (let i = 0, length = chapters.length; i < length; i++) {
-
             if (options.rows && itemsInRow === 0) {
                 html += '<div class="cardColumn">';
             }
@@ -73,9 +70,7 @@ import browser from 'browser';
     }
 
     function getImgUrl({Id}, {ImageTag}, index, maxWidth, apiClient) {
-
         if (ImageTag) {
-
             return apiClient.getScaledImageUrl(Id, {
 
                 maxWidth: maxWidth * 2,
@@ -89,7 +84,6 @@ import browser from 'browser';
     }
 
     function buildChapterCard(item, apiClient, chapter, index, {width, coverImage}, className, shape) {
-
         const imgUrl = getImgUrl(item, chapter, index, width || 400, apiClient);
 
         let cardImageContainerClass = 'cardContent cardContent-shadow cardImageContainer chapterCardImageContainer';
@@ -116,7 +110,6 @@ import browser from 'browser';
     }
 
     export function buildChapterCards(item, chapters, options) {
-
         if (options.parentContainer) {
             // Abort if the container has been disposed
             if (!document.body.contains(options.parentContainer)) {
diff --git a/src/components/cardbuilder/peoplecardbuilder.js b/src/components/cardbuilder/peoplecardbuilder.js
index 3b9a26a704..5fc9e8ade5 100644
--- a/src/components/cardbuilder/peoplecardbuilder.js
+++ b/src/components/cardbuilder/peoplecardbuilder.js
@@ -8,7 +8,6 @@
 import cardBuilder from 'cardBuilder';
 
     export function buildPeopleCards(items, options) {
-
         options = Object.assign(options || {}, {
             cardLayout: false,
             centerText: true,
diff --git a/src/components/collectionEditor/collectionEditor.js b/src/components/collectionEditor/collectionEditor.js
index 18cc0d311f..a115b86a8f 100644
--- a/src/components/collectionEditor/collectionEditor.js
+++ b/src/components/collectionEditor/collectionEditor.js
@@ -1,7 +1,6 @@
 import dom from 'dom';
 import dialogHelper from 'dialogHelper';
 import loading from 'loading';
-import appHost from 'apphost';
 import layoutManager from 'layoutManager';
 import connectionManager from 'connectionManager';
 import appRouter from 'appRouter';
@@ -39,7 +38,6 @@ import 'flexStyles';
     }
 
     function createCollection(apiClient, dlg) {
-
         const url = apiClient.getUrl('Collections', {
 
             Name: dlg.querySelector('#txtNewCollectionName').value,
@@ -53,7 +51,6 @@ import 'flexStyles';
             dataType: 'json'
 
         }).then(result => {
-
             loading.hide();
 
             const id = result.Id;
@@ -61,17 +58,14 @@ import 'flexStyles';
             dlg.submitted = true;
             dialogHelper.close(dlg);
             redirectToCollection(apiClient, id);
-
         });
     }
 
     function redirectToCollection(apiClient, id) {
-
         appRouter.showItem(id, apiClient.serverId());
     }
 
     function addToCollection(apiClient, dlg, id) {
-
         const url = apiClient.getUrl(`Collections/${id}/Items`, {
 
             Ids: dlg.querySelector('.fldSelectedItemIds').value || ''
@@ -82,7 +76,6 @@ import 'flexStyles';
             url: url
 
         }).then(() => {
-
             loading.hide();
 
             dlg.submitted = true;
@@ -99,7 +92,6 @@ import 'flexStyles';
     }
 
     function populateCollections(panel) {
-
         loading.show();
 
         const select = panel.querySelector('#selectCollectionToAddTo');
@@ -116,13 +108,11 @@ import 'flexStyles';
 
         const apiClient = connectionManager.getApiClient(currentServerId);
         apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
-
             let html = '';
 
             html += `<option value="">${globalize.translate('OptionNew')}</option>`;
 
             html += result.Items.map(i => {
-
                 return `<option value="${i.Id}">${i.Name}</option>`;
             });
 
@@ -135,7 +125,6 @@ import 'flexStyles';
     }
 
     function getEditorHtml() {
-
         let html = '';
 
         html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
@@ -183,7 +172,6 @@ import 'flexStyles';
     }
 
     function initEditor(content, items) {
-
         content.querySelector('#selectCollectionToAddTo').addEventListener('change', function () {
             if (this.value) {
                 content.querySelector('.newCollectionInfo').classList.add('hide');
@@ -220,7 +208,6 @@ import 'flexStyles';
 
     export class showEditor {
         constructor(options) {
-
             const items = options.items || {};
             currentServerId = options.serverId;
 
@@ -248,10 +235,6 @@ import 'flexStyles';
             html += title;
             html += '</h3>';
 
-            if (appHost.supports('externallinks')) {
-                html += `<a is="emby-linkbutton" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${globalize.translate('Help')}"><span class="material-icons info"></span><span style="margin-left:.25em;">${globalize.translate('Help')}</span></a>`;
-            }
-
             html += '</div>';
 
             html += getEditorHtml();
@@ -261,7 +244,6 @@ import 'flexStyles';
             initEditor(dlg, items);
 
             dlg.querySelector('.btnCancel').addEventListener('click', () => {
-
                 dialogHelper.close(dlg);
             });
 
@@ -270,7 +252,6 @@ import 'flexStyles';
             }
 
             return dialogHelper.open(dlg).then(() => {
-
                 if (layoutManager.tv) {
                     centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                 }
diff --git a/src/components/confirm/confirm.js b/src/components/confirm/confirm.js
index 2d5cfdb55c..0670816a53 100644
--- a/src/components/confirm/confirm.js
+++ b/src/components/confirm/confirm.js
@@ -4,7 +4,6 @@ import globalize from 'globalize';
 
 /* eslint-disable indent */
 export default (() => {
-
     function replaceAll(str, find, replace) {
         return str.split(find).join(replace);
     }
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
index 937e96d297..1b13900d85 100644
--- a/src/components/dialog/dialog.js
+++ b/src/components/dialog/dialog.js
@@ -13,7 +13,6 @@ import 'flexStyles';
 /* eslint-disable indent */
 
     function showDialog(options, template) {
-
         const dialogOptions = {
             removeOnClose: true,
             scrollY: false
@@ -45,10 +44,6 @@ import 'flexStyles';
             dlg.classList.add('dialog-fullscreen-lowres');
         }
 
-        //dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
-        //    dialogHelper.close(dlg);
-        //});
-
         if (options.title) {
             dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.title || '';
         } else {
@@ -68,7 +63,6 @@ import 'flexStyles';
         let hasDescriptions = false;
 
         for (i = 0, length = options.buttons.length; i < length; i++) {
-
             const item = options.buttons[i];
             const autoFocus = i === 0 ? ' autofocus' : '';
 
@@ -111,7 +105,6 @@ import 'flexStyles';
         }
 
         return dialogHelper.open(dlg).then(() => {
-
             if (enableTvLayout) {
                 scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
             }
@@ -125,7 +118,6 @@ import 'flexStyles';
     }
 
     export async function show(text, title) {
-
         let options;
         if (typeof text === 'string') {
             options = {
diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index ca7c94a416..1f11d8a195 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -12,7 +12,6 @@ import 'scrollStyles';
     let globalOnOpenCallback;
 
     function enableAnimation() {
-
         // too slow
         if (browser.tv) {
             return false;
@@ -22,7 +21,6 @@ import 'scrollStyles';
     }
 
     function removeCenterFocus(dlg) {
-
         if (layoutManager.tv) {
             if (dlg.classList.contains('scrollX')) {
                 centerFocus(dlg, true, false);
@@ -35,7 +33,6 @@ import 'scrollStyles';
     function tryRemoveElement(elem) {
         const parentNode = elem.parentNode;
         if (parentNode) {
-
             // Seeing crashes in edge webview
             try {
                 parentNode.removeChild(elem);
@@ -46,14 +43,12 @@ import 'scrollStyles';
     }
 
     function DialogHashHandler(dlg, hash, resolve) {
-
         const self = this;
         self.originalUrl = window.location.href;
         const activeElement = document.activeElement;
         let removeScrollLockOnClose = false;
 
         function onHashChange(e) {
-
             const isBack = self.originalUrl === window.location.href;
 
             if (isBack || !isOpened(dlg)) {
@@ -67,7 +62,6 @@ import 'scrollStyles';
         }
 
         function onBackCommand(e) {
-
             if (e.detail.command === 'back') {
                 self.closedByBack = true;
                 e.preventDefault();
@@ -77,7 +71,6 @@ import 'scrollStyles';
         }
 
         function onDialogClosed() {
-
             if (!isHistoryEnabled(dlg)) {
                 inputManager.off(dlg, onBackCommand);
             }
@@ -158,7 +151,6 @@ import 'scrollStyles';
     }
 
     function addBackdropOverlay(dlg) {
-
         const backdrop = document.createElement('div');
         backdrop.classList.add('dialogBackdrop');
 
@@ -193,7 +185,6 @@ import 'scrollStyles';
     }
 
     export function open(dlg) {
-
         if (globalOnOpenCallback) {
             globalOnOpenCallback(dlg);
         }
@@ -210,19 +201,16 @@ import 'scrollStyles';
         document.body.appendChild(dialogContainer);
 
         return new Promise((resolve, reject) => {
-
             new DialogHashHandler(dlg, `dlg${new Date().getTime()}`, resolve);
         });
     }
 
     function isOpened(dlg) {
-
         //return dlg.opened;
         return !dlg.classList.contains('hide');
     }
 
     export function close(dlg) {
-
         if (isOpened(dlg)) {
             if (isHistoryEnabled(dlg)) {
                 history.back();
@@ -233,9 +221,7 @@ import 'scrollStyles';
     }
 
     function closeDialog(dlg) {
-
         if (!dlg.classList.contains('hide')) {
-
             dlg.dispatchEvent(new CustomEvent('closing', {
                 bubbles: false,
                 cancelable: false
@@ -256,7 +242,6 @@ import 'scrollStyles';
     }
 
     function animateDialogOpen(dlg) {
-
         const onAnimationFinish = () => {
             focusManager.pushScope(dlg);
 
@@ -271,7 +256,6 @@ import 'scrollStyles';
         };
 
         if (enableAnimation()) {
-
             const onFinish = () => {
                 dom.removeEventListener(dlg, dom.whichAnimationEvent(), onFinish, {
                     once: true
@@ -288,13 +272,10 @@ import 'scrollStyles';
     }
 
     function animateDialogClose(dlg, onAnimationFinish) {
-
         if (enableAnimation()) {
-
             let animated = true;
 
             switch (dlg.animationConfig.exit.name) {
-
                 case 'fadeout':
                     dlg.style.animation = `fadeout ${dlg.animationConfig.exit.timing.duration}ms ease-out normal both`;
                     break;
@@ -329,7 +310,6 @@ import 'scrollStyles';
     const supportsOverscrollBehavior = 'overscroll-behavior-y' in document.body.style;
 
     function shouldLockDocumentScroll(options) {
-
         if (supportsOverscrollBehavior && (options.size || !browser.touch)) {
             return false;
         }
@@ -350,7 +330,6 @@ import 'scrollStyles';
     }
 
     function removeBackdrop(dlg) {
-
         const backdrop = dlg.backdrop;
 
         if (!backdrop) {
@@ -364,7 +343,6 @@ import 'scrollStyles';
         };
 
         if (enableAnimation()) {
-
             backdrop.classList.remove('dialogBackdropOpened');
 
             // this is not firing animatonend
@@ -383,7 +361,6 @@ import 'scrollStyles';
     }
 
     export function createDialog(options) {
-
         options = options || {};
 
         // If there's no native dialog support, use a plain div
@@ -473,9 +450,7 @@ import 'scrollStyles';
         }
 
         if (enableAnimation()) {
-
             switch (dlg.animationConfig.entry.name) {
-
                 case 'fadein':
                     dlg.style.animation = `fadein ${entryAnimationDuration}ms ease-out normal`;
                     break;
diff --git a/src/components/displaySettings/displaySettings.js b/src/components/displaySettings/displaySettings.js
index 4e24a3b730..ba78ab99e1 100644
--- a/src/components/displaySettings/displaySettings.js
+++ b/src/components/displaySettings/displaySettings.js
@@ -55,7 +55,6 @@ import 'emby-button';
     }
 
     function loadSoundEffects(context, userSettings) {
-
         const selectSoundEffects = context.querySelector('.selectSoundEffects');
         const options = pluginManager.ofType('soundeffects').map(plugin => {
             return {
@@ -81,7 +80,6 @@ import 'emby-button';
     }
 
     function loadSkins(context, userSettings) {
-
         const selectSkin = context.querySelector('.selectSkin');
 
         const options = pluginManager.ofType('skin').map(plugin => {
@@ -108,7 +106,6 @@ import 'emby-button';
     }
 
     function showOrHideMissingEpisodesField(context) {
-
         if (browser.tizen || browser.web0s) {
             context.querySelector('.fldDisplayMissingEpisodes').classList.add('hide');
             return;
@@ -118,7 +115,6 @@ import 'emby-button';
     }
 
     function loadForm(context, user, userSettings) {
-
         if (user.Policy.IsAdministrator) {
             context.querySelector('.selectDashboardThemeContainer').classList.remove('hide');
         } else {
@@ -213,7 +209,6 @@ import 'emby-button';
     }
 
     function saveUser(context, user, userSettingsInstance, apiClient) {
-
         appSettings.runAtStartup(context.querySelector('.chkRunAtStartup').checked);
 
         user.Configuration.DisplayMissingEpisodes = context.querySelector('.chkDisplayMissingEpisodes').checked;
diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js
index 38715043e7..358bf04112 100644
--- a/src/components/favoriteitems.js
+++ b/src/components/favoriteitems.js
@@ -154,8 +154,7 @@ define(['loading', 'libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoad
                     html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">';
                 }
 
-                var supportsImageAnalysis = appHost.supports('imageanalysis');
-                var cardLayout = (appHost.preferVisualCards || supportsImageAnalysis) && section.autoCardLayout && section.showTitle;
+                var cardLayout = appHost.preferVisualCards && section.autoCardLayout && section.showTitle;
                 cardLayout = false;
                 html += cardBuilder.getCardsHtml(result.Items, {
                     preferThumb: section.preferThumb,
diff --git a/src/components/fetchhelper.js b/src/components/fetchhelper.js
index f626abefee..00bffc235a 100644
--- a/src/components/fetchhelper.js
+++ b/src/components/fetchhelper.js
@@ -1,6 +1,5 @@
 /* eslint-disable indent */
     export function getFetchPromise(request) {
-
         const headers = request.headers || {};
 
         if (request.dataType === 'json') {
@@ -16,7 +15,6 @@
         let contentType = request.contentType;
 
         if (request.data) {
-
             if (typeof request.data === 'string') {
                 fetchRequest.body = request.data;
             } else {
@@ -27,7 +25,6 @@
         }
 
         if (contentType) {
-
             headers['Content-Type'] = contentType;
         }
 
@@ -48,11 +45,9 @@
     }
 
     function fetchWithTimeout(url, options, timeoutMs) {
-
         console.debug(`fetchWithTimeout: timeoutMs: ${timeoutMs}, url: ${url}`);
 
         return new Promise(function (resolve, reject) {
-
             const timeout = setTimeout(reject, timeoutMs);
 
             options = options || {};
@@ -65,7 +60,6 @@
 
                 resolve(response);
             }, function (error) {
-
                 clearTimeout(timeout);
 
                 console.debug(`fetchWithTimeout: timed out connecting to url: ${url}`);
diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js
index 936e2b0407..20399fb52d 100644
--- a/src/components/filtermenu/filtermenu.js
+++ b/src/components/filtermenu/filtermenu.js
@@ -2,19 +2,15 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     'use strict';
 
     function onSubmit(e) {
-
         e.preventDefault();
         return false;
     }
 
     function renderOptions(context, selector, cssClass, items, isCheckedFn) {
-
         var elem = context.querySelector(selector);
 
         if (items.length) {
-
             elem.classList.remove('hide');
-
         } else {
             elem.classList.add('hide');
         }
@@ -22,7 +18,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         var html = '';
 
         html += items.map(function (filter) {
-
             var itemHtml = '';
 
             var checkedHtml = isCheckedFn(filter) ? ' checked' : '';
@@ -32,45 +27,20 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
             itemHtml += '</label>';
 
             return itemHtml;
-
         }).join('');
 
         elem.querySelector('.filterOptions').innerHTML = html;
     }
 
     function renderDynamicFilters(context, result, options) {
-
-        // If there's a huge number of these they will be really show to render
-        //if (result.Tags) {
-        //    result.Tags.length = Math.min(result.Tags.length, 50);
-        //}
-
         renderOptions(context, '.genreFilters', 'chkGenreFilter', result.Genres, function (i) {
-
             // Switching from | to ,
             var delimeter = (options.settings.GenreIds || '').indexOf('|') === -1 ? ',' : '|';
             return (delimeter + (options.settings.GenreIds || '') + delimeter).indexOf(delimeter + i.Id + delimeter) !== -1;
         });
-
-        //renderOptions(context, '.officialRatingFilters', 'chkOfficialRatingFilter', result.OfficialRatings, function (i) {
-        //    var delimeter = '|';
-        //    return (delimeter + (query.OfficialRatings || '') + delimeter).indexOf(delimeter + i + delimeter) != -1;
-        //});
-
-        //renderOptions(context, '.tagFilters', 'chkTagFilter', result.Tags, function (i) {
-        //    var delimeter = '|';
-        //    return (delimeter + (query.Tags || '') + delimeter).indexOf(delimeter + i + delimeter) != -1;
-        //});
-
-        //renderOptions(context, '.yearFilters', 'chkYearFilter', result.Years, function (i) {
-
-        //    var delimeter = ',';
-        //    return (delimeter + (query.Years || '') + delimeter).indexOf(delimeter + i + delimeter) != -1;
-        //});
     }
 
     function loadDynamicFilters(context, options) {
-
         var apiClient = connectionManager.getApiClient(options.serverId);
 
         var filterMenuOptions = Object.assign(options.filterMenuOptions, {
@@ -81,16 +51,11 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         });
 
         apiClient.getFilters(filterMenuOptions).then(function (result) {
-
             renderDynamicFilters(context, result, options);
-        }, function () {
-
-            // older server
         });
     }
 
     function initEditor(context, settings) {
-
         context.querySelector('form').addEventListener('submit', onSubmit);
 
         var elems = context.querySelectorAll('.simpleFilter');
@@ -98,7 +63,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         var length;
 
         for (i = 0, length = elems.length; i < length; i++) {
-
             if (elems[i].tagName === 'INPUT') {
                 elems[i].checked = settings[elems[i].getAttribute('data-settingname')] || false;
             } else {
@@ -110,7 +74,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         elems = context.querySelectorAll('.chkVideoTypeFilter');
 
         for (i = 0, length = elems.length; i < length; i++) {
-
             elems[i].checked = videoTypes.indexOf(elems[i].getAttribute('data-filter')) !== -1;
         }
 
@@ -118,7 +81,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         elems = context.querySelectorAll('.chkSeriesStatus');
 
         for (i = 0, length = elems.length; i < length; i++) {
-
             elems[i].checked = seriesStatuses.indexOf(elems[i].getAttribute('data-filter')) !== -1;
         }
 
@@ -136,12 +98,10 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     }
 
     function saveValues(context, settings, settingsKey) {
-
         var elems = context.querySelectorAll('.simpleFilter');
         var i;
         var length;
         for (i = 0, length = elems.length; i < length; i++) {
-
             if (elems[i].tagName === 'INPUT') {
                 setBasicFilter(context, settingsKey + '-filter-' + elems[i].getAttribute('data-settingname'), elems[i]);
             } else {
@@ -154,7 +114,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         elems = context.querySelectorAll('.chkVideoTypeFilter');
 
         for (i = 0, length = elems.length; i < length; i++) {
-
             if (elems[i].checked) {
                 videoTypes.push(elems[i].getAttribute('data-filter'));
             }
@@ -166,7 +125,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         elems = context.querySelectorAll('.chkSeriesStatus');
 
         for (i = 0, length = elems.length; i < length; i++) {
-
             if (elems[i].checked) {
                 seriesStatuses.push(elems[i].getAttribute('data-filter'));
             }
@@ -177,7 +135,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         elems = context.querySelectorAll('.chkGenreFilter');
 
         for (i = 0, length = elems.length; i < length; i++) {
-
             if (elems[i].checked) {
                 genres.push(elems[i].getAttribute('data-filter'));
             }
@@ -186,7 +143,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     }
 
     function setBasicFilter(context, key, elem) {
-
         var value = elem.checked;
         value = value ? value : null;
         userSettings.setFilter(key, value);
@@ -200,7 +156,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     }
 
     function moveCheckboxFocus(elem, offset) {
-
         var parent = dom.parentWithClass(elem, 'checkboxList-verticalwrap');
         var elems = focusManager.getFocusableElements(parent);
 
@@ -225,7 +180,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
 
     function onInputCommand(e) {
         switch (e.detail.command) {
-
             case 'left':
                 moveCheckboxFocus(e.target, -1);
                 e.preventDefault();
@@ -244,7 +198,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     }
 
     function bindCheckboxInput(context, on) {
-
         var elems = context.querySelectorAll('.checkboxList-verticalwrap');
         for (var i = 0, length = elems.length; i < length; i++) {
             if (on) {
@@ -256,11 +209,8 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     }
 
     FilterMenu.prototype.show = function (options) {
-
         return new Promise(function (resolve, reject) {
-
             require(['text!./filtermenu.template.html'], function (template) {
-
                 var dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
@@ -303,7 +253,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
                 bindCheckboxInput(dlg, true);
 
                 dlg.querySelector('.btnCancel').addEventListener('click', function () {
-
                     dialogHelper.close(dlg);
                 });
 
@@ -314,17 +263,10 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
                 var submitted;
 
                 dlg.querySelector('form').addEventListener('change', function () {
-
                     submitted = true;
-                    //if (options.onChange) {
-                    //    saveValues(dlg, options.settings, options.settingsKey);
-                    //    options.onChange();
-                    //}
-
                 }, true);
 
                 dialogHelper.open(dlg).then(function () {
-
                     bindCheckboxInput(dlg, false);
 
                     if (layoutManager.tv) {
@@ -332,7 +274,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
                     }
 
                     if (submitted) {
-
                         //if (!options.onChange) {
                         saveValues(dlg, options.settings, options.settingsKey);
                         resolve();
diff --git a/src/components/focusManager.js b/src/components/focusManager.js
index f2022cc445..9c495bf952 100644
--- a/src/components/focusManager.js
+++ b/src/components/focusManager.js
@@ -7,14 +7,12 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function popScope(elem) {
-
         if (scopes.length) {
             scopes.length -= 1;
         }
     }
 
     function autoFocus(view, defaultToFirst, findAutoFocusElement) {
-
         var element;
         if (findAutoFocusElement !== false) {
             element = view.querySelector('*[autofocus]');
@@ -37,7 +35,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function focus(element) {
-
         try {
             element.focus({
                 preventScroll: scrollManager.isEnabled()
@@ -50,16 +47,13 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     var focusableTagNames = ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A'];
     var focusableContainerTagNames = ['BODY', 'DIALOG'];
     var focusableQuery = focusableTagNames.map(function (t) {
-
         if (t === 'INPUT') {
             t += ':not([type="range"]):not([type="file"])';
         }
         return t + ':not([tabindex="-1"]):not(:disabled)';
-
     }).join(',') + ',.focusable';
 
     function isFocusable(elem) {
-
         if (focusableTagNames.indexOf(elem.tagName) !== -1) {
             return true;
         }
@@ -83,7 +77,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function focusableParent(elem) {
-
         var originalElement = elem;
 
         while (!isFocusable(elem)) {
@@ -101,7 +94,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
 
     // Determines if a focusable element can be focused at a given point in time
     function isCurrentlyFocusableInternal(elem) {
-
         // http://stackoverflow.com/questions/19669786/check-if-element-is-visible-in-dom
         if (elem.offsetParent === null) {
             return false;
@@ -112,7 +104,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
 
     // Determines if a focusable element can be focused at a given point in time
     function isCurrentlyFocusable(elem) {
-
         if (elem.disabled) {
             return false;
         }
@@ -143,7 +134,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         var focusableElements = [];
 
         for (var i = 0, length = elems.length; i < length; i++) {
-
             var elem = elems[i];
 
             if (excludeClass && elem.classList.contains(excludeClass)) {
@@ -163,7 +153,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function isFocusContainer(elem, direction) {
-
         if (focusableContainerTagNames.indexOf(elem.tagName) !== -1) {
             return true;
         }
@@ -217,7 +206,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function getOffset(elem) {
-
         var box;
 
         // Support: BlackBerry 5, iOS 3 (original iPhone)
@@ -234,7 +222,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         }
 
         if (box.right === null) {
-
             // Create a new object because some browsers will throw an error when trying to set data onto the Rect object
             var newBox = {
                 top: box.top,
@@ -253,7 +240,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function nav(activeElement, direction, container, focusableElements) {
-
         activeElement = activeElement || document.activeElement;
 
         if (activeElement) {
@@ -272,14 +258,10 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         var rect = getOffset(activeElement);
 
         // Get elements and work out x/y points
-        var cache = [];
         var point1x = parseFloat(rect.left) || 0;
         var point1y = parseFloat(rect.top) || 0;
         var point2x = parseFloat(point1x + rect.width - 1) || point1x;
         var point2y = parseFloat(point1y + rect.height - 1) || point1y;
-        // Shortcuts to help with compression
-        var min = Math.min;
-        var max = Math.max;
 
         var sourceMidX = rect.left + (rect.width / 2);
         var sourceMidY = rect.top + (rect.height / 2);
@@ -301,10 +283,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
                 continue;
             }
 
-            //if (!isCurrentlyFocusableInternal(curr)) {
-            //    continue;
-            //}
-
             var elementRect = getOffset(curr);
 
             // not currently visible
@@ -313,7 +291,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
             }
 
             switch (direction) {
-
                 case 0:
                     // left
                     if (elementRect.left >= rect.left) {
@@ -369,7 +346,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
             var distY;
 
             switch (direction) {
-
                 case 0:
                     // left
                     distX = Math.abs(point1x - Math.min(point1x, x2));
@@ -403,7 +379,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         }
 
         if (nearestElement) {
-
             // See if there's a focusable container, and if so, send the focus command to that
             if (activeElement) {
                 var nearestElementFocusableParent = dom.parentWithClass(nearestElement, 'focusable');
@@ -418,12 +393,10 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function intersectsInternal(a1, a2, b1, b2) {
-
         return (b1 >= a1 && b1 <= a2) || (b2 >= a1 && b2 <= a2);
     }
 
     function intersects(a1, a2, b1, b2) {
-
         return intersectsInternal(a1, a2, b1, b2) || intersectsInternal(b1, b2, a1, a2);
     }
 
@@ -434,11 +407,9 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function focusFirst(container, focusableSelector) {
-
         var elems = container.querySelectorAll(focusableSelector);
 
         for (var i = 0, length = elems.length; i < length; i++) {
-
             var elem = elems[i];
 
             if (isCurrentlyFocusableInternal(elem)) {
@@ -449,11 +420,9 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function focusLast(container, focusableSelector) {
-
         var elems = [].slice.call(container.querySelectorAll(focusableSelector), 0).reverse();
 
         for (var i = 0, length = elems.length; i < length; i++) {
-
             var elem = elems[i];
 
             if (isCurrentlyFocusableInternal(elem)) {
@@ -464,7 +433,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
     }
 
     function moveFocus(sourceElement, container, focusableSelector, offset) {
-
         var elems = container.querySelectorAll(focusableSelector);
         var list = [];
         var i;
@@ -472,7 +440,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         var elem;
 
         for (i = 0, length = elems.length; i < length; i++) {
-
             elem = elems[i];
 
             if (isCurrentlyFocusableInternal(elem)) {
@@ -483,7 +450,6 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         var currentIndex = -1;
 
         for (i = 0, length = list.length; i < length; i++) {
-
             elem = list[i];
 
             if (sourceElement === elem || elem.contains(sourceElement)) {
diff --git a/src/components/guide/guide-settings.js b/src/components/guide/guide-settings.js
index 77a3637251..c3ba49f283 100644
--- a/src/components/guide/guide-settings.js
+++ b/src/components/guide/guide-settings.js
@@ -2,12 +2,10 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
     'use strict';
 
     function saveCategories(context, options) {
-
         var categories = [];
 
         var chkCategorys = context.querySelectorAll('.chkCategory');
         for (var i = 0, length = chkCategorys.length; i < length; i++) {
-
             var type = chkCategorys[i].getAttribute('data-type');
 
             if (chkCategorys[i].checked) {
@@ -25,12 +23,10 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
     }
 
     function loadCategories(context, options) {
-
         var selectedCategories = options.categories || [];
 
         var chkCategorys = context.querySelectorAll('.chkCategory');
         for (var i = 0, length = chkCategorys.length; i < length; i++) {
-
             var type = chkCategorys[i].getAttribute('data-type');
 
             chkCategorys[i].checked = !selectedCategories.length || selectedCategories.indexOf(type) !== -1;
@@ -38,13 +34,11 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
     }
 
     function save(context) {
-
         var i;
         var length;
 
         var chkIndicators = context.querySelectorAll('.chkIndicator');
         for (i = 0, length = chkIndicators.length; i < length; i++) {
-
             var type = chkIndicators[i].getAttribute('data-type');
             userSettings.set('guide-indicator-' + type, chkIndicators[i].checked);
         }
@@ -62,13 +56,11 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
     }
 
     function load(context) {
-
         var i;
         var length;
 
         var chkIndicators = context.querySelectorAll('.chkIndicator');
         for (i = 0, length = chkIndicators.length; i < length; i++) {
-
             var type = chkIndicators[i].getAttribute('data-type');
 
             if (chkIndicators[i].getAttribute('data-default') === 'true') {
@@ -90,13 +82,10 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
     }
 
     function showEditor(options) {
-
         return new Promise(function (resolve, reject) {
-
             var settingsChanged = false;
 
             require(['text!./guide-settings.template.html'], function (template) {
-
                 var dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
@@ -119,12 +108,10 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
                 dlg.innerHTML = html;
 
                 dlg.addEventListener('change', function () {
-
                     settingsChanged = true;
                 });
 
                 dlg.addEventListener('close', function () {
-
                     if (layoutManager.tv) {
                         scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false);
                     }
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index bb4a36497c..bd3ad89aaa 100644
--- a/src/components/guide/guide.js
+++ b/src/components/guide/guide.js
@@ -2,7 +2,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     'use strict';
 
     function showViewSettings(instance) {
-
         require(['guide-settings-dialog'], function (guideSettingsDialog) {
             guideSettingsDialog.show(instance.categoryOptions).then(function () {
                 instance.refresh();
@@ -11,7 +10,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function updateProgramCellOnScroll(cell, scrollPct) {
-
         var left = cell.posLeft;
         if (!left) {
             left = parseFloat(cell.style.left.replace('%', ''));
@@ -43,11 +41,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
         if (guideProgramName) {
             if (pctOfWidth > 0 && pctOfWidth <= 100) {
-                //guideProgramName.style.marginLeft = pctOfWidth + '%';
                 guideProgramName.style.transform = 'translateX(' + pctOfWidth + '%)';
                 caret.classList.remove('hide');
             } else {
-                //guideProgramName.style.marginLeft = '0';
                 guideProgramName.style.transform = 'none';
                 caret.classList.add('hide');
             }
@@ -56,7 +52,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
     var isUpdatingProgramCellScroll = false;
     function updateProgramCellsOnScroll(programGrid, programCells) {
-
         if (isUpdatingProgramCellScroll) {
             return;
         }
@@ -64,13 +59,11 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         isUpdatingProgramCellScroll = true;
 
         requestAnimationFrame(function () {
-
             var scrollLeft = programGrid.scrollLeft;
 
             var scrollPct = scrollLeft ? (scrollLeft / programGrid.scrollWidth) * 100 : 0;
 
             for (var i = 0, length = programCells.length; i < length; i++) {
-
                 updateProgramCellOnScroll(programCells[i], scrollPct);
             }
 
@@ -79,14 +72,12 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function onProgramGridClick(e) {
-
         if (!layoutManager.tv) {
             return;
         }
 
         var programCell = dom.parentWithClass(e.target, 'programCell');
         if (programCell) {
-
             var startDate = programCell.getAttribute('data-startdate');
             var endDate = programCell.getAttribute('data-enddate');
             startDate = datetime.parseISO8601Date(startDate, { toLocal: true }).getTime();
@@ -94,7 +85,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
             var now = new Date().getTime();
             if (now >= startDate && now < endDate) {
-
                 var channelId = programCell.getAttribute('data-channelid');
                 var serverId = programCell.getAttribute('data-serverid');
 
@@ -110,7 +100,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     }
 
     function Guide(options) {
-
         var self = this;
         var items = {};
 
@@ -121,7 +110,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         var cellCurationMinutes = 30;
         var cellDurationMs = cellCurationMinutes * 60 * 1000;
         var msPerDay = 86400000;
-        var totalRendererdMs = msPerDay;
 
         var currentDate;
         var currentStartIndex = 0;
@@ -132,7 +120,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         var programGrid;
 
         self.refresh = function () {
-
             currentDate = null;
             reloadPage(options.element);
             restartAutoRefresh();
@@ -151,7 +138,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         };
 
         self.destroy = function () {
-
             stopAutoRefresh();
 
             events.off(serverNotifications, 'TimerCreated', onTimerCreated);
@@ -165,7 +151,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         };
 
         function restartAutoRefresh() {
-
             stopAutoRefresh();
 
             var intervalMs = 60000 * 15; // (minutes)
@@ -183,15 +168,11 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function normalizeDateToTimeslot(date) {
-
             var minutesOffset = date.getMinutes() - cellCurationMinutes;
 
             if (minutesOffset >= 0) {
-
                 date.setHours(date.getHours(), cellCurationMinutes, 0, 0);
-
             } else {
-
                 date.setHours(date.getHours(), 0, 0, 0);
             }
 
@@ -207,7 +188,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function reloadGuide(context, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
-
             var apiClient = connectionManager.getApiClient(options.serverId);
 
             var channelQuery = {
@@ -290,12 +270,10 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             };
 
             apiClient.getLiveTvChannels(channelQuery).then(function (channelsResult) {
-
                 var btnPreviousPage = context.querySelector('.btnPreviousPage');
                 var btnNextPage = context.querySelector('.btnNextPage');
 
                 if (channelsResult.TotalRecordCount > channelLimit) {
-
                     context.querySelector('.guideOptions').classList.remove('hide');
 
                     btnPreviousPage.classList.remove('hide');
@@ -312,7 +290,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                     } else {
                         btnNextPage.disabled = true;
                     }
-
                 } else {
                     context.querySelector('.guideOptions').classList.add('hide');
                 }
@@ -343,22 +320,17 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 }
 
                 apiClient.getLiveTvPrograms(programQuery).then(function (programsResult) {
-
                     renderGuide(context, date, channelsResult.Items, programsResult.Items, renderOptions, apiClient, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender);
 
                     hideLoading();
-
                 });
             });
         }
 
         function getDisplayTime(date) {
-
             if ((typeof date).toString().toLowerCase() === 'string') {
                 try {
-
                     date = datetime.parseISO8601Date(date, { toLocal: true });
-
                 } catch (err) {
                     return date;
                 }
@@ -368,7 +340,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function getTimeslotHeadersHtml(startDate, endDateTime) {
-
             var html = '';
 
             // clone
@@ -377,7 +348,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             html += '<div class="timeslotHeadersInner">';
 
             while (startDate.getTime() < endDateTime) {
-
                 html += '<div class="timeslotHeader">';
 
                 html += getDisplayTime(startDate);
@@ -411,23 +381,19 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function getTimerIndicator(item) {
-
             var status;
 
             if (item.Type === 'SeriesTimer') {
                 return '<span class="material-icons programIcon seriesTimerIcon fiber_smart_record"></span>';
             } else if (item.TimerId || item.SeriesTimerId) {
-
                 status = item.Status || 'Cancelled';
             } else if (item.Type === 'Timer') {
-
                 status = item.Status;
             } else {
                 return '';
             }
 
             if (item.SeriesTimerId) {
-
                 if (status !== 'Cancelled') {
                     return '<span class="material-icons programIcon seriesTimerIcon fiber_smart_record"></span>';
                 }
@@ -439,7 +405,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) {
-
             var html = '';
 
             var startMs = date.getTime();
@@ -463,11 +428,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             var now = new Date().getTime();
 
             for (var i = listInfo.startIndex, length = programs.length; i < length; i++) {
-
                 var program = programs[i];
 
                 if (program.ChannelId !== channel.Id) {
-
                     if (programsFound) {
                         break;
                     }
@@ -577,7 +540,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                     html += '</div>';
 
                     if (program.IsHD && options.showHdIcon) {
-                        //html += '<span class="guideHdIcon material-icons programIcon hd"></span>';
                         if (layoutManager.tv) {
                             html += '<div class="programIcon guide-programTextIcon guide-programTextIcon-tv">HD</div>';
                         } else {
@@ -599,11 +561,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function renderChannelHeaders(context, channels, apiClient) {
-
             var html = '';
 
             for (var i = 0, length = channels.length; i < length; i++) {
-
                 var channel = channels[i];
                 var hasChannelImage = channel.ImageTags.Primary;
 
@@ -615,18 +575,15 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
                 var title = [];
                 if (channel.ChannelNumber) {
-
                     title.push(channel.ChannelNumber);
                 }
                 if (channel.Name) {
-
                     title.push(channel.Name);
                 }
 
                 html += '<button title="' + title.join(' ') + '" type="button" class="' + cssClass + '"' + ' data-action="link" data-isfolder="' + channel.IsFolder + '" data-id="' + channel.Id + '" data-serverid="' + channel.ServerId + '" data-type="' + channel.Type + '">';
 
                 if (hasChannelImage) {
-
                     var url = apiClient.getScaledImageUrl(channel.Id, {
                         maxHeight: 220,
                         tag: channel.ImageTags.Primary,
@@ -637,7 +594,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 }
 
                 if (channel.ChannelNumber) {
-
                     html += '<h3 class="guideChannelNumber">' + channel.ChannelNumber + '</h3>';
                 }
 
@@ -654,7 +610,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function renderPrograms(context, date, channels, programs, options) {
-
             var listInfo = {
                 startIndex: 0
             };
@@ -662,7 +617,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             var html = [];
 
             for (var i = 0, length = channels.length; i < length; i++) {
-
                 html.push(getChannelProgramsHtml(context, date, channels[i], programs, options, listInfo));
             }
 
@@ -674,7 +628,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function getProgramSortOrder(program, channels) {
-
             var channelId = program.ChannelId;
             var channelIndex = -1;
 
@@ -691,7 +644,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function renderGuide(context, date, channels, programs, renderOptions, apiClient, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
-
             programs.sort(function (a, b) {
                 return getProgramSortOrder(a, channels) - getProgramSortOrder(b, channels);
             });
@@ -721,7 +673,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function scrollProgramGridToTimeMs(context, scrollToTimeMs, startTimeOfDayMs) {
-
             scrollToTimeMs -= startTimeOfDayMs;
 
             var pct = scrollToTimeMs / msPerDay;
@@ -734,7 +685,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function focusProgram(context, itemId, channelRowId, focusToTimeMs, startTimeOfDayMs) {
-
             var focusElem;
             if (itemId) {
                 focusElem = context.querySelector('[data-id="' + itemId + '"]');
@@ -743,7 +693,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             if (focusElem) {
                 focusManager.focus(focusElem);
             } else {
-
                 var autoFocusParent;
 
                 if (channelRowId) {
@@ -761,7 +710,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 var programCell = autoFocusParent.querySelector('.programCell');
 
                 while (programCell) {
-
                     var left = (programCell.style.left || '').replace('%', '');
                     left = left ? parseFloat(left) : 0;
                     var width = (programCell.style.width || '').replace('%', '');
@@ -782,7 +730,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function nativeScrollTo(container, pos, horizontal) {
-
             if (container.scrollTo) {
                 if (horizontal) {
                     container.scrollTo(pos, 0);
@@ -802,7 +749,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         var lastHeaderScroll = 0;
         var scrollXPct = 0;
         function onProgramGridScroll(context, elem, timeslotHeaders) {
-
             if ((new Date().getTime() - lastHeaderScroll) >= 1000) {
                 lastGridScroll = new Date().getTime();
 
@@ -815,7 +761,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function onTimeslotHeadersScroll(context, elem) {
-
             if ((new Date().getTime() - lastGridScroll) >= 1000) {
                 lastHeaderScroll = new Date().getTime();
                 nativeScrollTo(programGrid, elem.scrollLeft, true);
@@ -823,7 +768,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function changeDate(page, date, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
-
             var newStartDate = normalizeDateToTimeslot(date);
             currentDate = newStartDate;
 
@@ -831,7 +775,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function getDateTabText(date, isActive, tabIndex) {
-
             var cssClass = isActive ? 'emby-tab-button guide-date-tab-button emby-tab-button-active' : 'emby-tab-button guide-date-tab-button';
 
             var html = '<button is="emby-button" class="' + cssClass + '" data-index="' + tabIndex + '" data-date="' + date.getTime() + '">';
@@ -846,7 +789,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function setDateRange(page, guideInfo) {
-
             var today = new Date();
             var nowHours = today.getHours();
             today.setHours(nowHours, 0, 0, 0);
@@ -866,6 +808,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             var dateTabsHtml = '';
             var tabIndex = 0;
 
+            // TODO: Use date-fns
             var date = new Date();
 
             if (currentDate) {
@@ -873,13 +816,11 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             }
 
             date.setHours(nowHours, 0, 0, 0);
-            //start.setHours(0, 0, 0, 0);
 
             var startTimeOfDayMs = (start.getHours() * 60 * 60 * 1000);
             startTimeOfDayMs += start.getMinutes() * 60 * 1000;
 
             while (start <= end) {
-
                 var isActive = date.getDate() === start.getDate() && date.getMonth() === start.getMonth() && date.getFullYear() === start.getFullYear();
 
                 dateTabsHtml += getDateTabText(start, isActive, tabIndex);
@@ -906,19 +847,16 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function reloadPage(page) {
-
             showLoading();
 
             var apiClient = connectionManager.getApiClient(options.serverId);
 
             apiClient.getLiveTvGuideInfo().then(function (guideInfo) {
-
                 setDateRange(page, guideInfo);
             });
         }
 
         function getChannelProgramsFocusableElements(container) {
-
             var elements = container.querySelectorAll('.programCell');
 
             var list = [];
@@ -926,7 +864,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             var currentScrollXPct = scrollXPct + 1;
 
             for (var i = 0, length = elements.length; i < length; i++) {
-
                 var elem = elements[i];
 
                 var left = (elem.style.left || '').replace('%', '');
@@ -943,7 +880,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function onInputCommand(e) {
-
             var target = e.target;
             var programCell = dom.parentWithClass(target, 'programCell');
             var container;
@@ -951,10 +887,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             var focusableElements;
             var newRow;
 
-            var scrollX = false;
-
             switch (e.detail.command) {
-
                 case 'up':
                     if (programCell) {
                         container = programGrid;
@@ -1018,7 +951,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                     focusManager.moveLeft(target, {
                         container: container
                     });
-                    scrollX = true;
                     break;
                 case 'right':
                     container = programCell ? dom.parentWithClass(programCell, 'channelPrograms') : null;
@@ -1027,7 +959,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                     focusManager.moveRight(target, {
                         container: container
                     });
-                    scrollX = true;
                     break;
                 default:
                     return;
@@ -1038,7 +969,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function onScrollerFocus(e) {
-
             var target = e.target;
             var programCell = dom.parentWithClass(target, 'programCell');
 
@@ -1057,22 +987,16 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             }
 
             if (lastFocusDirection === 'left') {
-
                 if (programCell) {
-
                     scrollHelper.toStart(programGrid, programCell, true, true);
                 }
             } else if (lastFocusDirection === 'right') {
-
                 if (programCell) {
-
                     scrollHelper.toCenter(programGrid, programCell, true, true);
                 }
             } else if (lastFocusDirection === 'up' || lastFocusDirection === 'down') {
-
                 var verticalScroller = dom.parentWithClass(target, 'guideVerticalScroller');
                 if (verticalScroller) {
-
                     var focusedElement = programCell || dom.parentWithTag(target, 'BUTTON');
                     verticalScroller.toCenter(focusedElement, true);
                 }
@@ -1080,7 +1004,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function setScrollEvents(view, enabled) {
-
             if (layoutManager.tv) {
                 var guideVerticalScroller = view.querySelector('.guideVerticalScroller');
 
@@ -1093,7 +1016,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function onTimerCreated(e, apiClient, data) {
-
             var programId = data.ProgramId;
             // This could be null, not supported by all tv providers
             var newTimerId = data.Id;
@@ -1146,7 +1068,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         require(['text!./tvguide.template.html'], function (template) {
-
             var context = options.element;
 
             context.classList.add('tvguide');
@@ -1203,12 +1124,10 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             });
 
             context.querySelector('.guideDateTabs').addEventListener('tabchange', function (e) {
-
                 var allTabButtons = e.target.querySelectorAll('.guide-date-tab-button');
 
                 var tabButton = allTabButtons[parseInt(e.detail.selectedTabIndex)];
                 if (tabButton) {
-
                     var previousButton = e.detail.previousIndex == null ? null : allTabButtons[parseInt(e.detail.previousIndex)];
 
                     var date = new Date();
@@ -1223,7 +1142,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                     }
 
                     if (previousButton) {
-
                         var previousDate = new Date();
                         previousDate.setTime(parseInt(previousButton.getAttribute('data-date')));
 
diff --git a/src/components/homeScreenSettings/homeScreenSettings.js b/src/components/homeScreenSettings/homeScreenSettings.js
index 6d6c26fce4..b5695fc818 100644
--- a/src/components/homeScreenSettings/homeScreenSettings.js
+++ b/src/components/homeScreenSettings/homeScreenSettings.js
@@ -15,12 +15,10 @@ import 'emby-checkbox';
     const numConfigurableSections = 7;
 
     function renderViews(page, user, result) {
-
         let folderHtml = '';
 
         folderHtml += '<div class="checkboxList">';
         folderHtml += result.map(i => {
-
             let currentHtml = '';
 
             const id = `chkGroupFolder${i.Id}`;
@@ -35,7 +33,6 @@ import 'emby-checkbox';
             currentHtml += '</label>';
 
             return currentHtml;
-
         }).join('');
 
         folderHtml += '</div>';
@@ -44,7 +41,6 @@ import 'emby-checkbox';
     }
 
     function getLandingScreenOptions(type) {
-
         const list = [];
 
         if (type === 'movies') {
@@ -133,9 +129,7 @@ import 'emby-checkbox';
     }
 
     function getLandingScreenOptionsHtml(type, userValue) {
-
         return getLandingScreenOptions(type).map(o => {
-
             const selected = userValue === o.value || (o.isDefault && !userValue);
             const selectedHtml = selected ? ' selected' : '';
             const optionValue = o.isDefault ? '' : o.value;
@@ -145,13 +139,9 @@ import 'emby-checkbox';
     }
 
     function renderViewOrder(context, user, result) {
-
         let html = '';
 
-        let index = 0;
-
-        html += result.Items.map(view => {
-
+        html += result.Items.map((view) => {
             let currentHtml = '';
 
             currentHtml += `<div class="listItem viewItem" data-viewid="${view.Id}">`;
@@ -171,18 +161,14 @@ import 'emby-checkbox';
 
             currentHtml += '</div>';
 
-            index++;
             return currentHtml;
-
         }).join('');
 
         context.querySelector('.viewOrderList').innerHTML = html;
     }
 
     function updateHomeSectionValues(context, userSettings) {
-
         for (let i = 1; i <= 7; i++) {
-
             const select = context.querySelector(`#selectHomeSection${i}`);
             const defaultValue = homeSections.getDefaultSection(i - 1);
 
@@ -203,7 +189,6 @@ import 'emby-checkbox';
     }
 
     function getPerLibrarySettingsHtml(item, user, userSettings, apiClient) {
-
         let html = '';
 
         let isChecked;
@@ -220,7 +205,6 @@ import 'emby-checkbox';
 
         const excludeFromLatest = ['playlists', 'livetv', 'boxsets', 'channels'];
         if (!excludeFromLatest.includes(item.CollectionType || '')) {
-
             isChecked = !user.Configuration.LatestItemsExcludes.includes(item.Id);
             html += '<label class="fldIncludeInLatest">';
             html += `<input type="checkbox" is="emby-checkbox" class="chkIncludeInLatest" data-folderid="${item.Id}"${isChecked ? ' checked="checked"' : ''}/>`;
@@ -229,12 +213,10 @@ import 'emby-checkbox';
         }
 
         if (html) {
-
             html = `<div class="checkboxListContainer">${html}</div>`;
         }
 
         if (item.CollectionType === 'movies' || item.CollectionType === 'tvshows' || item.CollectionType === 'music' || item.CollectionType === 'livetv') {
-
             const idForLanding = item.CollectionType === 'livetv' ? item.CollectionType : item.Id;
             html += '<div class="selectContainer">';
             html += `<select is="emby-select" class="selectLanding" data-folderid="${idForLanding}" label="${globalize.translate('LabelDefaultScreen')}">`;
@@ -248,7 +230,6 @@ import 'emby-checkbox';
         }
 
         if (html) {
-
             let prefix = '';
             prefix += '<div class="verticalSection">';
 
@@ -264,12 +245,10 @@ import 'emby-checkbox';
     }
 
     function renderPerLibrarySettings(context, user, userViews, userSettings, apiClient) {
-
         const elem = context.querySelector('.perLibrarySettings');
         let html = '';
 
         for (let i = 0, length = userViews.length; i < length; i++) {
-
             html += getPerLibrarySettingsHtml(userViews[i], user, userSettings, apiClient);
         }
 
@@ -277,7 +256,6 @@ import 'emby-checkbox';
     }
 
     function loadForm(context, user, userSettings, apiClient) {
-
         context.querySelector('.chkHidePlayedFromLatest').checked = user.Configuration.HidePlayedInLatest || false;
 
         updateHomeSectionValues(context, userSettings);
@@ -286,7 +264,6 @@ import 'emby-checkbox';
         const promise2 = apiClient.getJSON(apiClient.getUrl(`Users/${user.Id}/GroupingOptions`));
 
         Promise.all([promise1, promise2]).then(responses => {
-
             renderViewOrder(context, user, responses[0]);
 
             renderPerLibrarySettings(context, user, responses[0].Items, userSettings, apiClient);
@@ -298,17 +275,13 @@ import 'emby-checkbox';
     }
 
     function onSectionOrderListClick(e) {
-
         const target = dom.parentWithClass(e.target, 'btnViewItemMove');
 
         if (target) {
             const viewItem = dom.parentWithClass(target, 'viewItem');
 
             if (viewItem) {
-                const ul = dom.parentWithClass(viewItem, 'paperList');
-
                 if (target.classList.contains('btnViewItemDown')) {
-
                     const next = viewItem.nextSibling;
 
                     if (next) {
@@ -316,9 +289,7 @@ import 'emby-checkbox';
                         next.parentNode.insertBefore(viewItem, next.nextSibling);
                         focusManager.focus(e.target);
                     }
-
                 } else {
-
                     const prev = viewItem.previousSibling;
 
                     if (prev) {
@@ -332,37 +303,30 @@ import 'emby-checkbox';
     }
 
     function getCheckboxItems(selector, context, isChecked) {
-
         const inputs = context.querySelectorAll(selector);
         const list = [];
 
         for (let i = 0, length = inputs.length; i < length; i++) {
-
             if (inputs[i].checked === isChecked) {
                 list.push(inputs[i]);
             }
-
         }
 
         return list;
     }
 
     function saveUser(context, user, userSettingsInstance, apiClient) {
-
         user.Configuration.HidePlayedInLatest = context.querySelector('.chkHidePlayedFromLatest').checked;
 
         user.Configuration.LatestItemsExcludes = getCheckboxItems('.chkIncludeInLatest', context, false).map(i => {
-
             return i.getAttribute('data-folderid');
         });
 
         user.Configuration.MyMediaExcludes = getCheckboxItems('.chkIncludeInMyMedia', context, false).map(i => {
-
             return i.getAttribute('data-folderid');
         });
 
         user.Configuration.GroupedFolders = getCheckboxItems('.chkGroupFolder', context, true).map(i => {
-
             return i.getAttribute('data-folderid');
         });
 
@@ -396,13 +360,10 @@ import 'emby-checkbox';
     }
 
     function save(instance, context, userId, userSettings, apiClient, enableSaveConfirmation) {
-
         loading.show();
 
         apiClient.getUser(userId).then(user => {
-
             saveUser(context, user, userSettings, apiClient).then(() => {
-
                 loading.hide();
                 if (enableSaveConfirmation) {
                     import('toast').then(({default: toast}) => {
@@ -411,7 +372,6 @@ import 'emby-checkbox';
                 }
 
                 events.trigger(instance, 'saved');
-
             }, () => {
                 loading.hide();
             });
@@ -419,14 +379,12 @@ import 'emby-checkbox';
     }
 
     function onSubmit(e) {
-
         const self = this;
         const apiClient = connectionManager.getApiClient(self.options.serverId);
         const userId = self.options.userId;
         const userSettings = self.options.userSettings;
 
         userSettings.setUserInfo(userId, apiClient).then(() => {
-
             const enableSaveConfirmation = self.options.enableSaveConfirmation;
             save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
         });
@@ -439,7 +397,6 @@ import 'emby-checkbox';
     }
 
     function onChange(e) {
-
         const chkIncludeInMyMedia = dom.parentWithClass(e.target, 'chkIncludeInMyMedia');
         if (!chkIncludeInMyMedia) {
             return;
@@ -457,9 +414,7 @@ import 'emby-checkbox';
     }
 
     function embed(options, self) {
-
         return import('text!./homeScreenSettings.template.html').then(({default: template}) => {
-
             for (let i = 1; i <= numConfigurableSections; i++) {
                 template = template.replace(`{section${i}label}`, globalize.translate('LabelHomeScreenSectionValue', i));
             }
@@ -491,7 +446,6 @@ import 'emby-checkbox';
         }
 
         loadData(autoFocus) {
-
             const self = this;
             const context = self.options.element;
 
@@ -502,9 +456,7 @@ import 'emby-checkbox';
             const userSettings = self.options.userSettings;
 
             apiClient.getUser(userId).then(user => {
-
                 userSettings.setUserInfo(userId, apiClient).then(() => {
-
                     self.dataLoaded = true;
 
                     loadForm(context, user, userSettings, apiClient);
@@ -521,7 +473,6 @@ import 'emby-checkbox';
         }
 
         destroy() {
-
             this.options = null;
         }
     }
diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js
index 010b6b1a78..6198894088 100644
--- a/src/components/homesections/homesections.js
+++ b/src/components/homesections/homesections.js
@@ -1,13 +1,9 @@
 import connectionManager from 'connectionManager';
 import cardBuilder from 'cardBuilder';
-import appSettings from 'appSettings';
 import dom from 'dom';
-import appHost from 'apphost';
 import layoutManager from 'layoutManager';
 import imageLoader from 'imageLoader';
 import globalize from 'globalize';
-import itemShortcuts from 'itemShortcuts';
-import itemHelper from 'itemHelper';
 import appRouter from 'appRouter';
 import imageHelper from 'scripts/imagehelper';
 import 'paper-icon-button-light';
@@ -135,7 +131,6 @@ import 'css!./homesections';
     }
 
     function loadSection(page, apiClient, user, userSettings, userViews, allSections, index) {
-
         const section = allSections[index];
         const userId = user.Id;
 
@@ -215,14 +210,6 @@ import 'css!./homesections';
         imageLoader.lazyChildren(elem);
     }
 
-    /**
-     * Returns a random integer between min (inclusive) and max (inclusive)
-     * Using Math.round() will give you a non-uniform distribution!
-     */
-    function getRandomInt(min, max) {
-        return Math.floor(Math.random() * (max - min + 1)) + min;
-    }
-
     function getFetchLatestItemsFn(serverId, parentId, collectionType) {
         return function () {
             const apiClient = connectionManager.getApiClient(serverId);
@@ -347,14 +334,6 @@ import 'css!./homesections';
         }
     }
 
-    function getRequirePromise(deps) {
-        return new Promise(function (resolve, reject) {
-            import(deps).then(() => {
-                return resolve;
-            });
-        });
-    }
-
     export function loadLibraryTiles(elem, apiClient, user, userSettings, shape, userViews, allSections) {
         let html = '';
         if (userViews.length) {
@@ -549,7 +528,6 @@ import 'css!./homesections';
     }
 
     function getOnNowItemsHtml(items) {
-        const cardLayout = false;
         return cardBuilder.getCardsHtml({
             items: items,
             preferThumb: 'auto',
@@ -576,7 +554,6 @@ import 'css!./homesections';
             return Promise.resolve();
         }
 
-        const userId = user.Id;
         return apiClient.getLiveTvRecommendedPrograms({
             userId: apiClient.getCurrentUserId(),
             IsAiring: true,
@@ -649,7 +626,6 @@ import 'css!./homesections';
                     html += '</h2>';
                     html += '<span class="material-icons chevron_right"></span>';
                     html += '</a>';
-
                 } else {
                     html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('HeaderOnNow') + '</h2>';
                 }
@@ -766,7 +742,6 @@ import 'css!./homesections';
 
     function getLatestRecordingItemsHtml(activeRecordingsOnly) {
         return function (items) {
-            const cardLayout = false;
             return cardBuilder.getCardsHtml({
                 items: items,
                 shape: enableScrollX() ? 'autooverflow' : 'auto',
diff --git a/src/components/htmlMediaHelper.js b/src/components/htmlMediaHelper.js
index 062c80efa6..4095502aae 100644
--- a/src/components/htmlMediaHelper.js
+++ b/src/components/htmlMediaHelper.js
@@ -33,34 +33,7 @@ import events from 'events';
         return false;
     }
 
-    export function enableHlsShakaPlayer(item, mediaSource, mediaType) {
-        /* eslint-disable-next-line compat/compat */
-        if (!!window.MediaSource && !!MediaSource.isTypeSupported) {
-
-            if (canPlayNativeHls()) {
-
-                if (browser.edge && mediaType === 'Video') {
-                    return true;
-                }
-
-                // simple playback should use the native support
-                if (mediaSource.RunTimeTicks) {
-                    //if (!browser.edge) {
-                    //return false;
-                    //}
-                }
-
-                //return false;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
     export function enableHlsJsPlayer(runTimeTicks, mediaType) {
-
         if (window.MediaSource == null) {
             return false;
         }
@@ -76,7 +49,6 @@ import events from 'events';
         }
 
         if (canPlayNativeHls()) {
-
             // Having trouble with chrome's native support and transcoded music
             if (browser.android && mediaType === 'Audio') {
                 return true;
@@ -102,7 +74,6 @@ import events from 'events';
     var recoverDecodingErrorDate;
     var recoverSwapAudioCodecDate;
     export function handleHlsJsMediaError(instance, reject) {
-
         var hlsPlayer = instance._hlsPlayer;
 
         if (!hlsPlayer) {
@@ -138,7 +109,6 @@ import events from 'events';
     }
 
     export function onErrorInternal(instance, type) {
-
         // Needed for video
         if (instance.destroyCustomTrack) {
             instance.destroyCustomTrack(instance._mediaElement);
@@ -166,12 +136,9 @@ import events from 'events';
     }
 
     export function seekOnPlaybackStart(instance, element, ticks, onMediaReady) {
-
         var seconds = (ticks || 0) / 10000000;
 
         if (seconds) {
-            var src = (instance.currentSrc() || '').toLowerCase();
-
             // Appending #t=xxx to the query string doesn't seem to work with HLS
             // For plain video files, not all browsers support it either
 
@@ -204,11 +171,8 @@ import events from 'events';
     }
 
     export function applySrc(elem, src, options) {
-
         if (window.Windows && options.mediaSource && options.mediaSource.IsLocal) {
-
             return Windows.Storage.StorageFile.getFileFromPathAsync(options.url).then(function (file) {
-
                 var playlist = new Windows.Media.Playback.MediaPlaybackList();
 
                 var source1 = Windows.Media.Core.MediaSource.createFromStorageFile(file);
@@ -217,9 +181,7 @@ import events from 'events';
                 elem.src = URL.createObjectURL(playlist, { oneTimeOnly: true });
                 return Promise.resolve();
             });
-
         } else {
-
             elem.src = src;
         }
 
@@ -227,18 +189,15 @@ import events from 'events';
     }
 
     function onSuccessfulPlay(elem, onErrorFn) {
-
         elem.addEventListener('error', onErrorFn);
     }
 
     export function playWithPromise(elem, onErrorFn) {
-
         try {
             var promise = elem.play();
             if (promise && promise.then) {
                 // Chrome now returns a promise
                 return promise.catch(function (e) {
-
                     var errorName = (e.name || '').toLowerCase();
                     // safari uses aborterror
                     if (errorName === 'notallowederror' ||
@@ -260,7 +219,6 @@ import events from 'events';
     }
 
     export function destroyCastPlayer(instance) {
-
         var player = instance._castPlayer;
         if (player) {
             try {
@@ -273,19 +231,6 @@ import events from 'events';
         }
     }
 
-    export function destroyShakaPlayer(instance) {
-        var player = instance._shakaPlayer;
-        if (player) {
-            try {
-                player.destroy();
-            } catch (err) {
-                console.error(err);
-            }
-
-            instance._shakaPlayer = null;
-        }
-    }
-
     export function destroyHlsPlayer(instance) {
         var player = instance._hlsPlayer;
         if (player) {
@@ -315,10 +260,8 @@ import events from 'events';
     }
 
     export function bindEventsToHlsPlayer(instance, hls, elem, onErrorFn, resolve, reject) {
-
         hls.on(Hls.Events.MANIFEST_PARSED, function () {
             playWithPromise(elem, onErrorFn).then(resolve, function () {
-
                 if (reject) {
                     reject();
                     reject = null;
@@ -327,14 +270,12 @@ import events from 'events';
         });
 
         hls.on(Hls.Events.ERROR, function (event, data) {
-
             console.error('HLS Error: Type: ' + data.type + ' Details: ' + (data.details || '') + ' Fatal: ' + (data.fatal || false));
 
             switch (data.type) {
                 case Hls.ErrorTypes.NETWORK_ERROR:
                     // try to recover network error
                     if (data.response && data.response.code && data.response.code >= 400) {
-
                         console.debug('hls.js response error code: ' + data.response.code);
 
                         // Trigger failure differently depending on whether this is prior to start of playback, or after
@@ -348,7 +289,6 @@ import events from 'events';
                         }
 
                         return;
-
                     }
 
                     break;
@@ -361,7 +301,6 @@ import events from 'events';
                     case Hls.ErrorTypes.NETWORK_ERROR:
 
                         if (data.response && data.response.code === 0) {
-
                             // This could be a CORS error related to access control response headers
 
                             console.debug('hls.js response error code: ' + data.response.code);
@@ -407,7 +346,6 @@ import events from 'events';
     }
 
     export function onEndedInternal(instance, elem, onErrorFn) {
-
         elem.removeEventListener('error', onErrorFn);
 
         elem.src = '';
@@ -416,7 +354,6 @@ import events from 'events';
 
         destroyHlsPlayer(instance);
         destroyFlvPlayer(instance);
-        destroyShakaPlayer(instance);
         destroyCastPlayer(instance);
 
         var stopInfo = {
@@ -431,7 +368,6 @@ import events from 'events';
     }
 
     export function getBufferedRanges(instance, elem) {
-
         var ranges = [];
         var seekable = elem.buffered || [];
 
@@ -444,7 +380,6 @@ import events from 'events';
         offset = offset || 0;
 
         for (var i = 0, length = seekable.length; i < length; i++) {
-
             var start = seekable.start(i);
             var end = seekable.end(i);
 
diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js
index fbe98c532f..8c278a62b6 100644
--- a/src/components/imageDownloader/imageDownloader.js
+++ b/src/components/imageDownloader/imageDownloader.js
@@ -17,7 +17,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
     var selectedProvider;
 
     function getBaseRemoteOptions() {
-
         var options = {};
 
         options.itemId = currentItemId;
@@ -26,7 +25,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
     }
 
     function reloadBrowsableImages(page, apiClient) {
-
         loading.show();
 
         var options = getBaseRemoteOptions();
@@ -43,7 +41,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         }
 
         apiClient.getAvailableRemoteImages(options).then(function (result) {
-
             renderRemoteImages(page, apiClient, result, browsableImageType, options.startIndex, options.limit);
 
             page.querySelector('#selectBrowsableImageType').value = browsableImageType;
@@ -58,17 +55,14 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
 
             loading.hide();
         });
-
     }
 
     function renderRemoteImages(page, apiClient, imagesResult, imageType, startIndex, limit) {
-
         page.querySelector('.availableImagesPaging').innerHTML = getPagingHtml(startIndex, limit, imagesResult.TotalRecordCount);
 
         var html = '';
 
         for (var i = 0, length = imagesResult.Images.length; i < length; i++) {
-
             html += getRemoteImageHtml(imagesResult.Images[i], imageType, apiClient);
         }
 
@@ -92,11 +86,9 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
                 reloadBrowsableImages(page, apiClient);
             });
         }
-
     }
 
     function getPagingHtml(startIndex, limit, totalRecordCount) {
-
         var html = '';
 
         var recordsEnd = Math.min(startIndex + limit, totalRecordCount);
@@ -136,7 +128,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         loading.show();
 
         apiClient.downloadRemoteImage(options).then(function () {
-
             hasChanges = true;
             var dlg = dom.parentWithClass(page, 'dialog');
             dialogHelper.close(dlg);
@@ -166,7 +157,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         } else if (imageType === 'Disc') {
             shape = 'square';
         } else {
-
             if (currentItemType === 'Episode') {
                 shape = 'backdrop';
             } else if (currentItemType === 'MusicAlbum' || currentItemType === 'MusicArtist') {
@@ -217,19 +207,16 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         html += '<div class="cardText cardTextCentered">' + image.ProviderName + '</div>';
 
         if (image.Width || image.Height || image.Language) {
-
             html += '<div class="cardText cardText-secondary cardTextCentered">';
 
             if (image.Width && image.Height) {
                 html += image.Width + ' x ' + image.Height;
 
                 if (image.Language) {
-
                     html += ' • ' + image.Language;
                 }
             } else {
                 if (image.Language) {
-
                     html += image.Language;
                 }
             }
@@ -238,13 +225,11 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         }
 
         if (image.CommunityRating != null) {
-
             html += '<div class="cardText cardText-secondary cardTextCentered">';
 
             if (image.RatingType === 'Likes') {
                 html += image.CommunityRating + (image.CommunityRating === 1 ? ' like' : ' likes');
             } else {
-
                 if (image.CommunityRating) {
                     html += image.CommunityRating.toFixed(1);
 
@@ -270,7 +255,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         // end footer
 
         html += '</div>';
-        //html += '</div>';
 
         html += '</' + tagName + '>';
 
@@ -287,7 +271,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         });
 
         page.querySelector('#selectImageProvider').addEventListener('change', function () {
-
             browsableImageStartIndex = 0;
             selectedProvider = this.value;
 
@@ -295,14 +278,12 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         });
 
         page.querySelector('#chkAllLanguages').addEventListener('change', function () {
-
             browsableImageStartIndex = 0;
 
             reloadBrowsableImages(page, apiClient);
         });
 
         page.addEventListener('click', function (e) {
-
             var btnDownloadRemoteImage = dom.parentWithClass(e.target, 'btnDownloadRemoteImage');
             if (btnDownloadRemoteImage) {
                 var card = dom.parentWithClass(btnDownloadRemoteImage, 'card');
@@ -321,7 +302,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
         loading.show();
 
         require(['text!./imageDownloader.template.html'], function (template) {
-
             var apiClient = connectionManager.getApiClient(serverId);
 
             currentItemId = itemId;
@@ -354,7 +334,6 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
             initEditor(editorContent, apiClient);
 
             dlg.querySelector('.btnCancel').addEventListener('click', function () {
-
                 dialogHelper.close(dlg);
             });
 
diff --git a/src/components/imageUploader/imageUploader.js b/src/components/imageUploader/imageUploader.js
index 3cf7aa000d..59c31724d0 100644
--- a/src/components/imageUploader/imageUploader.js
+++ b/src/components/imageUploader/imageUploader.js
@@ -23,7 +23,6 @@ import 'css!./style';
     let hasChanges = false;
 
     function onFileReaderError(evt) {
-
         loading.hide();
 
         switch (evt.target.error.code) {
@@ -43,7 +42,6 @@ import 'css!./style';
     }
 
     function setFiles(page, files) {
-
         const file = files[0];
 
         if (!file || !file.type.match('image.*')) {
@@ -69,7 +67,6 @@ import 'css!./style';
         // Closure to capture the file information.
         reader.onload = (theFile => {
             return e => {
-
                 // Render thumbnail.
                 const html = ['<img style="max-width:100%;max-height:100%;" src="', e.target.result, '" title="', escape(theFile.name), '"/>'].join('');
 
@@ -84,7 +81,6 @@ import 'css!./style';
     }
 
     function onSubmit(e) {
-
         const file = currentFile;
 
         if (!file) {
@@ -113,7 +109,6 @@ import 'css!./style';
         }
 
         connectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(() => {
-
             dlg.querySelector('#uploadImage').value = '';
 
             loading.hide();
@@ -126,7 +121,6 @@ import 'css!./style';
     }
 
     function initEditor(page) {
-
         page.querySelector('form').addEventListener('submit', onSubmit);
 
         page.querySelector('#uploadImage').addEventListener('change', function () {
@@ -139,11 +133,9 @@ import 'css!./style';
     }
 
     function showEditor(options, resolve) {
-
         options = options || {};
 
         return import('text!./imageUploader.template.html').then(({default: template}) => {
-
             currentItemId = options.itemId;
             currentServerId = options.serverId;
 
@@ -169,7 +161,6 @@ import 'css!./style';
 
             // Has to be assigned a z-index after the call to .open()
             dlg.addEventListener('close', () => {
-
                 if (layoutManager.tv) {
                     scrollHelper.centerFocus.off(dlg, false);
                 }
@@ -185,16 +176,13 @@ import 'css!./style';
             dlg.querySelector('#selectImageType').value = options.imageType || 'Primary';
 
             dlg.querySelector('.btnCancel').addEventListener('click', () => {
-
                 dialogHelper.close(dlg);
             });
         });
     }
 
     export function show(options) {
-
         return new Promise(resolve => {
-
             hasChanges = false;
 
             showEditor(options, resolve);
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js
index 0a873fa4c7..125a2dc062 100644
--- a/src/components/imageeditor/imageeditor.js
+++ b/src/components/imageeditor/imageeditor.js
@@ -7,7 +7,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     var hasChanges = false;
 
     function getBaseRemoteOptions() {
-
         var options = {};
 
         options.itemId = currentItem.Id;
@@ -16,7 +15,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function reload(page, item, focusContext) {
-
         loading.show();
 
         var apiClient;
@@ -25,7 +23,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
             apiClient = connectionManager.getApiClient(item.ServerId);
             reloadItem(page, item, apiClient, focusContext);
         } else {
-
             apiClient = connectionManager.getApiClient(currentItem.ServerId);
             apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) {
                 reloadItem(page, item, apiClient, focusContext);
@@ -34,7 +31,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function addListeners(container, className, eventName, fn) {
-
         container.addEventListener(eventName, function (e) {
             var elem = dom.parentWithClass(e.target, className);
             if (elem) {
@@ -44,14 +40,11 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function reloadItem(page, item, apiClient, focusContext) {
-
         currentItem = item;
 
         apiClient.getRemoteImageProviders(getBaseRemoteOptions()).then(function (providers) {
-
             var btnBrowseAllImages = page.querySelectorAll('.btnBrowseAllImages');
             for (var i = 0, length = btnBrowseAllImages.length; i < length; i++) {
-
                 if (providers.length) {
                     btnBrowseAllImages[i].classList.remove('hide');
                 } else {
@@ -60,7 +53,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
             }
 
             apiClient.getItemImageInfos(currentItem.Id).then(function (imageInfos) {
-
                 renderStandardImages(page, apiClient, item, imageInfos, providers);
                 renderBackdrops(page, apiClient, item, imageInfos, providers);
                 renderScreenshots(page, apiClient, item, imageInfos, providers);
@@ -74,7 +66,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function getImageUrl(item, apiClient, type, index, options) {
-
         options = options || {};
         options.type = type;
         options.index = index;
@@ -94,7 +85,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function getCardHtml(image, index, numImages, apiClient, imageProviders, imageSize, tagName, enableFooterButtons) {
-
         // TODO move card creation code to Card component
 
         var html = '';
@@ -153,7 +143,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
             html += '<div class="cardText cardTextCentered">';
 
             if (image.ImageType === 'Backdrop' || image.ImageType === 'Screenshot') {
-
                 if (index > 0) {
                     html += '<button type="button" is="paper-icon-button-light" class="btnMoveImage autoSize" data-imagetype="' + image.ImageType + '" data-index="' + image.ImageIndex + '" data-newindex="' + (image.ImageIndex - 1) + '" title="' + globalize.translate('MoveLeft') + '"><span class="material-icons chevron_left"></span></button>';
                 } else {
@@ -183,13 +172,10 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function deleteImage(context, itemId, type, index, apiClient, enableConfirmation) {
-
         var afterConfirm = function () {
             apiClient.deleteItemImage(itemId, type, index).then(function () {
-
                 hasChanges = true;
                 reload(context);
-
             });
         };
 
@@ -199,7 +185,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
         }
 
         require(['confirm'], function (confirm) {
-
             confirm.default({
 
                 text: globalize.translate('ConfirmDeleteImage'),
@@ -211,13 +196,10 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function moveImage(context, apiClient, itemId, type, index, newIndex, focusContext) {
-
         apiClient.updateItemImageIndex(itemId, type, index, newIndex).then(function () {
-
             hasChanges = true;
             reload(context, null, focusContext);
         }, function () {
-
             require(['alert'], function (alert) {
                 alert(globalize.translate('DefaultErrorMessage'));
             });
@@ -225,7 +207,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function renderImages(page, item, apiClient, images, imageProviders, elem) {
-
         var html = '';
 
         var imageSize = 300;
@@ -238,7 +219,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
         var enableFooterButtons = !layoutManager.tv;
 
         for (var i = 0, length = images.length; i < length; i++) {
-
             var image = images[i];
 
             html += getCardHtml(image, i, length, apiClient, imageProviders, imageSize, tagName, enableFooterButtons);
@@ -249,7 +229,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function renderStandardImages(page, apiClient, item, imageInfos, imageProviders) {
-
         var images = imageInfos.filter(function (i) {
             return i.ImageType !== 'Screenshot' && i.ImageType !== 'Backdrop' && i.ImageType !== 'Chapter';
         });
@@ -258,10 +237,8 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function renderBackdrops(page, apiClient, item, imageInfos, imageProviders) {
-
         var images = imageInfos.filter(function (i) {
             return i.ImageType === 'Backdrop';
-
         }).sort(function (a, b) {
             return a.ImageIndex - b.ImageIndex;
         });
@@ -275,10 +252,8 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function renderScreenshots(page, apiClient, item, imageInfos, imageProviders) {
-
         var images = imageInfos.filter(function (i) {
             return i.ImageType === 'Screenshot';
-
         }).sort(function (a, b) {
             return a.ImageIndex - b.ImageIndex;
         });
@@ -292,20 +267,15 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function showImageDownloader(page, imageType) {
-
         require(['imageDownloader'], function (ImageDownloader) {
-
             ImageDownloader.show(currentItem.Id, currentItem.ServerId, currentItem.Type, imageType).then(function () {
-
                 hasChanges = true;
                 reload(page);
             });
-
         });
     }
 
     function showActionSheet(context, imageCard) {
-
         var itemId = imageCard.getAttribute('data-id');
         var serverId = imageCard.getAttribute('data-serverid');
         var apiClient = connectionManager.getApiClient(serverId);
@@ -316,7 +286,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
         var numImages = parseInt(imageCard.getAttribute('data-numimages'));
 
         require(['actionsheet'], function (actionSheet) {
-
             var commands = [];
 
             commands.push({
@@ -353,9 +322,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
                 positionTo: imageCard
 
             }).then(function (id) {
-
                 switch (id) {
-
                     case 'delete':
                         deleteImage(context, itemId, type, index, apiClient, false);
                         break;
@@ -371,13 +338,11 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
                     default:
                         break;
                 }
-
             });
         });
     }
 
     function initEditor(context, options) {
-
         var uploadButtons = context.querySelectorAll('.btnOpenUploadMenu');
         var isFileInputSupported = appHost.supports('fileinput');
         for (var i = 0, length = uploadButtons.length; i < length; i++) {
@@ -392,7 +357,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
             var imageType = this.getAttribute('data-imagetype');
 
             require(['imageUploader'], function (imageUploader) {
-
                 imageUploader.show({
 
                     theme: options.theme,
@@ -401,7 +365,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
                     serverId: currentItem.ServerId
 
                 }).then(function (hasChanged) {
-
                     if (hasChanged) {
                         hasChanges = true;
                         reload(context);
@@ -440,7 +403,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
     }
 
     function showEditor(options, resolve, reject) {
-
         var itemId = options.itemId;
         var serverId = options.serverId;
 
@@ -449,7 +411,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
         require(['text!./imageeditor.template.html'], function (template) {
             var apiClient = connectionManager.getApiClient(serverId);
             apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
-
                 var dialogOptions = {
                     removeOnClose: true
                 };
@@ -474,7 +435,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
 
                 // Has to be assigned a z-index after the call to .open()
                 dlg.addEventListener('close', function () {
-
                     if (layoutManager.tv) {
                         scrollHelper.centerFocus.off(dlg, false);
                     }
@@ -493,7 +453,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
                 reload(dlg, item);
 
                 dlg.querySelector('.btnCancel').addEventListener('click', function () {
-
                     dialogHelper.close(dlg);
                 });
             });
@@ -502,9 +461,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
 
     return {
         show: function (options) {
-
             return new Promise(function (resolve, reject) {
-
                 hasChanges = false;
 
                 showEditor(options, resolve, reject);
diff --git a/src/components/images/imageLoader.js b/src/components/images/imageLoader.js
index 069d32fb8b..c9d3e6fdb2 100644
--- a/src/components/images/imageLoader.js
+++ b/src/components/images/imageLoader.js
@@ -133,11 +133,9 @@ import 'css!./style';
     }
 
     export function getPrimaryImageAspectRatio(items) {
-
         var values = [];
 
         for (var i = 0, length = items.length; i < length; i++) {
-
             var ratio = items[i].PrimaryImageAspectRatio || 0;
 
             if (!ratio) {
@@ -193,7 +191,6 @@ import 'css!./style';
     }
 
     export function fillImages(elems) {
-
         for (var i = 0, length = elems.length; i < length; i++) {
             var elem = elems[0];
             fillImage(elem);
diff --git a/src/components/itemContextMenu.js b/src/components/itemContextMenu.js
index 7c89f7aeae..173383d064 100644
--- a/src/components/itemContextMenu.js
+++ b/src/components/itemContextMenu.js
@@ -4,8 +4,6 @@ import connectionManager from 'connectionManager';
 import itemHelper from 'itemHelper';
 import appRouter from 'appRouter';
 import playbackManager from 'playbackManager';
-import loading from 'loading';
-import appSettings from 'appSettings';
 import browser from 'browser';
 import actionsheet from 'actionsheet';
 
@@ -144,7 +142,6 @@ import actionsheet from 'actionsheet';
         }
 
         if (item.CanDelete && options.deleteItem !== false) {
-
             if (item.Type === 'Playlist' || item.Type === 'BoxSet') {
                 commands.push({
                     name: globalize.translate('Delete'),
@@ -355,7 +352,7 @@ import actionsheet from 'actionsheet';
                     });
                     break;
                 case 'download':
-                    import('fileDownloader').then(({default: fileDownloader}) => {
+                    import('fileDownloader').then((fileDownloader) => {
                         const downloadHref = apiClient.getItemDownloadUrl(itemId);
                         fileDownloader.download([{
                             url: downloadHref,
diff --git a/src/components/itemHelper.js b/src/components/itemHelper.js
index 3508866bdb..55e9e10062 100644
--- a/src/components/itemHelper.js
+++ b/src/components/itemHelper.js
@@ -2,7 +2,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
     'use strict';
 
     function getDisplayName(item, options = {}) {
-
         if (!item) {
             throw new Error('null item passed into getDisplayName');
         }
@@ -22,7 +21,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         if (item.Type === 'Episode' && item.ParentIndexNumber === 0) {
             name = globalize.translate('ValueSpecialEpisodeName', name);
         } else if ((item.Type === 'Episode' || item.Type === 'Program') && item.IndexNumber != null && item.ParentIndexNumber != null && options.includeIndexNumber !== false) {
-
             var displayIndexNumber = item.IndexNumber;
 
             var number = displayIndexNumber;
@@ -35,7 +33,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
             }
 
             if (item.IndexNumberEnd) {
-
                 displayIndexNumber = item.IndexNumberEnd;
                 number += '-' + displayIndexNumber;
             }
@@ -49,7 +46,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
     }
 
     function supportsAddingToCollection(item) {
-
         var invalidTypes = ['Genre', 'MusicGenre', 'Studio', 'UserView', 'CollectionFolder', 'Audio', 'Program', 'Timer', 'SeriesTimer'];
 
         if (item.Type === 'Recording') {
@@ -62,7 +58,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
     }
 
     function supportsAddingToPlaylist(item) {
-
         if (item.Type === 'Program') {
             return false;
         }
@@ -96,7 +91,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
     }
 
     function canEdit(user, item) {
-
         var itemType = item.Type;
 
         if (itemType === 'UserRootFolder' || itemType === 'UserView') {
@@ -129,7 +123,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
     }
 
     function isLocalItem(item) {
-
         if (item && item.Id && item.Id.indexOf('local') === 0) {
             return true;
         }
@@ -144,7 +137,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         isLocalItem: isLocalItem,
 
         canIdentify: function (user, item) {
-
             var itemType = item.Type;
 
             if (itemType === 'Movie' ||
@@ -156,9 +148,7 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
                 itemType === 'MusicAlbum' ||
                 itemType === 'MusicArtist' ||
                 itemType === 'MusicVideo') {
-
                 if (user.Policy.IsAdministrator) {
-
                     if (!isLocalItem(item)) {
                         return true;
                     }
@@ -171,7 +161,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         canEdit: canEdit,
 
         canEditImages: function (user, item) {
-
             var itemType = item.Type;
 
             if (item.MediaType === 'Photo') {
@@ -180,7 +169,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
 
             if (itemType === 'UserView') {
                 if (user.Policy.IsAdministrator) {
-
                     return true;
                 }
 
@@ -197,7 +185,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         },
 
         canSync: function (user, item) {
-
             if (user && !user.Policy.EnableContentDownloading) {
                 return false;
             }
@@ -210,7 +197,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         },
 
         canShare: function (item, user) {
-
             if (item.Type === 'Program') {
                 return false;
             }
@@ -239,7 +225,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         },
 
         canMarkPlayed: function (item) {
-
             if (item.Type === 'Program') {
                 return false;
             }
@@ -269,7 +254,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         },
 
         canRate: function (item) {
-
             if (item.Type === 'Program'
                 || item.Type === 'Timer'
                 || item.Type === 'SeriesTimer'
@@ -284,7 +268,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         },
 
         canConvert: function (item, user) {
-
             if (!user.Policy.EnableMediaConversion) {
                 return false;
             }
@@ -320,16 +303,13 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         },
 
         canRefreshMetadata: function (item, user) {
-
             if (user.Policy.IsAdministrator) {
-
                 var collectionType = item.CollectionType;
                 if (collectionType === 'livetv') {
                     return false;
                 }
 
                 if (item.Type !== 'Timer' && item.Type !== 'SeriesTimer' && item.Type !== 'Program' && item.Type !== 'TvChannel' && !(item.Type === 'Recording' && item.Status !== 'Completed')) {
-
                     if (!isLocalItem(item)) {
                         return true;
                     }
@@ -340,7 +320,6 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         },
 
         supportsMediaSourceSelection: function (item) {
-
             if (item.MediaType !== 'Video') {
                 return false;
             }
diff --git a/src/components/itemidentifier/itemidentifier.js b/src/components/itemidentifier/itemidentifier.js
index e9231623ca..5630680fbf 100644
--- a/src/components/itemidentifier/itemidentifier.js
+++ b/src/components/itemidentifier/itemidentifier.js
@@ -35,7 +35,6 @@ import 'cardStyle';
     }
 
     function searchForIdentificationResults(page) {
-
         let lookupInfo = {
             ProviderIds: {}
         };
@@ -45,11 +44,9 @@ import 'cardStyle';
         const identifyField = page.querySelectorAll('.identifyField');
         let value;
         for (i = 0, length = identifyField.length; i < length; i++) {
-
             value = identifyField[i].value;
 
             if (value) {
-
                 if (identifyField[i].type === 'number') {
                     value = parseInt(value);
                 }
@@ -62,7 +59,6 @@ import 'cardStyle';
 
         const txtLookupId = page.querySelectorAll('.txtLookupId');
         for (i = 0, length = txtLookupId.length; i < length; i++) {
-
             value = txtLookupId[i].value;
 
             if (value) {
@@ -100,14 +96,12 @@ import 'cardStyle';
             dataType: 'json'
 
         }).then(results => {
-
             loading.hide();
             showIdentificationSearchResults(page, results);
         });
     }
 
     function showIdentificationSearchResults(page, results) {
-
         const identificationSearchResults = page.querySelector('.identificationSearchResults');
 
         page.querySelector('.popupIdentifyForm').classList.add('hide');
@@ -119,7 +113,6 @@ import 'cardStyle';
         let i;
         let length;
         for (i = 0, length = results.length; i < length; i++) {
-
             const result = results[i];
             html += getSearchResultHtml(result, i);
         }
@@ -133,17 +126,14 @@ import 'cardStyle';
             const currentResult = results[index];
 
             if (currentItem != null) {
-
                 showIdentifyOptions(page, currentResult);
             } else {
-
                 finishFindNewDialog(page, currentResult);
             }
         }
 
         const searchImages = elem.querySelectorAll('.card');
         for (i = 0, length = searchImages.length; i < length; i++) {
-
             searchImages[i].addEventListener('click', onSearchImageClick);
         }
 
@@ -161,7 +151,6 @@ import 'cardStyle';
     }
 
     function showIdentifyOptions(page, identifyResult) {
-
         const identifyOptionsForm = page.querySelector('.identifyOptionsForm');
 
         page.querySelector('.popupIdentifyForm').classList.add('hide');
@@ -193,7 +182,6 @@ import 'cardStyle';
     }
 
     function getSearchResultHtml(result, index) {
-
         // TODO move card creation code to Card component
 
         let html = '';
@@ -234,7 +222,6 @@ import 'cardStyle';
 
             html += `<div class="cardImageContainer coveredImage" style="background-image:url('${displayUrl}');"></div>`;
         } else {
-
             html += `<div class="cardImageContainer coveredImage defaultCardBackground defaultCardBackground1"><div class="cardText cardCenteredText">${result.Name}</div></div>`;
         }
         html += '</div>';
@@ -257,7 +244,6 @@ import 'cardStyle';
         }
 
         for (let i = 0; i < numLines; i++) {
-
             if (i === 0) {
                 html += '<div class="cardText cardText-first cardTextCentered">';
             } else {
@@ -279,7 +265,6 @@ import 'cardStyle';
     }
 
     function submitIdentficationResult(page) {
-
         loading.show();
 
         const options = {
@@ -295,14 +280,11 @@ import 'cardStyle';
             contentType: 'application/json'
 
         }).then(() => {
-
             hasChanges = true;
             loading.hide();
 
             dialogHelper.close(page);
-
         }, () => {
-
             loading.hide();
 
             dialogHelper.close(page);
@@ -310,15 +292,12 @@ import 'cardStyle';
     }
 
     function showIdentificationForm(page, item) {
-
         const apiClient = getApiClient();
 
         apiClient.getJSON(apiClient.getUrl(`Items/${item.Id}/ExternalIdInfos`)).then(idList => {
-
             let html = '';
 
             for (let i = 0, length = idList.length; i < length; i++) {
-
                 const idInfo = idList[i];
 
                 const id = `txtLookup${idInfo.Key}`;
@@ -340,11 +319,9 @@ import 'cardStyle';
             page.querySelector('#txtLookupName').value = '';
 
             if (item.Type === 'Person' || item.Type === 'BoxSet') {
-
                 page.querySelector('.fldLookupYear').classList.add('hide');
                 page.querySelector('#txtLookupYear').value = '';
             } else {
-
                 page.querySelector('.fldLookupYear').classList.remove('hide');
                 page.querySelector('#txtLookupYear').value = '';
             }
@@ -356,15 +333,12 @@ import 'cardStyle';
     }
 
     function showEditor(itemId) {
-
         loading.show();
 
         return import('text!./itemidentifier.template.html').then(({default: template}) => {
-
             const apiClient = getApiClient();
 
             apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => {
-
                 currentItem = item;
                 currentItemType = currentItem.Type;
 
@@ -406,21 +380,18 @@ import 'cardStyle';
                 dialogHelper.open(dlg);
 
                 dlg.querySelector('.popupIdentifyForm').addEventListener('submit', e => {
-
                     e.preventDefault();
                     searchForIdentificationResults(dlg);
                     return false;
                 });
 
                 dlg.querySelector('.identifyOptionsForm').addEventListener('submit', e => {
-
                     e.preventDefault();
                     submitIdentficationResult(dlg);
                     return false;
                 });
 
                 dlg.querySelector('.btnCancel').addEventListener('click', () => {
-
                     dialogHelper.close(dlg);
                 });
 
@@ -433,7 +404,6 @@ import 'cardStyle';
     }
 
     function onDialogClosed() {
-
         loading.hide();
         if (hasChanges) {
             currentResolve();
@@ -444,12 +414,10 @@ import 'cardStyle';
 
     // TODO investigate where this was used
     function showEditorFindNew(itemName, itemYear, itemType, resolveFunc) {
-
         currentItem = null;
         currentItemType = itemType;
 
         return import('text!./itemidentifier.template.html').then(({default: template}) => {
-
             const dialogOptions = {
                 size: 'small',
                 removeOnClose: true,
@@ -477,19 +445,16 @@ import 'cardStyle';
             dialogHelper.open(dlg);
 
             dlg.querySelector('.btnCancel').addEventListener('click', () => {
-
                 dialogHelper.close(dlg);
             });
 
             dlg.querySelector('.popupIdentifyForm').addEventListener('submit', e => {
-
                 e.preventDefault();
                 searchForIdentificationResults(dlg);
                 return false;
             });
 
             dlg.addEventListener('close', () => {
-
                 loading.hide();
                 const foundItem = hasChanges ? currentSearchResult : null;
 
@@ -503,16 +468,12 @@ import 'cardStyle';
     }
 
     function showIdentificationFormFindNew(dlg, itemName, itemYear, itemType) {
-
         dlg.querySelector('#txtLookupName').value = itemName;
 
         if (itemType === 'Person' || itemType === 'BoxSet') {
-
             dlg.querySelector('.fldLookupYear').classList.add('hide');
             dlg.querySelector('#txtLookupYear').value = '';
-
         } else {
-
             dlg.querySelector('.fldLookupYear').classList.remove('hide');
             dlg.querySelector('#txtLookupYear').value = itemYear;
         }
@@ -521,9 +482,7 @@ import 'cardStyle';
     }
 
     export function show(itemId, serverId) {
-
         return new Promise((resolve, reject) => {
-
             currentResolve = resolve;
             currentReject = reject;
             currentServerId = serverId;
@@ -534,9 +493,7 @@ import 'cardStyle';
     }
 
     export function showFindNew(itemName, itemYear, itemType, serverId) {
-
         return new Promise((resolve) => {
-
             currentServerId = serverId;
 
             hasChanges = false;
diff --git a/src/components/itemsrefresher.js b/src/components/itemsrefresher.js
index 6da74eef80..a210af31af 100644
--- a/src/components/itemsrefresher.js
+++ b/src/components/itemsrefresher.js
@@ -2,23 +2,19 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     'use strict';
 
     function onUserDataChanged(e, apiClient, userData) {
-
         var instance = this;
 
         var eventsToMonitor = getEventsToMonitor(instance);
 
         // TODO: Check user data change reason?
         if (eventsToMonitor.indexOf('markfavorite') !== -1) {
-
             instance.notifyRefreshNeeded();
         } else if (eventsToMonitor.indexOf('markplayed') !== -1) {
-
             instance.notifyRefreshNeeded();
         }
     }
 
     function getEventsToMonitor(instance) {
-
         var options = instance.options;
         var monitor = options ? options.monitorEvents : null;
         if (monitor) {
@@ -29,21 +25,17 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     function onTimerCreated(e, apiClient, data) {
-
         var instance = this;
 
         if (getEventsToMonitor(instance).indexOf('timers') !== -1) {
-
             instance.notifyRefreshNeeded();
             return;
         }
     }
 
     function onSeriesTimerCreated(e, apiClient, data) {
-
         var instance = this;
         if (getEventsToMonitor(instance).indexOf('seriestimers') !== -1) {
-
             instance.notifyRefreshNeeded();
             return;
         }
@@ -53,28 +45,23 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
         var instance = this;
 
         if (getEventsToMonitor(instance).indexOf('timers') !== -1) {
-
             instance.notifyRefreshNeeded();
             return;
         }
     }
 
     function onSeriesTimerCancelled(e, apiClient, data) {
-
         var instance = this;
         if (getEventsToMonitor(instance).indexOf('seriestimers') !== -1) {
-
             instance.notifyRefreshNeeded();
             return;
         }
     }
 
     function onLibraryChanged(e, apiClient, data) {
-
         var instance = this;
         var eventsToMonitor = getEventsToMonitor(instance);
         if (eventsToMonitor.indexOf('seriestimers') !== -1 || eventsToMonitor.indexOf('timers') !== -1) {
-
             // yes this is an assumption
             return;
         }
@@ -101,23 +88,18 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     function onPlaybackStopped(e, stopInfo) {
-
         var instance = this;
 
         var state = stopInfo.state;
 
         var eventsToMonitor = getEventsToMonitor(instance);
         if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Video') {
-
             if (eventsToMonitor.indexOf('videoplayback') !== -1) {
-
                 instance.notifyRefreshNeeded(true);
                 return;
             }
         } else if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Audio') {
-
             if (eventsToMonitor.indexOf('audioplayback') !== -1) {
-
                 instance.notifyRefreshNeeded(true);
                 return;
             }
@@ -125,7 +107,6 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     function addNotificationEvent(instance, name, handler, owner) {
-
         var localHandler = handler.bind(instance);
         owner = owner || serverNotifications;
         events.on(owner, name, localHandler);
@@ -133,7 +114,6 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     function removeNotificationEvent(instance, name, owner) {
-
         var handler = instance['event_' + name];
         if (handler) {
             owner = owner || serverNotifications;
@@ -143,7 +123,6 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     function ItemsRefresher(options) {
-
         this.options = options || {};
 
         addNotificationEvent(this, 'UserDataChanged', onUserDataChanged);
@@ -156,24 +135,19 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     ItemsRefresher.prototype.pause = function () {
-
         clearRefreshInterval(this, true);
 
         this.paused = true;
     };
 
     ItemsRefresher.prototype.resume = function (options) {
-
         this.paused = false;
 
         var refreshIntervalEndTime = this.refreshIntervalEndTime;
         if (refreshIntervalEndTime) {
-
             var remainingMs = refreshIntervalEndTime - new Date().getTime();
             if (remainingMs > 0 && !this.needsRefresh) {
-
                 resetRefreshInterval(this, remainingMs);
-
             } else {
                 this.needsRefresh = true;
                 this.refreshIntervalEndTime = null;
@@ -188,7 +162,6 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     };
 
     ItemsRefresher.prototype.refreshItems = function () {
-
         if (!this.fetchData) {
             return Promise.resolve();
         }
@@ -204,7 +177,6 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     };
 
     ItemsRefresher.prototype.notifyRefreshNeeded = function (isInForeground) {
-
         if (this.paused) {
             this.needsRefresh = true;
             return;
@@ -223,9 +195,7 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     };
 
     function clearRefreshInterval(instance, isPausing) {
-
         if (instance.refreshInterval) {
-
             clearInterval(instance.refreshInterval);
             instance.refreshInterval = null;
 
@@ -236,7 +206,6 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     function resetRefreshInterval(instance, intervalMs) {
-
         clearRefreshInterval(instance);
 
         if (!intervalMs) {
@@ -253,7 +222,6 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     function onDataFetched(result) {
-
         resetRefreshInterval(this);
 
         if (this.afterRefresh) {
@@ -262,7 +230,6 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
     }
 
     ItemsRefresher.prototype.destroy = function () {
-
         clearRefreshInterval(this);
 
         removeNotificationEvent(this, 'UserDataChanged');
diff --git a/src/components/layoutManager.js b/src/components/layoutManager.js
index 1428f3468d..bec7d4ae3b 100644
--- a/src/components/layoutManager.js
+++ b/src/components/layoutManager.js
@@ -16,7 +16,6 @@ define(['browser', 'appSettings', 'events'], function (browser, appSettings, eve
     }
 
     LayoutManager.prototype.setLayout = function (layout, save) {
-
         if (!layout || layout === 'auto') {
             this.autoLayout();
 
@@ -41,7 +40,6 @@ define(['browser', 'appSettings', 'events'], function (browser, appSettings, eve
     };
 
     LayoutManager.prototype.autoLayout = function () {
-
         // Take a guess at initial layout. The consuming app can override
         if (browser.mobile) {
             this.setLayout('mobile', false);
diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js
index 922b6abc20..6b20159130 100644
--- a/src/components/listview/listview.js
+++ b/src/components/listview/listview.js
@@ -18,9 +18,7 @@ import 'emby-ratingbutton';
 import 'emby-playstatebutton';
 
     function getIndex(item, options) {
-
         if (options.index === 'disc') {
-
             return item.ParentIndexNumber == null ? '' : globalize.translate('ValueDiscNumber', item.ParentIndexNumber);
         }
 
@@ -29,7 +27,6 @@ import 'emby-playstatebutton';
         let name;
 
         if (sortBy.indexOf('sortname') === 0) {
-
             if (item.Type === 'Episode') {
                 return '';
             }
@@ -45,11 +42,9 @@ import 'emby-playstatebutton';
             return name.toUpperCase();
         }
         if (sortBy.indexOf('officialrating') === 0) {
-
             return item.OfficialRating || globalize.translate('Unrated');
         }
         if (sortBy.indexOf('communityrating') === 0) {
-
             if (item.CommunityRating == null) {
                 return globalize.translate('Unrated');
             }
@@ -57,7 +52,6 @@ import 'emby-playstatebutton';
             return Math.floor(item.CommunityRating);
         }
         if (sortBy.indexOf('criticrating') === 0) {
-
             if (item.CriticRating == null) {
                 return globalize.translate('Unrated');
             }
@@ -65,7 +59,6 @@ import 'emby-playstatebutton';
             return Math.floor(item.CriticRating);
         }
         if (sortBy.indexOf('albumartist') === 0) {
-
             // SortName
             if (!item.AlbumArtist) {
                 return '';
@@ -84,7 +77,6 @@ import 'emby-playstatebutton';
     }
 
     function getImageUrl(item, width) {
-
         const apiClient = connectionManager.getApiClient(item.ServerId);
         let itemId;
 
@@ -114,7 +106,6 @@ import 'emby-playstatebutton';
     }
 
     function getChannelImageUrl(item, width) {
-
         const apiClient = connectionManager.getApiClient(item.ServerId);
         const options = {
             maxWidth: width * 2,
@@ -161,11 +152,9 @@ import 'emby-playstatebutton';
     }
 
     function getRightButtonsHtml(options) {
-
         let html = '';
 
         for (let i = 0, length = options.rightButtons.length; i < length; i++) {
-
             const button = options.rightButtons[i];
 
             html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="${button.id}" title="${button.title}"><span class="material-icons ${button.icon}"></span></button>`;
@@ -179,7 +168,6 @@ import 'emby-playstatebutton';
     }
 
     export function getListViewHtml(options) {
-
         const items = options.items;
 
         let groupTitle = '';
@@ -198,17 +186,14 @@ import 'emby-playstatebutton';
         const containerAlbumArtistIds = (options.containerAlbumArtists || []).map(getId);
 
         for (let i = 0, length = items.length; i < length; i++) {
-
             const item = items[i];
 
             let html = '';
 
             if (options.showIndex) {
-
                 const itemGroupTitle = getIndex(item, options);
 
                 if (itemGroupTitle !== groupTitle) {
-
                     if (html) {
                         html += '</div>';
                     }
@@ -258,20 +243,16 @@ import 'emby-playstatebutton';
             const channelIdData = item.ChannelId ? (` data-channelid="${item.ChannelId}"`) : '';
 
             if (enableContentWrapper) {
-
                 cssClass += ' listItem-withContentWrapper';
             }
 
             html += `<${outerTagName} class="${cssClass}"${playlistItemId} data-action="${action}" data-isfolder="${item.IsFolder}" data-id="${item.Id}" data-serverid="${item.ServerId}" data-type="${item.Type}"${mediaTypeData}${collectionTypeData}${channelIdData}${positionTicksData}${collectionIdData}${playlistIdData}>`;
 
             if (enableContentWrapper) {
-
                 html += '<div class="listItem-content">';
             }
 
             if (!clickEntireItem && options.dragHandle) {
-                //html += '<button is="paper-icon-button-light" class="listViewDragHandle listItemButton"><span class="material-icons drag_handle"></span></button>';
-                // Firefox and Edge are not allowing the button to be draggable
                 html += '<span class="listViewDragHandle material-icons listItemIcon listItemIcon-transparent drag_handle"></span>';
             }
 
@@ -319,7 +300,6 @@ import 'emby-playstatebutton';
             }
 
             if (options.showIndexNumberLeft) {
-
                 html += '<div class="listItem-indexnumberleft">';
                 html += (item.IndexNumber || '&nbsp;');
                 html += '</div>';
@@ -367,9 +347,7 @@ import 'emby-playstatebutton';
             }
 
             if (options.showParentTitle && options.parentTitleWithTitle) {
-
                 if (displayName) {
-
                     if (parentTitle) {
                         parentTitle += ' - ';
                     }
@@ -387,18 +365,15 @@ import 'emby-playstatebutton';
 
             if (item.IsFolder) {
                 if (options.artist !== false) {
-
                     if (item.AlbumArtist && item.Type === 'MusicAlbum') {
                         textlines.push(item.AlbumArtist);
                     }
                 }
             } else {
-
                 let showArtist = options.artist === true;
                 const artistItems = item.ArtistItems;
 
                 if (!showArtist && options.artist !== false) {
-
                     if (!artistItems || !artistItems.length) {
                         showArtist = true;
                     } else if (artistItems.length > 1 || !containerAlbumArtistIds.includes(artistItems[0].Id)) {
@@ -407,7 +382,6 @@ import 'emby-playstatebutton';
                 }
 
                 if (showArtist) {
-
                     if (artistItems && item.Type !== 'MusicAlbum') {
                         textlines.push(artistItems.map(a => {
                             return a.Name;
@@ -417,7 +391,6 @@ import 'emby-playstatebutton';
             }
 
             if (item.Type === 'TvChannel') {
-
                 if (item.CurrentProgram) {
                     textlines.push(itemHelper.getDisplayName(item.CurrentProgram));
                 }
@@ -438,7 +411,6 @@ import 'emby-playstatebutton';
 
             if (options.mediaInfo !== false) {
                 if (!enableSideMediaInfo) {
-
                     const mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText';
 
                     html += `<div class="${mediaInfoClass}">`;
@@ -483,7 +455,6 @@ import 'emby-playstatebutton';
             html += '<div class="listViewUserDataButtons">';
 
             if (!clickEntireItem) {
-
                 if (options.addToListButton) {
                     html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><span class="material-icons playlist_add"></span></button>';
                 }
@@ -497,7 +468,6 @@ import 'emby-playstatebutton';
                 }
 
                 if (options.enableUserDataButtons !== false) {
-
                     const userData = item.UserData || {};
                     const likes = userData.Likes == null ? '' : userData.Likes;
 
diff --git a/src/components/loading/loading.js b/src/components/loading/loading.js
index f36e41f44d..9f86ba452f 100644
--- a/src/components/loading/loading.js
+++ b/src/components/loading/loading.js
@@ -14,7 +14,6 @@ define(['css!./loading'], function () {
             var elem = loadingElem;
 
             if (!elem) {
-
                 elem = document.createElement('div');
                 loadingElem = elem;
 
@@ -56,7 +55,6 @@ define(['css!./loading'], function () {
             var elem = loadingElem;
 
             if (elem) {
-
                 elem.classList.remove('mdlSpinnerActive');
 
                 elem.classList.remove('mdl-spinner__layer-1-active');
diff --git a/src/components/maintabsmanager.js b/src/components/maintabsmanager.js
index 0d31c2958a..1be1cf622f 100644
--- a/src/components/maintabsmanager.js
+++ b/src/components/maintabsmanager.js
@@ -8,29 +8,10 @@ import 'emby-button';
 
     let tabOwnerView;
     const queryScope = document.querySelector('.skinHeader');
-    let footerTabsContainer;
     let headerTabsContainer;
     let tabsElem;
 
-    function enableTabsInFooter() {
-        return false;
-    }
-
-    function getTabsContainerElem() {
-    }
-
-    function ensureElements(enableInFooter) {
-
-        if (enableInFooter) {
-            if (!footerTabsContainer) {
-                footerTabsContainer = document.createElement('div');
-                footerTabsContainer.classList.add('footerTabs');
-                footerTabsContainer.classList.add('sectionTabs');
-                footerTabsContainer.classList.add('hide');
-                //appFooter.add(footerTabsContainer);
-            }
-        }
-
+    function ensureElements() {
         if (!headerTabsContainer) {
             headerTabsContainer = queryScope.querySelector('.headerTabs');
         }
@@ -42,9 +23,7 @@ import 'emby-button';
     }
 
     function allowSwipe(target) {
-
         function allowSwipeOn(elem) {
-
             if (dom.parentWithTag(elem, 'input')) {
                 return false;
             }
@@ -69,13 +48,11 @@ import 'emby-button';
     }
 
     function configureSwipeTabs(view, tabsElem, getTabContainersFn) {
-
         if (!browser.touch) {
             return;
         }
 
         // implement without hammer
-        const pageCount = getTabContainersFn().length;
         const onSwipeLeft = function (e, target) {
             if (allowSwipe(target) && view.contains(target)) {
                 tabsElem.selectNext();
@@ -89,7 +66,6 @@ import 'emby-button';
         };
 
         import('touchHelper').then(({default: TouchHelper}) => {
-
             const touchHelper = new TouchHelper(view.parentNode.parentNode);
 
             events.on(touchHelper, 'swipeleft', onSwipeLeft);
@@ -102,28 +78,19 @@ import 'emby-button';
     }
 
     export function setTabs(view, selectedIndex, getTabsFn, getTabContainersFn, onBeforeTabChange, onTabChange, setSelectedIndex) {
-
-        const enableInFooter = enableTabsInFooter();
-
         if (!view) {
             if (tabOwnerView) {
-
                 if (!headerTabsContainer) {
                     headerTabsContainer = queryScope.querySelector('.headerTabs');
                 }
 
-                ensureElements(enableInFooter);
+                ensureElements();
 
                 document.body.classList.remove('withSectionTabs');
 
                 headerTabsContainer.innerHTML = '';
                 headerTabsContainer.classList.add('hide');
 
-                if (footerTabsContainer) {
-                    footerTabsContainer.innerHTML = '';
-                    footerTabsContainer.classList.add('hide');
-                }
-
                 tabOwnerView = null;
             }
             return {
@@ -132,21 +99,19 @@ import 'emby-button';
             };
         }
 
-        ensureElements(enableInFooter);
+        ensureElements();
 
-        const tabsContainerElem = enableInFooter ? footerTabsContainer : headerTabsContainer;
+        const tabsContainerElem = headerTabsContainer;
 
         if (!tabOwnerView) {
             tabsContainerElem.classList.remove('hide');
         }
 
         if (tabOwnerView !== view) {
-
             let index = 0;
 
             const indexAttribute = selectedIndex == null ? '' : (' data-index="' + selectedIndex + '"');
             const tabsHtml = '<div is="emby-tabs"' + indexAttribute + ' class="tabs-viewmenubar"><div class="emby-tabs-slider" style="white-space:nowrap;">' + getTabsFn().map(function (t) {
-
                 let tabClass = 'emby-tab-button';
 
                 if (t.enabled === false) {
@@ -167,7 +132,6 @@ import 'emby-button';
 
                 index++;
                 return tabHtml;
-
             }).join('') + '</div></div>';
 
             tabsContainerElem.innerHTML = tabsHtml;
@@ -181,10 +145,8 @@ import 'emby-button';
             configureSwipeTabs(view, tabsElem, getTabContainersFn);
 
             tabsElem.addEventListener('beforetabchange', function (e) {
-
                 const tabContainers = getTabContainersFn();
                 if (e.detail.previousIndex != null) {
-
                     const previousPanel = tabContainers[e.detail.previousIndex];
                     if (previousPanel) {
                         previousPanel.classList.remove('is-active');
@@ -193,12 +155,6 @@ import 'emby-button';
 
                 const newPanel = tabContainers[e.detail.selectedTabIndex];
 
-                //if (e.detail.previousIndex != null && e.detail.previousIndex != e.detail.selectedTabIndex) {
-                //    if (newPanel.animate && (animateTabs || []).indexOf(e.detail.selectedTabIndex) != -1) {
-                //        fadeInRight(newPanel);
-                //    }
-                //}
-
                 if (newPanel) {
                     newPanel.classList.add('is-active');
                 }
@@ -215,16 +171,11 @@ import 'emby-button';
                 if (tabsElem.selectedIndex) {
                     tabsElem.selectedIndex(selectedIndex);
                 } else {
-
                     tabsElem.readySelectedIndex = selectedIndex;
                     tabsElem.addEventListener('ready', onViewTabsReady);
                 }
             }
 
-            //if (enableSwipe !== false) {
-            //    libraryBrowser.configureSwipeTabs(ownerpage, tabs);
-            //}
-
             return {
                 tabsContainer: tabsContainerElem,
                 tabs: tabsContainerElem.querySelector('[is="emby-tabs"]'),
@@ -247,7 +198,6 @@ import 'emby-button';
     }
 
     export function selectedTabIndex(index) {
-
         const tabsContainerElem = headerTabsContainer;
 
         if (!tabsElem) {
diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js
index 71acc5bbce..53982040b8 100644
--- a/src/components/mediainfo/mediainfo.js
+++ b/src/components/mediainfo/mediainfo.js
@@ -11,23 +11,19 @@ import 'emby-button';
 /* eslint-disable indent */
 
     function getTimerIndicator(item) {
-
         let status;
 
         if (item.Type === 'SeriesTimer') {
             return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_smart_record"></span>';
         } else if (item.TimerId || item.SeriesTimerId) {
-
             status = item.Status || 'Cancelled';
         } else if (item.Type === 'Timer') {
-
             status = item.Status;
         } else {
             return '';
         }
 
         if (item.SeriesTimerId) {
-
             if (status !== 'Cancelled') {
                 return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_smart_record"></span>';
             }
@@ -46,9 +42,7 @@ import 'emby-button';
         let date;
 
         if (item.StartDate && options.programTime !== false) {
-
             try {
-
                 text = '';
 
                 date = datetime.parseISO8601Date(item.StartDate);
@@ -75,7 +69,6 @@ import 'emby-button';
         }
 
         if (item.ChannelName) {
-
             if (options.interactive && item.ChannelId) {
                 miscInfo.push({
                     html: `<a is="emby-linkbutton" class="button-flat mediaInfoItem" href="${appRouter.getRouteUrl({
@@ -121,11 +114,9 @@ import 'emby-button';
         const showFolderRuntime = item.Type === 'MusicAlbum' || item.MediaType === 'MusicArtist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
 
         if (showFolderRuntime) {
-
             count = item.SongCount || item.ChildCount;
 
             if (count) {
-
                 miscInfo.push(globalize.translate('TrackCount', count));
             }
 
@@ -133,19 +124,15 @@ import 'emby-button';
                 miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
             }
         } else if (item.Type === 'PhotoAlbum' || item.Type === 'BoxSet') {
-
             count = item.ChildCount;
 
             if (count) {
-
                 miscInfo.push(globalize.translate('ItemCount', count));
             }
         }
 
         if ((item.Type === 'Episode' || item.MediaType === 'Photo') && options.originalAirDate !== false) {
-
             if (item.PremiereDate) {
-
                 try {
                     date = datetime.parseISO8601Date(item.PremiereDate);
 
@@ -159,7 +146,6 @@ import 'emby-button';
 
         if (item.Type === 'SeriesTimer') {
             if (item.RecordAnyTime) {
-
                 miscInfo.push(globalize.translate('Anytime'));
             } else {
                 miscInfo.push(datetime.getDisplayTime(item.StartDate));
@@ -173,7 +159,6 @@ import 'emby-button';
         }
 
         if (item.StartDate && item.Type !== 'Program' && item.Type !== 'SeriesTimer') {
-
             try {
                 date = datetime.parseISO8601Date(item.StartDate);
 
@@ -190,24 +175,18 @@ import 'emby-button';
         }
 
         if (options.year !== false && item.ProductionYear && item.Type === 'Series') {
-
             if (item.Status === 'Continuing') {
                 miscInfo.push(globalize.translate('SeriesYearToPresent', item.ProductionYear));
-
             } else if (item.ProductionYear) {
-
                 text = item.ProductionYear;
 
                 if (item.EndDate) {
-
                     try {
-
                         const endYear = datetime.parseISO8601Date(item.EndDate).getFullYear();
 
                         if (endYear !== item.ProductionYear) {
                             text += `-${datetime.parseISO8601Date(item.EndDate).getFullYear()}`;
                         }
-
                     } catch (e) {
                         console.error('error parsing date:', item.EndDate);
                     }
@@ -218,7 +197,6 @@ import 'emby-button';
         }
 
         if (item.Type === 'Program') {
-
             if (options.programIndicator !== false) {
                 if (item.IsLive) {
                     miscInfo.push({
@@ -240,7 +218,6 @@ import 'emby-button';
             }
 
             if ((item.IsSeries || item.EpisodeTitle) && options.episodeTitle !== false) {
-
                 text = itemHelper.getDisplayName(item, {
                     includeIndexNumber: options.episodeTitleIndexNumber
                 });
@@ -251,7 +228,6 @@ import 'emby-button';
             } else if (item.IsMovie && item.ProductionYear && options.originalAirDate !== false) {
                 miscInfo.push(item.ProductionYear);
             } else if (item.PremiereDate && options.originalAirDate !== false) {
-
                 try {
                     date = datetime.parseISO8601Date(item.PremiereDate);
                     text = globalize.translate('OriginalAirDateValue', datetime.toLocaleDateString(date));
@@ -266,12 +242,9 @@ import 'emby-button';
 
         if (options.year !== false) {
             if (item.Type !== 'Series' && item.Type !== 'Episode' && item.Type !== 'Person' && item.MediaType !== 'Photo' && item.Type !== 'Program' && item.Type !== 'Season') {
-
                 if (item.ProductionYear) {
-
                     miscInfo.push(item.ProductionYear);
                 } else if (item.PremiereDate) {
-
                     try {
                         text = datetime.parseISO8601Date(item.PremiereDate).getFullYear();
                         miscInfo.push(text);
@@ -283,11 +256,8 @@ import 'emby-button';
         }
 
         if (item.RunTimeTicks && item.Type !== 'Series' && item.Type !== 'Program' && item.Type !== 'Book' && !showFolderRuntime && options.runtime !== false) {
-
             if (item.Type === 'Audio') {
-
                 miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
-
             } else {
                 minutes = item.RunTimeTicks / 600000000;
 
@@ -327,7 +297,6 @@ import 'emby-button';
         }
 
         if (item.CriticRating && options.criticRating !== false) {
-
             if (item.CriticRating >= 60) {
                 html += `<div class="mediaInfoItem mediaInfoCriticRating mediaInfoCriticRatingFresh">${item.CriticRating}</div>`;
             } else {
@@ -336,7 +305,6 @@ import 'emby-button';
         }
 
         if (options.endsAt !== false) {
-
             const endsAt = getEndsAt(item);
             if (endsAt) {
                 html += getMediaInfoItem(endsAt, 'endsAt');
@@ -349,9 +317,7 @@ import 'emby-button';
     }
 
     export function getEndsAt(item) {
-
         if (item.MediaType === 'Video' && item.RunTimeTicks) {
-
             if (!item.StartDate) {
                 let endDate = new Date().getTime() + (item.RunTimeTicks / 10000);
                 endDate = new Date(endDate);
@@ -365,7 +331,6 @@ import 'emby-button';
     }
 
     export function getEndsAtFromPosition(runtimeTicks, positionTicks, includeText) {
-
         let endDate = new Date().getTime() + ((runtimeTicks - (positionTicks || 0)) / 10000);
         endDate = new Date(endDate);
 
@@ -378,12 +343,10 @@ import 'emby-button';
     }
 
     function getMediaInfoItem(m, cssClass) {
-
         cssClass = cssClass ? (`${cssClass} mediaInfoItem`) : 'mediaInfoItem';
         let mediaInfoText = m;
 
         if (typeof (m) !== 'string' && typeof (m) !== 'number') {
-
             if (m.html) {
                 return m.html;
             }
@@ -408,17 +371,13 @@ import 'emby-button';
     }
 
     function dynamicEndTime(elem, item) {
-
         const interval = setInterval(() => {
-
             if (!document.body.contains(elem)) {
-
                 clearInterval(interval);
                 return;
             }
 
             elem.innerHTML = getEndsAt(item);
-
         }, 60000);
     }
 
@@ -437,7 +396,6 @@ import 'emby-button';
     }
 
     function afterFill(elem, item, options) {
-
         if (options.endsAt !== false) {
             const endsAtElem = elem.querySelector('.endsAt');
             if (endsAtElem) {
@@ -452,7 +410,6 @@ import 'emby-button';
     }
 
     function onChannelLinkClick(e) {
-
         const channelId = this.getAttribute('data-id');
         const serverId = this.getAttribute('data-serverid');
 
@@ -463,7 +420,6 @@ import 'emby-button';
     }
 
     export function getPrimaryMediaInfoHtml(item, options) {
-
         options = options || {};
         if (options.interactive == null) {
             options.interactive = false;
@@ -473,7 +429,6 @@ import 'emby-button';
     }
 
     export function getSecondaryMediaInfoHtml(item, options) {
-
         options = options || {};
         if (options.interactive == null) {
             options.interactive = false;
@@ -486,12 +441,10 @@ import 'emby-button';
     }
 
     export function getResolutionText(i) {
-
         const width = i.Width;
         const height = i.Height;
 
         if (width && height) {
-
             if (width >= 3800 || height >= 2000) {
                 return '4K';
             }
@@ -514,19 +467,16 @@ import 'emby-button';
                 return '720p';
             }
             if (width >= 700 || height >= 400) {
-
                 if (i.IsInterlaced) {
                     return '480i';
                 }
                 return '480p';
             }
-
         }
         return null;
     }
 
     function getAudioStreamForDisplay(item) {
-
         if (!item.MediaSources) {
             return null;
         }
@@ -542,7 +492,6 @@ import 'emby-button';
     }
 
     export function getMediaInfoStats(item, options) {
-
         options = options || {};
 
         const list = [];
@@ -568,10 +517,6 @@ import 'emby-button';
             });
         }
 
-        //if (mediaSource.Container) {
-        //    html += '<div class="mediaInfoIcon mediaInfoText">' + mediaSource.Container + '</div>';
-        //}
-
         const resolutionText = getResolutionText(videoStream);
         if (resolutionText) {
             list.push({
@@ -591,19 +536,12 @@ import 'emby-button';
         let channelText;
 
         if (channels === 8) {
-
             channelText = '7.1';
-
         } else if (channels === 7) {
-
             channelText = '6.1';
-
         } else if (channels === 6) {
-
             channelText = '5.1';
-
         } else if (channels === 2) {
-
             channelText = '2.0';
         }
 
@@ -629,7 +567,6 @@ import 'emby-button';
         }
 
         if (item.DateCreated && itemHelper.enableDateAddedDisplay(item)) {
-
             const dateCreated = datetime.parseISO8601Date(item.DateCreated);
 
             list.push({
diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 9bf2da2003..be44e86b44 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -1,4 +1,3 @@
-import itemHelper from 'itemHelper';
 import dom from 'dom';
 import layoutManager from 'layoutManager';
 import dialogHelper from 'dialogHelper';
@@ -31,16 +30,13 @@ import 'flexStyles';
     }
 
     function closeDialog(isSubmitted) {
-
         if (isDialog()) {
             dialogHelper.close(currentContext);
         }
     }
 
     function submitUpdatedItem(form, item) {
-
         function afterContentTypeUpdated() {
-
             require(['toast'], function (toast) {
                 toast(globalize.translate('MessageItemSaved'));
             });
@@ -52,11 +48,9 @@ import 'flexStyles';
         const apiClient = getApiClient();
 
         apiClient.updateItem(item).then(function () {
-
             const newContentType = form.querySelector('#selectContentType').value || '';
 
             if ((metadataEditorInfo.ContentType || '') !== newContentType) {
-
                 apiClient.ajax({
 
                     url: apiClient.getUrl('Items/' + item.Id + '/ContentType', {
@@ -68,11 +62,9 @@ import 'flexStyles';
                 }).then(function () {
                     afterContentTypeUpdated();
                 });
-
             } else {
                 afterContentTypeUpdated();
             }
-
         });
     }
 
@@ -84,13 +76,9 @@ import 'flexStyles';
     }
 
     function getAlbumArtists(form) {
-
         return form.querySelector('#txtAlbumArtist').value.trim().split(';').filter(function (s) {
-
             return s.length > 0;
-
         }).map(function (a) {
-
             return {
                 Name: a
             };
@@ -98,13 +86,9 @@ import 'flexStyles';
     }
 
     function getArtists(form) {
-
         return form.querySelector('#txtArtist').value.trim().split(';').filter(function (s) {
-
             return s.length > 0;
-
         }).map(function (a) {
-
             return {
                 Name: a
             };
@@ -112,7 +96,6 @@ import 'flexStyles';
     }
 
     function getDateValue(form, element, property) {
-
         let val = form.querySelector(element).value;
 
         if (!val) {
@@ -120,14 +103,12 @@ import 'flexStyles';
         }
 
         if (currentItem[property]) {
-
             const date = datetime.parseISO8601Date(currentItem[property], true);
 
             const parts = date.toISOString().split('T');
 
             // If the date is the same, preserve the time
             if (parts[0].indexOf(val) === 0) {
-
                 const iso = parts[1];
 
                 val += 'T' + iso;
@@ -138,7 +119,6 @@ import 'flexStyles';
     }
 
     function onSubmit(e) {
-
         loading.show();
 
         const form = this;
@@ -199,14 +179,12 @@ import 'flexStyles';
         item.PreferredMetadataCountryCode = form.querySelector('#selectCountry').value;
 
         if (currentItem.Type === 'Person') {
-
             const placeOfBirth = form.querySelector('#txtPlaceOfBirth').value;
 
             item.ProductionLocations = placeOfBirth ? [placeOfBirth] : [];
         }
 
         if (currentItem.Type === 'Series') {
-
             // 600000000
             const seriesRuntime = form.querySelector('#txtSeriesRuntime').value;
             item.RunTimeTicks = seriesRuntime ? (seriesRuntime * 600000000) : null;
@@ -249,11 +227,8 @@ import 'flexStyles';
     }
 
     function editPerson(context, person, index) {
-
         require(['personEditor'], function (personEditor) {
-
             personEditor.show(person).then(function (updatedPerson) {
-
                 const isNew = index === -1;
 
                 if (isNew) {
@@ -303,7 +278,6 @@ import 'flexStyles';
     }
 
     function onEditorClick(e) {
-
         const btnRemoveFromEditorList = dom.parentWithClass(e.target, 'btnRemoveFromEditorList');
         if (btnRemoveFromEditorList) {
             removeElementFromList(btnRemoveFromEditorList);
@@ -376,12 +350,10 @@ import 'flexStyles';
         form.addEventListener('submit', onSubmit);
 
         context.querySelector('#btnAddPerson').addEventListener('click', function (event, data) {
-
             editPerson(context, {}, -1);
         });
 
         context.querySelector('#peopleList').addEventListener('click', function (e) {
-
             let index;
             const btnDeletePerson = dom.parentWithClass(e.target, 'btnDeletePerson');
             if (btnDeletePerson) {
@@ -399,7 +371,6 @@ import 'flexStyles';
     }
 
     function getItem(itemId, serverId) {
-
         const apiClient = connectionManager.getApiClient(serverId);
 
         if (itemId) {
@@ -410,7 +381,6 @@ import 'flexStyles';
     }
 
     function getEditorConfig(itemId, serverId) {
-
         const apiClient = connectionManager.getApiClient(serverId);
 
         if (itemId) {
@@ -421,13 +391,11 @@ import 'flexStyles';
     }
 
     function populateCountries(select, allCountries) {
-
         let html = '';
 
         html += "<option value=''></option>";
 
         for (let i = 0, length = allCountries.length; i < length; i++) {
-
             const culture = allCountries[i];
 
             html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + '</option>';
@@ -437,13 +405,11 @@ import 'flexStyles';
     }
 
     function populateLanguages(select, languages) {
-
         let html = '';
 
         html += "<option value=''></option>";
 
         for (let i = 0, length = languages.length; i < length; i++) {
-
             const culture = languages[i];
 
             html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + '</option>';
@@ -453,7 +419,6 @@ import 'flexStyles';
     }
 
     function renderContentTypeOptions(context, metadataInfo) {
-
         if (!metadataInfo.ContentTypeOptions.length) {
             hideElement('#fldContentType', context);
         } else {
@@ -461,9 +426,7 @@ import 'flexStyles';
         }
 
         const html = metadataInfo.ContentTypeOptions.map(function (i) {
-
             return '<option value="' + i.Value + '">' + i.Name + '</option>';
-
         }).join('');
 
         const selectEl = context.querySelector('#selectContentType');
@@ -472,13 +435,11 @@ import 'flexStyles';
     }
 
     function loadExternalIds(context, item, externalIds) {
-
         let html = '';
 
         const providerIds = item.ProviderIds || {};
 
         for (let i = 0, length = externalIds.length; i < length; i++) {
-
             const idInfo = externalIds[i];
 
             const id = 'txt1' + idInfo.Key;
@@ -524,7 +485,6 @@ import 'flexStyles';
     function hideElement(selector, context, multiple) {
         context = context || document;
         if (typeof selector === 'string') {
-
             const elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)];
 
             Array.prototype.forEach.call(elements, function (el) {
@@ -543,7 +503,6 @@ import 'flexStyles';
     function showElement(selector, context, multiple) {
         context = context || document;
         if (typeof selector === 'string') {
-
             const elements = multiple ? context.querySelectorAll(selector) : [context.querySelector(selector)];
 
             Array.prototype.forEach.call(elements, function (el) {
@@ -745,7 +704,6 @@ import 'flexStyles';
     }
 
     function fillItemInfo(context, item, parentalRatingOptions) {
-
         let select = context.querySelector('#selectOfficialRating');
 
         populateRatings(parentalRatingOptions, select, item.OfficialRating);
@@ -867,7 +825,6 @@ import 'flexStyles';
         context.querySelector('#selectCountry').value = item.PreferredMetadataCountryCode || '';
 
         if (item.RunTimeTicks) {
-
             const minutes = item.RunTimeTicks / 600000000;
 
             context.querySelector('#txtSeriesRuntime').value = Math.round(minutes);
@@ -877,7 +834,6 @@ import 'flexStyles';
     }
 
     function populateRatings(allParentalRatings, select, currentValue) {
-
         let html = '';
 
         html += "<option value=''></option>";
@@ -888,7 +844,6 @@ import 'flexStyles';
         let currentValueFound = false;
 
         for (let i = 0, length = allParentalRatings.length; i < length; i++) {
-
             rating = allParentalRatings[i];
 
             ratings.push({ Name: rating.Name, Value: rating.Name });
@@ -903,7 +858,6 @@ import 'flexStyles';
         }
 
         for (let i = 0, length = ratings.length; i < length; i++) {
-
             rating = ratings[i];
 
             html += "<option value='" + rating.Value + "'>" + rating.Name + '</option>';
@@ -922,7 +876,6 @@ import 'flexStyles';
     }
 
     function populateListView(list, items, sortCallback) {
-
         items = items || [];
         if (typeof (sortCallback) === 'undefined') {
             items.sort(function (a, b) {
@@ -954,14 +907,12 @@ import 'flexStyles';
     }
 
     function populatePeople(context, people) {
-
         let lastType = '';
         let html = '';
 
         const elem = context.querySelector('#peopleList');
 
         for (let i = 0, length = people.length; i < length; i++) {
-
             const person = people[i];
 
             html += '<div class="listItem">';
@@ -991,10 +942,8 @@ import 'flexStyles';
     }
 
     function getLockedFieldsHtml(fields, currentFields) {
-
         let html = '';
         for (let i = 0; i < fields.length; i++) {
-
             const field = fields[i];
             const name = field.name;
             const value = field.value || field.name;
@@ -1041,11 +990,9 @@ import 'flexStyles';
     }
 
     function reload(context, itemId, serverId) {
-
         loading.show();
 
         Promise.all([getItem(itemId, serverId), getEditorConfig(itemId, serverId)]).then(function (responses) {
-
             const item = responses[0];
             metadataEditorInfo = responses[1];
 
@@ -1137,7 +1084,6 @@ import 'flexStyles';
 
         embed: function (elem, itemId, serverId) {
             return new Promise(function (resolve, reject) {
-
                 loading.show();
 
                 import('text!./metadataEditor.template.html').then(({default: template}) => {
diff --git a/src/components/metadataEditor/personEditor.js b/src/components/metadataEditor/personEditor.js
index 2349f40e7b..8326971247 100644
--- a/src/components/metadataEditor/personEditor.js
+++ b/src/components/metadataEditor/personEditor.js
@@ -1,7 +1,6 @@
 import dialogHelper from 'dialogHelper';
 import layoutManager from 'layoutManager';
 import globalize from 'globalize';
-import require from 'require';
 import 'paper-icon-button-light';
 import 'emby-input';
 import 'emby-select';
@@ -18,9 +17,7 @@ import 'css!./../formdialog';
 
     function show(person) {
         return new Promise(function (resolve, reject) {
-
             import('text!./personEditor.template.html').then(({default: template}) => {
-
                 const dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
@@ -54,7 +51,6 @@ import 'css!./../formdialog';
                 dialogHelper.open(dlg);
 
                 dlg.addEventListener('close', function () {
-
                     if (layoutManager.tv) {
                         centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                     }
@@ -67,7 +63,6 @@ import 'css!./../formdialog';
                 });
 
                 dlg.querySelector('.selectPersonType').addEventListener('change', function (e) {
-
                     if (this.value === 'Actor') {
                         dlg.querySelector('.fldRole').classList.remove('hide');
                     } else {
@@ -76,12 +71,10 @@ import 'css!./../formdialog';
                 });
 
                 dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
-
                     dialogHelper.close(dlg);
                 });
 
                 dlg.querySelector('form').addEventListener('submit', function (e) {
-
                     submitted = true;
 
                     person.Name = dlg.querySelector('.txtPersonName', dlg).value;
diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js
index 87696909af..d922aee84a 100644
--- a/src/components/multiSelect/multiSelect.js
+++ b/src/components/multiSelect/multiSelect.js
@@ -13,10 +13,8 @@ import 'css!./multiSelect';
     let currentSelectionCommandsPanel;
 
     function hideSelections() {
-
         const selectionCommandsPanel = currentSelectionCommandsPanel;
         if (selectionCommandsPanel) {
-
             selectionCommandsPanel.parentNode.removeChild(selectionCommandsPanel);
             currentSelectionCommandsPanel = null;
 
@@ -24,7 +22,6 @@ import 'css!./multiSelect';
             selectedElements = [];
             const elems = document.querySelectorAll('.itemSelectionPanel');
             for (let i = 0, length = elems.length; i < length; i++) {
-
                 const parent = elems[i].parentNode;
                 parent.removeChild(elems[i]);
                 parent.classList.remove('withMultiSelect');
@@ -33,13 +30,11 @@ import 'css!./multiSelect';
     }
 
     function onItemSelectionPanelClick(e, itemSelectionPanel) {
-
         // toggle the checkbox, if it wasn't clicked on
         if (!dom.parentWithClass(e.target, 'chkItemSelect')) {
             const chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
 
             if (chkItemSelect) {
-
                 if (chkItemSelect.classList.contains('checkedInitial')) {
                     chkItemSelect.classList.remove('checkedInitial');
                 } else {
@@ -56,11 +51,9 @@ import 'css!./multiSelect';
     }
 
     function updateItemSelection(chkItemSelect, selected) {
-
         const id = dom.parentWithAttribute(chkItemSelect, 'data-id').getAttribute('data-id');
 
         if (selected) {
-
             const current = selectedItems.filter(i => {
                 return i === id;
             });
@@ -69,7 +62,6 @@ import 'css!./multiSelect';
                 selectedItems.push(id);
                 selectedElements.push(chkItemSelect);
             }
-
         } else {
             selectedItems = selectedItems.filter(i => {
                 return i !== id;
@@ -94,11 +86,9 @@ import 'css!./multiSelect';
     }
 
     function showSelection(item, isChecked) {
-
         let itemSelectionPanel = item.querySelector('.itemSelectionPanel');
 
         if (!itemSelectionPanel) {
-
             itemSelectionPanel = document.createElement('div');
             itemSelectionPanel.classList.add('itemSelectionPanel');
 
@@ -120,11 +110,9 @@ import 'css!./multiSelect';
     }
 
     function showSelectionCommands() {
-
         let selectionCommandsPanel = currentSelectionCommandsPanel;
 
         if (!selectionCommandsPanel) {
-
             selectionCommandsPanel = document.createElement('div');
             selectionCommandsPanel.classList.add('selectionCommandsPanel');
 
@@ -150,9 +138,7 @@ import 'css!./multiSelect';
     }
 
     function alertText(options) {
-
         return new Promise((resolve, reject) => {
-
             import('alert').then(({default: alert}) => {
                 alert(options).then(resolve, resolve);
             });
@@ -160,9 +146,7 @@ import 'css!./multiSelect';
     }
 
     function deleteItems(apiClient, itemIds) {
-
         return new Promise((resolve, reject) => {
-
             let msg = globalize.translate('ConfirmDeleteItem');
             let title = globalize.translate('HeaderDeleteItem');
 
@@ -172,28 +156,23 @@ import 'css!./multiSelect';
             }
 
             import('confirm').then(({default: confirm}) => {
-
                 confirm(msg, title).then(() => {
                     const promises = itemIds.map(itemId => {
                         apiClient.deleteItem(itemId);
                     });
 
                     Promise.all(promises).then(resolve, () => {
-
                         alertText(globalize.translate('ErrorDeletingItem')).then(reject, reject);
                     });
                 }, reject);
-
             });
         });
     }
 
     function showMenuForSelectedItems(e) {
-
         const apiClient = connectionManager.currentApiClient();
 
         apiClient.getCurrentUser().then(user => {
-
             const menuItems = [];
 
             menuItems.push({
@@ -317,17 +296,14 @@ import 'css!./multiSelect';
                         }
                     }
                 });
-
             });
         });
     }
 
     function dispatchNeedsRefresh() {
-
         const elems = [];
 
         [].forEach.call(selectedElements, i => {
-
             const container = dom.parentWithAttribute(i, 'is', 'emby-itemscontainer');
 
             if (container && !elems.includes(container)) {
@@ -341,9 +317,7 @@ import 'css!./multiSelect';
     }
 
     function combineVersions(apiClient, selection) {
-
         if (selection.length < 2) {
-
             import('alert').then(({default: alert}) => {
                 alert({
 
@@ -361,7 +335,6 @@ import 'css!./multiSelect';
             url: apiClient.getUrl('Videos/MergeVersions', { Ids: selection.join(',') })
 
         }).then(() => {
-
             loading.hide();
             hideSelections();
             dispatchNeedsRefresh();
@@ -369,7 +342,6 @@ import 'css!./multiSelect';
     }
 
     function showSelections(initialCard) {
-
         import('emby-checkbox').then(() => {
             const cards = document.querySelectorAll('.card');
             for (let i = 0, length = cards.length; i < length; i++) {
@@ -382,11 +354,9 @@ import 'css!./multiSelect';
     }
 
     function onContainerClick(e) {
-
         const target = e.target;
 
         if (selectedItems.length) {
-
             const card = dom.parentWithClass(target, 'card');
             if (card) {
                 const itemSelectionPanel = card.querySelector('.itemSelectionPanel');
@@ -404,17 +374,14 @@ import 'css!./multiSelect';
     document.addEventListener('viewbeforehide', hideSelections);
 
     export default function (options) {
-
         const self = this;
 
         const container = options.container;
 
         function onTapHold(e) {
-
             const card = dom.parentWithClass(e.target, 'card');
 
             if (card) {
-
                 showSelections(card);
             }
 
@@ -427,7 +394,6 @@ import 'css!./multiSelect';
         }
 
         function getTouches(e) {
-
             return e.changedTouches || e.targetTouches || e.touches;
         }
 
@@ -436,7 +402,6 @@ import 'css!./multiSelect';
         let touchStartX;
         let touchStartY;
         function onTouchStart(e) {
-
             const touch = getTouches(e)[0];
             touchTarget = null;
             touchStartX = 0;
@@ -451,7 +416,6 @@ import 'css!./multiSelect';
                     const card = dom.parentWithClass(element, 'card');
 
                     if (card) {
-
                         if (touchStartTimeout) {
                             clearTimeout(touchStartTimeout);
                             touchStartTimeout = null;
@@ -465,7 +429,6 @@ import 'css!./multiSelect';
         }
 
         function onTouchMove(e) {
-
             if (touchTarget) {
                 const touch = getTouches(e)[0];
                 let deltaX;
@@ -487,12 +450,10 @@ import 'css!./multiSelect';
         }
 
         function onTouchEnd(e) {
-
             onMouseOut(e);
         }
 
         function onMouseDown(e) {
-
             if (touchStartTimeout) {
                 clearTimeout(touchStartTimeout);
                 touchStartTimeout = null;
@@ -503,7 +464,6 @@ import 'css!./multiSelect';
         }
 
         function onMouseOut(e) {
-
             if (touchStartTimeout) {
                 clearTimeout(touchStartTimeout);
                 touchStartTimeout = null;
@@ -512,7 +472,6 @@ import 'css!./multiSelect';
         }
 
         function onTouchStartTimerFired() {
-
             if (!touchTarget) {
                 return;
             }
@@ -521,13 +480,11 @@ import 'css!./multiSelect';
             touchTarget = null;
 
             if (card) {
-
                 showSelections(card);
             }
         }
 
         function initTapHold(element) {
-
             // mobile safari doesn't allow contextmenu override
             if (browser.touch && !browser.safari) {
                 element.addEventListener('contextmenu', onTapHold);
@@ -565,7 +522,6 @@ import 'css!./multiSelect';
         self.onContainerClick = onContainerClick;
 
         self.destroy = () => {
-
             container.removeEventListener('click', onContainerClick);
             container.removeEventListener('contextmenu', onTapHold);
 
@@ -580,10 +536,6 @@ import 'css!./multiSelect';
             dom.removeEventListener(element, 'touchend', onTouchEnd, {
                 passive: true
             });
-            // this fires in safari due to magnifying class
-            //dom.removeEventListener(element, "touchcancel", onTouchEnd, {
-            //    passive: true
-            //});
             dom.removeEventListener(element, 'mousedown', onMouseDown, {
                 passive: true
             });
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index c8480e4f15..b4647bbf25 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -44,7 +44,6 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     }
 
     function showNonPersistentNotification(title, options, timeoutMs) {
-
         try {
             var notif = new Notification(title, options); /* eslint-disable-line compat/compat */
 
@@ -66,7 +65,6 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     }
 
     function showNotification(options, timeoutMs, apiClient) {
-
         var title = options.title;
 
         options.data = options.data || {};
@@ -85,7 +83,6 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     }
 
     function showNewItemNotification(item, apiClient) {
-
         if (playbackManager.isPlayingLocally(['Video'])) {
             return;
         }
@@ -101,17 +98,12 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
             body: body,
             vibrate: true,
             tag: 'newItem' + item.Id,
-            data: {
-                //options: {
-                //    url: LibraryBrowser.getHref(item)
-                //}
-            }
+            data: {}
         };
 
         var imageTags = item.ImageTags || {};
 
         if (imageTags.Primary) {
-
             notification.icon = apiClient.getScaledImageUrl(item.Id, {
                 width: 80,
                 tag: imageTags.Primary,
@@ -123,7 +115,6 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     }
 
     function onLibraryChanged(data, apiClient) {
-
         var newItems = data.ItemsAdded;
 
         if (!newItems.length) {
@@ -147,11 +138,9 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
             EnableTotalRecordCount: false
 
         }).then(function (result) {
-
             var items = result.Items;
 
             for (var i = 0, length = items.length ; i < length; i++) {
-
                 showNewItemNotification(items[i], apiClient);
             }
         });
@@ -163,9 +152,7 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     }
 
     function showPackageInstallNotification(apiClient, installation, status) {
-
         apiClient.getCurrentUser().then(function (user) {
-
             if (!user.Policy.IsAdministrator) {
                 return;
             }
@@ -199,7 +186,6 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
             }
 
             if (status === 'progress') {
-
                 var percentComplete = Math.round(installation.PercentComplete || 0);
 
                 notification.body = percentComplete + '% complete.';
@@ -250,7 +236,6 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     });
 
     events.on(serverNotifications, 'RestartRequired', function (e, apiClient) {
-
         var serverId = apiClient.serverInfo().Id;
         var notification = {
             tag: 'restart' + serverId,
diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index ed46131292..d411dcc620 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -1,6 +1,4 @@
-import require from 'require';
 import datetime from 'datetime';
-import itemHelper from 'itemHelper';
 import events from 'events';
 import browser from 'browser';
 import imageLoader from 'imageLoader';
@@ -39,7 +37,6 @@ import 'emby-ratingbutton';
     let isVisibilityAllowed = true;
 
     function getNowPlayingBarHtml() {
-
         let html = '';
 
         html += '<div class="nowPlayingBar hide nowPlayingBar-hidden">';
@@ -99,12 +96,10 @@ import 'emby-ratingbutton';
     }
 
     function onSlideDownComplete() {
-
         this.classList.add('hide');
     }
 
     function slideDown(elem) {
-
         // trigger reflow
         void elem.offsetWidth;
 
@@ -116,7 +111,6 @@ import 'emby-ratingbutton';
     }
 
     function slideUp(elem) {
-
         dom.removeEventListener(elem, dom.whichTransitionEvent(), onSlideDownComplete, {
             once: true
         });
@@ -134,7 +128,6 @@ import 'emby-ratingbutton';
     }
 
     function bindEvents(elem) {
-
         currentTimeElement = elem.querySelector('.nowPlayingBarCurrentTime');
         nowPlayingImageElement = elem.querySelector('.nowPlayingImage');
         nowPlayingTextElement = elem.querySelector('.nowPlayingBarText');
@@ -147,15 +140,12 @@ import 'emby-ratingbutton';
         volumeSliderContainer = elem.querySelector('.nowPlayingBarVolumeSliderContainer');
 
         muteButton.addEventListener('click', function () {
-
             if (currentPlayer) {
                 playbackManager.toggleMute(currentPlayer);
             }
-
         });
 
         elem.querySelector('.stopButton').addEventListener('click', function () {
-
             if (currentPlayer) {
                 playbackManager.stop(currentPlayer);
             }
@@ -166,7 +156,6 @@ import 'emby-ratingbutton';
         });
 
         elem.querySelector('.nextTrackButton').addEventListener('click', function () {
-
             if (currentPlayer) {
                 playbackManager.nextTrack(currentPlayer);
             }
@@ -226,18 +215,14 @@ import 'emby-ratingbutton';
         });
 
         positionSlider.addEventListener('change', function () {
-
             if (currentPlayer) {
-
                 const newPercent = parseFloat(this.value);
 
                 playbackManager.seekPercent(newPercent, currentPlayer);
             }
-
         });
 
         positionSlider.getBubbleText = function (value) {
-
             const state = lastPlayerState;
 
             if (!state || !state.NowPlayingItem || !currentRuntimeTicks) {
@@ -252,7 +237,6 @@ import 'emby-ratingbutton';
         };
 
         elem.addEventListener('click', function (e) {
-
             if (!dom.parentWithTag(e.target, ['BUTTON', 'INPUT'])) {
                 showRemoteControl();
             }
@@ -260,7 +244,6 @@ import 'emby-ratingbutton';
     }
 
     function showRemoteControl() {
-
         import('appRouter').then(({default: appRouter}) => {
             appRouter.showNowPlaying();
         });
@@ -268,7 +251,6 @@ import 'emby-ratingbutton';
 
     let nowPlayingBarElement;
     function getNowPlayingBar() {
-
         if (nowPlayingBarElement) {
             return Promise.resolve(nowPlayingBarElement);
         }
@@ -329,7 +311,6 @@ import 'emby-ratingbutton';
     }
 
     function updatePlayerStateInternal(event, state, player) {
-
         showNowPlayingBar();
 
         lastPlayerState = state;
@@ -417,7 +398,6 @@ import 'emby-ratingbutton';
     }
 
     function updatePlayerVolumeState(isMuted, volumeLevel) {
-
         const supportedCommands = currentPlayerSupportedCommands;
 
         let showMuteButton = true;
@@ -448,7 +428,6 @@ import 'emby-ratingbutton';
 
         // See bindEvents for why this is necessary
         if (volumeSlider) {
-
             volumeSliderContainer.classList.toggle('hide', !showVolumeSlider);
 
             if (!volumeSlider.dragging) {
@@ -458,7 +437,6 @@ import 'emby-ratingbutton';
     }
 
     function seriesImageUrl(item, options) {
-
         if (!item) {
             throw new Error('item cannot be null!');
         }
@@ -471,9 +449,7 @@ import 'emby-ratingbutton';
         options.type = options.type || 'Primary';
 
         if (options.type === 'Primary') {
-
             if (item.SeriesPrimaryImageTag) {
-
                 options.tag = item.SeriesPrimaryImageTag;
 
                 return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
@@ -481,15 +457,12 @@ import 'emby-ratingbutton';
         }
 
         if (options.type === 'Thumb') {
-
             if (item.SeriesThumbImageTag) {
-
                 options.tag = item.SeriesThumbImageTag;
 
                 return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
             }
             if (item.ParentThumbImageTag) {
-
                 options.tag = item.ParentThumbImageTag;
 
                 return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
@@ -500,7 +473,6 @@ import 'emby-ratingbutton';
     }
 
     function imageUrl(item, options) {
-
         if (!item) {
             throw new Error('item cannot be null!');
         }
@@ -509,13 +481,11 @@ import 'emby-ratingbutton';
         options.type = options.type || 'Primary';
 
         if (item.ImageTags && item.ImageTags[options.type]) {
-
             options.tag = item.ImageTags[options.type];
             return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
         }
 
         if (item.AlbumId && item.AlbumPrimaryImageTag) {
-
             options.tag = item.AlbumPrimaryImageTag;
             return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
         }
@@ -525,7 +495,6 @@ import 'emby-ratingbutton';
 
     let currentImgUrl;
     function updateNowPlayingInfo(state) {
-
         const nowPlayingItem = state.NowPlayingItem;
 
         const textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
@@ -579,7 +548,6 @@ import 'emby-ratingbutton';
 
         if (nowPlayingItem.Id) {
             if (isRefreshing) {
-
                 const apiClient = connectionManager.getApiClient(nowPlayingItem.ServerId);
                 apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
                     const userData = item.UserData || {};
@@ -657,7 +625,6 @@ import 'emby-ratingbutton';
     }
 
     function hideNowPlayingBar() {
-
         isEnabled = false;
 
         // Use a timeout to prevent the bar from hiding and showing quickly
@@ -666,13 +633,11 @@ import 'emby-ratingbutton';
         // Don't call getNowPlayingBar here because we don't want to end up creating it just to hide it
         const elem = document.getElementsByClassName('nowPlayingBar')[0];
         if (elem) {
-
             slideDown(elem);
         }
     }
 
     function onPlaybackStopped(e, state) {
-
         console.debug('nowplaying event: ' + e.type);
         const player = this;
 
@@ -688,7 +653,6 @@ import 'emby-ratingbutton';
     }
 
     function onPlayPauseStateChanged(e) {
-
         if (!isEnabled) {
             return;
         }
@@ -698,7 +662,6 @@ import 'emby-ratingbutton';
     }
 
     function onStateChanged(event, state) {
-
         console.debug('nowplaying event: ' + event.type);
         const player = this;
 
@@ -725,7 +688,6 @@ import 'emby-ratingbutton';
     }
 
     function onTimeUpdate(e) {
-
         if (!isEnabled) {
             return;
         }
@@ -733,7 +695,6 @@ import 'emby-ratingbutton';
         // Try to avoid hammering the document with changes
         const now = new Date().getTime();
         if ((now - lastUpdateTime) < 700) {
-
             return;
         }
         lastUpdateTime = now;
@@ -744,7 +705,6 @@ import 'emby-ratingbutton';
     }
 
     function releaseCurrentPlayer() {
-
         const player = currentPlayer;
 
         if (player) {
@@ -764,7 +724,6 @@ import 'emby-ratingbutton';
     }
 
     function onVolumeChanged(e) {
-
         if (!isEnabled) {
             return;
         }
@@ -775,14 +734,12 @@ import 'emby-ratingbutton';
     }
 
     function refreshFromPlayer(player) {
-
         const state = playbackManager.getPlayerState(player);
 
         onStateChanged.call(player, { type: 'init' }, state);
     }
 
     function bindToPlayer(player) {
-
         if (player === currentPlayer) {
             return;
         }
@@ -815,16 +772,12 @@ import 'emby-ratingbutton';
     bindToPlayer(playbackManager.getCurrentPlayer());
 
     document.addEventListener('viewbeforeshow', function (e) {
-
         if (!e.detail.options.enableMediaControl) {
-
             if (isVisibilityAllowed) {
                 isVisibilityAllowed = false;
                 hideNowPlayingBar();
             }
-
         } else if (!isVisibilityAllowed) {
-
             isVisibilityAllowed = true;
             if (currentPlayer) {
                 refreshFromPlayer(currentPlayer);
diff --git a/src/components/packageManager.js b/src/components/packageManager.js
index 46f4704522..936f5a4029 100644
--- a/src/components/packageManager.js
+++ b/src/components/packageManager.js
@@ -4,9 +4,7 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
     var settingsKey = 'installedpackages1';
 
     function addPackage(packageManager, pkg) {
-
         packageManager.packagesList = packageManager.packagesList.filter(function (p) {
-
             return p.name !== pkg.name;
         });
 
@@ -14,7 +12,6 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
     }
 
     function removeUrl(url) {
-
         var manifestUrls = JSON.parse(appSettings.get(settingsKey) || '[]');
 
         manifestUrls = manifestUrls.filter(function (i) {
@@ -25,9 +22,7 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
     }
 
     function loadPackage(packageManager, url, throwError) {
-
         return new Promise(function (resolve, reject) {
-
             var xhr = new XMLHttpRequest();
             var originalUrl = url;
             url += url.indexOf('?') === -1 ? '?' : '&';
@@ -36,7 +31,6 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
             xhr.open('GET', url, true);
 
             var onError = function () {
-
                 if (throwError === true) {
                     reject();
                 } else {
@@ -47,7 +41,6 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
 
             xhr.onload = function (e) {
                 if (this.status < 400) {
-
                     var pkg = JSON.parse(this.response);
                     pkg.url = originalUrl;
 
@@ -61,7 +54,6 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
                         return pluginManager.loadPlugin(packageManager.mapPath(pkg, pluginUrl));
                     });
                     Promise.all(promises).then(resolve, resolve);
-
                 } else {
                     onError();
                 }
@@ -74,7 +66,6 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
     }
 
     function PackageManager() {
-
         this.packagesList = [];
     }
 
@@ -83,9 +74,7 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
 
         var instance = this;
         return Promise.all(manifestUrls.map(function (u) {
-
             return loadPackage(instance, u);
-
         })).then(function () {
             return Promise.resolve();
         }, function () {
@@ -98,9 +87,7 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
     };
 
     PackageManager.prototype.install = function (url) {
-
         return loadPackage(this, url, true).then(function (pkg) {
-
             var manifestUrls = JSON.parse(appSettings.get(settingsKey) || '[]');
 
             if (manifestUrls.indexOf(url) === -1) {
@@ -113,16 +100,12 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
     };
 
     PackageManager.prototype.uninstall = function (name) {
-
         var pkg = this.packagesList.filter(function (p) {
-
             return p.name === name;
         })[0];
 
         if (pkg) {
-
             this.packagesList = this.packagesList.filter(function (p) {
-
                 return p.name !== name;
             });
 
@@ -133,7 +116,6 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
     };
 
     PackageManager.prototype.mapPath = function (pkg, pluginUrl) {
-
         var urlLower = pluginUrl.toLowerCase();
         if (urlLower.indexOf('http:') === 0 || urlLower.indexOf('https:') === 0 || urlLower.indexOf('file:') === 0) {
             return pluginUrl;
diff --git a/src/components/playback/brightnessosd.js b/src/components/playback/brightnessosd.js
index 5f3becd64b..9d5db62fe0 100644
--- a/src/components/playback/brightnessosd.js
+++ b/src/components/playback/brightnessosd.js
@@ -23,10 +23,8 @@ function getOsdElementHtml() {
 }
 
 function ensureOsdElement() {
-
     var elem = osdElement;
     if (!elem) {
-
         enableAnimation = browser.supportsCssAnimation();
 
         elem = document.createElement('div');
@@ -50,7 +48,6 @@ function onHideComplete() {
 
 var hideTimeout;
 function showOsd() {
-
     clearHideTimeout();
 
     var elem = osdElement;
@@ -79,12 +76,10 @@ function clearHideTimeout() {
 }
 
 function hideOsd() {
-
     clearHideTimeout();
 
     var elem = osdElement;
     if (elem) {
-
         if (enableAnimation) {
             // trigger reflow
             void elem.offsetWidth;
@@ -108,7 +103,6 @@ function setIcon(iconElement, icon) {
 }
 
 function updateElementsFromPlayer(brightness) {
-
     if (iconElement) {
         if (brightness >= 80) {
             setIcon(iconElement, 'brightness_high');
@@ -124,7 +118,6 @@ function updateElementsFromPlayer(brightness) {
 }
 
 function releaseCurrentPlayer() {
-
     var player = currentPlayer;
 
     if (player) {
@@ -135,7 +128,6 @@ function releaseCurrentPlayer() {
 }
 
 function onBrightnessChanged(e) {
-
     var player = this;
 
     ensureOsdElement();
@@ -146,7 +138,6 @@ function onBrightnessChanged(e) {
 }
 
 function bindToPlayer(player) {
-
     if (player === currentPlayer) {
         return;
     }
diff --git a/src/components/playback/nowplayinghelper.js b/src/components/playback/nowplayinghelper.js
index 310edc03c3..d7f9d04865 100644
--- a/src/components/playback/nowplayinghelper.js
+++ b/src/components/playback/nowplayinghelper.js
@@ -1,5 +1,4 @@
 export function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
-
     var topItem = nowPlayingItem;
     var bottomItem = null;
     var topText = nowPlayingItem.Name;
@@ -25,7 +24,6 @@ export function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
     var bottomText = '';
 
     if (nowPlayingItem.ArtistItems && nowPlayingItem.ArtistItems.length) {
-
         bottomItem = {
             Id: nowPlayingItem.ArtistItems[0].Id,
             Name: nowPlayingItem.ArtistItems[0].Name,
@@ -36,9 +34,7 @@ export function getNowPlayingNames(nowPlayingItem, includeNonNameInfo) {
         bottomText = nowPlayingItem.ArtistItems.map(function (a) {
             return a.Name;
         }).join(', ');
-
     } else if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
-
         bottomText = nowPlayingItem.Artists.join(', ');
     } else if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
         bottomText = topText;
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index fe3ff11250..829cd38f2c 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -2,14 +2,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     'use strict';
 
     function enableLocalPlaylistManagement(player) {
-
         if (player.getPlaylist) {
-
             return false;
         }
 
         if (player.isLocalPlayer) {
-
             return true;
         }
 
@@ -25,13 +22,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function triggerPlayerChange(playbackManagerInstance, newPlayer, newTarget, previousPlayer, previousTargetInfo) {
-
         if (!newPlayer && !previousPlayer) {
             return;
         }
 
         if (newTarget && previousTargetInfo) {
-
             if (newTarget.id === previousTargetInfo.id) {
                 return;
             }
@@ -41,7 +36,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function reportPlayback(playbackManagerInstance, state, player, reportPlaylist, serverId, method, progressEventName) {
-
         if (!serverId) {
             // Not a server item
             // We can expand on this later and possibly report them
@@ -78,9 +72,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId) {
-
         info.NowPlayingQueue = getPlaylistSync(playbackManagerInstance, player).map(function (i) {
-
             var itemInfo = {
                 Id: i.Id,
                 PlaylistItemId: i.PlaylistItemId
@@ -99,22 +91,18 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getItemsForPlayback(serverId, query) {
-
         var apiClient = connectionManager.getApiClient(serverId);
 
         if (query.Ids && query.Ids.split(',').length === 1) {
-
             var itemId = query.Ids.split(',');
 
             return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
-
                 return {
                     Items: [item],
                     TotalRecordCount: 1
                 };
             });
         } else {
-
             query.Limit = query.Limit || 300;
             query.Fields = 'Chapters';
             query.ExcludeLocationTypes = 'Virtual';
@@ -126,7 +114,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function createStreamInfoFromUrlItem(item) {
-
         // Check item.Path for games
         return {
             url: item.Url || item.Path,
@@ -138,7 +125,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function mergePlaybackQueries(obj1, obj2) {
-
         var query = Object.assign(obj1, obj2);
 
         var filters = query.Filters ? query.Filters.split(',') : [];
@@ -150,7 +136,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function backdropImageUrl(apiClient, item, options) {
-
         options = options || {};
         options.type = options.type || 'Backdrop';
 
@@ -160,7 +145,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         if (item.BackdropImageTags && item.BackdropImageTags.length) {
-
             options.tag = item.BackdropImageTags[0];
             return apiClient.getScaledImageUrl(item.Id, options);
         }
@@ -174,7 +158,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getMimeType(type, container) {
-
         container = (container || '').toLowerCase();
 
         if (type === 'audio') {
@@ -222,7 +205,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function isAutomaticPlayer(player) {
-
         if (player.isLocalPlayer) {
             return true;
         }
@@ -231,7 +213,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getAutomaticPlayers(instance, forceLocalPlayer) {
-
         if (!forceLocalPlayer) {
             var player = instance._currentPlayer;
             if (player && !isAutomaticPlayer(player)) {
@@ -250,7 +231,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function enableIntros(item) {
-
         if (item.MediaType !== 'Video') {
             return false;
         }
@@ -266,7 +246,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getIntros(firstItem, apiClient, options) {
-
         if (options.startPositionTicks || options.startIndex || options.fullscreen === false || !enableIntros(firstItem) || !userSettings.enableCinemaMode()) {
             return Promise.resolve({
                 Items: []
@@ -274,11 +253,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         return apiClient.getIntros(firstItem.Id).then(function (result) {
-
             return result;
-
         }, function (err) {
-
             return Promise.resolve({
                 Items: []
             });
@@ -286,14 +262,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getAudioMaxValues(deviceProfile) {
-
         // TODO - this could vary per codec and should be done on the server using the entire profile
         var maxAudioSampleRate = null;
         var maxAudioBitDepth = null;
         var maxAudioBitrate = null;
 
         deviceProfile.CodecProfiles.map(function (codecProfile) {
-
             if (codecProfile.Type === 'Audio') {
                 (codecProfile.Conditions || []).map(function (condition) {
                     if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitDepth') {
@@ -316,7 +290,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
     var startingPlaySession = new Date().getTime();
     function getAudioStreamUrl(item, transcodingProfile, directPlayContainers, maxBitrate, apiClient, maxAudioSampleRate, maxAudioBitDepth, maxAudioBitrate, startPosition) {
-
         var url = 'Audio/' + item.Id + '/universal';
 
         startingPlaySession++;
@@ -339,7 +312,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getAudioStreamUrlFromDeviceProfile(item, deviceProfile, maxBitrate, apiClient, startPosition) {
-
         var transcodingProfile = deviceProfile.TranscodingProfiles.filter(function (p) {
             return p.Type === 'Audio' && p.Context === 'Streaming';
         })[0];
@@ -347,7 +319,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         var directPlayContainers = '';
 
         deviceProfile.DirectPlayProfiles.map(function (p) {
-
             if (p.Type === 'Audio') {
                 if (directPlayContainers) {
                     directPlayContainers += ',' + p.Container;
@@ -359,7 +330,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     directPlayContainers += '|' + p.AudioCodec;
                 }
             }
-
         });
 
         var maxValues = getAudioMaxValues(deviceProfile);
@@ -368,7 +338,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition) {
-
         var audioTranscodingProfile = deviceProfile.TranscodingProfiles.filter(function (p) {
             return p.Type === 'Audio' && p.Context === 'Streaming';
         })[0];
@@ -376,7 +345,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         var audioDirectPlayContainers = '';
 
         deviceProfile.DirectPlayProfiles.map(function (p) {
-
             if (p.Type === 'Audio') {
                 if (audioDirectPlayContainers) {
                     audioDirectPlayContainers += ',' + p.Container;
@@ -395,7 +363,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         var streamUrls = [];
 
         for (var i = 0, length = items.length; i < length; i++) {
-
             var item = items[i];
             var streamUrl;
 
@@ -414,11 +381,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function setStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition) {
-
         return getStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPosition).then(function (streamUrls) {
-
             for (var i = 0, length = items.length; i < length; i++) {
-
                 var item = items[i];
                 var streamUrl = streamUrls[i];
 
@@ -449,9 +413,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         enableDirectStream,
         allowVideoStreamCopy,
         allowAudioStreamCopy) {
-
         if (!itemHelper.isLocalItem(item) && item.MediaType === 'Audio') {
-
             return Promise.resolve({
                 MediaSources: [
                     {
@@ -531,7 +493,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getOptimalMediaSource(apiClient, item, versions) {
-
         var promises = versions.map(function (v) {
             return supportsDirectPlay(apiClient, item, v);
         });
@@ -541,21 +502,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         return Promise.all(promises).then(function (results) {
-
             for (var i = 0, length = versions.length; i < length; i++) {
                 versions[i].enableDirectPlay = results[i] || false;
             }
             var optimalVersion = versions.filter(function (v) {
-
                 return v.enableDirectPlay;
-
             })[0];
 
             if (!optimalVersion) {
                 optimalVersion = versions.filter(function (v) {
-
                     return v.SupportsDirectStream;
-
                 })[0];
             }
 
@@ -568,7 +524,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getLiveStream(player, apiClient, item, playSessionId, deviceProfile, maxBitrate, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
-
         var postData = {
             DeviceProfile: deviceProfile,
             OpenToken: mediaSource.OpenToken
@@ -609,15 +564,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function isHostReachable(mediaSource, apiClient) {
-
         if (mediaSource.IsRemote) {
             return Promise.resolve(true);
         }
 
         return apiClient.getEndpointInfo().then(function (endpointInfo) {
-
             if (endpointInfo.IsInNetwork) {
-
                 if (!endpointInfo.IsLocal) {
                     var path = (mediaSource.Path || '').toLowerCase();
                     if (path.indexOf('localhost') !== -1 || path.indexOf('127.0.0.1') !== -1) {
@@ -635,18 +587,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function supportsDirectPlay(apiClient, item, mediaSource) {
-
         // folder rip hacks due to not yet being supported by the stream building engine
         var isFolderRip = mediaSource.VideoType === 'BluRay' || mediaSource.VideoType === 'Dvd' || mediaSource.VideoType === 'HdDvd';
 
         if (mediaSource.SupportsDirectPlay || isFolderRip) {
-
             if (mediaSource.IsRemote && !apphost.supports('remotevideo')) {
                 return Promise.resolve(false);
             }
 
             if (mediaSource.Protocol === 'Http' && !mediaSource.RequiredHttpHeaders.length) {
-
                 // If this is the only way it can be played, then allow it
                 if (!mediaSource.SupportsDirectStream && !mediaSource.SupportsTranscoding) {
                     return Promise.resolve(true);
@@ -654,12 +603,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     return isHostReachable(mediaSource, apiClient);
                 }
             } else if (mediaSource.Protocol === 'File') {
-
                 return new Promise(function (resolve, reject) {
-
                     // Determine if the file can be accessed directly
                     require(['filesystem'], function (filesystem) {
-
                         var method = isFolderRip ?
                             'directoryExists' :
                             'fileExists';
@@ -669,7 +615,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                         }, function () {
                             resolve(false);
                         });
-
                     });
                 });
             }
@@ -679,9 +624,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function validatePlaybackInfoResult(instance, result) {
-
         if (result.ErrorCode) {
-
             showPlaybackInfoErrorMessage(instance, result.ErrorCode);
             return false;
         }
@@ -690,13 +633,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function showPlaybackInfoErrorMessage(instance, errorCode, playNextTrack) {
-
         require(['alert'], function (alert) {
             alert.default({
                 text: globalize.translate('PlaybackError' + errorCode),
                 title: globalize.translate('HeaderPlaybackError')
             }).then(function () {
-
                 if (playNextTrack) {
                     instance.nextTrack();
                 }
@@ -709,7 +650,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function truncatePlayOptions(playOptions) {
-
         return {
             fullscreen: playOptions.fullscreen,
             mediaSourceId: playOptions.mediaSourceId,
@@ -720,7 +660,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function getNowPlayingItemForReporting(player, item, mediaSource) {
-
         var nowPlayingItem = Object.assign({}, item);
 
         if (mediaSource) {
@@ -737,7 +676,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function displayPlayerIndividually(player) {
-
         return !player.isLocalPlayer;
     }
 
@@ -761,7 +699,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function sortPlayerTargets(a, b) {
-
         var aVal = a.isLocalPlayer ? 0 : 1;
         var bVal = b.isLocalPlayer ? 0 : 1;
 
@@ -772,12 +709,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     }
 
     function PlaybackManager() {
-
         var self = this;
 
         var players = [];
         var currentTargetInfo;
-        var lastLocalPlayer;
         var currentPairingId = null;
 
         this._playNextAfterEnded = true;
@@ -786,7 +721,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         this._playQueueManager = new PlayQueueManager();
 
         self.currentItem = function (player) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -800,7 +734,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.currentMediaSource = function (player) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -814,7 +747,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.playMethod = function (player) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -828,7 +760,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.playSessionId = function (player) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -842,7 +773,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getPlayerInfo = function () {
-
             var player = self._currentPlayer;
 
             if (!player) {
@@ -863,7 +793,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.setActivePlayer = function (player, targetInfo) {
-
             if (player === 'localplayer' || player.name === 'localplayer') {
                 if (self._currentPlayer && self._currentPlayer.isLocalPlayer) {
                     return;
@@ -886,7 +815,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.trySetActivePlayer = function (player, targetInfo) {
-
             if (player === 'localplayer' || player.name === 'localplayer') {
                 if (self._currentPlayer && self._currentPlayer.isLocalPlayer) {
                     return;
@@ -928,13 +856,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getTargets = function () {
-
             var promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);
 
             return Promise.all(promises).then(function (responses) {
-
                 return connectionManager.currentApiClient().getCurrentUser().then(function (user) {
-
                     var targets = [];
 
                     targets.push({
@@ -950,11 +875,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     });
 
                     for (var i = 0; i < responses.length; i++) {
-
                         var subTargets = responses[i];
 
                         for (var j = 0; j < subTargets.length; j++) {
-
                             targets.push(subTargets[j]);
                         }
                     }
@@ -967,7 +890,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         function getCurrentSubtitleStream(player) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -988,10 +910,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.getPlaylist = function (player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
-
                 if (player.getPlaylistSync) {
                     return Promise.resolve(player.getPlaylistSync());
                 }
@@ -1011,7 +931,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function setCurrentPlayerInternal(player, targetInfo) {
-
             var previousPlayer = self._currentPlayer;
             var previousTargetInfo = currentTargetInfo;
 
@@ -1031,10 +950,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 console.debug('Active player: ' + JSON.stringify(targetInfo));
             }
 
-            if (player && player.isLocalPlayer) {
-                lastLocalPlayer = player;
-            }
-
             if (previousPlayer) {
                 self.endPlayerUpdates(previousPlayer);
             }
@@ -1047,7 +962,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.isPlaying = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player) {
@@ -1078,7 +992,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.isPlayingLocally = function (mediaTypes, player) {
-
             player = player || self._currentPlayer;
 
             if (!player || !player.isLocalPlayer) {
@@ -1086,9 +999,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             return mediaTypes.filter(function (mediaType) {
-
                 return self.isPlayingMediaType(mediaType, player);
-
             }).length > 0;
         };
 
@@ -1101,7 +1012,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getPlayers = function () {
-
             return players;
         };
 
@@ -1139,7 +1049,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.toggleAspectRatio = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player) {
@@ -1165,17 +1074,14 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.setAspectRatio = function (val, player) {
-
             player = player || self._currentPlayer;
 
             if (player && player.setAspectRatio) {
-
                 player.setAspectRatio(val);
             }
         };
 
         self.getSupportedAspectRatios = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player && player.getSupportedAspectRatios) {
@@ -1186,7 +1092,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getAspectRatio = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player && player.getAspectRatio) {
@@ -1196,11 +1101,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
         var brightnessOsdLoaded;
         self.setBrightness = function (val, player) {
-
             player = player || self._currentPlayer;
 
             if (player) {
-
                 if (!brightnessOsdLoaded) {
                     brightnessOsdLoaded = true;
                     // TODO: Have this trigger an event instead to get the osd out of here
@@ -1211,7 +1114,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getBrightness = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player) {
@@ -1220,7 +1122,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.setVolume = function (val, player) {
-
             player = player || self._currentPlayer;
 
             if (player) {
@@ -1229,7 +1130,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getVolume = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player) {
@@ -1238,7 +1138,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.volumeUp = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player) {
@@ -1247,7 +1146,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.volumeDown = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player) {
@@ -1256,7 +1154,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.changeAudioStream = function (player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.changeAudioStream();
@@ -1301,7 +1198,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.changeSubtitleStream = function (player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.changeSubtitleStream();
@@ -1346,7 +1242,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getAudioStreamIndex = function (player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.getAudioStreamIndex();
@@ -1356,7 +1251,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         function isAudioStreamSupported(mediaSource, index, deviceProfile) {
-
             var mediaStream;
             var i;
             var length;
@@ -1382,9 +1276,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var profiles = deviceProfile.DirectPlayProfiles || [];
 
             return profiles.filter(function (p) {
-
                 if (p.Type === 'Video') {
-
                     if (!p.AudioCodec) {
                         return true;
                     }
@@ -1398,27 +1290,21 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 }
 
                 return false;
-
             }).length > 0;
         }
 
         self.setAudioStreamIndex = function (index, player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.setAudioStreamIndex(index);
             }
 
             if (self.playMethod(player) === 'Transcode' || !player.canSetAudioStreamIndex()) {
-
                 changeStream(player, getCurrentTicks(player), { AudioStreamIndex: index });
                 getPlayerData(player).audioStreamIndex = index;
-
             } else {
-
                 // See if the player supports the track without transcoding
                 player.getDeviceProfile(self.currentItem(player)).then(function (profile) {
-
                     if (isAudioStreamSupported(self.currentMediaSource(player), index, profile)) {
                         player.setAudioStreamIndex(index);
                         getPlayerData(player).audioStreamIndex = index;
@@ -1431,7 +1317,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         function getSavedMaxStreamingBitrate(apiClient, mediaType) {
-
             if (!apiClient) {
                 // This should hopefully never happen
                 apiClient = connectionManager.currentApiClient();
@@ -1443,7 +1328,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.getMaxStreamingBitrate = function (player) {
-
             player = player || self._currentPlayer;
             if (player && player.getMaxStreamingBitrate) {
                 return player.getMaxStreamingBitrate();
@@ -1463,7 +1347,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.enableAutomaticBitrateDetection = function (player) {
-
             player = player || self._currentPlayer;
             if (player && player.enableAutomaticBitrateDetection) {
                 return player.enableAutomaticBitrateDetection();
@@ -1480,7 +1363,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.setMaxStreamingBitrate = function (options, player) {
-
             player = player || self._currentPlayer;
             if (player && player.setMaxStreamingBitrate) {
                 return player.setMaxStreamingBitrate(options);
@@ -1489,7 +1371,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var apiClient = connectionManager.getApiClient(self.currentItem(player).ServerId);
 
             apiClient.getEndpointInfo().then(function (endpointInfo) {
-
                 var playerData = getPlayerData(player);
                 var mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
 
@@ -1503,7 +1384,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 }
 
                 promise.then(function (bitrate) {
-
                     appSettings.maxStreamingBitrate(endpointInfo.IsInNetwork, mediaType, bitrate);
 
                     changeStream(player, getCurrentTicks(player), {
@@ -1514,7 +1394,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.isFullscreen = function (player) {
-
             player = player || self._currentPlayer;
             if (!player.isLocalPlayer || player.isFullscreen) {
                 return player.isFullscreen();
@@ -1524,7 +1403,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.toggleFullscreen = function (player) {
-
             player = player || self._currentPlayer;
             if (!player.isLocalPlayer || player.toggleFulscreen) {
                 return player.toggleFulscreen();
@@ -1546,7 +1424,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getSubtitleStreamIndex = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player && !enableLocalPlaylistManagement(player)) {
@@ -1561,7 +1438,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         function getDeliveryMethod(subtitleStream) {
-
             // This will be null for internal subs for local items
             if (subtitleStream.DeliveryMethod) {
                 return subtitleStream.DeliveryMethod;
@@ -1571,7 +1447,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.setSubtitleStreamIndex = function (index, player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.setSubtitleStreamIndex(index);
@@ -1590,25 +1465,20 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var currentPlayMethod = self.playMethod(player);
 
             if (currentStream && !newStream) {
-
                 if (getDeliveryMethod(currentStream) === 'Encode' || (getDeliveryMethod(currentStream) === 'Embed' && currentPlayMethod === 'Transcode')) {
-
                     // Need to change the transcoded stream to remove subs
                     changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: -1 });
                 }
             } else if (!currentStream && newStream) {
-
                 if (getDeliveryMethod(newStream) === 'External') {
                     selectedTrackElementIndex = index;
                 } else if (getDeliveryMethod(newStream) === 'Embed' && currentPlayMethod !== 'Transcode') {
                     selectedTrackElementIndex = index;
                 } else {
-
                     // Need to change the transcoded stream to add subs
                     changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: index });
                 }
             } else if (currentStream && newStream) {
-
                 // Switching tracks
                 // We can handle this clientside if the new track is external or the new track is embedded and we're not transcoding
                 if (getDeliveryMethod(newStream) === 'External' || (getDeliveryMethod(newStream) === 'Embed' && currentPlayMethod !== 'Transcode')) {
@@ -1619,7 +1489,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                         changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: -1 });
                     }
                 } else {
-
                     // Need to change the transcoded stream to add subs
                     changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: index });
                 }
@@ -1677,12 +1546,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.seek = function (ticks, player) {
-
             ticks = Math.max(0, ticks);
 
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
-
                 if (player.isLocalPlayer) {
                     return player.seek((ticks || 0) / 10000);
                 } else {
@@ -1694,10 +1561,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.seekRelative = function (offsetTicks, player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player) && player.seekRelative) {
-
                 if (player.isLocalPlayer) {
                     return player.seekRelative((ticks || 0) / 10000);
                 } else {
@@ -1711,7 +1576,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
         // Returns true if the player can seek using native client-side seeking functions
         function canPlayerSeek(player) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -1738,9 +1602,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function changeStream(player, ticks, params) {
-
             if (canPlayerSeek(player) && params == null) {
-
                 player.currentTime(parseInt(ticks / 10000));
                 return;
             }
@@ -1759,7 +1621,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 isRetry: params.EnableDirectPlay === false
 
             }).then(function (deviceProfile) {
-
                 var audioStreamIndex = params.AudioStreamIndex == null ? getPlayerData(player).audioStreamIndex : params.AudioStreamIndex;
                 var subtitleStreamIndex = params.SubtitleStreamIndex == null ? getPlayerData(player).subtitleStreamIndex : params.SubtitleStreamIndex;
 
@@ -1775,9 +1636,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 var currentPlayOptions = currentItem.playOptions || getDefaultPlayOptions();
 
                 getPlaybackInfo(player, apiClient, currentItem, deviceProfile, maxBitrate, ticks, true, currentMediaSource.Id, audioStreamIndex, subtitleStreamIndex, liveStreamId, params.EnableDirectPlay, params.EnableDirectStream, params.AllowVideoStreamCopy, params.AllowAudioStreamCopy).then(function (result) {
-
                     if (validatePlaybackInfoResult(self, result)) {
-
                         currentMediaSource = result.MediaSources[0];
 
                         var streamInfo = createStreamInfo(apiClient, currentItem.MediaType, currentItem, currentMediaSource, ticks);
@@ -1800,32 +1659,25 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function changeStreamToUrl(apiClient, player, playSessionId, streamInfo, newPositionTicks) {
-
             var playerData = getPlayerData(player);
 
             playerData.isChangingStream = true;
 
             if (playerData.streamInfo && playSessionId) {
-
                 apiClient.stopActiveEncodings(playSessionId).then(function () {
-
                     // Stop the first transcoding afterwards because the player may still send requests to the original url
                     var afterSetSrc = function () {
-
                         apiClient.stopActiveEncodings(playSessionId);
                     };
                     setSrcIntoPlayer(apiClient, player, streamInfo).then(afterSetSrc, afterSetSrc);
                 });
-
             } else {
                 setSrcIntoPlayer(apiClient, player, streamInfo);
             }
         }
 
         function setSrcIntoPlayer(apiClient, player, streamInfo) {
-
             return player.play(streamInfo).then(function () {
-
                 var playerData = getPlayerData(player);
 
                 playerData.isChangingStream = false;
@@ -1835,7 +1687,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                 sendProgressUpdate(player, 'timeupdate');
             }, function (e) {
-
                 var playerData = getPlayerData(player);
                 playerData.isChangingStream = false;
 
@@ -1862,18 +1713,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var queryOptions = options.queryOptions || {};
 
             if (firstItem.Type === 'Program') {
-
                 promise = getItemsForPlayback(serverId, {
                     Ids: firstItem.ChannelId
                 });
             } else if (firstItem.Type === 'Playlist') {
-
                 promise = getItemsForPlayback(serverId, {
                     ParentId: firstItem.Id,
                     SortBy: options.shuffle ? 'Random' : null
                 });
             } else if (firstItem.Type === 'MusicArtist') {
-
                 promise = getItemsForPlayback(serverId, {
                     ArtistIds: firstItem.Id,
                     Filters: 'IsNotFolder',
@@ -1881,9 +1729,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     SortBy: options.shuffle ? 'Random' : 'SortName',
                     MediaTypes: 'Audio'
                 });
-
             } else if (firstItem.MediaType === 'Photo') {
-
                 promise = getItemsForPlayback(serverId, {
                     ParentId: firstItem.ParentId,
                     Filters: 'IsNotFolder',
@@ -1896,7 +1742,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                     var index = items.map(function (i) {
                         return i.Id;
-
                     }).indexOf(firstItem.Id);
 
                     if (index === -1) {
@@ -1906,10 +1751,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     options.startIndex = index;
 
                     return Promise.resolve(result);
-
                 });
             } else if (firstItem.Type === 'PhotoAlbum') {
-
                 promise = getItemsForPlayback(serverId, {
                     ParentId: firstItem.Id,
                     Filters: 'IsNotFolder',
@@ -1921,7 +1764,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                 });
             } else if (firstItem.Type === 'MusicGenre') {
-
                 promise = getItemsForPlayback(serverId, {
                     GenreIds: firstItem.Id,
                     Filters: 'IsNotFolder',
@@ -1930,7 +1772,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     MediaTypes: 'Audio'
                 });
             } else if (firstItem.IsFolder) {
-
                 promise = getItemsForPlayback(serverId, mergePlaybackQueries({
 
                     ParentId: firstItem.Id,
@@ -1942,12 +1783,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                 }, queryOptions));
             } else if (firstItem.Type === 'Episode' && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
-
                 promise = new Promise(function (resolve, reject) {
                     var apiClient = connectionManager.getApiClient(firstItem.ServerId);
 
                     apiClient.getCurrentUser().then(function (user) {
-
                         if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) {
                             resolve(null);
                             return;
@@ -1960,10 +1799,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                             Fields: 'Chapters'
 
                         }).then(function (episodesResult) {
-
                             var foundItem = false;
                             episodesResult.Items = episodesResult.Items.filter(function (e) {
-
                                 if (foundItem) {
                                     return true;
                                 }
@@ -1983,7 +1820,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
             if (promise) {
                 return promise.then(function (result) {
-
                     return result ? result.Items : items;
                 });
             } else {
@@ -1992,7 +1828,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.play = function (options) {
-
             normalizePlayOptions(options);
 
             if (self._currentPlayer) {
@@ -2010,14 +1845,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             if (options.items) {
-
                 return translateItemsForPlayback(options.items, options).then(function (items) {
-
                     return playWithIntros(items, options);
                 });
-
             } else {
-
                 if (!options.serverId) {
                     throw new Error('serverId required!');
                 }
@@ -2027,18 +1858,14 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     Ids: options.ids.join(',')
 
                 }).then(function (result) {
-
                     return translateItemsForPlayback(result.Items, options).then(function (items) {
-
                         return playWithIntros(items, options);
                     });
-
                 });
             }
         };
 
         function getPlayerData(player) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -2056,7 +1883,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.getPlayerState = function (player, item, mediaSource) {
-
             player = player || self._currentPlayer;
 
             if (!player) {
@@ -2075,7 +1901,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             };
 
             if (player) {
-
                 state.PlayState.VolumeLevel = player.getVolume();
                 state.PlayState.IsMuted = player.isMuted();
                 state.PlayState.IsPaused = player.paused();
@@ -2100,7 +1925,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             if (mediaSource) {
-
                 state.PlayState.MediaSourceId = mediaSource.Id;
 
                 state.NowPlayingItem = {
@@ -2111,7 +1935,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             if (item) {
-
                 state.NowPlayingItem = getNowPlayingItemForReporting(player, item, mediaSource);
             }
 
@@ -2121,7 +1944,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.duration = function (player) {
-
             player = player || self._currentPlayer;
 
             if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) {
@@ -2148,7 +1970,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         function getCurrentTicks(player) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -2167,7 +1988,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         self.getCurrentTicks = getCurrentTicks;
 
         function playOther(items, options, user) {
-
             var playStartIndex = options.startIndex || 0;
             var player = getPlayer(items[playStartIndex], options);
 
@@ -2179,7 +1999,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function playWithIntros(items, options, user) {
-
             var playStartIndex = options.startIndex || 0;
             var firstItem = items[playStartIndex];
 
@@ -2196,25 +2015,21 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             if (firstItem.MediaType === 'Photo' || firstItem.MediaType === 'Book') {
-
                 return playOther(items, options, user);
             }
 
             var apiClient = connectionManager.getApiClient(firstItem.ServerId);
 
             return getIntros(firstItem, apiClient, options).then(function (introsResult) {
-
                 var introItems = introsResult.Items;
                 var introPlayOptions;
 
                 firstItem.playOptions = truncatePlayOptions(options);
 
                 if (introItems.length) {
-
                     introPlayOptions = {
                         fullscreen: firstItem.playOptions.fullscreen
                     };
-
                 } else {
                     introPlayOptions = firstItem.playOptions;
                 }
@@ -2226,7 +2041,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 introPlayOptions.startIndex = playStartIndex;
 
                 return playInternal(items[playStartIndex], introPlayOptions, function () {
-
                     self._playQueueManager.setPlaylist(items);
 
                     setPlaylistState(items[playStartIndex].PlaylistItemId, playStartIndex);
@@ -2237,14 +2051,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
         // Set playlist state. Using a method allows for overloading in derived player implementations
         function setPlaylistState(playlistItemId, index) {
-
             if (!isNaN(index)) {
                 self._playQueueManager.setPlaylistState(playlistItemId, index);
             }
         }
 
         function playInternal(item, playOptions, onPlaybackStartedFn) {
-
             if (item.IsPlaceHolder) {
                 loading.hide();
                 showPlaybackInfoErrorMessage(self, 'PlaceHolder', true);
@@ -2261,7 +2073,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             return runInterceptors(item, playOptions).then(function () {
-
                 if (playOptions.fullscreen) {
                     loading.show();
                 }
@@ -2279,24 +2090,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                 var apiClient = connectionManager.getApiClient(item.ServerId);
                 apiClient.getEndpointInfo().then(function (endpointInfo) {
-
                     if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) {
-
                         return apiClient.detectBitrate().then(function (bitrate) {
-
                             appSettings.maxStreamingBitrate(endpointInfo.IsInNetwork, mediaType, bitrate);
 
                             return playAfterBitrateDetect(bitrate, item, playOptions, onPlaybackStartedFn);
-
                         }, onBitrateDetectionFailure);
-
                     } else {
-
                         onBitrateDetectionFailure();
                     }
-
                 }, onBitrateDetectionFailure);
-
             }, onInterceptorRejection);
         }
 
@@ -2318,9 +2121,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function runInterceptors(item, playOptions) {
-
             return new Promise(function (resolve, reject) {
-
                 var interceptors = pluginManager.ofType('preplayintercept');
 
                 interceptors.sort(function (a, b) {
@@ -2344,7 +2145,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function runNextPrePlay(interceptors, index, options, resolve, reject) {
-
             if (index >= interceptors.length) {
                 resolve();
                 return;
@@ -2353,16 +2153,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var interceptor = interceptors[index];
 
             interceptor.intercept(options).then(function () {
-
                 runNextPrePlay(interceptors, index + 1, options, resolve, reject);
-
             }, reject);
         }
 
         function sendPlaybackListToPlayer(player, items, deviceProfile, maxBitrate, apiClient, startPositionTicks, mediaSourceId, audioStreamIndex, subtitleStreamIndex, startIndex) {
-
             return setStreamUrls(items, deviceProfile, maxBitrate, apiClient, startPositionTicks).then(function () {
-
                 loading.hide();
 
                 return player.play({
@@ -2377,7 +2173,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function playAfterBitrateDetect(maxBitrate, item, playOptions, onPlaybackStartedFn) {
-
             var startPosition = playOptions.startPositionTicks;
 
             var player = getPlayer(item, playOptions);
@@ -2386,7 +2181,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var promise;
 
             if (activePlayer) {
-
                 // TODO: if changing players within the same playlist, this will cause nextItem to be null
                 self._playNextAfterEnded = false;
                 promise = onPlaybackChanging(activePlayer, player, item);
@@ -2411,7 +2205,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             return Promise.all([promise, player.getDeviceProfile(item)]).then(function (responses) {
-
                 var deviceProfile = responses[1];
 
                 var apiClient = connectionManager.getApiClient(item.ServerId);
@@ -2421,7 +2214,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 var subtitleStreamIndex = playOptions.subtitleStreamIndex;
 
                 if (player && !enableLocalPlaylistManagement(player)) {
-
                     return sendPlaybackListToPlayer(player, playOptions.items, deviceProfile, maxBitrate, apiClient, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex, playOptions.startIndex);
                 }
 
@@ -2429,7 +2221,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 playOptions.items = null;
 
                 return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex).then(function (mediaSource) {
-
                     var streamInfo = createStreamInfo(apiClient, item.MediaType, item, mediaSource, startPosition);
 
                     streamInfo.fullscreen = playOptions.fullscreen;
@@ -2442,7 +2233,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                         onPlaybackStartedFn();
                         onPlaybackStarted(player, playOptions, streamInfo, mediaSource);
                     }, function (err) {
-
                         // TODO: Improve this because it will report playback start on a failure
                         onPlaybackStartedFn();
                         onPlaybackStarted(player, playOptions, streamInfo, mediaSource);
@@ -2458,7 +2248,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.getPlaybackInfo = function (item, options) {
-
             options = options || {};
             var startPosition = options.startPositionTicks || 0;
             var mediaType = options.mediaType || item.MediaType;
@@ -2467,13 +2256,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
             // Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
             return apiClient.getEndpointInfo().then(function () {
-
                 var maxBitrate = getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType);
 
                 return player.getDeviceProfile(item).then(function (deviceProfile) {
-
                     return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, options.mediaSourceId, options.audioStreamIndex, options.subtitleStreamIndex).then(function (mediaSource) {
-
                         return createStreamInfo(apiClient, item.MediaType, item, mediaSource, startPosition);
                     });
                 });
@@ -2481,7 +2267,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getPlaybackMediaSources = function (item, options) {
-
             options = options || {};
             var startPosition = options.startPositionTicks || 0;
             var mediaType = options.mediaType || item.MediaType;
@@ -2491,22 +2276,17 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
             // Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
             return apiClient.getEndpointInfo().then(function () {
-
                 var maxBitrate = getSavedMaxStreamingBitrate(connectionManager.getApiClient(item.ServerId), mediaType);
 
                 return player.getDeviceProfile(item).then(function (deviceProfile) {
-
                     return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, false, null, null, null, null).then(function (playbackInfoResult) {
-
                         return playbackInfoResult.MediaSources;
                     });
                 });
             });
-
         };
 
         function createStreamInfo(apiClient, type, item, mediaSource, startPosition) {
-
             var mediaUrl;
             var contentType;
             var transcodingOffsetTicks = 0;
@@ -2519,21 +2299,17 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var directOptions;
 
             if (type === 'Video' || type === 'Audio') {
-
                 contentType = getMimeType(type.toLowerCase(), mediaSourceContainer);
 
                 if (mediaSource.enableDirectPlay) {
                     mediaUrl = mediaSource.Path;
 
                     playMethod = 'DirectPlay';
-
                 } else if (mediaSource.StreamUrl) {
-
                     // Only used for audio
                     playMethod = 'Transcode';
                     mediaUrl = mediaSource.StreamUrl;
                 } else if (mediaSource.SupportsDirectStream) {
-
                     directOptions = {
                         Static: true,
                         mediaSourceId: mediaSource.Id,
@@ -2553,17 +2329,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     mediaUrl = apiClient.getUrl(prefix + '/' + item.Id + '/stream.' + mediaSourceContainer, directOptions);
 
                     playMethod = 'DirectStream';
-
                 } else if (mediaSource.SupportsTranscoding) {
-
                     mediaUrl = apiClient.getUrl(mediaSource.TranscodingUrl);
 
                     if (mediaSource.TranscodingSubProtocol === 'hls') {
-
                         contentType = 'application/x-mpegURL';
-
                     } else {
-
                         contentType = getMimeType(type.toLowerCase(), mediaSource.TranscodingContainer);
 
                         if (mediaUrl.toLowerCase().indexOf('copytimestamps=true') === -1) {
@@ -2571,9 +2342,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                         }
                     }
                 }
-
             } else {
-
                 // All other media types
                 mediaUrl = mediaSource.Path;
                 playMethod = 'DirectPlay';
@@ -2611,7 +2380,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function getTextTracks(apiClient, item, mediaSource) {
-
             var subtitleStreams = mediaSource.MediaStreams.filter(function (s) {
                 return s.Type === 'Subtitle';
             });
@@ -2623,7 +2391,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var tracks = [];
 
             for (var i = 0, length = textStreams.length; i < length; i++) {
-
                 var textStream = textStreams[i];
                 var textStreamUrl;
 
@@ -2646,26 +2413,17 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex) {
-
             return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, true, mediaSourceId, audioStreamIndex, subtitleStreamIndex, null).then(function (playbackInfoResult) {
-
                 if (validatePlaybackInfoResult(self, playbackInfoResult)) {
-
                     return getOptimalMediaSource(apiClient, item, playbackInfoResult.MediaSources).then(function (mediaSource) {
                         if (mediaSource) {
-
                             if (mediaSource.RequiresOpening && !mediaSource.LiveStreamId) {
-
                                 return getLiveStream(player, apiClient, item, playbackInfoResult.PlaySessionId, deviceProfile, maxBitrate, startPosition, mediaSource, null, null).then(function (openLiveStreamResult) {
-
                                     return supportsDirectPlay(apiClient, item, openLiveStreamResult.MediaSource).then(function (result) {
-
                                         openLiveStreamResult.MediaSource.enableDirectPlay = result;
                                         return openLiveStreamResult.MediaSource;
                                     });
-
                                 });
-
                             } else {
                                 return mediaSource;
                             }
@@ -2681,12 +2439,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function getPlayer(item, playOptions, forceLocalPlayers) {
-
             var serverItem = isServerItem(item);
             return getAutomaticPlayers(self, forceLocalPlayers).filter(function (p) {
-
                 if (p.canPlayMediaType(item.MediaType)) {
-
                     if (serverItem) {
                         if (p.canPlayItem) {
                             return p.canPlayItem(item, playOptions);
@@ -2698,12 +2453,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 }
 
                 return false;
-
             })[0];
         }
 
         self.setCurrentPlaylistItem = function (playlistItemId, player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.setCurrentPlaylistItem(playlistItemId);
@@ -2722,7 +2475,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             if (newItem) {
-
                 var newItemPlayOptions = newItem.playOptions || getDefaultPlayOptions();
 
                 playInternal(newItem, newItemPlayOptions, function () {
@@ -2732,7 +2484,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.removeFromPlaylist = function (playlistItemIds, player) {
-
             if (!playlistItemIds) {
                 throw new Error('Invalid playlistItemIds');
             }
@@ -2756,7 +2507,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 }]);
 
             if (isCurrentIndex) {
-
                 return self.setCurrentPlaylistItem(self._playQueueManager.getPlaylist()[0].PlaylistItemId, player);
             }
 
@@ -2764,7 +2514,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.movePlaylistItem = function (playlistItemId, newIndex, player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.movePlaylistItem(playlistItemId, newIndex);
@@ -2784,7 +2533,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getCurrentPlaylistIndex = function (player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.getCurrentPlaylistIndex();
@@ -2794,7 +2542,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.getCurrentPlaylistItemId = function (player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.getCurrentPlaylistItemId();
@@ -2804,19 +2551,16 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.channelUp = function (player) {
-
             player = player || self._currentPlayer;
             return self.nextTrack(player);
         };
 
         self.channelDown = function (player) {
-
             player = player || self._currentPlayer;
             return self.previousTrack(player);
         };
 
         self.nextTrack = function (player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.nextTrack();
@@ -2825,7 +2569,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var newItemInfo = self._playQueueManager.getNextItemInfo();
 
             if (newItemInfo) {
-
                 console.debug('playing next track');
 
                 var newItemPlayOptions = newItemInfo.item.playOptions || getDefaultPlayOptions();
@@ -2837,7 +2580,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.previousTrack = function (player) {
-
             player = player || self._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player)) {
                 return player.previousTrack();
@@ -2845,12 +2587,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
             var newIndex = self.getCurrentPlaylistIndex(player) - 1;
             if (newIndex >= 0) {
-
                 var playlist = self._playQueueManager.getPlaylist();
                 var newItem = playlist[newIndex];
 
                 if (newItem) {
-
                     var newItemPlayOptions = newItem.playOptions || getDefaultPlayOptions();
                     newItemPlayOptions.startPositionTicks = 0;
 
@@ -2870,7 +2610,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         function queue(options, mode, player) {
-
             player = player || self._currentPlayer;
 
             if (!player) {
@@ -2878,16 +2617,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             if (options.items) {
-
                 return translateItemsForPlayback(options.items, options).then(function (items) {
-
                     // TODO: Handle options.startIndex for photos
                     queueAll(items, mode, player);
-
                 });
-
             } else {
-
                 if (!options.serverId) {
                     throw new Error('serverId required!');
                 }
@@ -2897,19 +2631,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     Ids: options.ids.join(',')
 
                 }).then(function (result) {
-
                     return translateItemsForPlayback(result.Items, options).then(function (items) {
-
                         // TODO: Handle options.startIndex for photos
                         queueAll(items, mode, player);
-
                     });
                 });
             }
         }
 
         function queueAll(items, mode, player) {
-
             if (!items.length) {
                 return;
             }
@@ -2930,13 +2660,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var queueDirectToPlayer = player && !enableLocalPlaylistManagement(player);
 
             if (queueDirectToPlayer) {
-
                 var apiClient = connectionManager.getApiClient(items[0].ServerId);
 
                 player.getDeviceProfile(items[0]).then(function (profile) {
-
                     setStreamUrls(items, profile, self.getMaxStreamingBitrate(player), apiClient, 0).then(function () {
-
                         if (mode === 'next') {
                             player.queueNext(items);
                         } else {
@@ -2962,23 +2689,19 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function startPlaybackProgressTimer(player) {
-
             stopPlaybackProgressTimer(player);
 
             player._progressInterval = setInterval(onPlayerProgressInterval.bind(player), 10000);
         }
 
         function stopPlaybackProgressTimer(player) {
-
             if (player._progressInterval) {
-
                 clearInterval(player._progressInterval);
                 player._progressInterval = null;
             }
         }
 
         function onPlaybackStarted(player, playOptions, streamInfo, mediaSource) {
-
             if (!player) {
                 throw new Error('player cannot be null');
             }
@@ -3019,7 +2742,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function onPlaybackStartedFromSelfManagingPlayer(e, item, mediaSource) {
-
             var player = this;
             setCurrentPlayerInternal(player);
 
@@ -3051,7 +2773,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function onPlaybackStoppedFromSelfManagingPlayer(e, playerStopInfo) {
-
             var player = this;
 
             stopPlaybackProgressTimer(player);
@@ -3075,7 +2796,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             streamInfo.ended = true;
 
             if (isServerItem(playerStopInfo.item)) {
-
                 state.PlayState.PositionTicks = (playerStopInfo.positionMs || 0) * 10000;
 
                 reportPlayback(self, state, player, true, playerStopInfo.item.ServerId, 'reportPlaybackStopped');
@@ -3096,11 +2816,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function enablePlaybackRetryWithTranscoding(streamInfo, errorType, currentlyPreventsVideoStreamCopy, currentlyPreventsAudioStreamCopy) {
-
             // mediadecodeerror, medianotsupported, network, servererror
 
             if (streamInfo.mediaSource.SupportsTranscoding && (!currentlyPreventsVideoStreamCopy || !currentlyPreventsAudioStreamCopy)) {
-
                 return true;
             }
 
@@ -3108,7 +2826,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function onPlaybackError(e, error) {
-
             var player = this;
             error = error || {};
 
@@ -3122,13 +2839,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var streamInfo = error.streamInfo || getPlayerData(player).streamInfo;
 
             if (streamInfo) {
-
                 var currentlyPreventsVideoStreamCopy = streamInfo.url.toLowerCase().indexOf('allowvideostreamcopy=false') !== -1;
                 var currentlyPreventsAudioStreamCopy = streamInfo.url.toLowerCase().indexOf('allowaudiostreamcopy=false') !== -1;
 
                 // Auto switch to transcoding
                 if (enablePlaybackRetryWithTranscoding(streamInfo, errorType, currentlyPreventsVideoStreamCopy, currentlyPreventsAudioStreamCopy)) {
-
                     var startTime = getCurrentTicks(player) || streamInfo.playerStartPositionTicks;
 
                     changeStream(player, startTime, {
@@ -3150,7 +2865,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function onPlaybackStopped(e, displayErrorCode) {
-
             var player = this;
 
             if (getPlayerData(player).isChangingStream) {
@@ -3178,7 +2892,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             state.NextMediaType = nextMediaType;
 
             if (isServerItem(streamInfo.item)) {
-
                 if (player.supportsProgress === false && state.PlayState && !state.PlayState.PositionTicks) {
                     state.PlayState.PositionTicks = streamInfo.item.RunTimeTicks;
                 }
@@ -3217,7 +2930,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function onPlaybackChanging(activePlayer, newPlayer, newItem) {
-
             var state = self.getPlayerState(activePlayer);
 
             var serverId = self.currentItem(activePlayer).ServerId;
@@ -3229,18 +2941,14 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             unbindStopped(activePlayer);
 
             if (activePlayer === newPlayer) {
-
                 // If we're staying with the same player, stop it
                 promise = activePlayer.stop(false);
-
             } else {
-
                 // If we're switching players, tear down the current one
                 promise = activePlayer.stop(true);
             }
 
             return promise.then(function () {
-
                 bindStopped(activePlayer);
 
                 if (enableLocalPlaylistManagement(activePlayer)) {
@@ -3257,7 +2965,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function bindStopped(player) {
-
             if (enableLocalPlaylistManagement(player)) {
                 events.off(player, 'stopped', onPlaybackStopped);
                 events.on(player, 'stopped', onPlaybackStopped);
@@ -3310,7 +3017,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function unbindStopped(player) {
-
             events.off(player, 'stopped', onPlaybackStopped);
         }
 
@@ -3324,10 +3030,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function initMediaPlayer(player) {
-
             players.push(player);
             players.sort(function (a, b) {
-
                 return (a.priority || 0) - (b.priority || 0);
             });
 
@@ -3353,7 +3057,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 events.on(player, 'playlistitemremove', onPlaylistItemRemove);
                 events.on(player, 'playlistitemadd', onPlaylistItemAdd);
             } else if (player.isLocalPlayer) {
-
                 events.on(player, 'itemstarted', onPlaybackStartedFromSelfManagingPlayer);
                 events.on(player, 'itemstopped', onPlaybackStoppedFromSelfManagingPlayer);
                 events.on(player, 'timeupdate', onPlaybackTimeUpdate);
@@ -3374,9 +3077,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         events.on(pluginManager, 'registered', function (e, plugin) {
-
             if (plugin.type === 'mediaplayer') {
-
                 initMediaPlayer(plugin);
             }
         });
@@ -3400,7 +3101,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 }
 
                 if (streamInfo && streamInfo.liveStreamId) {
-
                     if (new Date().getTime() - (streamInfo.lastMediaInfoQuery || 0) >= 600000) {
                         getLiveStreamMediaInfo(player, streamInfo, self.currentMediaSource(player), streamInfo.liveStreamId, serverId);
                     }
@@ -3409,7 +3109,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         function getLiveStreamMediaInfo(player, streamInfo, mediaSource, liveStreamId, serverId) {
-
             console.debug('getLiveStreamMediaInfo');
 
             streamInfo.lastMediaInfoQuery = new Date().getTime();
@@ -3421,17 +3120,14 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             connectionManager.getApiClient(serverId).getLiveStreamMediaInfo(liveStreamId).then(function (info) {
-
                 mediaSource.MediaStreams = info.MediaStreams;
                 events.trigger(player, 'mediastreamschange');
-
             }, function () {
 
             });
         }
 
         self.onAppClose = function () {
-
             var player = this._currentPlayer;
 
             // Try to report playback stopped before the app closes
@@ -3442,7 +3138,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         self.playbackStartTime = function (player) {
-
             player = player || this._currentPlayer;
             if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) {
                 return player.playbackStartTime();
@@ -3453,7 +3148,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         };
 
         if (apphost.supports('remotecontrol')) {
-
             require(['serverNotifications'], function (serverNotifications) {
                 events.on(serverNotifications, 'ServerShuttingDown', self.setDefaultPlayerActive.bind(self));
                 events.on(serverNotifications, 'ServerRestarting', self.setDefaultPlayerActive.bind(self));
@@ -3466,7 +3160,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.currentTime = function (player) {
-
         player = player || this._currentPlayer;
         if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) {
             return player.currentTime();
@@ -3476,7 +3169,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.nextItem = function (player) {
-
         player = player || this._currentPlayer;
 
         if (player && !enableLocalPlaylistManagement(player)) {
@@ -3494,7 +3186,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.canQueue = function (item) {
-
         if (item.Type === 'MusicAlbum' || item.Type === 'MusicArtist' || item.Type === 'MusicGenre') {
             return this.canQueueMediaType('Audio');
         }
@@ -3502,7 +3193,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.canQueueMediaType = function (mediaType) {
-
         if (this._currentPlayer) {
             return this._currentPlayer.canPlayMediaType(mediaType);
         }
@@ -3511,7 +3201,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.isMuted = function (player) {
-
         player = player || this._currentPlayer;
 
         if (player) {
@@ -3522,7 +3211,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.setMute = function (mute, player) {
-
         player = player || this._currentPlayer;
 
         if (player) {
@@ -3531,10 +3219,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.toggleMute = function (mute, player) {
-
         player = player || this._currentPlayer;
         if (player) {
-
             if (player.toggleMute) {
                 player.toggleMute();
             } else {
@@ -3548,9 +3234,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.enableDisplayMirroring = function (enabled) {
-
         if (enabled != null) {
-
             var val = enabled ? '1' : '0';
             appSettings.set('displaymirror', val);
             return;
@@ -3560,16 +3244,13 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.nextChapter = function (player) {
-
         player = player || this._currentPlayer;
         var item = this.currentItem(player);
 
         var ticks = this.getCurrentTicks(player);
 
         var nextChapter = (item.Chapters || []).filter(function (i) {
-
             return i.StartPositionTicks > ticks;
-
         })[0];
 
         if (nextChapter) {
@@ -3580,7 +3261,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.previousChapter = function (player) {
-
         player = player || this._currentPlayer;
         var item = this.currentItem(player);
 
@@ -3595,7 +3275,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         var previousChapters = (item.Chapters || []).filter(function (i) {
-
             return i.StartPositionTicks <= ticks;
         });
 
@@ -3607,7 +3286,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.fastForward = function (player) {
-
         player = player || this._currentPlayer;
 
         if (player.fastForward != null) {
@@ -3622,7 +3300,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.rewind = function (player) {
-
         player = player || this._currentPlayer;
 
         if (player.rewind != null) {
@@ -3637,7 +3314,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.seekPercent = function (percent, player) {
-
         player = player || this._currentPlayer;
 
         var ticks = this.duration(player) || 0;
@@ -3648,7 +3324,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.seekMs = function (ms, player) {
-
         player = player || this._currentPlayer;
 
         var ticks = ms * 10000;
@@ -3656,7 +3331,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.playTrailers = function (item) {
-
         var player = this._currentPlayer;
 
         if (player && player.playTrailers) {
@@ -3695,7 +3369,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.getSubtitleUrl = function (textStream, serverId) {
-
         var apiClient = connectionManager.getApiClient(serverId);
         var textStreamUrl = !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
         return textStreamUrl;
@@ -3705,7 +3378,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         player = player || this._currentPlayer;
 
         if (player) {
-
             if (enableLocalPlaylistManagement(player)) {
                 this._playNextAfterEnded = false;
             }
@@ -3718,11 +3390,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.getBufferedRanges = function (player) {
-
         player = player || this._currentPlayer;
 
         if (player) {
-
             if (player.getBufferedRanges) {
                 return player.getBufferedRanges();
             }
@@ -3732,11 +3402,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.playPause = function (player) {
-
         player = player || this._currentPlayer;
 
         if (player) {
-
             if (player.playPause) {
                 return player.playPause();
             }
@@ -3750,7 +3418,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.paused = function (player) {
-
         player = player || this._currentPlayer;
 
         if (player) {
@@ -3789,7 +3456,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.instantMix = function (item, player) {
-
         player = player || this._currentPlayer;
         if (player && player.instantMix) {
             return player.instantMix(item);
@@ -3811,7 +3477,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.shuffle = function (shuffleItem, player) {
-
         player = player || this._currentPlayer;
         if (player && player.shuffle) {
             return player.shuffle(shuffleItem);
@@ -3821,7 +3486,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.audioTracks = function (player) {
-
         player = player || this._currentPlayer;
         if (player.audioTracks) {
             var result = player.audioTracks();
@@ -3839,7 +3503,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.subtitleTracks = function (player) {
-
         player = player || this._currentPlayer;
         if (player.subtitleTracks) {
             var result = player.subtitleTracks();
@@ -3857,7 +3520,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.getSupportedCommands = function (player) {
-
         player = player || this._currentPlayer || { isLocalPlayer: true };
 
         if (player.isLocalPlayer) {
@@ -3975,12 +3637,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.trySetActiveDeviceName = function (name) {
-
         name = normalizeName(name);
 
         var instance = this;
         instance.getTargets().then(function (result) {
-
             var target = result.filter(function (p) {
                 return normalizeName(p.name) === name;
             })[0];
@@ -3988,7 +3648,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             if (target) {
                 instance.trySetActivePlayer(target.playerName, target);
             }
-
         });
     };
 
@@ -4012,12 +3671,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.setDefaultPlayerActive = function () {
-
         this.setActivePlayer('localplayer');
     };
 
     PlaybackManager.prototype.removeActivePlayer = function (name) {
-
         var playerInfo = this.getPlayerInfo();
         if (playerInfo) {
             if (playerInfo.name === name) {
@@ -4027,7 +3684,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
     };
 
     PlaybackManager.prototype.removeActiveTarget = function (id) {
-
         var playerInfo = this.getPlayerInfo();
         if (playerInfo) {
             if (playerInfo.id === id) {
@@ -4076,8 +3732,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 this.setSubtitleStreamIndex(parseInt(cmd.Arguments.Index), player);
                 break;
             case 'SetMaxStreamingBitrate':
-                // todo
-                //this.setMaxStreamingBitrate(parseInt(cmd.Arguments.Bitrate), player);
+                this.setMaxStreamingBitrate(parseInt(cmd.Arguments.Bitrate), player);
                 break;
             case 'ToggleFullscreen':
                 this.toggleFullscreen(player);
diff --git a/src/components/playback/playbackorientation.js b/src/components/playback/playbackorientation.js
index 2078c6f6a8..1aa939da04 100644
--- a/src/components/playback/playbackorientation.js
+++ b/src/components/playback/playbackorientation.js
@@ -14,7 +14,6 @@ function onOrientationChangeError(err) {
 }
 
 events.on(playbackManager, 'playbackstart', function (e, player, state) {
-
     var isLocalVideo = player.isLocalPlayer && !player.isExternalPlayer && playbackManager.isPlayingVideo(player);
 
     if (isLocalVideo && layoutManager.mobile) {
@@ -22,7 +21,6 @@ events.on(playbackManager, 'playbackstart', function (e, player, state) {
         var lockOrientation = screen.lockOrientation || screen.mozLockOrientation || screen.msLockOrientation || (screen.orientation && screen.orientation.lock);
 
         if (lockOrientation) {
-
             try {
                 var promise = lockOrientation('landscape');
                 if (promise.then) {
@@ -39,9 +37,7 @@ events.on(playbackManager, 'playbackstart', function (e, player, state) {
 });
 
 events.on(playbackManager, 'playbackstop', function (e, playbackStopInfo) {
-
     if (orientationLocked && !playbackStopInfo.nextMediaType) {
-
         /* eslint-disable-next-line compat/compat */
         var unlockOrientation = screen.unlockOrientation || screen.mozUnlockOrientation || screen.msUnlockOrientation || (screen.orientation && screen.orientation.unlock);
 
diff --git a/src/components/playback/playerSelectionMenu.js b/src/components/playback/playerSelectionMenu.js
index 298ae0b07e..6e5a346c03 100644
--- a/src/components/playback/playerSelectionMenu.js
+++ b/src/components/playback/playerSelectionMenu.js
@@ -8,7 +8,6 @@ import globalize from 'globalize';
 import appHost from 'apphost';
 
 function mirrorItem(info, player) {
-
     var item = info.item;
 
     playbackManager.displayContent({
@@ -21,9 +20,7 @@ function mirrorItem(info, player) {
 }
 
 function mirrorIfEnabled(info) {
-
     if (info && playbackManager.enableDisplayMirroring()) {
-
         var getPlayerInfo = playbackManager.getPlayerInfo();
 
         if (getPlayerInfo) {
@@ -39,9 +36,7 @@ function emptyCallback() {
 }
 
 function getTargetSecondaryText(target) {
-
     if (target.user) {
-
         return target.user.Name;
     }
 
@@ -49,7 +44,6 @@ function getTargetSecondaryText(target) {
 }
 
 function getIcon(target) {
-
     var deviceType = target.deviceType;
 
     if (!deviceType && target.isLocalPlayer) {
@@ -67,7 +61,6 @@ function getIcon(target) {
     }
 
     switch (deviceType) {
-
         case 'smartphone':
             return 'smartphone';
         case 'tablet':
@@ -84,7 +77,6 @@ function getIcon(target) {
 }
 
 export function show(button) {
-
     var currentPlayerInfo = playbackManager.getPlayerInfo();
 
     if (currentPlayerInfo) {
@@ -99,9 +91,7 @@ export function show(button) {
     loading.show();
 
     playbackManager.getTargets().then(function (targets) {
-
         var menuItems = targets.map(function (t) {
-
             var name = t.name;
 
             if (t.appName && t.appName !== t.name) {
@@ -115,11 +105,9 @@ export function show(button) {
                 secondaryText: getTargetSecondaryText(t),
                 icon: getIcon(t)
             };
-
         });
 
         import('actionsheet').then(({default: actionsheet}) => {
-
             loading.hide();
 
             var menuOptions = {
@@ -138,7 +126,6 @@ export function show(button) {
             }
 
             actionsheet.show(menuOptions).then(function (id) {
-
                 var target = targets.filter(function (t) {
                     return t.id === id;
                 })[0];
@@ -146,7 +133,6 @@ export function show(button) {
                 playbackManager.trySetActivePlayer(target.playerName, target);
 
                 mirrorIfEnabled();
-
             }, emptyCallback);
         });
     });
@@ -164,11 +150,8 @@ function showActivePlayerMenu(playerInfo) {
 }
 
 function disconnectFromPlayer(currentDeviceName) {
-
     if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
-
         import('dialog').then(({default: dialog}) => {
-
             var menuItems = [];
 
             menuItems.push({
@@ -182,12 +165,10 @@ function disconnectFromPlayer(currentDeviceName) {
 
             dialog({
                 buttons: menuItems,
-                //positionTo: positionTo,
                 text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName)
 
             }).then(function (id) {
                 switch (id) {
-
                     case 'yes':
                         playbackManager.getCurrentPlayer().endSession();
                         playbackManager.setDefaultPlayerActive();
@@ -199,17 +180,13 @@ function disconnectFromPlayer(currentDeviceName) {
                         break;
                 }
             });
-
         });
-
     } else {
-
         playbackManager.setDefaultPlayerActive();
     }
 }
 
 function showActivePlayerMenuInternal(dialogHelper, playerInfo) {
-
     var html = '';
 
     var dialogOptions = {
@@ -235,7 +212,6 @@ function showActivePlayerMenuInternal(dialogHelper, playerInfo) {
     html += '<div>';
 
     if (playerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
-
         html += '<label class="checkboxContainer">';
         var checkedHtml = playbackManager.enableDisplayMirroring() ? ' checked' : '';
         html += '<input type="checkbox" is="emby-checkbox" class="chkMirror"' + checkedHtml + '/>';
@@ -294,7 +270,6 @@ function onMirrorChange() {
 }
 
 document.addEventListener('viewshow', function (e) {
-
     var state = e.detail.state || {};
     var item = state.item;
 
diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js
index 33d252c52a..71dd7a86ff 100644
--- a/src/components/playback/playersettingsmenu.js
+++ b/src/components/playback/playersettingsmenu.js
@@ -5,7 +5,6 @@ import globalize from 'globalize';
 import qualityoptions from 'qualityoptions';
 
 function showQualityMenu(player, btn) {
-
     var videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) {
         return stream.Type === 'Video';
     })[0];
@@ -88,8 +87,6 @@ function showRepeatModeMenu(player, btn) {
 
 function getQualitySecondaryText(player) {
     var state = playbackManager.getPlayerState(player);
-    var isAutoEnabled = playbackManager.enableAutomaticBitrateDetection(player);
-    var currentMaxBitrate = playbackManager.getMaxStreamingBitrate(player);
 
     var videoStream = playbackManager.currentMediaSource(player).MediaStreams.filter(function (stream) {
         return stream.Type === 'Video';
@@ -106,20 +103,6 @@ function getQualitySecondaryText(player) {
         enableAuto: true
     });
 
-    var menuItems = options.map(function (o) {
-        var opt = {
-            name: o.name,
-            id: o.bitrate,
-            asideText: o.secondaryText
-        };
-
-        if (o.selected) {
-            opt.selected = true;
-        }
-
-        return opt;
-    });
-
     var selectedOption = options.filter(function (o) {
         return o.selected;
     });
@@ -168,7 +151,6 @@ function showAspectRatioMenu(player, btn) {
 
 function showWithUser(options, player, user) {
     var supportedCommands = playbackManager.getSupportedCommands(player);
-    var mediaType = options.mediaType;
 
     var menuItems = [];
     if (supportedCommands.indexOf('SetAspectRatio') !== -1) {
diff --git a/src/components/playback/playmethodhelper.js b/src/components/playback/playmethodhelper.js
index 62793b9a33..50210aa2f2 100644
--- a/src/components/playback/playmethodhelper.js
+++ b/src/components/playback/playmethodhelper.js
@@ -1,5 +1,4 @@
 export function getDisplayPlayMethod(session) {
-
     if (!session.NowPlayingItem) {
         return null;
     }
diff --git a/src/components/playback/playqueuemanager.js b/src/components/playback/playqueuemanager.js
index 2f411091c6..696075b344 100644
--- a/src/components/playback/playqueuemanager.js
+++ b/src/components/playback/playqueuemanager.js
@@ -3,16 +3,13 @@ define([], function () {
 
     var currentId = 0;
     function addUniquePlaylistItemId(item) {
-
         if (!item.PlaylistItemId) {
-
             item.PlaylistItemId = 'playlistItem' + currentId;
             currentId++;
         }
     }
 
     function findPlaylistIndex(playlistItemId, list) {
-
         for (var i = 0, length = list.length; i < length; i++) {
             if (list[i].PlaylistItemId === playlistItemId) {
                 return i;
@@ -23,7 +20,6 @@ define([], function () {
     }
 
     function PlayQueueManager() {
-
         this._sortedPlaylist = [];
         this._playlist = [];
         this._repeatMode = 'RepeatNone';
@@ -35,11 +31,9 @@ define([], function () {
     };
 
     PlayQueueManager.prototype.setPlaylist = function (items) {
-
         items = items.slice(0);
 
         for (var i = 0, length = items.length; i < length; i++) {
-
             addUniquePlaylistItemId(items[i]);
         }
 
@@ -49,9 +43,7 @@ define([], function () {
     };
 
     PlayQueueManager.prototype.queue = function (items) {
-
         for (var i = 0, length = items.length; i < length; i++) {
-
             addUniquePlaylistItemId(items[i]);
 
             this._playlist.push(items[i]);
@@ -105,7 +97,6 @@ define([], function () {
         var length;
 
         for (i = 0, length = items.length; i < length; i++) {
-
             addUniquePlaylistItemId(items[i]);
         }
 
@@ -121,12 +112,10 @@ define([], function () {
     };
 
     PlayQueueManager.prototype.getCurrentPlaylistIndex = function () {
-
         return findPlaylistIndex(this.getCurrentPlaylistItemId(), this._playlist);
     };
 
     PlayQueueManager.prototype.getCurrentItem = function () {
-
         var index = findPlaylistIndex(this.getCurrentPlaylistItemId(), this._playlist);
 
         return index === -1 ? null : this._playlist[index];
@@ -137,12 +126,10 @@ define([], function () {
     };
 
     PlayQueueManager.prototype.setPlaylistState = function (playlistItemId, playlistIndex) {
-
         this._currentPlaylistItemId = playlistItemId;
     };
 
     PlayQueueManager.prototype.setPlaylistIndex = function (playlistIndex) {
-
         if (playlistIndex < 0) {
             this.setPlaylistState(null);
         } else {
@@ -151,7 +138,6 @@ define([], function () {
     };
 
     PlayQueueManager.prototype.removeFromPlaylist = function (playlistItemIds) {
-
         if (this._playlist.length <= playlistItemIds.length) {
             return {
                 result: 'empty'
@@ -180,7 +166,6 @@ define([], function () {
     }
 
     PlayQueueManager.prototype.movePlaylistItem = function (playlistItemId, newIndex) {
-
         var playlist = this.getPlaylist();
 
         var oldIndex;
@@ -213,7 +198,6 @@ define([], function () {
     };
 
     PlayQueueManager.prototype.reset = function () {
-
         this._sortedPlaylist = [];
         this._playlist = [];
         this._currentPlaylistItemId = null;
@@ -265,13 +249,11 @@ define([], function () {
     };
 
     PlayQueueManager.prototype.getNextItemInfo = function () {
-
         var newIndex;
         var playlist = this.getPlaylist();
         var playlistLength = playlist.length;
 
         switch (this.getRepeatMode()) {
-
             case 'RepeatOne':
                 newIndex = this.getCurrentPlaylistIndex();
                 break;
diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js
index c2f6761f53..8a6f534b52 100644
--- a/src/components/playback/volumeosd.js
+++ b/src/components/playback/volumeosd.js
@@ -23,10 +23,8 @@ function getOsdElementHtml() {
 }
 
 function ensureOsdElement() {
-
     var elem = osdElement;
     if (!elem) {
-
         enableAnimation = browser.supportsCssAnimation();
 
         elem = document.createElement('div');
@@ -50,7 +48,6 @@ function onHideComplete() {
 
 var hideTimeout;
 function showOsd() {
-
     clearHideTimeout();
 
     var elem = osdElement;
@@ -79,12 +76,10 @@ function clearHideTimeout() {
 }
 
 function hideOsd() {
-
     clearHideTimeout();
 
     var elem = osdElement;
     if (elem) {
-
         if (enableAnimation) {
             // trigger reflow
             void elem.offsetWidth;
@@ -103,7 +98,6 @@ function hideOsd() {
 }
 
 function updatePlayerVolumeState(isMuted, volume) {
-
     if (iconElement) {
         iconElement.classList.remove('volume_off', 'volume_up');
         iconElement.classList.add(isMuted ? 'volume_off' : 'volume_up');
@@ -114,7 +108,6 @@ function updatePlayerVolumeState(isMuted, volume) {
 }
 
 function releaseCurrentPlayer() {
-
     var player = currentPlayer;
 
     if (player) {
@@ -125,7 +118,6 @@ function releaseCurrentPlayer() {
 }
 
 function onVolumeChanged(e) {
-
     var player = this;
 
     ensureOsdElement();
@@ -136,7 +128,6 @@ function onVolumeChanged(e) {
 }
 
 function bindToPlayer(player) {
-
     if (player === currentPlayer) {
         return;
     }
diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js
index 9c7e20f9e1..66e1ae777f 100644
--- a/src/components/playbackSettings/playbackSettings.js
+++ b/src/components/playbackSettings/playbackSettings.js
@@ -13,7 +13,6 @@ import 'emby-checkbox';
 /* eslint-disable indent */
 
     function fillSkipLengths(select) {
-
         const options = [5, 10, 15, 20, 25, 30];
 
         select.innerHTML = options.map(option => {
@@ -27,13 +26,11 @@ import 'emby-checkbox';
     }
 
     function populateLanguages(select, languages) {
-
         let html = '';
 
         html += `<option value=''>${globalize.translate('AnyLanguage')}</option>`;
 
         for (let i = 0, length = languages.length; i < length; i++) {
-
             const culture = languages[i];
 
             html += `<option value='${culture.ThreeLetterISOLanguageName}'>${culture.DisplayName}</option>`;
@@ -43,7 +40,6 @@ import 'emby-checkbox';
     }
 
     function setMaxBitrateIntoField(select, isInNetwork, mediatype) {
-
         const options = mediatype === 'Audio' ? qualityoptions.getAudioQualityOptions({
 
             currentMaxBitrate: appSettings.maxStreamingBitrate(isInNetwork, mediatype),
@@ -59,7 +55,6 @@ import 'emby-checkbox';
         });
 
         select.innerHTML = options.map(i => {
-
             // render empty string instead of 0 for the auto option
             return `<option value="${i.bitrate || ''}">${i.name}</option>`;
         }).join('');
@@ -72,7 +67,6 @@ import 'emby-checkbox';
     }
 
     function fillChromecastQuality(select) {
-
         const options = qualityoptions.getVideoQualityOptions({
 
             currentMaxBitrate: appSettings.maxChromecastBitrate(),
@@ -81,7 +75,6 @@ import 'emby-checkbox';
         });
 
         select.innerHTML = options.map(i => {
-
             // render empty string instead of 0 for the auto option
             return `<option value="${i.bitrate || ''}">${i.name}</option>`;
         }).join('');
@@ -90,7 +83,6 @@ import 'emby-checkbox';
     }
 
     function setMaxBitrateFromField(select, isInNetwork, mediatype) {
-
         if (select.value) {
             appSettings.maxStreamingBitrate(isInNetwork, mediatype, select.value);
             appSettings.enableAutomaticBitrateDetection(isInNetwork, mediatype, false);
@@ -100,7 +92,6 @@ import 'emby-checkbox';
     }
 
     function showHideQualityFields(context, user, apiClient) {
-
         if (user.Policy.EnableVideoPlaybackTranscoding) {
             context.querySelector('.videoQualitySection').classList.remove('hide');
         } else {
@@ -108,7 +99,6 @@ import 'emby-checkbox';
         }
 
         if (appHost.supports('multiserver')) {
-
             context.querySelector('.fldVideoInNetworkQuality').classList.remove('hide');
             context.querySelector('.fldVideoInternetQuality').classList.remove('hide');
 
@@ -122,15 +112,12 @@ import 'emby-checkbox';
         }
 
         apiClient.getEndpointInfo().then(endpointInfo => {
-
             if (endpointInfo.IsInNetwork) {
-
                 context.querySelector('.fldVideoInNetworkQuality').classList.remove('hide');
 
                 context.querySelector('.fldVideoInternetQuality').classList.add('hide');
                 context.querySelector('.musicQualitySection').classList.add('hide');
             } else {
-
                 context.querySelector('.fldVideoInNetworkQuality').classList.add('hide');
 
                 context.querySelector('.fldVideoInternetQuality').classList.remove('hide');
@@ -145,7 +132,6 @@ import 'emby-checkbox';
     }
 
     function showOrHideEpisodesField(context) {
-
         if (browser.tizen || browser.web0s) {
             context.querySelector('.fldEpisodeAutoPlay').classList.add('hide');
             return;
@@ -155,14 +141,12 @@ import 'emby-checkbox';
     }
 
     function loadForm(context, user, userSettings, apiClient) {
-
         const loggedInUserId = apiClient.getCurrentUserId();
         const userId = user.Id;
 
         showHideQualityFields(context, user, apiClient);
 
         apiClient.getCultures().then(allCultures => {
-
             populateLanguages(context.querySelector('#selectAudioLanguage'), allCultures);
 
             context.querySelector('#selectAudioLanguage', context).value = user.Configuration.AudioLanguagePreference || '';
@@ -171,7 +155,6 @@ import 'emby-checkbox';
 
         // hide cinema mode options if disabled at server level
         apiClient.getNamedConfiguration('cinemamode').then(cinemaConfig => {
-
             if (cinemaConfig.EnableIntrosForMovies || cinemaConfig.EnableIntrosForEpisodes) {
                 context.querySelector('.cinemaModeOptions').classList.remove('hide');
             } else {
@@ -232,7 +215,6 @@ import 'emby-checkbox';
     }
 
     function saveUser(context, user, userSettingsInstance, apiClient) {
-
         appSettings.enableSystemExternalPlayers(context.querySelector('.chkExternalVideoPlayer').checked);
 
         appSettings.maxChromecastBitrate(context.querySelector('.selectChromecastVideoQuality').value);
@@ -256,13 +238,10 @@ import 'emby-checkbox';
     }
 
     function save(instance, context, userId, userSettings, apiClient, enableSaveConfirmation) {
-
         loading.show();
 
         apiClient.getUser(userId).then(user => {
-
             saveUser(context, user, userSettings, apiClient).then(() => {
-
                 loading.hide();
                 if (enableSaveConfirmation) {
                     import('toast').then(({default: toast}) => {
@@ -271,7 +250,6 @@ import 'emby-checkbox';
                 }
 
                 events.trigger(instance, 'saved');
-
             }, () => {
                 loading.hide();
             });
@@ -279,14 +257,12 @@ import 'emby-checkbox';
     }
 
     function onSubmit(e) {
-
         const self = this;
         const apiClient = connectionManager.getApiClient(self.options.serverId);
         const userId = self.options.userId;
         const userSettings = self.options.userSettings;
 
         userSettings.setUserInfo(userId, apiClient).then(() => {
-
             const enableSaveConfirmation = self.options.enableSaveConfirmation;
             save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
         });
@@ -299,9 +275,7 @@ import 'emby-checkbox';
     }
 
     function embed(options, self) {
-
         return import('text!./playbackSettings.template.html').then(({default: template}) => {
-
             options.element.innerHTML = globalize.translateHtml(template, 'core');
 
             options.element.querySelector('form').addEventListener('submit', onSubmit.bind(self));
@@ -325,7 +299,6 @@ import 'emby-checkbox';
         }
 
         loadData() {
-
             const self = this;
             const context = self.options.element;
 
@@ -336,9 +309,7 @@ import 'emby-checkbox';
             const userSettings = self.options.userSettings;
 
             apiClient.getUser(userId).then(user => {
-
                 userSettings.setUserInfo(userId, apiClient).then(() => {
-
                     self.dataLoaded = true;
 
                     loadForm(context, user, userSettings, apiClient);
@@ -351,7 +322,6 @@ import 'emby-checkbox';
         }
 
         destroy() {
-
             this.options = null;
         }
     }
diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js
index fce37c1507..23a84310fb 100644
--- a/src/components/playerstats/playerstats.js
+++ b/src/components/playerstats/playerstats.js
@@ -5,14 +5,12 @@ import connectionManager from 'connectionManager';
 import syncPlayManager from 'syncPlayManager';
 import playMethodHelper from 'playMethodHelper';
 import layoutManager from 'layoutManager';
-import serverNotifications from 'serverNotifications';
 import 'paper-icon-button-light';
 import 'css!./playerstats';
 
 /* eslint-disable indent */
 
     function init(instance) {
-
         const parent = document.createElement('div');
 
         parent.classList.add('playerStats');
@@ -51,9 +49,7 @@ import 'css!./playerstats';
     }
 
     function renderStats(elem, categories) {
-
         elem.querySelector('.playerStats-stats').innerHTML = categories.map(function (category) {
-
             let categoryHtml = '';
 
             const stats = category.stats;
@@ -73,7 +69,6 @@ import 'css!./playerstats';
             }
 
             for (let i = 0, length = stats.length; i < length; i++) {
-
                 categoryHtml += '<div class="playerStats-stat">';
 
                 const stat = stats[i];
@@ -90,12 +85,10 @@ import 'css!./playerstats';
             }
 
             return categoryHtml;
-
         }).join('');
     }
 
     function getSession(instance, player) {
-
         const now = new Date().getTime();
 
         if ((now - (instance.lastSessionTime || 0)) < 10000) {
@@ -107,19 +100,16 @@ import 'css!./playerstats';
         return apiClient.getSessions({
             deviceId: apiClient.deviceId()
         }).then(function (sessions) {
-
             instance.lastSession = sessions[0] || {};
             instance.lastSessionTime = new Date().getTime();
 
             return Promise.resolve(instance.lastSession);
-
         }, function () {
             return Promise.resolve({});
         });
     }
 
     function translateReason(reason) {
-
         return globalize.translate('' + reason);
     }
 
@@ -132,7 +122,6 @@ import 'css!./playerstats';
         let audioChannels;
 
         if (session.TranscodingInfo) {
-
             videoCodec = session.TranscodingInfo.VideoCodec;
             audioCodec = session.TranscodingInfo.AudioCodec;
             totalBitrate = session.TranscodingInfo.Bitrate;
@@ -140,7 +129,6 @@ import 'css!./playerstats';
         }
 
         if (videoCodec) {
-
             sessionStats.push({
                 label: globalize.translate('LabelVideoCodec'),
                 value: session.TranscodingInfo.IsVideoDirect ? (videoCodec.toUpperCase() + ' (direct)') : videoCodec.toUpperCase()
@@ -148,45 +136,39 @@ import 'css!./playerstats';
         }
 
         if (audioCodec) {
-
             sessionStats.push({
                 label: globalize.translate('LabelAudioCodec'),
                 value: session.TranscodingInfo.IsAudioDirect ? (audioCodec.toUpperCase() + ' (direct)') : audioCodec.toUpperCase()
             });
         }
 
-        //if (audioChannels) {
-
-        //    sessionStats.push({
-        //        label: 'Audio channels:',
-        //        value: audioChannels
-        //    });
-        //}
+        if (audioChannels) {
+            sessionStats.push({
+                label: globalize.translate('LabelAudioChannels'),
+                value: audioChannels
+            });
+        }
 
         if (displayPlayMethod === 'Transcode') {
             if (totalBitrate) {
-
                 sessionStats.push({
                     label: globalize.translate('LabelBitrate'),
                     value: getDisplayBitrate(totalBitrate)
                 });
             }
             if (session.TranscodingInfo.CompletionPercentage) {
-
                 sessionStats.push({
                     label: globalize.translate('LabelTranscodingProgress'),
                     value: session.TranscodingInfo.CompletionPercentage.toFixed(1) + '%'
                 });
             }
             if (session.TranscodingInfo.Framerate) {
-
                 sessionStats.push({
                     label: globalize.translate('LabelTranscodingFramerate'),
                     value: session.TranscodingInfo.Framerate + ' fps'
                 });
             }
             if (session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length) {
-
                 sessionStats.push({
                     label: globalize.translate('LabelReasonForTranscoding'),
                     value: session.TranscodingInfo.TranscodeReasons.map(translateReason).join('<br/>')
@@ -198,7 +180,6 @@ import 'css!./playerstats';
     }
 
     function getDisplayBitrate(bitrate) {
-
         if (bitrate > 1000000) {
             return (bitrate / 1000000).toFixed(1) + ' Mbps';
         } else {
@@ -217,7 +198,6 @@ import 'css!./playerstats';
     }
 
     function getMediaSourceStats(session, player, displayPlayMethod) {
-
         const sessionStats = [];
 
         const mediaSource = playbackManager.currentMediaSource(player) || {};
@@ -239,7 +219,6 @@ import 'css!./playerstats';
         }
 
         if (totalBitrate) {
-
             sessionStats.push({
                 label: globalize.translate('LabelBitrate'),
                 value: getDisplayBitrate(totalBitrate)
@@ -248,18 +227,14 @@ import 'css!./playerstats';
 
         const mediaStreams = mediaSource.MediaStreams || [];
         const videoStream = mediaStreams.filter(function (s) {
-
             return s.Type === 'Video';
-
         })[0] || {};
 
         const videoCodec = videoStream.Codec;
 
         const audioStreamIndex = playbackManager.getAudioStreamIndex(player);
         const audioStream = playbackManager.audioTracks(player).filter(function (s) {
-
             return s.Type === 'Audio' && s.Index === audioStreamIndex;
-
         })[0] || {};
 
         const audioCodec = audioStream.Codec;
@@ -360,12 +335,10 @@ import 'css!./playerstats';
     }
 
     function getStats(instance, player) {
-
         const statsPromise = player.getStats ? player.getStats() : Promise.resolve({});
         const sessionPromise = getSession(instance, player);
 
         return Promise.all([statsPromise, sessionPromise]).then(function (responses) {
-
             const playerStatsResult = responses[0];
             const playerStats = playerStatsResult.categories || [];
             const session = responses[1];
@@ -392,7 +365,6 @@ import 'css!./playerstats';
             categories.push(baseCategory);
 
             for (let i = 0, length = playerStats.length; i < length; i++) {
-
                 const category = playerStats[i];
                 if (category.type === 'audio') {
                     category.name = 'Audio Info';
@@ -403,7 +375,6 @@ import 'css!./playerstats';
             }
 
             if (session.TranscodingInfo) {
-
                 categories.push({
                     stats: getTranscodingStats(session, player, displayPlayMethod),
                     name: displayPlayMethod === 'Transcode' ? 'Transcoding Info' : 'Direct Stream Info'
@@ -428,7 +399,6 @@ import 'css!./playerstats';
     }
 
     function renderPlayerStats(instance, player) {
-
         const now = new Date().getTime();
 
         if ((now - (instance.lastRender || 0)) < 700) {
@@ -438,7 +408,6 @@ import 'css!./playerstats';
         instance.lastRender = now;
 
         getStats(instance, player).then(function (stats) {
-
             const elem = instance.element;
             if (!elem) {
                 return;
@@ -449,7 +418,6 @@ import 'css!./playerstats';
     }
 
     function bindEvents(instance, player) {
-
         const localOnTimeUpdate = function () {
             renderPlayerStats(instance, player);
         };
@@ -459,7 +427,6 @@ import 'css!./playerstats';
     }
 
     function unbindEvents(instance, player) {
-
         const localOnTimeUpdate = instance.onTimeUpdate;
 
         if (localOnTimeUpdate) {
@@ -469,7 +436,6 @@ import 'css!./playerstats';
 
 class PlayerStats {
     constructor(options) {
-
         this.options = options;
 
         init(this);
@@ -478,7 +444,6 @@ class PlayerStats {
     }
 
     enabled(enabled) {
-
         if (enabled == null) {
             return this._enabled;
         }
@@ -504,11 +469,9 @@ class PlayerStats {
     }
 
     destroy() {
-
         const options = this.options;
 
         if (options) {
-
             this.options = null;
             unbindEvents(this, options.player);
         }
diff --git a/src/components/playmenu.js b/src/components/playmenu.js
index 50c2a7b31f..c537993ef6 100644
--- a/src/components/playmenu.js
+++ b/src/components/playmenu.js
@@ -4,7 +4,6 @@ import playbackManager from 'playbackManager';
 import globalize from 'globalize';
 
 export function show(options) {
-
     var item = options.item;
 
     var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null;
@@ -38,7 +37,6 @@ export function show(options) {
 
     }).then(function (id) {
         switch (id) {
-
             case 'play':
                 playbackManager.play({
                     ids: [playableItemId],
diff --git a/src/components/pluginManager.js b/src/components/pluginManager.js
index fd35d344bf..df4a0c42b7 100644
--- a/src/components/pluginManager.js
+++ b/src/components/pluginManager.js
@@ -13,7 +13,6 @@ define(['events', 'globalize'], function (events, globalize) {
     }
 
     function definePluginRoute(pluginManager, route, plugin) {
-
         route.contentPath = pluginManager.mapPath(plugin, route.path);
         route.path = pluginManager.mapRoute(plugin, route);
 
@@ -21,12 +20,10 @@ define(['events', 'globalize'], function (events, globalize) {
     }
 
     function PluginManager() {
-
         this.pluginsList = [];
     }
 
     PluginManager.prototype.loadPlugin = function(pluginSpec) {
-
         var instance = this;
 
         function registerPlugin(plugin) {
@@ -39,7 +36,6 @@ define(['events', 'globalize'], function (events, globalize) {
             }
 
             if (plugin.type === 'skin') {
-
                 // translations won't be loaded for skins until needed
                 return Promise.resolve(plugin);
             } else {
@@ -104,13 +100,11 @@ define(['events', 'globalize'], function (events, globalize) {
     // name
     // type (skin, screensaver, etc)
     PluginManager.prototype.register = function (obj) {
-
         this.pluginsList.push(obj);
         events.trigger(this, 'registered', [obj]);
     };
 
     PluginManager.prototype.ofType = function (type) {
-
         return this.pluginsList.filter(function (o) {
             return o.type === type;
         });
@@ -121,7 +115,6 @@ define(['events', 'globalize'], function (events, globalize) {
     };
 
     PluginManager.prototype.mapRoute = function (plugin, route) {
-
         if (typeof plugin === 'string') {
             plugin = this.pluginsList.filter(function (p) {
                 return (p.id || p.packageName) === plugin;
@@ -138,7 +131,6 @@ define(['events', 'globalize'], function (events, globalize) {
     };
 
     PluginManager.prototype.mapPath = function (plugin, path, addCacheParam) {
-
         if (typeof plugin === 'string') {
             plugin = this.pluginsList.filter(function (p) {
                 return (p.id || p.packageName) === plugin;
diff --git a/src/components/prompt/prompt.js b/src/components/prompt/prompt.js
index f3bf72f8f2..868f1d865c 100644
--- a/src/components/prompt/prompt.js
+++ b/src/components/prompt/prompt.js
@@ -12,7 +12,6 @@ import 'formDialogStyle';
 
 /* eslint-disable indent */
 export default (() => {
-
     function replaceAll(str, find, replace) {
         return str.split(find).join(replace);
     }
@@ -68,7 +67,6 @@ export default (() => {
         let submitValue;
 
         dlg.querySelector('form').addEventListener('submit', e => {
-
             submitValue = dlg.querySelector('#txtInput').value;
             e.preventDefault();
             e.stopPropagation();
diff --git a/src/components/qualityOptions.js b/src/components/qualityOptions.js
index 221e13d4ef..10a5df39ba 100644
--- a/src/components/qualityOptions.js
+++ b/src/components/qualityOptions.js
@@ -2,7 +2,6 @@ define(['globalize'], function (globalize) {
     'use strict';
 
     function getVideoQualityOptions(options) {
-
         var maxStreamingBitrate = options.currentMaxBitrate;
         var videoWidth = options.videoWidth;
         var videoHeight = options.videoHeight;
@@ -14,7 +13,6 @@ define(['globalize'], function (globalize) {
         }
 
         var maxAllowedWidth = videoWidth || 4096;
-        //var maxAllowedHeight = videoHeight || 2304;
 
         var qualityOptions = [];
 
@@ -26,7 +24,6 @@ define(['globalize'], function (globalize) {
 
         // Some 1080- videos are reported as 1912?
         if (maxAllowedWidth >= 1900) {
-
             qualityOptions.push({ name: '1080p - 60 Mbps', maxHeight: 1080, bitrate: 60000000 });
             qualityOptions.push({ name: '1080p - 50 Mbps', maxHeight: 1080, bitrate: 50000000 });
             qualityOptions.push({ name: '1080p - 40 Mbps', maxHeight: 1080, bitrate: 40000000 });
@@ -39,13 +36,11 @@ define(['globalize'], function (globalize) {
             qualityOptions.push({ name: '1080p - 6 Mbps', maxHeight: 1080, bitrate: 6000001 });
             qualityOptions.push({ name: '1080p - 5 Mbps', maxHeight: 1080, bitrate: 5000001 });
             qualityOptions.push({ name: '1080p - 4 Mbps', maxHeight: 1080, bitrate: 4000002 });
-
         } else if (maxAllowedWidth >= 1260) {
             qualityOptions.push({ name: '720p - 10 Mbps', maxHeight: 720, bitrate: 10000000 });
             qualityOptions.push({ name: '720p - 8 Mbps', maxHeight: 720, bitrate: 8000000 });
             qualityOptions.push({ name: '720p - 6 Mbps', maxHeight: 720, bitrate: 6000000 });
             qualityOptions.push({ name: '720p - 5 Mbps', maxHeight: 720, bitrate: 5000000 });
-
         } else if (maxAllowedWidth >= 620) {
             qualityOptions.push({ name: '480p - 4 Mbps', maxHeight: 480, bitrate: 4000001 });
             qualityOptions.push({ name: '480p - 3 Mbps', maxHeight: 480, bitrate: 3000001 });
@@ -84,7 +79,6 @@ define(['globalize'], function (globalize) {
         if (maxStreamingBitrate) {
             var selectedIndex = -1;
             for (var i = 0, length = qualityOptions.length; i < length; i++) {
-
                 var option = qualityOptions[i];
 
                 if (selectedIndex === -1 && option.bitrate <= maxStreamingBitrate) {
@@ -93,7 +87,6 @@ define(['globalize'], function (globalize) {
             }
 
             if (selectedIndex === -1) {
-
                 selectedIndex = qualityOptions.length - 1;
             }
 
@@ -110,7 +103,6 @@ define(['globalize'], function (globalize) {
     }
 
     function getAudioQualityOptions(options) {
-
         var maxStreamingBitrate = options.currentMaxBitrate;
 
         var qualityOptions = [];
@@ -138,7 +130,6 @@ define(['globalize'], function (globalize) {
         if (maxStreamingBitrate) {
             var selectedIndex = -1;
             for (var i = 0, length = qualityOptions.length; i < length; i++) {
-
                 var option = qualityOptions[i];
 
                 if (selectedIndex === -1 && option.bitrate <= maxStreamingBitrate) {
@@ -147,7 +138,6 @@ define(['globalize'], function (globalize) {
             }
 
             if (selectedIndex === -1) {
-
                 selectedIndex = qualityOptions.length - 1;
             }
 
diff --git a/src/components/recordingcreator/recordingbutton.js b/src/components/recordingcreator/recordingbutton.js
index c4bfc43010..3ad4ffa594 100644
--- a/src/components/recordingcreator/recordingbutton.js
+++ b/src/components/recordingcreator/recordingbutton.js
@@ -2,11 +2,9 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
     'use strict';
 
     function onRecordingButtonClick(e) {
-
         var item = this.item;
 
         if (item) {
-
             var serverId = item.ServerId;
             var programId = item.Id;
             var timerId = item.TimerId;
@@ -50,23 +48,19 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
     }
 
     function getIndicatorIcon(item) {
-
         var status;
 
         if (item.Type === 'SeriesTimer') {
             return 'fiber_smart_record';
         } else if (item.TimerId || item.SeriesTimerId) {
-
             status = item.Status || 'Cancelled';
         } else if (item.Type === 'Timer') {
-
             status = item.Status;
         } else {
             return 'fiber_manual_record';
         }
 
         if (item.SeriesTimerId) {
-
             if (status !== 'Cancelled') {
                 return 'fiber_smart_record';
             }
@@ -76,7 +70,6 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
     }
 
     RecordingButton.prototype.refresh = function (serverId, itemId) {
-
         var apiClient = connectionManager.getApiClient(serverId);
         var self = this;
         apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
@@ -85,7 +78,6 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
     };
 
     RecordingButton.prototype.refreshItem = function (item) {
-
         var options = this.options;
         var button = options.button;
         this.item = item;
@@ -99,7 +91,6 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
     };
 
     RecordingButton.prototype.destroy = function () {
-
         var options = this.options;
 
         if (options) {
diff --git a/src/components/recordingcreator/recordingcreator.js b/src/components/recordingcreator/recordingcreator.js
index d18d5fcb6c..f330e54156 100644
--- a/src/components/recordingcreator/recordingcreator.js
+++ b/src/components/recordingcreator/recordingcreator.js
@@ -6,27 +6,22 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     var currentRecordingFields;
 
     function closeDialog() {
-
         dialogHelper.close(currentDialog);
     }
 
     function init(context) {
-
         context.querySelector('.btnPlay').addEventListener('click', function () {
-
             closeAction = 'play';
             closeDialog();
         });
 
         context.querySelector('.btnCancel').addEventListener('click', function () {
-
             closeAction = null;
             closeDialog();
         });
     }
 
     function getImageUrl(item, apiClient, imageHeight) {
-
         var imageTags = item.ImageTags || {};
 
         if (item.PrimaryImageTag) {
@@ -34,14 +29,12 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         }
 
         if (imageTags.Primary) {
-
             return apiClient.getScaledImageUrl(item.Id, {
                 type: 'Primary',
                 maxHeight: imageHeight,
                 tag: item.ImageTags.Primary
             });
         } else if (imageTags.Thumb) {
-
             return apiClient.getScaledImageUrl(item.Id, {
                 type: 'Thumb',
                 maxHeight: imageHeight,
@@ -53,7 +46,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function renderRecording(context, defaultTimer, program, apiClient, refreshRecordingStateOnly) {
-
         if (!refreshRecordingStateOnly) {
             var imgUrl = getImageUrl(program, apiClient, 200);
             var imageContainer = context.querySelector('.recordingDialog-imageContainer');
@@ -91,7 +83,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function reload(context, programId, serverId, refreshRecordingStateOnly) {
-
         loading.show();
 
         var apiClient = connectionManager.getApiClient(serverId);
@@ -100,7 +91,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         var promise2 = apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId());
 
         Promise.all([promise1, promise2]).then(function (responses) {
-
             var defaults = responses[0];
             var program = responses[1];
 
@@ -109,15 +99,11 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function executeCloseAction(action, programId, serverId) {
-
         if (action === 'play') {
-
             require(['playbackManager'], function (playbackManager) {
-
                 var apiClient = connectionManager.getApiClient(serverId);
 
                 apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) {
-
                     playbackManager.play({
                         ids: [item.ChannelId],
                         serverId: serverId
@@ -129,15 +115,12 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function showEditor(itemId, serverId) {
-
         return new Promise(function (resolve, reject) {
-
             closeAction = null;
 
             loading.show();
 
             require(['text!./recordingcreator.template.html'], function (template) {
-
                 var dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
@@ -167,7 +150,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 }
 
                 dlg.addEventListener('close', function () {
-
                     events.off(currentRecordingFields, 'recordingchanged', onRecordingChanged);
                     executeCloseAction(closeAction, itemId, serverId);
 
diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js
index c3f40fcddb..3797cde370 100644
--- a/src/components/recordingcreator/recordingeditor.js
+++ b/src/components/recordingcreator/recordingeditor.js
@@ -8,20 +8,14 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     var currentResolve;
 
     function deleteTimer(apiClient, timerId) {
-
         return new Promise(function (resolve, reject) {
-
             require(['recordingHelper'], function (recordingHelper) {
-
                 recordingHelper.cancelTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject);
             });
         });
     }
 
     function renderTimer(context, item, apiClient) {
-
-        var program = item.ProgramInfo || {};
-
         context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
         context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
 
@@ -29,14 +23,12 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function closeDialog(isDeleted) {
-
         recordingDeleted = isDeleted;
 
         dialogHelper.close(currentDialog);
     }
 
     function onSubmit(e) {
-
         var form = this;
 
         var apiClient = connectionManager.getApiClient(currentServerId);
@@ -54,14 +46,11 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function init(context) {
-
         context.querySelector('.btnCancel').addEventListener('click', function () {
-
             closeDialog(false);
         });
 
         context.querySelector('.btnCancelRecording').addEventListener('click', function () {
-
             var apiClient = connectionManager.getApiClient(currentServerId);
             deleteTimer(apiClient, currentItemId).then(function () {
                 closeDialog(true);
@@ -72,22 +61,18 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function reload(context, id) {
-
         loading.show();
         currentItemId = id;
 
         var apiClient = connectionManager.getApiClient(currentServerId);
         apiClient.getLiveTvTimer(id).then(function (result) {
-
             renderTimer(context, result, apiClient);
             loading.hide();
         });
     }
 
     function showEditor(itemId, serverId, options) {
-
         return new Promise(function (resolve, reject) {
-
             recordingDeleted = false;
             currentServerId = serverId;
             loading.show();
@@ -127,14 +112,12 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 currentDialog = dlg;
 
                 dlg.addEventListener('closing', function () {
-
                     if (!recordingDeleted) {
                         dlg.querySelector('.btnSubmit').click();
                     }
                 });
 
                 dlg.addEventListener('close', function () {
-
                     if (recordingDeleted) {
                         resolve({
                             updated: true,
diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js
index 84348fcfbc..2534eafe6a 100644
--- a/src/components/recordingcreator/recordingfields.js
+++ b/src/components/recordingcreator/recordingfields.js
@@ -34,7 +34,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
     }
 
     function fetchData(instance) {
-
         var options = instance.options;
         var apiClient = connectionManager.getApiClient(options.serverId);
 
@@ -121,7 +120,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
     }
 
     function onManageSeriesRecordingClick(e) {
-
         var options = this.options;
 
         if (!this.SeriesTimerId) {
@@ -131,7 +129,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
         var self = this;
 
         require(['seriesRecordingEditor'], function (seriesRecordingEditor) {
-
             seriesRecordingEditor.show(self.SeriesTimerId, options.serverId, {
 
                 enableCancel: false
@@ -143,7 +140,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
     }
 
     function onRecordChange(e) {
-
         this.changed = true;
 
         var self = this;
@@ -183,7 +179,6 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
     }
 
     function onRecordSeriesChange(e) {
-
         this.changed = true;
 
         var self = this;
diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js
index c773368f2d..4a0bdd9b01 100644
--- a/src/components/recordingcreator/recordinghelper.js
+++ b/src/components/recordingcreator/recordinghelper.js
@@ -2,17 +2,13 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
     'use strict';
 
     function changeRecordingToSeries(apiClient, timerId, programId, confirmTimerCancellation) {
-
         loading.show();
 
         return apiClient.getItem(apiClient.getCurrentUserId(), programId).then(function (item) {
-
             if (item.IsSeries) {
                 // create series
                 return apiClient.getNewLiveTvTimerDefaults({ programId: programId }).then(function (timerDefaults) {
-
                     return apiClient.createLiveTvSeriesTimer(timerDefaults).then(function () {
-
                         loading.hide();
                         sendToast(globalize.translate('SeriesRecordingScheduled'));
                     });
@@ -29,11 +25,8 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
     }
 
     function cancelTimerWithConfirmation(timerId, serverId) {
-
         return new Promise(function (resolve, reject) {
-
             require(['confirm'], function (confirm) {
-
                 confirm.default({
 
                     text: globalize.translate('MessageConfirmRecordingCancellation'),
@@ -42,23 +35,18 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                     cancelText: globalize.translate('HeaderKeepRecording')
 
                 }).then(function () {
-
                     loading.show();
 
                     var apiClient = connectionManager.getApiClient(serverId);
                     cancelTimer(apiClient, timerId, true).then(resolve, reject);
-
                 }, reject);
             });
         });
     }
 
     function cancelSeriesTimerWithConfirmation(timerId, serverId) {
-
         return new Promise(function (resolve, reject) {
-
             require(['confirm'], function (confirm) {
-
                 confirm.default({
 
                     text: globalize.translate('MessageConfirmRecordingCancellation'),
@@ -67,12 +55,10 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                     cancelText: globalize.translate('HeaderKeepSeries')
 
                 }).then(function () {
-
                     loading.show();
 
                     var apiClient = connectionManager.getApiClient(serverId);
                     apiClient.cancelLiveTvSeriesTimer(timerId).then(function () {
-
                         require(['toast'], function (toast) {
                             toast(globalize.translate('SeriesCancelled'));
                         });
@@ -80,7 +66,6 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                         loading.hide();
                         resolve();
                     }, reject);
-
                 }, reject);
             });
         });
@@ -89,7 +74,6 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
     function cancelTimer(apiClient, timerId, hideLoading) {
         loading.show();
         return apiClient.cancelLiveTvTimer(timerId).then(function () {
-
             if (hideLoading !== false) {
                 loading.hide();
                 sendToast(globalize.translate('RecordingCancelled'));
@@ -98,16 +82,13 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
     }
 
     function createRecording(apiClient, programId, isSeries) {
-
         loading.show();
         return apiClient.getNewLiveTvTimerDefaults({ programId: programId }).then(function (item) {
-
             var promise = isSeries ?
                 apiClient.createLiveTvSeriesTimer(item) :
                 apiClient.createLiveTvTimer(item);
 
             return promise.then(function () {
-
                 loading.hide();
                 sendToast(globalize.translate('RecordingScheduled'));
             });
@@ -122,9 +103,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 
     function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) {
         return new Promise(function (resolve, reject) {
-
             require(['dialog'], function (dialog) {
-
                 var items = [];
 
                 items.push({
@@ -159,7 +138,6 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                     buttons: items
 
                 }).then(function (result) {
-
                     var apiClient = connectionManager.getApiClient(serverId);
 
                     if (result === 'canceltimer') {
@@ -167,11 +145,9 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
 
                         cancelTimer(apiClient, timerId, true).then(resolve, reject);
                     } else if (result === 'cancelseriestimer') {
-
                         loading.show();
 
                         apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () {
-
                             require(['toast'], function (toast) {
                                 toast(globalize.translate('SeriesCancelled'));
                             });
@@ -182,7 +158,6 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                     } else {
                         resolve();
                     }
-
                 }, reject);
             });
         });
diff --git a/src/components/recordingcreator/seriesrecordingeditor.js b/src/components/recordingcreator/seriesrecordingeditor.js
index a101ce53ec..ea20c7267d 100644
--- a/src/components/recordingcreator/seriesrecordingeditor.js
+++ b/src/components/recordingcreator/seriesrecordingeditor.js
@@ -8,20 +8,14 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     var currentServerId;
 
     function deleteTimer(apiClient, timerId) {
-
         return new Promise(function (resolve, reject) {
-
             require(['recordingHelper'], function (recordingHelper) {
-
                 recordingHelper.cancelSeriesTimerWithConfirmation(timerId, apiClient.serverId()).then(resolve, reject);
             });
         });
     }
 
     function renderTimer(context, item, apiClient) {
-
-        var program = item.ProgramInfo || {};
-
         context.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
         context.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
 
@@ -44,7 +38,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function closeDialog(isDeleted) {
-
         recordingUpdated = true;
         recordingDeleted = isDeleted;
 
@@ -52,13 +45,11 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function onSubmit(e) {
-
         var form = this;
 
         var apiClient = connectionManager.getApiClient(currentServerId);
 
         apiClient.getLiveTvSeriesTimer(currentItemId).then(function (item) {
-
             item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
             item.PostPaddingSeconds = form.querySelector('#txtPostPaddingMinutes').value * 60;
             item.RecordAnyChannel = form.querySelector('.selectChannels').value === 'all';
@@ -77,16 +68,13 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function init(context) {
-
         fillKeepUpTo(context);
 
         context.querySelector('.btnCancel').addEventListener('click', function () {
-
             closeDialog(false);
         });
 
         context.querySelector('.btnCancelRecording').addEventListener('click', function () {
-
             var apiClient = connectionManager.getApiClient(currentServerId);
             deleteTimer(apiClient, currentItemId).then(function () {
                 closeDialog(true);
@@ -97,7 +85,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function reload(context, id) {
-
         var apiClient = connectionManager.getApiClient(currentServerId);
 
         loading.show();
@@ -105,12 +92,10 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             currentItemId = id;
 
             apiClient.getLiveTvSeriesTimer(id).then(function (result) {
-
                 renderTimer(context, result, apiClient);
                 loading.hide();
             });
         } else if (id) {
-
             currentItemId = id.Id;
 
             renderTimer(context, id, apiClient);
@@ -119,11 +104,9 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function fillKeepUpTo(context) {
-
         var html = '';
 
         for (var i = 0; i <= 50; i++) {
-
             var text;
 
             if (i === 0) {
@@ -145,7 +128,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function embed(itemId, serverId, options) {
-
         recordingUpdated = false;
         recordingDeleted = false;
         currentServerId = serverId;
@@ -153,7 +135,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
         options = options || {};
 
         require(['text!./seriesrecordingeditor.template.html'], function (template) {
-
             var dialogOptions = {
                 removeOnClose: true,
                 scrollY: false
@@ -188,9 +169,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
     }
 
     function showEditor(itemId, serverId, options) {
-
         return new Promise(function (resolve, reject) {
-
             recordingUpdated = false;
             recordingDeleted = false;
             currentServerId = serverId;
@@ -198,7 +177,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             options = options || {};
 
             require(['text!./seriesrecordingeditor.template.html'], function (template) {
-
                 var dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
@@ -232,14 +210,12 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 currentDialog = dlg;
 
                 dlg.addEventListener('closing', function () {
-
                     if (!recordingDeleted) {
                         this.querySelector('.btnSubmit').click();
                     }
                 });
 
                 dlg.addEventListener('close', function () {
-
                     if (recordingUpdated) {
                         resolve({
                             updated: true,
diff --git a/src/components/refreshdialog/refreshdialog.js b/src/components/refreshdialog/refreshdialog.js
index 3edb725c4a..40e1183502 100644
--- a/src/components/refreshdialog/refreshdialog.js
+++ b/src/components/refreshdialog/refreshdialog.js
@@ -2,7 +2,6 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionM
     'use strict';
 
     function getEditorHtml() {
-
         var html = '';
 
         html += '<div class="formDialogContent smoothScrollY" style="padding-top:2em;">';
@@ -48,7 +47,6 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionM
     }
 
     function onSubmit(e) {
-
         loading.show();
 
         var instance = this;
@@ -90,7 +88,6 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionM
     }
 
     RefreshDialog.prototype.show = function () {
-
         var dialogOptions = {
             removeOnClose: true,
             scrollY: false
@@ -124,7 +121,6 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionM
         dlg.querySelector('form').addEventListener('submit', onSubmit.bind(this));
 
         dlg.querySelector('#selectMetadataRefreshMode').addEventListener('change', function () {
-
             if (this.value === 'scan') {
                 dlg.querySelector('.fldReplaceExistingImages').classList.add('hide');
             } else {
@@ -139,7 +135,6 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionM
         dlg.querySelector('#selectMetadataRefreshMode').dispatchEvent(new CustomEvent('change'));
 
         dlg.querySelector('.btnCancel').addEventListener('click', function () {
-
             dialogHelper.close(dlg);
         });
 
@@ -148,7 +143,6 @@ define(['dom', 'shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionM
         }
 
         return new Promise(function (resolve, reject) {
-
             if (layoutManager.tv) {
                 centerFocus(dlg.querySelector('.formDialogContent'), false, false);
             }
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 874137155c..db2bed36a7 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -222,7 +222,6 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
     }
 
     function setImageUrl(context, state, url) {
-        currentImgUrl = url;
         var item = state.NowPlayingItem;
         var imgContainer = context.querySelector('.nowPlayingPageImageContainer');
 
@@ -257,7 +256,6 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         }
     }
 
-    var currentImgUrl;
     return function () {
         function toggleRepeat() {
             switch (playbackManager.getRepeatMode()) {
@@ -420,7 +418,6 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 var nowPlayingVolumeSliderContainer = context.querySelector('.nowPlayingVolumeSliderContainer');
 
                 if (nowPlayingVolumeSlider) {
-
                     nowPlayingVolumeSliderContainer.classList.toggle('hide', !showVolumeSlider);
 
                     if (!nowPlayingVolumeSlider.dragging) {
@@ -909,7 +906,6 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
         }
 
         function onShow(context, tab) {
-            currentImgUrl = null;
             bindToPlayer(context, playbackManager.getCurrentPlayer());
         }
 
diff --git a/src/components/require/requirecss.js b/src/components/require/requirecss.js
index 78e5af2a08..8aaa04d689 100644
--- a/src/components/require/requirecss.js
+++ b/src/components/require/requirecss.js
@@ -18,7 +18,6 @@ define(function () {
     }
 
     function removeFromLoadHistory(url) {
-
         url = url.toLowerCase();
 
         importedCss = importedCss.filter(function (c) {
@@ -27,7 +26,6 @@ define(function () {
     }
 
     requireCss.load = function (cssId, req, load, config) {
-
         // Somehow if the url starts with /css, require will get all screwed up since this extension is also called css
         var srch = 'components/require/requirecss';
         var index = cssId.indexOf(srch);
@@ -65,7 +63,6 @@ define(function () {
 
     window.requireCss = {
         removeStylesheet: function (stylesheet) {
-
             stylesheet.parentNode.removeChild(stylesheet);
             removeFromLoadHistory(stylesheet.href);
         }
diff --git a/src/components/require/requiretext.js b/src/components/require/requiretext.js
index ac508f95be..8c68daed92 100644
--- a/src/components/require/requiretext.js
+++ b/src/components/require/requiretext.js
@@ -7,7 +7,6 @@ define(function () {
     return {
 
         load: function (url, req, load, config) {
-
             if (url.indexOf('://') === -1) {
                 url = config.baseUrl + url;
             }
diff --git a/src/components/sanitizeFilename.js b/src/components/sanitizeFilename.js
index de7b1a0782..ffea2a0a6c 100644
--- a/src/components/sanitizeFilename.js
+++ b/src/components/sanitizeFilename.js
@@ -1,3 +1,4 @@
+// TODO: Check if needed and move to external dependency
 // From https://github.com/parshap/node-sanitize-filename
 
 const illegalRe = /[\/\?<>\\:\*\|":]/g;
diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js
index 3b01cf1ad1..4ee31a6275 100644
--- a/src/components/scrollManager.js
+++ b/src/components/scrollManager.js
@@ -376,7 +376,6 @@ import layoutManager from 'layoutManager';
      * @param {number} scrollY - Vertical coordinate.
      */
     function animateScroll(xScroller, scrollX, yScroller, scrollY) {
-
         const ox = xScroller.scrollLeft;
         const oy = yScroller.scrollTop;
         const dx = scrollX - ox;
@@ -389,7 +388,6 @@ import layoutManager from 'layoutManager';
         let start;
 
         function scrollAnim(currentTimestamp) {
-
             start = start || currentTimestamp;
 
             let k = Math.min(1, (currentTimestamp - start) / ScrollTime);
@@ -423,7 +421,6 @@ import layoutManager from 'layoutManager';
      * @param {boolean} smooth - Smooth scrolling.
      */
     function doScroll(xScroller, scrollX, yScroller, scrollY, smooth) {
-
         resetScrollTimer();
 
         if (smooth && useAnimatedScroll()) {
@@ -437,7 +434,6 @@ import layoutManager from 'layoutManager';
      * Returns true if smooth scroll must be used.
      */
     function useSmoothScroll() {
-
         if (browser.tizen) {
             return true;
         }
@@ -469,7 +465,6 @@ import layoutManager from 'layoutManager';
      * @param {boolean} [smooth=false] - Smooth scrolling.
      */
     export function scrollTo(scrollX, scrollY, smooth) {
-
         smooth = !!smooth;
 
         // Scroller is document itself by default
@@ -491,7 +486,6 @@ import layoutManager from 'layoutManager';
      * @param {boolean} [smooth=false] - Smooth scrolling.
      */
     export function scrollToElement(element, smooth) {
-
         smooth = !!smooth;
 
         let scrollCenterX = true;
diff --git a/src/components/search/searchfields.js b/src/components/search/searchfields.js
index 5cc38eda9a..b3cb3cf4c4 100644
--- a/src/components/search/searchfields.js
+++ b/src/components/search/searchfields.js
@@ -11,7 +11,6 @@ import 'css!./searchfields';
 /* eslint-disable indent */
 
     function onSearchTimeout() {
-
         const instance = this;
         let value = instance.nextSearchValue;
 
@@ -20,7 +19,6 @@ import 'css!./searchfields';
     }
 
     function triggerSearch(instance, value) {
-
         if (instance.searchTimeout) {
             clearTimeout(instance.searchTimeout);
         }
@@ -30,17 +28,14 @@ import 'css!./searchfields';
     }
 
     function onAlphaValueClicked(e) {
-
         const value = e.detail.value;
         const searchFieldsInstance = this;
 
         const txtSearch = searchFieldsInstance.options.element.querySelector('.searchfields-txtSearch');
 
         if (value === 'backspace') {
-
             const val = txtSearch.value;
             txtSearch.value = val.length ? val.substring(0, val.length - 1) : '';
-
         } else {
             txtSearch.value += value;
         }
@@ -51,7 +46,6 @@ import 'css!./searchfields';
     }
 
     function initAlphaPicker(alphaPickerElement, instance) {
-
         instance.alphaPicker = new AlphaPicker({
             element: alphaPickerElement,
             mode: 'keyboard'
@@ -61,16 +55,13 @@ import 'css!./searchfields';
     }
 
     function onSearchInput(e) {
-
         const value = e.target.value;
         const searchFieldsInstance = this;
         triggerSearch(searchFieldsInstance, value);
     }
 
     function embed(elem, instance, options) {
-
         import('text!./searchfields.template.html').then(({default: template}) => {
-
             let html = globalize.translateHtml(template, 'core');
 
             if (browser.tizen || browser.orsay) {
@@ -98,16 +89,13 @@ import 'css!./searchfields';
 
 class SearchFields {
     constructor(options) {
-
         this.options = options;
         embed(options.element, this, options);
     }
     focus() {
-
         this.options.element.querySelector('.searchfields-txtSearch').focus();
     }
     destroy() {
-
         const options = this.options;
         if (options) {
             options.element.classList.remove('searchFields');
diff --git a/src/components/search/searchresults.js b/src/components/search/searchresults.js
index e16b6a1cd4..64be0e3e87 100644
--- a/src/components/search/searchresults.js
+++ b/src/components/search/searchresults.js
@@ -1,7 +1,5 @@
 import layoutManager from 'layoutManager';
 import globalize from 'globalize';
-import require from 'require';
-import events from 'events';
 import connectionManager from 'connectionManager';
 import cardBuilder from 'cardBuilder';
 import appRouter from 'appRouter';
@@ -12,7 +10,6 @@ import 'emby-button';
 /* eslint-disable indent */
 
     function loadSuggestions(instance, context, apiClient) {
-
         const options = {
 
             SortBy: 'IsFavoriteOrLiked,Random',
@@ -26,20 +23,17 @@ import 'emby-button';
         };
 
         apiClient.getItems(apiClient.getCurrentUserId(), options).then(function (result) {
-
             if (instance.mode !== 'suggestions') {
                 result.Items = [];
             }
 
             const html = result.Items.map(function (i) {
-
                 const href = appRouter.getRouteUrl(i);
 
                 let itemHtml = '<div><a is="emby-linkbutton" class="button-link" style="display:inline-block;padding:.5em 1em;" href="' + href + '">';
                 itemHtml += i.Name;
                 itemHtml += '</a></div>';
                 return itemHtml;
-
             }).join('');
 
             const searchSuggestions = context.querySelector('.searchSuggestions');
@@ -52,7 +46,6 @@ import 'emby-button';
     }
 
     function getSearchHints(instance, apiClient, query) {
-
         if (!query.searchTerm) {
             return Promise.resolve({
                 SearchHints: []
@@ -131,7 +124,6 @@ import 'emby-button';
 
         // Convert the search hint query to a regular item query
         if (apiClient.isMinServerVersion('3.4.1.31')) {
-
             query.Fields = 'PrimaryImageAspectRatio,CanDelete,BasicSyncInfo,MediaSourceCount';
             query.Recursive = true;
             query.EnableTotalRecordCount = false;
@@ -142,7 +134,6 @@ import 'emby-button';
             if (!query.IncludeMedia) {
                 if (query.IncludePeople) {
                     methodName = 'getPeople';
-
                 } else if (query.IncludeArtists) {
                     methodName = 'getArtists';
                 }
@@ -157,7 +148,6 @@ import 'emby-button';
     }
 
     function search(instance, apiClient, context, value) {
-
         if (value || layoutManager.tv) {
             instance.mode = 'search';
             context.querySelector('.searchSuggestions').classList.add('hide');
@@ -167,7 +157,6 @@ import 'emby-button';
         }
 
         if (instance.options.collectionType === 'livetv') {
-
             searchType(instance, apiClient, {
                 searchTerm: value,
                 IncludePeople: false,
@@ -196,7 +185,6 @@ import 'emby-button';
                 showChannelName: true
             });
         } else {
-
             searchType(instance, apiClient, {
                 searchTerm: value,
                 IncludePeople: false,
@@ -233,7 +221,6 @@ import 'emby-button';
         });
 
         if (instance.options.collectionType === 'livetv') {
-
             searchType(instance, apiClient, {
                 searchTerm: value,
                 IncludePeople: false,
@@ -262,9 +249,7 @@ import 'emby-button';
                 showAirDateTime: true,
                 showChannelName: true
             });
-
         } else {
-
             searchType(instance, apiClient, {
                 searchTerm: value,
                 IncludePeople: false,
@@ -562,18 +547,15 @@ import 'emby-button';
     }
 
     function searchType(instance, apiClient, query, context, section, cardOptions) {
-
         query.Limit = enableScrollX() ? 24 : 16;
         query.ParentId = instance.options.parentId;
 
         getSearchHints(instance, apiClient, query).then(function (result) {
-
             populateResults(result, context, section, cardOptions);
         });
     }
 
     function populateResults(result, context, section, cardOptions) {
-
         section = context.querySelector(section);
 
         const items = result.Items || result.SearchHints;
@@ -603,9 +585,7 @@ import 'emby-button';
     }
 
     function embed(elem, instance, options) {
-
         import('text!./searchresults.template.html').then(({default: template}) => {
-
             if (!enableScrollX()) {
                 template = replaceAll(template, 'data-horizontal="true"', 'data-horizontal="false"');
                 template = replaceAll(template, 'itemsContainer scrollSlider', 'itemsContainer scrollSlider vertical-wrap');
@@ -622,24 +602,20 @@ import 'emby-button';
 
 class SearchResults {
     constructor(options) {
-
         this.options = options;
         embed(options.element, this, options);
     }
     search(value) {
-
         const apiClient = connectionManager.getApiClient(this.options.serverId);
 
         search(this, apiClient, this.options.element, value);
     }
     destroy() {
-
         const options = this.options;
         if (options) {
             options.element.classList.remove('searchFields');
         }
         this.options = null;
-
     }
 }
 
diff --git a/src/components/shortcuts.js b/src/components/shortcuts.js
index f105d6c599..5bd65ae1d9 100644
--- a/src/components/shortcuts.js
+++ b/src/components/shortcuts.js
@@ -14,7 +14,6 @@ import dom from 'dom';
 import recordingHelper from 'recordingHelper';
 
     function playAllFromHere(card, serverId, queue) {
-
         const parent = card.parentNode;
         const className = card.classList.length ? (`.${card.classList[0]}`) : '';
         const cards = parent.querySelectorAll(`${className}[data-id]`);
@@ -36,17 +35,14 @@ import recordingHelper from 'recordingHelper';
 
         const itemsContainer = dom.parentWithClass(card, 'itemsContainer');
         if (itemsContainer && itemsContainer.fetchData) {
-
             const queryOptions = queue ? { StartIndex: startIndex } : {};
 
             return itemsContainer.fetchData(queryOptions).then(result => {
-
                 if (queue) {
                     return playbackManager.queue({
                         items: result.Items
                     });
                 } else {
-
                     return playbackManager.play({
                         items: result.Items,
                         startIndex: startIndex
@@ -65,7 +61,6 @@ import recordingHelper from 'recordingHelper';
                 serverId: serverId
             });
         } else {
-
             return playbackManager.play({
                 ids: ids,
                 serverId: serverId,
@@ -75,15 +70,12 @@ import recordingHelper from 'recordingHelper';
     }
 
     function showProgramDialog(item) {
-
         import('recordingCreator').then(({default:recordingCreator}) => {
-
             recordingCreator.show(item.Id, item.ServerId);
         });
     }
 
     function getItem(button) {
-
         button = dom.parentWithAttribute(button, 'data-id');
         const serverId = button.getAttribute('data-serverid');
         const id = button.getAttribute('data-id');
@@ -101,7 +93,6 @@ import recordingHelper from 'recordingHelper';
     }
 
     function notifyRefreshNeeded(childElement, itemsContainer) {
-
         itemsContainer = itemsContainer || dom.parentWithAttribute(childElement, 'is', 'emby-itemscontainer');
 
         if (itemsContainer) {
@@ -110,9 +101,7 @@ import recordingHelper from 'recordingHelper';
     }
 
     function showContextMenu(card, options) {
-
         getItem(card).then(item => {
-
             const playlistId = card.getAttribute('data-playlistid');
             const collectionId = card.getAttribute('data-collectionid');
 
@@ -122,7 +111,6 @@ import recordingHelper from 'recordingHelper';
             }
 
             import('itemContextMenu').then(({default: itemContextMenu}) => {
-
                 connectionManager.getApiClient(item.ServerId).getCurrentUser().then(user => {
                     itemContextMenu.show(Object.assign({
                         item: item,
@@ -135,7 +123,6 @@ import recordingHelper from 'recordingHelper';
                         user: user
 
                     }, options || {})).then(result => {
-
                         if (result.command === 'playallfromhere' || result.command === 'queueallfromhere') {
                             executeAction(card, options.positionTo, result.command);
                         } else if (result.updated || result.deleted) {
@@ -148,7 +135,6 @@ import recordingHelper from 'recordingHelper';
     }
 
     function getItemInfoFromCard(card) {
-
         return {
             Type: card.getAttribute('data-type'),
             Id: card.getAttribute('data-id'),
@@ -166,11 +152,9 @@ import recordingHelper from 'recordingHelper';
     }
 
     function showPlayMenu(card, target) {
-
         const item = getItemInfoFromCard(card);
 
         import('playMenu').then(({default: playMenu}) => {
-
             playMenu.show({
 
                 item: item,
@@ -186,7 +170,6 @@ import recordingHelper from 'recordingHelper';
     }
 
     function executeAction(card, target, action) {
-
         target = target || card;
 
         let id = card.getAttribute('data-id');
@@ -208,13 +191,11 @@ import recordingHelper from 'recordingHelper';
         }
 
         if (action === 'link') {
-
             appRouter.showItem(item, {
                 context: card.getAttribute('data-context'),
                 parentId: card.getAttribute('data-parentid')
             });
         } else if (action === 'programdialog') {
-
             showProgramDialog(item);
         } else if (action === 'instantmix') {
             playbackManager.instantMix({
@@ -222,7 +203,6 @@ import recordingHelper from 'recordingHelper';
                 ServerId: serverId
             });
         } else if (action === 'play' || action === 'resume') {
-
             const startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
 
             playbackManager.play({
@@ -231,7 +211,6 @@ import recordingHelper from 'recordingHelper';
                 serverId: serverId
             });
         } else if (action === 'queue') {
-
             if (playbackManager.isPlaying()) {
                 playbackManager.queue({
                     ids: [playableItemId],
@@ -253,7 +232,6 @@ import recordingHelper from 'recordingHelper';
         } else if (action === 'record') {
             onRecordCommand(serverId, id, type, card.getAttribute('data-timerid'), card.getAttribute('data-seriestimerid'));
         } else if (action === 'menu') {
-
             const options = target.getAttribute('data-playoptions') === 'false' ?
                 {
                     shuffle: false,
@@ -279,7 +257,6 @@ import recordingHelper from 'recordingHelper';
         } else if (action === 'addtoplaylist') {
             getItem(target).then(addToPlaylist);
         } else if (action === 'custom') {
-
             const customAction = target.getAttribute('data-customaction');
 
             card.dispatchEvent(new CustomEvent(`action-${customAction}`, {
@@ -294,7 +271,6 @@ import recordingHelper from 'recordingHelper';
 
     function addToPlaylist(item) {
         import('playlistEditor').then(({default: playlistEditor}) => {
-
             new playlistEditor().show({
                 items: [item.Id],
                 serverId: item.ServerId
@@ -304,7 +280,6 @@ import recordingHelper from 'recordingHelper';
     }
 
     function playTrailer(item) {
-
         const apiClient = connectionManager.getApiClient(item.ServerId);
 
         apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(trailers => {
@@ -313,28 +288,23 @@ import recordingHelper from 'recordingHelper';
     }
 
     function editItem(item, serverId) {
-
         const apiClient = connectionManager.getApiClient(serverId);
 
         return new Promise((resolve, reject) => {
-
             const serverId = apiClient.serverInfo().Id;
 
             if (item.Type === 'Timer') {
                 if (item.ProgramId) {
                     import('recordingCreator').then(({default: recordingCreator}) => {
-
                         recordingCreator.show(item.ProgramId, serverId).then(resolve, reject);
                     });
                 } else {
                     import('recordingEditor').then(({default: recordingEditor}) => {
-
                         recordingEditor.show(item.Id, serverId).then(resolve, reject);
                     });
                 }
             } else {
                 import('metadataEditor').then(({default: metadataEditor}) => {
-
                     metadataEditor.show(item.Id, serverId).then(resolve, reject);
                 });
             }
@@ -342,20 +312,16 @@ import recordingHelper from 'recordingHelper';
     }
 
     function onRecordCommand(serverId, id, type, timerId, seriesTimerId) {
-
         if (type === 'Program' || timerId || seriesTimerId) {
-
             const programId = type === 'Program' ? id : null;
             recordingHelper.toggleRecording(serverId, programId, timerId, seriesTimerId);
         }
     }
 
     export function onClick(e) {
-
         const card = dom.parentWithClass(e.target, 'itemAction');
 
         if (card) {
-
             let actionElement = card;
             let action = actionElement.getAttribute('data-action');
 
@@ -377,11 +343,9 @@ import recordingHelper from 'recordingHelper';
     }
 
     function onCommand(e) {
-
         const cmd = e.detail.command;
 
         if (cmd === 'play' || cmd === 'resume' || cmd === 'record' || cmd === 'menu' || cmd === 'info') {
-
             const target = e.target;
             const card = dom.parentWithClass(target, 'itemAction') || dom.parentWithAttribute(target, 'data-id');
 
@@ -394,7 +358,6 @@ import recordingHelper from 'recordingHelper';
     }
 
     export function on(context, options) {
-
         options = options || {};
 
         if (options.click !== false) {
@@ -417,7 +380,6 @@ import recordingHelper from 'recordingHelper';
     }
 
     export function getShortcutAttributesHtml(item, serverId) {
-
         let html = `data-id="${item.Id}" data-serverid="${serverId || item.ServerId}" data-type="${item.Type}" data-mediatype="${item.MediaType}" data-channelid="${item.ChannelId}" data-isfolder="${item.IsFolder}"`;
 
         const collectionType = item.CollectionType;
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js
index f7026a007e..56327312f6 100644
--- a/src/components/slideshow/slideshow.js
+++ b/src/components/slideshow/slideshow.js
@@ -38,7 +38,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
 
         if (options.type === 'Primary') {
             if (item.AlbumId && item.AlbumPrimaryImageTag) {
-
                 options.tag = item.AlbumPrimaryImageTag;
                 return apiClient.getScaledImageUrl(item.AlbumId, options);
             }
@@ -64,7 +63,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
         }
 
         if (item.BackdropImageTags && item.BackdropImageTags.length) {
-
             options.tag = item.BackdropImageTags[0];
             return apiClient.getScaledImageUrl(item.Id, options);
         }
@@ -130,11 +128,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
         var hideTimeout;
         /** Last coordinates of the mouse pointer. */
         var lastMouseMoveData;
-        /** Visibility status of the OSD. */
-        var _osdOpen = false;
-
-        // Use autoplay on Chromecast since it is non-interactive.
-        if (browser.chromecast) options.interactive = false;
 
         /**
          * Creates the HTML markup for the dialog and the OSD.
@@ -189,7 +182,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
 
                     html += '</div>';
                 }
-
             } else {
                 html += '<div class="slideshowImage"></div><h1 class="slideshowImageText"></h1>';
             }
@@ -363,8 +355,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
         function getSwiperSlideHtmlFromItem(item) {
             return getSwiperSlideHtmlFromSlide({
                 originalImage: getImgUrl(item, currentOptions.user),
-                //title: item.Name,
-                //description: item.Overview
                 Id: item.Id,
                 ServerId: item.ServerId
             });
@@ -545,7 +535,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
                 return;
             }
 
-            _osdOpen = true;
             element.classList.remove('hide');
 
             var onFinish = function () {
@@ -578,7 +567,6 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
 
             var onFinish = function () {
                 element.classList.add('hide');
-                _osdOpen = false;
             };
 
             if (!element.animate) {
diff --git a/src/components/sortmenu/sortmenu.js b/src/components/sortmenu/sortmenu.js
index dbf7ef1a7f..f62e5bb3a4 100644
--- a/src/components/sortmenu/sortmenu.js
+++ b/src/components/sortmenu/sortmenu.js
@@ -2,13 +2,11 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
     'use strict';
 
     function onSubmit(e) {
-
         e.preventDefault();
         return false;
     }
 
     function initEditor(context, settings) {
-
         context.querySelector('form').addEventListener('submit', onSubmit);
 
         context.querySelector('.selectSortOrder').value = settings.sortOrder;
@@ -26,14 +24,11 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
         var selectSortBy = context.querySelector('.selectSortBy');
 
         selectSortBy.innerHTML = options.map(function (o) {
-
             return '<option value="' + o.value + '">' + o.name + '</option>';
-
         }).join('');
     }
 
     function saveValues(context, settings, settingsKey) {
-
         userSettings.setFilter(settingsKey + '-sortorder', context.querySelector('.selectSortOrder').value);
         userSettings.setFilter(settingsKey + '-sortby', context.querySelector('.selectSortBy').value);
     }
@@ -43,11 +38,8 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
     }
 
     SortMenu.prototype.show = function (options) {
-
         return new Promise(function (resolve, reject) {
-
             require(['text!./sortmenu.template.html'], function (template) {
-
                 var dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
@@ -79,7 +71,6 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
                 initEditor(dlg, options.settings);
 
                 dlg.querySelector('.btnCancel').addEventListener('click', function () {
-
                     dialogHelper.close(dlg);
                 });
 
@@ -90,27 +81,17 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
                 var submitted;
 
                 dlg.querySelector('form').addEventListener('change', function () {
-
                     submitted = true;
-                    //if (options.onChange) {
-                    //    saveValues(dlg, options.settings, options.settingsKey);
-                    //    options.onChange();
-                    //}
-
                 }, true);
 
                 dialogHelper.open(dlg).then(function () {
-
                     if (layoutManager.tv) {
                         centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                     }
 
                     if (submitted) {
-
-                        //if (!options.onChange) {
                         saveValues(dlg, options.settings, options.settingsKey);
                         resolve();
-                        //}
                         return;
                     }
 
diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js
index 9c0992c53c..37f767524e 100644
--- a/src/components/subtitleeditor/subtitleeditor.js
+++ b/src/components/subtitleeditor/subtitleeditor.js
@@ -4,45 +4,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     var currentItem;
     var hasChanges;
 
-    function showLocalSubtitles(context, index) {
-
-        loading.show();
-
-        var subtitleContent = context.querySelector('.subtitleContent');
-        subtitleContent.innerHTML = '';
-
-        var apiClient = connectionManager.getApiClient(currentItem.ServerId);
-        var url = 'Videos/' + currentItem.Id + '/Subtitles/' + index;
-
-        apiClient.ajax({
-
-            type: 'GET',
-            url: url
-
-        }).then(function (result) {
-
-            subtitleContent.innerHTML = result;
-
-            loading.hide();
-        });
-    }
-
-    function showRemoteSubtitles(context, id) {
-
-        loading.show();
-
-        var url = 'Providers/Subtitles/Subtitles/' + id;
-
-        ApiClient.get(ApiClient.getUrl(url)).then(function (result) {
-
-            // show result
-
-            loading.hide();
-        });
-    }
-
     function downloadRemoteSubtitles(context, id) {
-
         var url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id;
 
         var apiClient = connectionManager.getApiClient(currentItem.ServerId);
@@ -52,7 +14,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             url: apiClient.getUrl(url)
 
         }).then(function () {
-
             hasChanges = true;
 
             require(['toast'], function (toast) {
@@ -64,11 +25,9 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }
 
     function deleteLocalSubtitle(context, index) {
-
         var msg = globalize.translate('MessageAreYouSureDeleteSubtitles');
 
         require(['confirm'], function (confirm) {
-
             confirm.default({
 
                 title: globalize.translate('ConfirmDeletion'),
@@ -77,7 +36,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
                 primary: 'delete'
 
             }).then(function () {
-
                 loading.show();
 
                 var itemId = currentItem.Id;
@@ -91,34 +49,28 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
                     url: apiClient.getUrl(url)
 
                 }).then(function () {
-
                     hasChanges = true;
                     reload(context, apiClient, itemId);
-
                 });
             });
         });
     }
 
     function fillSubtitleList(context, item) {
-
         var streams = item.MediaStreams || [];
 
         var subs = streams.filter(function (s) {
-
             return s.Type === 'Subtitle';
         });
 
         var html = '';
 
         if (subs.length) {
-
             html += '<h2>' + globalize.translate('MySubtitles') + '</h2>';
 
             html += '<div>';
 
             html += subs.map(function (s) {
-
                 var itemHtml = '';
 
                 var tagName = layoutManager.tv ? 'button' : 'div';
@@ -156,7 +108,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
                 itemHtml += '</' + tagName + '>';
 
                 return itemHtml;
-
             }).join('');
 
             html += '</div>';
@@ -170,22 +121,12 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             elem.classList.add('hide');
         }
         elem.innerHTML = html;
-
-        //('.btnViewSubtitles', elem).on('click', function () {
-
-        //    var index = this.getAttribute('data-index');
-
-        //    showLocalSubtitles(context, index);
-
-        //});
     }
 
     function fillLanguages(context, apiClient, languages) {
-
         var selectLanguage = context.querySelector('#selectLanguage');
 
         selectLanguage.innerHTML = languages.map(function (l) {
-
             return '<option value="' + l.ThreeLetterISOLanguageName + '">' + l.DisplayName + '</option>';
         });
 
@@ -193,9 +134,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         if (lastLanguage) {
             selectLanguage.value = lastLanguage;
         } else {
-
             apiClient.getCurrentUser().then(function (user) {
-
                 var lang = user.Configuration.SubtitleLanguagePreference;
 
                 if (lang) {
@@ -206,12 +145,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }
 
     function renderSearchResults(context, results) {
-
         var lastProvider = '';
         var html = '';
 
         if (!results.length) {
-
             context.querySelector('.noSearchResults').classList.remove('hide');
             context.querySelector('.subtitleResults').innerHTML = '';
             loading.hide();
@@ -221,13 +158,11 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         context.querySelector('.noSearchResults').classList.add('hide');
 
         for (var i = 0, length = results.length; i < length; i++) {
-
             var result = results[i];
 
             var provider = result.ProviderName;
 
             if (provider !== lastProvider) {
-
                 if (i > 0) {
                     html += '</div>';
                 }
@@ -250,8 +185,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
 
             html += '<div class="listItemBody ' + bodyClass + '">';
 
-            //html += '<a class="btnViewSubtitle" href="#" data-subid="' + result.Id + '">';
-
             html += '<div>' + (result.Name) + '</div>';
             html += '<div class="secondary listItemBodyText">';
 
@@ -272,8 +205,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
                 html += '<div class="secondary listItemBodyText"><div class="inline-flex align-items-center justify-content-center" style="background:#3388cc;color:#fff;padding: .3em 1em;border-radius:1000em;">' + globalize.translate('PerfectMatch') + '</div></div>';
             }
 
-            //html += '</a>';
-
             html += '</div>';
 
             if (!layoutManager.tv) {
@@ -290,17 +221,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         var elem = context.querySelector('.subtitleResults');
         elem.innerHTML = html;
 
-        //('.btnViewSubtitle', elem).on('click', function () {
-
-        //    var id = this.getAttribute('data-subid');
-        //    showRemoteSubtitles(context, id);
-        //});
-
         loading.hide();
     }
 
     function searchForSubtitles(context, language) {
-
         userSettings.set('subtitleeditor-language', language);
 
         loading.show();
@@ -309,17 +233,14 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         var url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language);
 
         apiClient.getJSON(url).then(function (results) {
-
             renderSearchResults(context, results);
         });
     }
 
     function reload(context, apiClient, itemId) {
-
         context.querySelector('.noSearchResults').classList.add('hide');
 
         function onGetItem(item) {
-
             currentItem = item;
 
             fillSubtitleList(context, item);
@@ -359,7 +280,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }
 
     function onSubtitleListClick(e) {
-
         var btnDelete = dom.parentWithClass(e.target, 'btnDelete');
         if (btnDelete) {
             var index = btnDelete.getAttribute('data-index');
@@ -369,11 +289,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }
 
     function onSubtitleResultsClick(e) {
-
-        var btnOptions = dom.parentWithClass(e.target, 'btnOptions');
         var subtitleId;
         var context;
 
+        var btnOptions = dom.parentWithClass(e.target, 'btnOptions');
         if (btnOptions) {
             subtitleId = btnOptions.getAttribute('data-subid');
             context = dom.parentWithClass(btnOptions, 'subtitleEditorDialog');
@@ -389,7 +308,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }
 
     function showDownloadOptions(button, context, subtitleId) {
-
         var items = [];
 
         items.push({
@@ -398,15 +316,12 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         });
 
         require(['actionsheet'], function (actionsheet) {
-
             actionsheet.show({
                 items: items,
                 positionTo: button
 
             }).then(function (id) {
-
                 switch (id) {
-
                     case 'download':
                         downloadRemoteSubtitles(context, subtitleId);
                         break;
@@ -414,7 +329,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
                         break;
                 }
             });
-
         });
     }
 
@@ -426,12 +340,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }
 
     function showEditorInternal(itemId, serverId, template) {
-
         hasChanges = false;
 
         var apiClient = connectionManager.getApiClient(serverId);
         return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
-
             var dialogOptions = {
                 removeOnClose: true,
                 scrollY: false
@@ -469,19 +381,15 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             dlg.querySelector('.subtitleResults').addEventListener('click', onSubtitleResultsClick);
 
             apiClient.getCultures().then(function (languages) {
-
                 fillLanguages(editorContent, apiClient, languages);
             });
 
             dlg.querySelector('.btnCancel').addEventListener('click', function () {
-
                 dialogHelper.close(dlg);
             });
 
             return new Promise(function (resolve, reject) {
-
                 dlg.addEventListener('close', function () {
-
                     if (layoutManager.tv) {
                         centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                     }
@@ -501,17 +409,13 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     }
 
     function showEditor(itemId, serverId) {
-
         loading.show();
 
         return new Promise(function (resolve, reject) {
-
             require(['text!./subtitleeditor.template.html'], function (template) {
-
                 showEditorInternal(itemId, serverId, template).then(resolve, reject);
             });
         });
-
     }
 
     return {
diff --git a/src/components/subtitlesettings/subtitleappearancehelper.js b/src/components/subtitlesettings/subtitleappearancehelper.js
index f710751376..7e3e2de7ac 100644
--- a/src/components/subtitlesettings/subtitleappearancehelper.js
+++ b/src/components/subtitlesettings/subtitleappearancehelper.js
@@ -4,12 +4,10 @@
  */
 
 function getTextStyles(settings, isCue) {
-
     let list = [];
 
     if (isCue) {
         switch (settings.textSize || '') {
-
             case 'smaller':
                 list.push({ name: 'font-size', value: '.5em' });
                 break;
@@ -31,7 +29,6 @@ function getTextStyles(settings, isCue) {
         }
     } else {
         switch (settings.textSize || '') {
-
             case 'smaller':
                 list.push({ name: 'font-size', value: '.8em' });
                 break;
@@ -55,7 +52,6 @@ function getTextStyles(settings, isCue) {
     }
 
     switch (settings.dropShadow || '') {
-
         case 'raised':
             list.push({ name: 'text-shadow', value: '-1px -1px white, 0px -1px white, -1px 0px white, 1px 1px black, 0px 1px black, 1px 0px black' });
             break;
@@ -85,7 +81,6 @@ function getTextStyles(settings, isCue) {
     }
 
     switch (settings.font || '') {
-
         case 'typewriter':
             list.push({ name: 'font-family', value: '"Courier New",monospace' });
             list.push({ name: 'font-variant', value: 'none' });
@@ -120,7 +115,6 @@ function getTextStyles(settings, isCue) {
 }
 
 export function getStyles(settings, isCue) {
-
     return {
         text: getTextStyles(settings, isCue),
         window: []
@@ -128,9 +122,7 @@ export function getStyles(settings, isCue) {
 }
 
 function applyStyleList(styles, elem) {
-
     for (let i = 0, length = styles.length; i < length; i++) {
-
         let style = styles[i];
 
         elem.style[style.name] = style.value;
@@ -138,7 +130,6 @@ function applyStyleList(styles, elem) {
 }
 
 export function applyStyles(elements, appearanceSettings) {
-
     let styles = getStyles(appearanceSettings);
 
     if (elements.text) {
diff --git a/src/components/subtitlesettings/subtitlesettings.js b/src/components/subtitlesettings/subtitlesettings.js
index d2ae852bd5..79fa289ab0 100644
--- a/src/components/subtitlesettings/subtitlesettings.js
+++ b/src/components/subtitlesettings/subtitlesettings.js
@@ -1,4 +1,3 @@
-import require from 'require';
 import globalize from 'globalize';
 import appHost from 'apphost';
 import appSettings from 'appSettings';
@@ -33,9 +32,7 @@ function getSubtitleAppearanceObject(context) {
 }
 
 function loadForm(context, user, userSettings, appearanceSettings, apiClient) {
-
     apiClient.getCultures().then(function (allCultures) {
-
         if (appHost.supports('subtitleburnsettings') && user.Policy.EnableVideoPlaybackTranscoding) {
             context.querySelector('.fldBurnIn').classList.remove('hide');
         }
@@ -66,7 +63,6 @@ function loadForm(context, user, userSettings, appearanceSettings, apiClient) {
 }
 
 function saveUser(context, user, userSettingsInstance, appearanceKey, apiClient) {
-
     let appearanceSettings = userSettingsInstance.getSubtitleAppearanceSettings(appearanceKey);
     appearanceSettings = Object.assign(appearanceSettings, getSubtitleAppearanceObject(context));
 
@@ -79,15 +75,12 @@ function saveUser(context, user, userSettingsInstance, appearanceKey, apiClient)
 }
 
 function save(instance, context, userId, userSettings, apiClient, enableSaveConfirmation) {
-
     loading.show();
 
     appSettings.set('subtitleburnin', context.querySelector('#selectSubtitleBurnIn').value);
 
     apiClient.getUser(userId).then(function (user) {
-
         saveUser(context, user, userSettings, instance.appearanceKey, apiClient).then(function () {
-
             loading.hide();
             if (enableSaveConfirmation) {
                 import('toast').then(({default: toast}) => {
@@ -96,7 +89,6 @@ function save(instance, context, userId, userSettings, apiClient, enableSaveConf
             }
 
             events.trigger(instance, 'saved');
-
         }, function () {
             loading.hide();
         });
@@ -104,7 +96,6 @@ function save(instance, context, userId, userSettings, apiClient, enableSaveConf
 }
 
 function onSubtitleModeChange(e) {
-
     let view = dom.parentWithClass(e.target, 'subtitlesettings');
 
     let subtitlesHelp = view.querySelectorAll('.subtitlesHelp');
@@ -115,7 +106,6 @@ function onSubtitleModeChange(e) {
 }
 
 function onAppearanceFieldChange(e) {
-
     let view = dom.parentWithClass(e.target, 'subtitlesettings');
 
     let appearanceSettings = getSubtitleAppearanceObject(view);
@@ -129,9 +119,7 @@ function onAppearanceFieldChange(e) {
 }
 
 function embed(options, self) {
-
     import('text!./subtitlesettings.template.html').then(({default: template}) => {
-
         options.element.classList.add('subtitlesettings');
         options.element.innerHTML = globalize.translateHtml(template, 'core');
 
@@ -161,9 +149,7 @@ function embed(options, self) {
 }
 
 export class SubtitleSettings {
-
     constructor(options) {
-
         this.options = options;
 
         embed(options, this);
@@ -205,7 +191,6 @@ export class SubtitleSettings {
         let userSettings = self.options.userSettings;
 
         userSettings.setUserInfo(userId, apiClient).then(function () {
-
             let enableSaveConfirmation = self.options.enableSaveConfirmation;
             save(self, self.options.element, userId, userSettings, apiClient, enableSaveConfirmation);
         });
diff --git a/src/components/subtitlesync/subtitlesync.js b/src/components/subtitlesync/subtitlesync.js
index a3e60593e8..e825e8e0a2 100644
--- a/src/components/subtitlesync/subtitlesync.js
+++ b/src/components/subtitlesync/subtitlesync.js
@@ -8,7 +8,6 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
     var subtitleSyncContainer;
 
     function init(instance) {
-
         var parent = document.createElement('div');
         document.body.appendChild(parent);
         parent.innerHTML = template;
@@ -141,7 +140,6 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
     };
 
     SubtitleSync.prototype.toggle = function(action) {
-
         if (player && playbackManager.supportSubtitleOffset(player)) {
             /* eslint-disable no-fallthrough */
             switch (action) {
diff --git a/src/components/syncPlay/playbackPermissionManager.js b/src/components/syncPlay/playbackPermissionManager.js
index 3c258ad18d..e2d7ef2f4c 100644
--- a/src/components/syncPlay/playbackPermissionManager.js
+++ b/src/components/syncPlay/playbackPermissionManager.js
@@ -3,7 +3,6 @@
  * @returns {HTMLMediaElement} The audio element.
  */
 function createTestMediaElement () {
-
     const elem = document.createElement('audio');
     elem.classList.add('testMediaPlayerAudio');
     elem.classList.add('hide');
diff --git a/src/components/syncPlay/syncPlayManager.js b/src/components/syncPlay/syncPlayManager.js
index c8660b2bc4..2366172a79 100644
--- a/src/components/syncPlay/syncPlayManager.js
+++ b/src/components/syncPlay/syncPlayManager.js
@@ -554,7 +554,6 @@ class SyncPlayManager {
                 this.syncTimeout = setTimeout(() => {
                     this.syncEnabled = true;
                 }, SyncMethodThreshold / 2);
-
             }, playTimeout);
 
             console.debug('Scheduled play in', playTimeout / 1000.0, 'seconds.');
diff --git a/src/components/syncPlay/timeSyncManager.js b/src/components/syncPlay/timeSyncManager.js
index d3b59589ee..e219fb0413 100644
--- a/src/components/syncPlay/timeSyncManager.js
+++ b/src/components/syncPlay/timeSyncManager.js
@@ -140,7 +140,6 @@ class TimeSyncManager {
                 }).finally(() => {
                     this.requestPing();
                 });
-
             }, this.pollingInterval);
         }
     }
diff --git a/src/components/tabbedview/itemstab.js b/src/components/tabbedview/itemstab.js
deleted file mode 100644
index d40faef5dc..0000000000
--- a/src/components/tabbedview/itemstab.js
+++ /dev/null
@@ -1,589 +0,0 @@
-define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts', 'connectionManager', 'focusManager', 'loading', 'globalize'], function (playbackManager, userSettings, AlphaPicker, AlphaNumericShortcuts, connectionManager, focusManager, loading, globalize) {
-    'use strict';
-
-    function trySelectValue(instance, scroller, view, value) {
-
-        var card;
-
-        // If it's the symbol just pick the first card
-        if (value === '#') {
-
-            card = view.querySelector('.card');
-
-            if (card) {
-                scroller.toStart(card, false);
-                return;
-            }
-        }
-
-        card = view.querySelector('.card[data-prefix^=\'' + value + '\']');
-
-        if (card) {
-            scroller.toStart(card, false);
-            return;
-        }
-
-        // go to the previous letter
-        var values = instance.alphaPicker.values();
-        var index = values.indexOf(value);
-
-        if (index < values.length - 2) {
-            trySelectValue(instance, scroller, view, values[index + 1]);
-        } else {
-            var all = view.querySelectorAll('.card');
-            card = all.length ? all[all.length - 1] : null;
-
-            if (card) {
-                scroller.toStart(card, false);
-            }
-        }
-    }
-
-    function onAlphaValueChanged() {
-
-        var value = this.alphaPicker.value();
-        var scroller = this.scroller;
-
-        trySelectValue(this, scroller, this.itemsContainer, value);
-    }
-
-    function initAlphaPicker(instance, view) {
-
-        instance.itemsContainer = view.querySelector('.itemsContainer');
-
-        instance.alphaPicker = new AlphaPicker.default({
-            element: instance.alphaPickerElement,
-            itemsContainer: instance.itemsContainer,
-            itemClass: 'card'
-        });
-
-        instance.alphaPicker.on('alphavaluechanged', onAlphaValueChanged.bind(instance));
-    }
-
-    function showFilterMenu() {
-
-        var instance = this;
-
-        require(['filterMenu'], function (FilterMenu) {
-
-            new FilterMenu().show({
-
-                settingsKey: instance.getSettingsKey(),
-                settings: instance.getFilters(),
-                visibleSettings: instance.getVisibleFilters(),
-                onChange: instance.itemsContainer.refreshItems.bind(instance.itemsContainer),
-                parentId: instance.params.parentId,
-                itemTypes: instance.getItemTypes ? instance.getItemTypes() : [],
-                serverId: instance.apiClient.serverId(),
-                filterMenuOptions: instance.getFilterMenuOptions()
-
-            }).then(function () {
-
-                instance.itemsContainer.refreshItems();
-            });
-        });
-    }
-
-    function updateAlphaPickerState(instance) {
-
-        if (!instance.alphaPicker) {
-            return;
-        }
-
-        var alphaPicker = instance.alphaPickerElement;
-        if (!alphaPicker) {
-            return;
-        }
-        var values = instance.getSortValues();
-
-        if (values.sortBy === 'SortName' && values.sortOrder === 'Ascending') {
-            alphaPicker.classList.remove('hide');
-        } else {
-            alphaPicker.classList.add('hide');
-        }
-    }
-
-    function showSortMenu() {
-        var instance = this;
-        require(['sortMenu'], function (SortMenu) {
-            new SortMenu().show({
-                settingsKey: instance.getSettingsKey(),
-                settings: instance.getSortValues(),
-                onChange: instance.itemsContainer.refreshItems.bind(instance.itemsContainer),
-                serverId: instance.params.serverId,
-                sortOptions: instance.getSortMenuOptions()
-            }).then(function () {
-                updateSortText(instance);
-                updateAlphaPickerState(instance);
-                instance.itemsContainer.refreshItems();
-            });
-        });
-    }
-
-    function showViewSettingsMenu() {
-
-        var instance = this;
-
-        require(['viewSettings'], function (ViewSettings) {
-
-            new ViewSettings().show({
-
-                settingsKey: instance.getSettingsKey(),
-                settings: instance.getViewSettings(),
-                visibleSettings: instance.getVisibleViewSettings()
-
-            }).then(function () {
-
-                updateItemsContainerForViewType(instance);
-                instance.itemsContainer.refreshItems();
-            });
-        });
-    }
-
-    function updateItemsContainerForViewType(instance) {
-
-        var settings = instance.getViewSettings();
-
-        if (settings.imageType === 'list') {
-
-            instance.itemsContainer.classList.remove('vertical-wrap');
-            instance.itemsContainer.classList.add('vertical-list');
-
-        } else {
-            instance.itemsContainer.classList.add('vertical-wrap');
-            instance.itemsContainer.classList.remove('vertical-list');
-        }
-    }
-
-    function updateSortText(instance) {
-
-        var btnSortText = instance.btnSortText;
-        if (!btnSortText) {
-            return;
-        }
-
-        var options = instance.getSortMenuOptions();
-        var values = instance.getSortValues();
-
-        var sortBy = values.sortBy;
-
-        for (var i = 0, length = options.length; i < length; i++) {
-
-            if (sortBy === options[i].value) {
-
-                btnSortText.innerHTML = globalize.translate('SortByValue', options[i].name);
-                break;
-            }
-        }
-
-        var btnSortIcon = instance.btnSortIcon;
-        if (!btnSortIcon) {
-            return;
-        }
-
-        btnSortIcon.classList.remove('arrow_downward', 'arrow_upward');
-        btnSortIcon.classList.add(values.sortOrder === 'Descending' ? 'arrow_downward' : 'arrow_upward');
-    }
-
-    function bindAll(elems, eventName, fn) {
-        for (var i = 0, length = elems.length; i < length; i++) {
-
-            elems[i].addEventListener(eventName, fn);
-        }
-    }
-
-    function play() {
-
-        this.fetchData().then(function (result) {
-            playbackManager.play({
-                items: result.Items || result
-            });
-        });
-    }
-
-    function shuffle() {
-
-        this.fetchData().then(function (result) {
-            playbackManager.play({
-                items: result.Items || result
-            });
-        });
-    }
-
-    function hideOrShowAll(elems, hide) {
-
-        for (var i = 0, length = elems.length; i < length; i++) {
-
-            if (hide) {
-                elems[i].classList.add('hide');
-            } else {
-                elems[i].classList.remove('hide');
-            }
-        }
-    }
-
-    function ItemsTab(view, params) {
-        this.view = view;
-        this.params = params;
-
-        if (params.serverId) {
-            this.apiClient = connectionManager.getApiClient(params.serverId);
-        }
-
-        this.itemsContainer = view.querySelector('.itemsContainer');
-        this.scroller = view.querySelector('.scrollFrameY');
-
-        this.itemsContainer.fetchData = this.fetchData.bind(this);
-        this.itemsContainer.getItemsHtml = this.getItemsHtml.bind(this);
-
-        if (params.parentId) {
-            this.itemsContainer.setAttribute('data-parentid', params.parentId);
-        }
-
-        var i;
-        var length;
-
-        var btnViewSettings = view.querySelectorAll('.btnViewSettings');
-        for (i = 0, length = btnViewSettings.length; i < length; i++) {
-
-            btnViewSettings[i].addEventListener('click', showViewSettingsMenu.bind(this));
-        }
-
-        var filterButtons = view.querySelectorAll('.btnFilter');
-        this.filterButtons = filterButtons;
-        var hasVisibleFilters = this.getVisibleFilters().length;
-        for (i = 0, length = filterButtons.length; i < length; i++) {
-
-            var btnFilter = filterButtons[i];
-            btnFilter.addEventListener('click', showFilterMenu.bind(this));
-
-            if (hasVisibleFilters) {
-                btnFilter.classList.remove('hide');
-            } else {
-                btnFilter.classList.add('hide');
-            }
-        }
-
-        var sortButtons = view.querySelectorAll('.btnSort');
-        this.sortButtons = sortButtons;
-        for (i = 0, length = sortButtons.length; i < length; i++) {
-
-            var sortButton = sortButtons[i];
-            sortButton.addEventListener('click', showSortMenu.bind(this));
-
-            if (params.type !== 'nextup') {
-                sortButton.classList.remove('hide');
-            }
-        }
-        this.btnSortText = view.querySelector('.btnSortText');
-        this.btnSortIcon = view.querySelector('.btnSortIcon');
-
-        this.alphaPickerElement = view.querySelector('.alphaPicker');
-
-        hideOrShowAll(view.querySelectorAll('.btnShuffle'), true);
-
-        bindAll(view.querySelectorAll('.btnPlay'), 'click', play.bind(this));
-        bindAll(view.querySelectorAll('.btnShuffle'), 'click', shuffle.bind(this));
-    }
-
-    function getSettingValue(key, defaultValue) {
-    }
-
-    ItemsTab.prototype.getViewSettings = function () {
-
-        var basekey = this.getSettingsKey();
-
-        return {
-            showTitle: userSettings.get(basekey + '-showTitle') !== 'false',
-            showYear: userSettings.get(basekey + '-showYear') !== 'false',
-            imageType: userSettings.get(basekey + '-imageType') || this.getDefaultImageType()
-        };
-    };
-
-    ItemsTab.prototype.getDefaultImageType = function () {
-
-        return 'primary';
-    };
-
-    ItemsTab.prototype.getSettingsKey = function () {
-
-        return this.params.parentId + '-1';
-    };
-
-    ItemsTab.prototype.onResume = function (options) {
-
-        if (options && options.refresh) {
-            updateSortText(this);
-            updateItemsContainerForViewType(this);
-            loading.show();
-        }
-
-        var view = this.view;
-
-        var scroller = this.scroller;
-        if (scroller && scroller.resume) {
-            scroller.resume();
-        }
-
-        if (this.enableAlphaPicker && !this.alphaPicker) {
-            initAlphaPicker(this, view);
-            updateAlphaPickerState(this);
-        }
-
-        if (this.enableAlphaNumericShortcuts !== false) {
-            this.alphaNumericShortcuts = new AlphaNumericShortcuts.default({
-                itemsContainer: this.itemsContainer
-            });
-        }
-
-        var instance = this;
-        var autoFocus = options.autoFocus;
-
-        this.itemsContainer.resume(options).then(function (result) {
-
-            loading.hide();
-
-            if (autoFocus) {
-                focusManager.autoFocus(instance.itemsContainer);
-            }
-        });
-    };
-
-    ItemsTab.prototype.getVisibleViewSettings = function () {
-
-        return [
-            'showTitle',
-            'showYear',
-            'imageType'
-        ];
-    };
-
-    ItemsTab.prototype.getFilters = function () {
-
-        var basekey = this.getSettingsKey();
-
-        return {
-            IsPlayed: userSettings.getFilter(basekey + '-filter-IsPlayed') === 'true',
-            IsUnplayed: userSettings.getFilter(basekey + '-filter-IsUnplayed') === 'true',
-            IsFavorite: userSettings.getFilter(basekey + '-filter-IsFavorite') === 'true',
-            IsResumable: userSettings.getFilter(basekey + '-filter-IsResumable') === 'true',
-            Is4K: userSettings.getFilter(basekey + '-filter-Is4K') === 'true',
-            IsHD: userSettings.getFilter(basekey + '-filter-IsHD') === 'true',
-            IsSD: userSettings.getFilter(basekey + '-filter-IsSD') === 'true',
-            Is3D: userSettings.getFilter(basekey + '-filter-Is3D') === 'true',
-            VideoTypes: userSettings.getFilter(basekey + '-filter-VideoTypes'),
-            SeriesStatus: userSettings.getFilter(basekey + '-filter-SeriesStatus'),
-            HasSubtitles: userSettings.getFilter(basekey + '-filter-HasSubtitles'),
-            HasTrailer: userSettings.getFilter(basekey + '-filter-HasTrailer'),
-            HasSpecialFeature: userSettings.getFilter(basekey + '-filter-HasSpecialFeature'),
-            HasThemeSong: userSettings.getFilter(basekey + '-filter-HasThemeSong'),
-            HasThemeVideo: userSettings.getFilter(basekey + '-filter-HasThemeVideo'),
-            GenreIds: userSettings.getFilter(basekey + '-filter-GenreIds')
-        };
-    };
-
-    ItemsTab.prototype.getSortValues = function () {
-
-        var basekey = this.getSettingsKey();
-
-        return {
-            sortBy: userSettings.getFilter(basekey + '-sortby') || this.getSortMenuOptions()[0].value,
-            sortOrder: userSettings.getFilter(basekey + '-sortorder') === 'Descending' ? 'Descending' : 'Ascending'
-        };
-    };
-
-    ItemsTab.prototype.getVisibleFilters = function () {
-
-        return [
-            'IsUnplayed',
-            'IsPlayed',
-            'IsFavorite',
-            'IsResumable',
-            'VideoType',
-            'HasSubtitles',
-            'HasTrailer',
-            'HasSpecialFeature',
-            'HasThemeSong',
-            'HasThemeVideo'
-        ];
-    };
-
-    ItemsTab.prototype.getDefaultSortBy = function () {
-
-        return 'SortName';
-    };
-
-    ItemsTab.prototype.getSortMenuOptions = function () {
-
-        var sortBy = [];
-
-        var option = this.getNameSortOption();
-        if (option) {
-            sortBy.push(option);
-        }
-
-        option = this.getCommunityRatingSortOption();
-        if (option) {
-            sortBy.push(option);
-        }
-
-        option = this.getCriticRatingSortOption();
-
-        if (option) {
-            sortBy.push(option);
-        }
-
-        sortBy.push({
-            name: globalize.translate('DateAdded'),
-            value: 'DateCreated,SortName'
-        });
-
-        option = this.getDatePlayedSortOption();
-        if (option) {
-            sortBy.push(option);
-        }
-
-        sortBy.push({
-            name: globalize.translate('ParentalRating'),
-            value: 'OfficialRating,SortName'
-        });
-
-        option = this.getPlayCountSortOption();
-        if (option) {
-            sortBy.push(option);
-        }
-
-        sortBy.push({
-            name: globalize.translate('ReleaseDate'),
-            value: 'PremiereDate,ProductionYear,SortName'
-        });
-
-        sortBy.push({
-            name: globalize.translate('Runtime'),
-            value: 'Runtime,SortName'
-        });
-
-        return sortBy;
-    };
-
-    ItemsTab.prototype.getNameSortOption = function () {
-
-        return {
-            name: globalize.translate('Name'),
-            value: 'SortName'
-        };
-    };
-
-    ItemsTab.prototype.getPlayCountSortOption = function () {
-
-        return {
-            name: globalize.translate('PlayCount'),
-            value: 'PlayCount,SortName'
-        };
-    };
-
-    ItemsTab.prototype.getDatePlayedSortOption = function () {
-
-        return {
-            name: globalize.translate('DatePlayed'),
-            value: 'DatePlayed,SortName'
-        };
-    };
-
-    ItemsTab.prototype.getCriticRatingSortOption = function () {
-
-        return {
-            name: globalize.translate('CriticRating'),
-            value: 'CriticRating,SortName'
-        };
-    };
-
-    ItemsTab.prototype.getCommunityRatingSortOption = function () {
-
-        return {
-            name: globalize.translate('CommunityRating'),
-            value: 'CommunityRating,SortName'
-        };
-    };
-
-    ItemsTab.prototype.getFilterMenuOptions = function () {
-
-        var params = this.params;
-
-        return {
-
-        };
-    };
-
-    ItemsTab.prototype.getItemTypes = function () {
-
-        return [];
-    };
-
-    ItemsTab.prototype.setFilterStatus = function (hasFilters) {
-
-        this.hasFilters = hasFilters;
-
-        var filterButtons = this.filterButtons;
-        if (!filterButtons.length) {
-            return;
-        }
-
-        for (var i = 0, length = filterButtons.length; i < length; i++) {
-
-            var btnFilter = filterButtons[i];
-
-            var bubble = btnFilter.querySelector('.filterButtonBubble');
-            if (!bubble) {
-
-                if (!hasFilters) {
-                    continue;
-                }
-
-                btnFilter.insertAdjacentHTML('afterbegin', '<div class="filterButtonBubble">!</div>');
-                btnFilter.classList.add('btnFilterWithBubble');
-                bubble = btnFilter.querySelector('.filterButtonBubble');
-            }
-
-            if (hasFilters) {
-                bubble.classList.remove('hide');
-            } else {
-                bubble.classList.add('hide');
-            }
-        }
-    };
-
-    ItemsTab.prototype.onPause = function () {
-        var scroller = this.scroller;
-        if (scroller && scroller.pause) {
-            scroller.pause();
-        }
-
-        var alphaNumericShortcuts = this.alphaNumericShortcuts;
-        if (alphaNumericShortcuts) {
-            alphaNumericShortcuts.default.destroy();
-            this.alphaNumericShortcuts = null;
-        }
-    };
-
-    ItemsTab.prototype.destroy = function () {
-        this.view = null;
-        this.itemsContainer = null;
-        this.params = null;
-        this.apiClient = null;
-        this.scroller = null;
-        this.filterButtons = null;
-
-        if (this.alphaPicker) {
-            this.alphaPicker.destroy();
-            this.alphaPicker = null;
-        }
-
-        this.sortButtons = null;
-        this.btnSortText = null;
-        this.btnSortIcon = null;
-        this.alphaPickerElement = null;
-    };
-
-    return ItemsTab;
-});
diff --git a/src/components/tabbedview/tabbedview.js b/src/components/tabbedview/tabbedview.js
index 4fec69f619..8bd3afd372 100644
--- a/src/components/tabbedview/tabbedview.js
+++ b/src/components/tabbedview/tabbedview.js
@@ -2,7 +2,6 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
     'use strict';
 
     function onViewDestroy(e) {
-
         var tabControllers = this.tabControllers;
 
         if (tabControllers) {
@@ -26,7 +25,6 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
     }
 
     function TabbedView(view, params) {
-
         this.tabControllers = [];
         this.view = view;
         this.params = params;
@@ -37,15 +35,12 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
         this.initialTabIndex = currentTabIndex;
 
         function validateTabLoad(index) {
-
             return self.validateTabLoad ? self.validateTabLoad(index) : Promise.resolve();
         }
 
         function loadTab(index, previousIndex) {
-
             validateTabLoad(index).then(function () {
                 self.getTabController(index).then(function (controller) {
-
                     var refresh = !controller.refreshed;
 
                     controller.onResume({
@@ -80,12 +75,10 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
         view.addEventListener('viewbeforehide', this.onPause.bind(this));
 
         view.addEventListener('viewbeforeshow', function (e) {
-
             mainTabsManager.setTabs(view, currentTabIndex, self.getTabs, getTabContainers, onBeforeTabChange, onTabChange, false);
         });
 
         view.addEventListener('viewshow', function (e) {
-
             self.onResume(e.detail);
         });
 
@@ -93,7 +86,6 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
     }
 
     TabbedView.prototype.onResume = function (options) {
-
         this.setTitle();
         backdrop.clearBackdrop();
 
@@ -107,7 +99,6 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
     };
 
     TabbedView.prototype.onPause = function () {
-
         var currentTabController = this.currentTabController;
 
         if (currentTabController && currentTabController.onPause) {
diff --git a/src/components/themeMediaPlayer.js b/src/components/themeMediaPlayer.js
index 94012ba823..dd04f384aa 100644
--- a/src/components/themeMediaPlayer.js
+++ b/src/components/themeMediaPlayer.js
@@ -5,13 +5,11 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
     var currentThemeIds = [];
 
     function playThemeMedia(items, ownerId) {
-
         var currentThemeItems = items.filter(function (i) {
             return enabled(i.MediaType);
         });
 
         if (currentThemeItems.length) {
-
             // Stop if a theme song from another ownerId
             // Leave it alone if anything else (e.g user playing a movie)
             if (!currentOwnerId && playbackManager.isPlaying()) {
@@ -29,7 +27,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
             }).then(function () {
                 currentOwnerId = ownerId;
             });
-
         } else {
             stopIfPlaying();
         }
@@ -44,7 +41,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
     }
 
     function enabled(mediaType) {
-
         if (mediaType === 'Video') {
             return userSettings.enableThemeVideos();
         }
@@ -55,7 +51,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
     var excludeTypes = ['CollectionFolder', 'UserView', 'Program', 'SeriesTimer', 'Person', 'TvChannel', 'Channel'];
 
     function loadThemeMedia(item) {
-
         if (item.CollectionType) {
             stopIfPlaying();
             return;
@@ -68,11 +63,9 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
 
         var apiClient = connectionManager.getApiClient(item.ServerId);
         apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) {
-
             var ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId;
 
             if (ownerId !== currentOwnerId) {
-
                 var items = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.Items : themeMediaResult.ThemeSongsResult.Items;
 
                 playThemeMedia(items, ownerId);
@@ -81,7 +74,6 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
     }
 
     document.addEventListener('viewshow', function (e) {
-
         var state = e.detail.state || {};
         var item = state.item;
 
@@ -97,15 +89,13 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
         } else {
             playThemeMedia([], null);
         }
-
     }, true);
 
-    //Events.on(playbackManager, 'playbackstart', function (e, player) {
-    //    var item = playbackManager.currentItem(player);
-    //    // User played something manually
-    //    if (currentThemeIds.indexOf(item.Id) == -1) {
-    //        currentOwnerId = null;
-    //    }
-    //});
-
+    Events.on(playbackManager, 'playbackstart', function (e, player) {
+        var item = playbackManager.currentItem(player);
+        // User played something manually
+        if (currentThemeIds.indexOf(item.Id) == -1) {
+            currentOwnerId = null;
+        }
+    });
 });
diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js
index 7b8e49e4d2..d14abffce4 100644
--- a/src/components/toast/toast.js
+++ b/src/components/toast/toast.js
@@ -2,24 +2,19 @@ define(['css!./toast'], function () {
     'use strict';
 
     function remove(elem) {
-
         setTimeout(function () {
             elem.parentNode.removeChild(elem);
         }, 300);
     }
 
     function animateRemove(elem) {
-
         setTimeout(function () {
-
             elem.classList.remove('toastVisible');
             remove(elem);
-
         }, 3300);
     }
 
     return function (options) {
-
         if (typeof options === 'string') {
             options = {
                 text: options
@@ -36,7 +31,6 @@ define(['css!./toast'], function () {
             elem.classList.add('toastVisible');
 
             animateRemove(elem);
-
         }, 300);
     };
 });
diff --git a/src/components/upnextdialog/upnextdialog.js b/src/components/upnextdialog/upnextdialog.js
index 3e9c9f9c5e..1dbe71c632 100644
--- a/src/components/upnextdialog/upnextdialog.js
+++ b/src/components/upnextdialog/upnextdialog.js
@@ -4,7 +4,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     var transitionEndEventName = dom.whichTransitionEvent();
 
     function seriesImageUrl(item, options) {
-
         if (item.Type !== 'Episode') {
             return null;
         }
@@ -13,9 +12,7 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
         options.type = options.type || 'Primary';
 
         if (options.type === 'Primary') {
-
             if (item.SeriesPrimaryImageTag) {
-
                 options.tag = item.SeriesPrimaryImageTag;
 
                 return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
@@ -23,15 +20,12 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
         }
 
         if (options.type === 'Thumb') {
-
             if (item.SeriesThumbImageTag) {
-
                 options.tag = item.SeriesThumbImageTag;
 
                 return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
             }
             if (item.ParentThumbImageTag) {
-
                 options.tag = item.ParentThumbImageTag;
 
                 return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
@@ -42,19 +36,16 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function imageUrl(item, options) {
-
         options = options || {};
         options.type = options.type || 'Primary';
 
         if (item.ImageTags && item.ImageTags[options.type]) {
-
             options.tag = item.ImageTags[options.type];
             return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
         }
 
         if (options.type === 'Primary') {
             if (item.AlbumId && item.AlbumPrimaryImageTag) {
-
                 options.tag = item.AlbumPrimaryImageTag;
                 return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
             }
@@ -64,9 +55,7 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function setPoster(osdPoster, item, secondaryItem) {
-
         if (item) {
-
             var imgUrl = seriesImageUrl(item, { type: 'Primary' }) ||
                 seriesImageUrl(item, { type: 'Thumb' }) ||
                 imageUrl(item, { type: 'Primary' });
@@ -87,7 +76,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function getHtml() {
-
         var html = '';
 
         html += '<div class="upNextDialog-poster">';
@@ -124,7 +112,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function setNextVideoText() {
-
         var instance = this;
 
         var elem = instance.options.parent;
@@ -143,7 +130,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function fillItem(item) {
-
         var instance = this;
 
         var elem = instance.options.parent;
@@ -175,11 +161,9 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function onStartNowClick() {
-
         var options = this.options;
 
         if (options) {
-
             var player = options.player;
 
             this.hide();
@@ -189,7 +173,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function init(instance, options) {
-
         options.parent.innerHTML = getHtml();
 
         options.parent.classList.add('hide');
@@ -203,7 +186,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function clearHideAnimationEventListeners(instance, elem) {
-
         var fn = instance._onHideAnimationComplete;
 
         if (fn) {
@@ -214,7 +196,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function onHideAnimationComplete(e) {
-
         var instance = this;
         var elem = e.target;
 
@@ -225,7 +206,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function hideComingUpNext() {
-
         var instance = this;
         clearCountdownTextTimeout(this);
 
@@ -259,10 +239,8 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function getTimeRemainingMs(instance) {
-
         var options = instance.options;
         if (options) {
-
             var runtimeTicks = playbackManager.duration(options.player);
 
             if (runtimeTicks) {
@@ -276,7 +254,6 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function startComingUpNextHideTimer(instance) {
-
         var timeRemainingMs = getTimeRemainingMs(instance);
 
         if (timeRemainingMs <= 0) {
@@ -290,14 +267,12 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     }
 
     function UpNextDialog(options) {
-
         this.options = options;
 
         init(this, options);
     }
 
     UpNextDialog.prototype.show = function () {
-
         var elem = this.options.parent;
 
         clearHideAnimationEventListeners(this, elem);
@@ -319,12 +294,10 @@ define(['dom', 'playbackManager', 'connectionManager', 'events', 'mediaInfo', 'l
     };
 
     UpNextDialog.prototype.hide = function () {
-
         hideComingUpNext.call(this);
     };
 
     UpNextDialog.prototype.destroy = function () {
-
         hideComingUpNext.call(this);
 
         this.options = null;
diff --git a/src/components/userdatabuttons/userdatabuttons.js b/src/components/userdatabuttons/userdatabuttons.js
index 86b9902133..e3a7b9e06b 100644
--- a/src/components/userdatabuttons/userdatabuttons.js
+++ b/src/components/userdatabuttons/userdatabuttons.js
@@ -9,7 +9,6 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     };
 
     function getUserDataButtonHtml(method, itemId, serverId, buttonCssClass, iconCssClass, icon, tooltip, style) {
-
         if (style === 'fab-mini') {
             style = 'fab';
             buttonCssClass = buttonCssClass ? (buttonCssClass + ' mini') : 'mini';
@@ -34,7 +33,6 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function onContainerClick(e) {
-
         var btnUserData = dom.parentWithClass(e.target, 'btnUserData');
 
         if (!btnUserData) {
@@ -46,7 +44,6 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function fill(options) {
-
         var html = getIconsHtml(options);
 
         if (options.fillMode === 'insertAdjacent') {
@@ -65,7 +62,6 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function destroy(options) {
-
         options.element.innerHTML = '';
 
         dom.removeEventListener(options.element, 'click', onContainerClick, {
@@ -74,7 +70,6 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function getIconsHtml(options) {
-
         var item = options.item;
         var includePlayed = options.includePlayed;
         var cssClass = options.cssClass;
@@ -112,25 +107,8 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
             }
         }
 
-        //var tooltipLike = globalize.translate('Like');
-        //var tooltipDislike = globalize.translate('Dislike');
-
-        //if (typeof userData.Likes == "undefined") {
-        //    html += getUserDataButtonHtml('markDislike', itemId, serverId, btnCssClass + ' btnUserData btnDislike', 'thumb-down', tooltipDislike);
-        //    html += getUserDataButtonHtml('markLike', itemId, serverId, btnCssClass + ' btnUserData btnLike', 'thumb-up', tooltipLike);
-        //}
-        //else if (userData.Likes) {
-        //    html += getUserDataButtonHtml('markDislike', itemId, serverId, btnCssClass + ' btnUserData btnDislike', 'thumb-down', tooltipDislike);
-        //    html += getUserDataButtonHtml('markLike', itemId, serverId, btnCssClass + ' btnUserData btnLike btnUserDataOn', 'thumb-up', tooltipLike);
-        //}
-        //else {
-        //    html += getUserDataButtonHtml('markDislike', itemId, serverId, btnCssClass + ' btnUserData btnDislike btnUserDataOn', 'thumb-down', tooltipDislike);
-        //    html += getUserDataButtonHtml('markLike', itemId, serverId, btnCssClass + ' btnUserData btnLike', 'thumb-up', tooltipLike);
-        //}
-
         var tooltipFavorite = globalize.translate('Favorite');
         if (userData.IsFavorite) {
-
             html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData btnUserDataOn', iconCssClass, 'favorite', tooltipFavorite, style);
         } else {
             html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData', iconCssClass, 'favorite', tooltipFavorite, style);
@@ -140,7 +118,6 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function markFavorite(link) {
-
         var id = link.getAttribute('data-itemid');
         var serverId = link.getAttribute('data-serverid');
 
@@ -156,18 +133,14 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function markLike(link) {
-
         var id = link.getAttribute('data-itemid');
         var serverId = link.getAttribute('data-serverid');
 
         if (!link.classList.contains('btnUserDataOn')) {
-
             likes(id, serverId, true);
 
             link.classList.add('btnUserDataOn');
-
         } else {
-
             clearLike(id, serverId);
 
             link.classList.remove('btnUserDataOn');
@@ -177,18 +150,14 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function markDislike(link) {
-
         var id = link.getAttribute('data-itemid');
         var serverId = link.getAttribute('data-serverid');
 
         if (!link.classList.contains('btnUserDataOn')) {
-
             likes(id, serverId, false);
 
             link.classList.add('btnUserDataOn');
-
         } else {
-
             clearLike(id, serverId);
 
             link.classList.remove('btnUserDataOn');
@@ -198,18 +167,14 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function markPlayed(link) {
-
         var id = link.getAttribute('data-itemid');
         var serverId = link.getAttribute('data-serverid');
 
         if (!link.classList.contains('btnUserDataOn')) {
-
             played(id, serverId, true);
 
             link.classList.add('btnUserDataOn');
-
         } else {
-
             played(id, serverId, false);
 
             link.classList.remove('btnUserDataOn');
@@ -236,7 +201,6 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
     }
 
     function clearLike(id, serverId) {
-
         var apiClient = connectionManager.getApiClient(serverId);
 
         return apiClient.clearUserItemRating(apiClient.getCurrentUserId(), id);
@@ -247,5 +211,4 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
         destroy: destroy,
         getIconsHtml: getIconsHtml
     };
-
 });
diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js
index 8e17264f9f..058ba4ebb2 100644
--- a/src/components/viewManager/viewManager.js
+++ b/src/components/viewManager/viewManager.js
@@ -5,10 +5,8 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
     var dispatchPageEvents;
 
     viewContainer.setOnBeforeChange(function (newView, isRestored, options) {
-
         var lastView = currentView;
         if (lastView) {
-
             var beforeHideResult = dispatchViewEvent(lastView, null, 'viewbeforehide', true);
 
             if (!beforeHideResult) {
@@ -21,11 +19,10 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
         if (!newView.initComplete) {
             newView.initComplete = true;
 
-            var controller;
             if (typeof options.controllerFactory === 'function') {
-                controller = new options.controllerFactory(newView, eventDetail.detail.params);
+                new options.controllerFactory(newView, eventDetail.detail.params);
             } else if (options.controllerFactory && typeof options.controllerFactory.default === 'function') {
-                controller = new options.controllerFactory.default(newView, eventDetail.detail.params);
+                new options.controllerFactory.default(newView, eventDetail.detail.params);
             }
 
             if (!options.controllerFactory || dispatchPageEvents) {
@@ -37,7 +34,6 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
     });
 
     function onViewChange(view, options, isRestore) {
-
         var lastView = currentView;
         if (lastView) {
             dispatchViewEvent(lastView, null, 'viewhide');
@@ -77,7 +73,6 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
     }
 
     function dispatchViewEvent(view, eventInfo, eventName, isCancellable) {
-
         if (!eventInfo) {
             eventInfo = {
                 detail: {
@@ -102,7 +97,6 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
     }
 
     function getViewEventDetail(view, options, isRestore) {
-
         var url = options.url;
         var index = url.indexOf('?');
         var params = index === -1 ? {} : queryString.parse(url.substring(index + 1));
@@ -134,7 +128,6 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
     }
 
     ViewManager.prototype.loadView = function (options) {
-
         var lastView = currentView;
 
         // Record the element that has focus
@@ -147,13 +140,11 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
         }
 
         viewContainer.loadView(options).then(function (view) {
-
             onViewChange(view, options);
         });
     };
 
     ViewManager.prototype.tryRestoreView = function (options, onViewChanging) {
-
         if (options.cancel) {
             return Promise.reject({ cancelled: true });
         }
@@ -164,10 +155,8 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
         }
 
         return viewContainer.tryRestoreView(options).then(function (view) {
-
             onViewChanging();
             onViewChange(view, options, true);
-
         });
     };
 
diff --git a/src/components/viewSettings/viewSettings.js b/src/components/viewSettings/viewSettings.js
index 28a9854c34..67abc25a9c 100644
--- a/src/components/viewSettings/viewSettings.js
+++ b/src/components/viewSettings/viewSettings.js
@@ -2,19 +2,16 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
     'use strict';
 
     function onSubmit(e) {
-
         e.preventDefault();
         return false;
     }
 
     function initEditor(context, settings) {
-
         context.querySelector('form').addEventListener('submit', onSubmit);
 
         var elems = context.querySelectorAll('.viewSetting-checkboxContainer');
 
         for (var i = 0, length = elems.length; i < length; i++) {
-
             elems[i].querySelector('input').checked = settings[elems[i].getAttribute('data-settingname')] || false;
         }
 
@@ -22,7 +19,6 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
     }
 
     function saveValues(context, settings, settingsKey) {
-
         var elems = context.querySelectorAll('.viewSetting-checkboxContainer');
         for (var i = 0, length = elems.length; i < length; i++) {
             userSettings.set(settingsKey + '-' + elems[i].getAttribute('data-settingname'), elems[i].querySelector('input').checked);
@@ -39,7 +35,6 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
     }
 
     function showIfAllowed(context, selector, visible) {
-
         var elem = context.querySelector(selector);
 
         if (visible && !elem.classList.contains('hiddenFromViewSettings')) {
@@ -54,11 +49,8 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
     }
 
     ViewSettings.prototype.show = function (options) {
-
         return new Promise(function (resolve, reject) {
-
             require(['text!./viewSettings.template.html'], function (template) {
-
                 var dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
@@ -100,13 +92,11 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
                 initEditor(dlg, options.settings);
 
                 dlg.querySelector('.selectImageType').addEventListener('change', function () {
-
                     showIfAllowed(dlg, '.chkTitleContainer', this.value !== 'list');
                     showIfAllowed(dlg, '.chkYearContainer', this.value !== 'list');
                 });
 
                 dlg.querySelector('.btnCancel').addEventListener('click', function () {
-
                     dialogHelper.close(dlg);
                 });
 
@@ -119,13 +109,10 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
                 dlg.querySelector('.selectImageType').dispatchEvent(new CustomEvent('change', {}));
 
                 dlg.querySelector('form').addEventListener('change', function () {
-
                     submitted = true;
-
                 }, true);
 
                 dialogHelper.open(dlg).then(function () {
-
                     if (layoutManager.tv) {
                         centerFocus(dlg.querySelector('.formDialogContent'), false, false);
                     }
diff --git a/src/controllers/dashboard/apikeys.js b/src/controllers/dashboard/apikeys.js
index 0e122c486d..2b526aa8cc 100644
--- a/src/controllers/dashboard/apikeys.js
+++ b/src/controllers/dashboard/apikeys.js
@@ -1,6 +1,5 @@
 import datetime from 'datetime';
 import loading from 'loading';
-import libraryMenu from 'libraryMenu';
 import dom from 'dom';
 import globalize from 'globalize';
 import 'emby-button';
diff --git a/src/controllers/dashboard/devices/device.js b/src/controllers/dashboard/devices/device.js
index 7faaee2494..17e28b9bdb 100644
--- a/src/controllers/dashboard/devices/device.js
+++ b/src/controllers/dashboard/devices/device.js
@@ -1,5 +1,4 @@
 import loading from 'loading';
-import libraryMenu from 'libraryMenu';
 import dom from 'dom';
 import 'emby-input';
 import 'emby-button';
diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js
index 9f05d84713..93ae62c43f 100644
--- a/src/controllers/dashboard/devices/devices.js
+++ b/src/controllers/dashboard/devices/devices.js
@@ -1,6 +1,5 @@
 import loading from 'loading';
 import dom from 'dom';
-import libraryMenu from 'libraryMenu';
 import globalize from 'globalize';
 import imageHelper from 'scripts/imagehelper';
 import * as datefns from 'date-fns';
diff --git a/src/controllers/dashboard/dlna/profile.js b/src/controllers/dashboard/dlna/profile.js
index 69098ac506..2a4fbec37b 100644
--- a/src/controllers/dashboard/dlna/profile.js
+++ b/src/controllers/dashboard/dlna/profile.js
@@ -257,7 +257,6 @@ import 'listViewStyle';
         let currentType;
 
         for (const [index, profile] of profiles.entries()) {
-
             if (profile.Type !== currentType) {
                 html += '<li data-role="list-divider">' + profile.Type + '</li>';
                 currentType = profile.Type;
diff --git a/src/controllers/dashboard/mediaLibrary.js b/src/controllers/dashboard/mediaLibrary.js
index b958e69d22..6694a28d0f 100644
--- a/src/controllers/dashboard/mediaLibrary.js
+++ b/src/controllers/dashboard/mediaLibrary.js
@@ -1,11 +1,9 @@
 import $ from 'jQuery';
-import appHost from 'apphost';
 import taskButton from 'scripts/taskbutton';
 import loading from 'loading';
 import libraryMenu from 'libraryMenu';
 import globalize from 'globalize';
 import dom from 'dom';
-import indicators from 'indicators';
 import imageHelper from 'scripts/imagehelper';
 import 'cardStyle';
 import 'emby-itemrefreshindicator';
@@ -395,7 +393,6 @@ import 'emby-itemrefreshindicator';
         });
     });
     pageIdOn('pagebeforehide', 'mediaLibraryPage', function () {
-
         const page = this;
         taskButton({
             mode: 'off',
diff --git a/src/controllers/dashboard/metadataImages.js b/src/controllers/dashboard/metadataImages.js
index cbfe05419c..02e01736ea 100644
--- a/src/controllers/dashboard/metadataImages.js
+++ b/src/controllers/dashboard/metadataImages.js
@@ -1,5 +1,4 @@
 import $ from 'jQuery';
-import dom from 'dom';
 import loading from 'loading';
 import libraryMenu from 'libraryMenu';
 import globalize from 'globalize';
diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js
index 367ab8335c..5cae08d2fa 100644
--- a/src/controllers/dashboard/networking.js
+++ b/src/controllers/dashboard/networking.js
@@ -1,5 +1,4 @@
 import loading from 'loading';
-import libraryMenu from 'libraryMenu';
 import globalize from 'globalize';
 import 'emby-checkbox';
 import 'emby-select';
diff --git a/src/notificationsetting.html b/src/controllers/dashboard/notifications/notification/index.html
similarity index 100%
rename from src/notificationsetting.html
rename to src/controllers/dashboard/notifications/notification/index.html
diff --git a/src/controllers/dashboard/notifications/notification.js b/src/controllers/dashboard/notifications/notification/index.js
similarity index 100%
rename from src/controllers/dashboard/notifications/notification.js
rename to src/controllers/dashboard/notifications/notification/index.js
diff --git a/src/notificationsettings.html b/src/controllers/dashboard/notifications/notifications/index.html
similarity index 100%
rename from src/notificationsettings.html
rename to src/controllers/dashboard/notifications/notifications/index.html
diff --git a/src/controllers/dashboard/notifications/notifications.js b/src/controllers/dashboard/notifications/notifications/index.js
similarity index 100%
rename from src/controllers/dashboard/notifications/notifications.js
rename to src/controllers/dashboard/notifications/notifications/index.js
diff --git a/src/addplugin.html b/src/controllers/dashboard/plugins/add/index.html
similarity index 100%
rename from src/addplugin.html
rename to src/controllers/dashboard/plugins/add/index.html
diff --git a/src/controllers/dashboard/plugins/add.js b/src/controllers/dashboard/plugins/add/index.js
similarity index 100%
rename from src/controllers/dashboard/plugins/add.js
rename to src/controllers/dashboard/plugins/add/index.js
diff --git a/src/availableplugins.html b/src/controllers/dashboard/plugins/available/index.html
similarity index 100%
rename from src/availableplugins.html
rename to src/controllers/dashboard/plugins/available/index.html
diff --git a/src/controllers/dashboard/plugins/available.js b/src/controllers/dashboard/plugins/available/index.js
similarity index 99%
rename from src/controllers/dashboard/plugins/available.js
rename to src/controllers/dashboard/plugins/available/index.js
index 37df8801b5..1f202d6ff6 100644
--- a/src/controllers/dashboard/plugins/available.js
+++ b/src/controllers/dashboard/plugins/available/index.js
@@ -34,7 +34,6 @@ define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby
         var availablePlugins = options.availablePlugins;
         var installedPlugins = options.installedPlugins;
 
-        var categories = [];
         availablePlugins.forEach(function (plugin, index, array) {
             plugin.category = plugin.category || 'General';
             plugin.categoryDisplayName = getHeaderText(plugin.category);
diff --git a/src/installedplugins.html b/src/controllers/dashboard/plugins/installed/index.html
similarity index 100%
rename from src/installedplugins.html
rename to src/controllers/dashboard/plugins/installed/index.html
diff --git a/src/controllers/dashboard/plugins/installed.js b/src/controllers/dashboard/plugins/installed/index.js
similarity index 100%
rename from src/controllers/dashboard/plugins/installed.js
rename to src/controllers/dashboard/plugins/installed/index.js
diff --git a/src/repositories.html b/src/controllers/dashboard/plugins/repositories/index.html
similarity index 100%
rename from src/repositories.html
rename to src/controllers/dashboard/plugins/repositories/index.html
diff --git a/src/controllers/dashboard/plugins/repositories.js b/src/controllers/dashboard/plugins/repositories/index.js
similarity index 100%
rename from src/controllers/dashboard/plugins/repositories.js
rename to src/controllers/dashboard/plugins/repositories/index.js
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
index fe214fef63..cc650452db 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtask.js
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
@@ -10,7 +10,6 @@ import 'emby-select';
 /* eslint-disable indent */
 
     function fillTimeOfDay(select) {
-
         const options = [];
 
         for (let i = 0; i < 86400000; i += 900000) {
@@ -99,7 +98,6 @@ import 'emby-select';
             }
 
             if (trigger.Type == 'IntervalTrigger') {
-
                 const hours = trigger.IntervalTicks / 36e9;
 
                 if (hours == 0.25) {
diff --git a/src/controllers/dashboard/users/userparentalcontrol.js b/src/controllers/dashboard/users/userparentalcontrol.js
index 3fba3fc2b2..e146aac567 100644
--- a/src/controllers/dashboard/users/userparentalcontrol.js
+++ b/src/controllers/dashboard/users/userparentalcontrol.js
@@ -228,7 +228,6 @@ import 'paper-icon-button-light';
     }
 
     function showBlockedTagPopup(page) {
-
         import('prompt').then(({default: prompt}) => {
             prompt({
                 label: globalize.translate('LabelTag')
diff --git a/src/controllers/dashboard/users/userprofilespage.js b/src/controllers/dashboard/users/userprofilespage.js
index dbdec4f752..824baef4cf 100644
--- a/src/controllers/dashboard/users/userprofilespage.js
+++ b/src/controllers/dashboard/users/userprofilespage.js
@@ -155,102 +155,12 @@ import 'flexStyles';
         page.querySelector('.localUsers').innerHTML = getUserSectionHtml(users, true);
     }
 
-    function showPendingUserMenu(elem) {
-        const menuItems = [];
-        menuItems.push({
-            name: globalize.translate('ButtonCancel'),
-            id: 'delete',
-            icon: 'delete'
-        });
-
-        import('actionsheet').then(({default: actionsheet}) => {
-            const card = dom.parentWithClass(elem, 'card');
-            const page = dom.parentWithClass(card, 'page');
-            const id = card.getAttribute('data-id');
-            actionsheet.show({
-                items: menuItems,
-                positionTo: card,
-                callback: function (menuItemId) {
-                    switch (menuItemId) {
-                        case 'delete':
-                            cancelAuthorization(page, id);
-                    }
-                }
-            });
-        });
-    }
-
-    function getPendingUserHtml(user) {
-        let html = '';
-        html += "<div data-id='" + user.Id + "' class='card squareCard scalableCard squareCard-scalable'>";
-        html += '<div class="cardBox cardBox-bottompadded visualCardBox">';
-        html += '<div class="cardScalable visualCardBox-cardScalable">';
-        html += '<div class="cardPadder cardPadder-square"></div>';
-        html += '<a class="cardContent cardImageContainer" is="emby-linkbutton" href="#">';
-
-        if (user.ImageUrl) {
-            html += '<div class="cardImage" style="background-image:url(\'' + user.ImageUrl + "');\">";
-            html += '</div>';
-        } else {
-            html += '<span class="cardImageIcon material-icons person"></span>';
-        }
-
-        html += '</a>';
-        html += '</div>';
-        html += '<div class="cardFooter visualCardBox-cardFooter">';
-        html += '<div class="cardText" style="text-align:right; float:right;padding:0;">';
-        html += '<button type="button" is="paper-icon-button-light" class="btnUserMenu"><span class="material-icons more_vert"></span></button>';
-        html += '</div>';
-        html += '<div class="cardText" style="padding-top:10px;padding-bottom:10px;">';
-        html += user.UserName;
-        html += '</div>';
-        html += '</div>';
-        html += '</div>';
-        return html + '</div>';
-    }
-
-    function renderPendingGuests(page, users) {
-        if (users.length) {
-            page.querySelector('.sectionPendingGuests').classList.remove('hide');
-        } else {
-            page.querySelector('.sectionPendingGuests').classList.add('hide');
-        }
-
-        page.querySelector('.pending').innerHTML = users.map(getPendingUserHtml).join('');
-    }
-
-    // TODO cvium: maybe reuse for invitation system
-    function cancelAuthorization(page, id) {
-        loading.show();
-        ApiClient.ajax({
-            type: 'DELETE',
-            url: ApiClient.getUrl('Connect/Pending', {
-                Id: id
-            })
-        }).then(function () {
-            loadData(page);
-        });
-    }
-
     function loadData(page) {
         loading.show();
         ApiClient.getUsers().then(function (users) {
             renderUsers(page, users);
             loading.hide();
         });
-        // TODO cvium
-        renderPendingGuests(page, []);
-        // ApiClient.getJSON(ApiClient.getUrl("Connect/Pending")).then(function (pending) {
-        //
-        // });
-    }
-
-    function showInvitePopup(page) {
-        import('components/guestinviter/guestinviter').then(({default: guestinviter}) => {
-            guestinviter.show().then(function () {
-                loadData(page);
-            });
-        });
     }
 
     pageIdOn('pageinit', 'userProfilesPage', function () {
@@ -265,14 +175,8 @@ import 'flexStyles';
                 showUserMenu(btnUserMenu);
             }
         });
-        page.querySelector('.pending').addEventListener('click', function (e__r) {
-            const btnUserMenu = dom.parentWithClass(e__r.target, 'btnUserMenu');
-
-            if (btnUserMenu) {
-                showPendingUserMenu(btnUserMenu);
-            }
-        });
     });
+
     pageIdOn('pagebeforeshow', 'userProfilesPage', function () {
         loadData(this);
     });
diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js
index b4c7936239..51c4301a71 100644
--- a/src/controllers/favorites.js
+++ b/src/controllers/favorites.js
@@ -170,8 +170,7 @@ define(['appRouter', 'cardBuilder', 'dom', 'globalize', 'connectionManager', 'ap
 
     function getItemsHtmlFn(section) {
         return function (items) {
-            var supportsImageAnalysis = appHost.supports('imageanalysis');
-            var cardLayout = (appHost.preferVisualCards || supportsImageAnalysis) && section.autoCardLayout && section.showTitle;
+            var cardLayout = appHost.preferVisualCards && section.autoCardLayout && section.showTitle;
             cardLayout = false;
             var serverId = this.apiClient.serverId();
             var leadingButtons = layoutManager.tv ? [{
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 011bc4ac92..29aa8ad1e1 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1652,7 +1652,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         html += '<h2 class="sectionTitle sectionTitle-cards">';
         html += '<span>' + type.name + '</span>';
         html += '</h2>';
-        html += '<button class="btnAddToCollection sectionTitleButton" type="button" is="paper-icon-button-light" style="margin-left:1em;"><span class="material-icons add"></span></button>';
         html += '</div>';
         html += '<div is="emby-itemscontainer" class="itemsContainer collectionItemsContainer vertical-wrap padded-left padded-right">';
         var shape = 'MusicAlbum' == type.type ? getSquareShape(false) : getPortraitShape(false);
@@ -1674,14 +1673,6 @@ define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSetti
         var collectionItems = page.querySelector('.collectionItems');
         collectionItems.insertAdjacentHTML('beforeend', html);
         imageLoader.lazyChildren(collectionItems);
-        collectionItems.querySelector('.btnAddToCollection').addEventListener('click', function () {
-            require(['alert'], function (alert) {
-                alert.default({
-                    text: globalize.translate('AddItemToCollectionHelp'),
-                    html: globalize.translate('AddItemToCollectionHelp') + '<br/><br/><a is="emby-linkbutton" class="button-link" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections">' + globalize.translate('ButtonLearnMore') + '</a>'
-                });
-            });
-        });
     }
 
     function renderMusicVideos(page, item, user) {
diff --git a/src/controllers/livetv/livetvrecordings.js b/src/controllers/livetv/livetvrecordings.js
index d5cfe66672..d832ca1339 100644
--- a/src/controllers/livetv/livetvrecordings.js
+++ b/src/controllers/livetv/livetvrecordings.js
@@ -24,7 +24,6 @@ define(['layoutManager', 'loading', 'cardBuilder', 'apphost', 'imageLoader', 'sc
             recordingItems.classList.add('vertical-wrap');
         }
 
-        appHost.supports('imageanalysis');
         recordingItems.innerHTML = cardBuilder.getCardsHtml(Object.assign({
             items: recordings,
             shape: scrollX ? 'autooverflow' : 'auto',
diff --git a/src/controllers/livetv/livetvschedule.js b/src/controllers/livetv/livetvschedule.js
index a6f509c6f1..2f451e50fb 100644
--- a/src/controllers/livetv/livetvschedule.js
+++ b/src/controllers/livetv/livetvschedule.js
@@ -30,17 +30,14 @@ define(['layoutManager', 'cardBuilder', 'apphost', 'imageLoader', 'loading', 'sc
             recordingItems.classList.add('vertical-wrap');
         }
 
-        var supportsImageAnalysis = appHost.supports('imageanalysis');
-        var cardLayout = appHost.preferVisualCards || supportsImageAnalysis;
-        cardLayout = false;
         recordingItems.innerHTML = cardBuilder.getCardsHtml(Object.assign({
             items: recordings,
             shape: enableScrollX() ? 'autooverflow' : 'auto',
             showTitle: true,
             showParentTitle: true,
             coverImage: true,
-            cardLayout: cardLayout,
-            centerText: !cardLayout,
+            cardLayout: false,
+            centerText: true,
             allowBottomPadding: !enableScrollX(),
             preferThumb: 'auto'
         }, cardOptions || {}));
diff --git a/src/controllers/livetv/livetvseriestimers.js b/src/controllers/livetv/livetvseriestimers.js
index 27daca1983..c5d0da60d7 100644
--- a/src/controllers/livetv/livetvseriestimers.js
+++ b/src/controllers/livetv/livetvseriestimers.js
@@ -3,7 +3,6 @@ define(['datetime', 'cardBuilder', 'imageLoader', 'apphost', 'loading', 'paper-i
 
     function renderTimers(context, timers) {
         var html = '';
-        appHost.supports('imageanalysis');
         html += cardBuilder.getCardsHtml({
             items: timers,
             shape: 'auto',
diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js
index ab410c1bd4..43f73bfa76 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/src/controllers/movies/moviegenres.js
@@ -75,8 +75,6 @@ define(['layoutManager', 'loading', 'libraryBrowser', 'cardBuilder', 'lazyLoader
                 ParentId: params.topParentId
             };
             ApiClient.getItems(ApiClient.getCurrentUserId(), query).then(function (result) {
-                var supportsImageAnalysis = appHost.supports('imageanalysis');
-
                 if (viewStyle == 'Thumb') {
                     cardBuilder.buildCards(result.Items, {
                         itemsContainer: elem,
diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js
index d948c1cef7..4ffe7888cf 100644
--- a/src/controllers/movies/moviesrecommended.js
+++ b/src/controllers/movies/moviesrecommended.js
@@ -346,8 +346,6 @@ define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu'
         function loadTab(page, index) {
             currentTabIndex = index;
             getTabController(page, index, function (controller) {
-                initialTabIndex = null;
-
                 if (renderedTabs.indexOf(index) == -1) {
                     renderedTabs.push(index);
                     controller.renderTab();
@@ -370,10 +368,8 @@ define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu'
             }
         }
 
-        var isViewRestored;
         var self = this;
         var currentTabIndex = parseInt(params.tab || getDefaultTabIndex(params.topParentId));
-        var initialTabIndex = currentTabIndex;
         var suggestionsTabIndex = 1;
 
         self.initTab = function () {
@@ -389,7 +385,8 @@ define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu'
         var tabControllers = [];
         var renderedTabs = [];
         view.addEventListener('viewshow', function (e) {
-            if (isViewRestored = e.detail.isRestored, initTabs(), !view.getAttribute('data-title')) {
+            initTabs();
+            if (!view.getAttribute('data-title')) {
                 var parentId = params.topParentId;
 
                 if (parentId) {
diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js
index 3f025799f6..0eecef0bfb 100644
--- a/src/controllers/music/musicrecommended.js
+++ b/src/controllers/music/musicrecommended.js
@@ -41,8 +41,7 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
         };
         ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) {
             var elem = page.querySelector('#recentlyAddedSongs');
-            var supportsImageAnalysis = appHost.supports('imageanalysis');
-            supportsImageAnalysis = false;
+
             elem.innerHTML = cardBuilder.getCardsHtml({
                 items: items,
                 showUnplayedIndicator: false,
@@ -51,10 +50,10 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
                 showTitle: true,
                 showParentTitle: true,
                 lazy: true,
-                centerText: !supportsImageAnalysis,
-                overlayPlayButton: !supportsImageAnalysis,
+                centerText: true,
+                overlayPlayButton: true,
                 allowBottomPadding: !enableScrollX(),
-                cardLayout: supportsImageAnalysis,
+                cardLayout: false,
                 coverImage: true
             });
             imageLoader.lazyChildren(elem);
@@ -90,8 +89,6 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
             }
 
             var itemsContainer = elem.querySelector('.itemsContainer');
-            var supportsImageAnalysis = appHost.supports('imageanalysis');
-            supportsImageAnalysis = false;
             itemsContainer.innerHTML = cardBuilder.getCardsHtml({
                 items: result.Items,
                 showUnplayedIndicator: false,
@@ -100,10 +97,10 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
                 showParentTitle: true,
                 action: 'instantmix',
                 lazy: true,
-                centerText: !supportsImageAnalysis,
-                overlayMoreButton: !supportsImageAnalysis,
+                centerText: true,
+                overlayMoreButton: true,
                 allowBottomPadding: !enableScrollX(),
-                cardLayout: supportsImageAnalysis,
+                cardLayout: false,
                 coverImage: true
             });
             imageLoader.lazyChildren(itemsContainer);
@@ -134,8 +131,6 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
             }
 
             var itemsContainer = elem.querySelector('.itemsContainer');
-            var supportsImageAnalysis = appHost.supports('imageanalysis');
-            supportsImageAnalysis = false;
             itemsContainer.innerHTML = cardBuilder.getCardsHtml({
                 items: result.Items,
                 showUnplayedIndicator: false,
@@ -144,10 +139,10 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
                 showParentTitle: true,
                 action: 'instantmix',
                 lazy: true,
-                centerText: !supportsImageAnalysis,
-                overlayMoreButton: !supportsImageAnalysis,
+                centerText: true,
+                overlayMoreButton: true,
                 allowBottomPadding: !enableScrollX(),
-                cardLayout: supportsImageAnalysis,
+                cardLayout: false,
                 coverImage: true
             });
             imageLoader.lazyChildren(itemsContainer);
@@ -339,8 +334,6 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
         function loadTab(page, index) {
             currentTabIndex = index;
             getTabController(page, index, function (controller) {
-                initialTabIndex = null;
-
                 if (renderedTabs.indexOf(index) == -1) {
                     renderedTabs.push(index);
                     controller.renderTab();
@@ -356,10 +349,8 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
             }
         }
 
-        var isViewRestored;
         var self = this;
         var currentTabIndex = parseInt(params.tab || getDefaultTabIndex(params.topParentId));
-        var initialTabIndex = currentTabIndex;
 
         self.initTab = function () {
             var tabContent = view.querySelector(".pageTabContent[data-index='0']");
@@ -377,7 +368,6 @@ define(['browser', 'layoutManager', 'userSettings', 'inputManager', 'loading', '
         var tabControllers = [];
         var renderedTabs = [];
         view.addEventListener('viewshow', function (e) {
-            isViewRestored = e.detail.isRestored;
             initTabs();
             if (!view.getAttribute('data-title')) {
                 var parentId = params.topParentId;
diff --git a/src/nowplaying.html b/src/controllers/playback/queue/index.html
similarity index 100%
rename from src/nowplaying.html
rename to src/controllers/playback/queue/index.html
diff --git a/src/controllers/playback/nowplaying.js b/src/controllers/playback/queue/index.js
similarity index 100%
rename from src/controllers/playback/nowplaying.js
rename to src/controllers/playback/queue/index.js
diff --git a/src/videoosd.html b/src/controllers/playback/video/index.html
similarity index 100%
rename from src/videoosd.html
rename to src/controllers/playback/video/index.html
diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/video/index.js
similarity index 99%
rename from src/controllers/playback/videoosd.js
rename to src/controllers/playback/video/index.js
index e821c2393e..d2bddfc136 100644
--- a/src/controllers/playback/videoosd.js
+++ b/src/controllers/playback/video/index.js
@@ -963,7 +963,6 @@ import 'css!assets/css/videoosd';
                 const player = currentPlayer;
 
                 if (player) {
-
                     // show subtitle offset feature only if player and media support it
                     const showSubOffset = playbackManager.supportSubtitleOffset(player) &&
                         playbackManager.canHandleOffsetOnCurrentSubtitle(player);
diff --git a/src/controllers/searchpage.js b/src/controllers/searchpage.js
index 8ce3e8afe8..ffb7fbac0b 100644
--- a/src/controllers/searchpage.js
+++ b/src/controllers/searchpage.js
@@ -1,4 +1,3 @@
-import focusManager from 'focusManager';
 import SearchFields from 'searchFields';
 import SearchResults from 'searchResults';
 import events from 'events';
diff --git a/src/addserver.html b/src/controllers/session/addServer/index.html
similarity index 100%
rename from src/addserver.html
rename to src/controllers/session/addServer/index.html
diff --git a/src/controllers/auth/addserver.js b/src/controllers/session/addServer/index.js
similarity index 98%
rename from src/controllers/auth/addserver.js
rename to src/controllers/session/addServer/index.js
index 1129283246..7d3ba7f471 100644
--- a/src/controllers/auth/addserver.js
+++ b/src/controllers/session/addServer/index.js
@@ -1,6 +1,5 @@
 import appSettings from 'appSettings';
 import loading from 'loading';
-import browser from 'browser';
 import globalize from 'globalize';
 import 'emby-button';
 
diff --git a/src/forgotpassword.html b/src/controllers/session/forgotPassword/index.html
similarity index 94%
rename from src/forgotpassword.html
rename to src/controllers/session/forgotPassword/index.html
index d4ed0d4170..80631564f8 100644
--- a/src/forgotpassword.html
+++ b/src/controllers/session/forgotPassword/index.html
@@ -1,5 +1,5 @@
 <div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage">
-    <div>
+    <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
                 <h1>${HeaderForgotPassword}</h1>
diff --git a/src/controllers/auth/forgotpassword.js b/src/controllers/session/forgotPassword/index.js
similarity index 100%
rename from src/controllers/auth/forgotpassword.js
rename to src/controllers/session/forgotPassword/index.js
diff --git a/src/login.html b/src/controllers/session/login/index.html
similarity index 92%
rename from src/login.html
rename to src/controllers/session/login/index.html
index fd52b4bf58..458ac7df3b 100644
--- a/src/login.html
+++ b/src/controllers/session/login/index.html
@@ -1,6 +1,6 @@
-<div id="loginPage" data-role="page" class="page standalonePage flex flex-direction-column align-items-center justify-content-center" data-backbutton="false">
-    <div class="padded-left padded-right padded-bottom-page">
-        <form class="manualLoginForm hide">
+<div id="loginPage" data-role="page" class="page standalonePage flex flex-direction-column" data-backbutton="false">
+    <div class="padded-left padded-right padded-bottom-page margin-auto-y">
+        <form class="manualLoginForm margin-auto-x hide">
             <div class="padded-left padded-right flex align-items-center justify-content-center">
                 <h1 class="sectionTitle">${HeaderPleaseSignIn}</h1>
             </div>
diff --git a/src/controllers/auth/login.js b/src/controllers/session/login/index.js
similarity index 100%
rename from src/controllers/auth/login.js
rename to src/controllers/session/login/index.js
diff --git a/src/forgotpasswordpin.html b/src/controllers/session/resetPassword/index.html
similarity index 93%
rename from src/forgotpasswordpin.html
rename to src/controllers/session/resetPassword/index.html
index 3b1ba0d37b..ef915be788 100644
--- a/src/forgotpasswordpin.html
+++ b/src/controllers/session/resetPassword/index.html
@@ -1,5 +1,5 @@
 <div data-role="page" class="page standalonePage forgotPasswordPinPage">
-    <div>
+    <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordPinForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
                 <h2>${HeaderPasswordReset}</h2>
diff --git a/src/controllers/auth/forgotpasswordpin.js b/src/controllers/session/resetPassword/index.js
similarity index 100%
rename from src/controllers/auth/forgotpasswordpin.js
rename to src/controllers/session/resetPassword/index.js
diff --git a/src/controllers/session/selectServer/index.html b/src/controllers/session/selectServer/index.html
new file mode 100644
index 0000000000..0a14e7fa03
--- /dev/null
+++ b/src/controllers/session/selectServer/index.html
@@ -0,0 +1,17 @@
+<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage pageContainer fullWidthContent vertical flex flex-direction-column">
+    <div class="margin-auto-y">
+        <div class="verticalSection flex-shrink-zero w-100 flex flex-direction-column">
+            <div class="padded-left padded-right flex align-items-center justify-content-center">
+                <h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
+            </div>
+            <div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
+                <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>
+            </div>
+        </div>
+        <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap margin-auto-x">
+            <a is="emby-linkbutton" href="addserver.html" class="raised cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
+                <span>${ButtonAddServer}</span>
+            </a>
+        </div>
+    </div>
+</div>
diff --git a/src/controllers/auth/selectserver.js b/src/controllers/session/selectServer/index.js
similarity index 97%
rename from src/controllers/auth/selectserver.js
rename to src/controllers/session/selectServer/index.js
index 3e36b74859..b7d7b9d221 100644
--- a/src/controllers/auth/selectserver.js
+++ b/src/controllers/session/selectServer/index.js
@@ -3,7 +3,6 @@ import appRouter from 'appRouter';
 import layoutManager from 'layoutManager';
 import libraryMenu from 'libraryMenu';
 import appSettings from 'appSettings';
-import appHost from 'apphost';
 import focusManager from 'focusManager';
 import connectionManager from 'connectionManager';
 import globalize from 'globalize';
@@ -95,11 +94,6 @@ import 'emby-button';
         }
     }
 
-    function showGeneralError() {
-        loading.hide();
-        alertText(globalize.translate('DefaultErrorMessage'));
-    }
-
     function alertText(text) {
         alertTextWithOptions({
             text: text
diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js
index d686a62197..87d3a2e240 100644
--- a/src/controllers/shows/tvgenres.js
+++ b/src/controllers/shows/tvgenres.js
@@ -3,10 +3,8 @@ import loading from 'loading';
 import libraryBrowser from 'libraryBrowser';
 import cardBuilder from 'cardBuilder';
 import lazyLoader from 'lazyLoader';
-import appHost from 'apphost';
 import globalize from 'globalize';
 import appRouter from 'appRouter';
-import dom from 'dom';
 import 'emby-button';
 
 /* eslint-disable indent */
@@ -85,8 +83,6 @@ import 'emby-button';
                 ParentId: params.topParentId
             };
             ApiClient.getItems(ApiClient.getCurrentUserId(), query).then(function (result) {
-                const supportsImageAnalysis = appHost.supports('imageanalysis');
-
                 if (viewStyle == 'Thumb') {
                     cardBuilder.buildCards(result.Items, {
                         itemsContainer: elem,
diff --git a/src/controllers/shows/tvlatest.js b/src/controllers/shows/tvlatest.js
index c08f3d5a15..2f768f352a 100644
--- a/src/controllers/shows/tvlatest.js
+++ b/src/controllers/shows/tvlatest.js
@@ -1,7 +1,6 @@
 import loading from 'loading';
 import groupedcards from 'components/groupedcards';
 import cardBuilder from 'cardBuilder';
-import appHost from 'apphost';
 import imageLoader from 'imageLoader';
 
 /* eslint-disable indent */
@@ -24,7 +23,6 @@ import imageLoader from 'imageLoader';
     function loadLatest(context, params, promise) {
         promise.then(function (items) {
             let html = '';
-            appHost.supports('imageanalysis');
             html += cardBuilder.getCardsHtml({
                 items: items,
                 shape: 'backdrop',
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index 7edd2ab501..4aab69e978 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -269,8 +269,6 @@ import 'emby-button';
         function loadTab(page, index) {
             currentTabIndex = index;
             getTabController(page, index, function (controller) {
-                initialTabIndex = null;
-
                 if (renderedTabs.indexOf(index) == -1) {
                     renderedTabs.push(index);
                     controller.renderTab();
@@ -301,10 +299,8 @@ import 'emby-button';
             }
         }
 
-        let isViewRestored;
         const self = this;
         let currentTabIndex = parseInt(params.tab || getDefaultTabIndex(params.topParentId));
-        let initialTabIndex = currentTabIndex;
 
         self.initTab = function () {
             const tabContent = self.tabContent;
@@ -319,7 +315,6 @@ import 'emby-button';
         let renderedTabs = [];
         setScrollClasses(view.querySelector('#resumableItems'), enableScrollX());
         view.addEventListener('viewshow', function (e) {
-            isViewRestored = e.detail.isRestored;
             initTabs();
             if (!view.getAttribute('data-title')) {
                 const parentId = params.topParentId;
diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js
index cde5ae5058..1ee70c8f88 100644
--- a/src/controllers/shows/tvshows.js
+++ b/src/controllers/shows/tvshows.js
@@ -1,4 +1,3 @@
-import layoutManager from 'layoutManager';
 import loading from 'loading';
 import events from 'events';
 import libraryBrowser from 'libraryBrowser';
diff --git a/src/controllers/shows/tvstudios.js b/src/controllers/shows/tvstudios.js
index ba7fdfaf78..4be717fb7f 100644
--- a/src/controllers/shows/tvstudios.js
+++ b/src/controllers/shows/tvstudios.js
@@ -1,7 +1,6 @@
 import loading from 'loading';
 import libraryBrowser from 'libraryBrowser';
 import cardBuilder from 'cardBuilder';
-import appHost from 'apphost';
 
 /* eslint-disable indent */
 
diff --git a/src/controllers/shows/tvupcoming.js b/src/controllers/shows/tvupcoming.js
index a2016279b8..f9df3df343 100644
--- a/src/controllers/shows/tvupcoming.js
+++ b/src/controllers/shows/tvupcoming.js
@@ -1,9 +1,7 @@
 import layoutManager from 'layoutManager';
 import loading from 'loading';
 import datetime from 'datetime';
-import libraryBrowser from 'libraryBrowser';
 import cardBuilder from 'cardBuilder';
-import appHost from 'apphost';
 import imageLoader from 'imageLoader';
 import globalize from 'globalize';
 import 'scrollStyles';
@@ -106,8 +104,6 @@ import 'emby-itemscontainer';
                 html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">';
             }
 
-            let supportsImageAnalysis = appHost.supports('imageanalysis');
-            supportsImageAnalysis = false;
             html += cardBuilder.getCardsHtml({
                 items: group.items,
                 showLocationTypeIndicator: false,
@@ -116,11 +112,11 @@ import 'emby-itemscontainer';
                 preferThumb: true,
                 lazy: true,
                 showDetailsMenu: true,
-                centerText: !supportsImageAnalysis,
+                centerText: true,
                 showParentTitle: true,
                 overlayText: false,
                 allowBottomPadding: allowBottomPadding,
-                cardLayout: supportsImageAnalysis,
+                cardLayout: false,
                 overlayMoreButton: true,
                 missingIndicator: false
             });
diff --git a/src/mypreferencesdisplay.html b/src/controllers/user/display/index.html
similarity index 100%
rename from src/mypreferencesdisplay.html
rename to src/controllers/user/display/index.html
diff --git a/src/controllers/user/display.js b/src/controllers/user/display/index.js
similarity index 100%
rename from src/controllers/user/display.js
rename to src/controllers/user/display/index.js
diff --git a/src/mypreferenceshome.html b/src/controllers/user/home/index.html
similarity index 100%
rename from src/mypreferenceshome.html
rename to src/controllers/user/home/index.html
diff --git a/src/controllers/user/home.js b/src/controllers/user/home/index.js
similarity index 95%
rename from src/controllers/user/home.js
rename to src/controllers/user/home/index.js
index e7058fd3ac..f811aa52b9 100644
--- a/src/controllers/user/home.js
+++ b/src/controllers/user/home/index.js
@@ -1,7 +1,4 @@
 import HomescreenSettings from 'homescreenSettings';
-import dom from 'dom';
-import globalize from 'globalize';
-import loading from 'loading';
 import * as userSettings from 'userSettings';
 import autoFocuser from 'autoFocuser';
 import 'listViewStyle';
diff --git a/src/mypreferencesmenu.html b/src/controllers/user/menu/index.html
similarity index 100%
rename from src/mypreferencesmenu.html
rename to src/controllers/user/menu/index.html
diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu/index.js
similarity index 96%
rename from src/controllers/user/menu.js
rename to src/controllers/user/menu/index.js
index ef4b3b21c8..f44a193a52 100644
--- a/src/controllers/user/menu.js
+++ b/src/controllers/user/menu/index.js
@@ -1,6 +1,4 @@
 import appHost from 'apphost';
-import connectionManager from 'connectionManager';
-import layoutManager from 'layoutManager';
 import 'listViewStyle';
 import 'emby-button';
 
diff --git a/src/mypreferencesplayback.html b/src/controllers/user/playback/index.html
similarity index 100%
rename from src/mypreferencesplayback.html
rename to src/controllers/user/playback/index.html
diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback/index.js
similarity index 95%
rename from src/controllers/user/playback.js
rename to src/controllers/user/playback/index.js
index 5bcf055cd3..16c50a1980 100644
--- a/src/controllers/user/playback.js
+++ b/src/controllers/user/playback/index.js
@@ -1,7 +1,4 @@
 import PlaybackSettings from 'playbackSettings';
-import dom from 'dom';
-import globalize from 'globalize';
-import loading from 'loading';
 import * as userSettings from 'userSettings';
 import autoFocuser from 'autoFocuser';
 import 'listViewStyle';
diff --git a/src/myprofile.html b/src/controllers/user/profile/index.html
similarity index 100%
rename from src/myprofile.html
rename to src/controllers/user/profile/index.html
diff --git a/src/controllers/user/profile.js b/src/controllers/user/profile/index.js
similarity index 100%
rename from src/controllers/user/profile.js
rename to src/controllers/user/profile/index.js
diff --git a/src/mypreferencessubtitles.html b/src/controllers/user/subtitles/index.html
similarity index 100%
rename from src/mypreferencessubtitles.html
rename to src/controllers/user/subtitles/index.html
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles/index.js
similarity index 100%
rename from src/controllers/user/subtitles.js
rename to src/controllers/user/subtitles/index.js
diff --git a/src/wizardfinish.html b/src/controllers/wizard/finish/index.html
similarity index 100%
rename from src/wizardfinish.html
rename to src/controllers/wizard/finish/index.html
diff --git a/src/controllers/wizard/finish.js b/src/controllers/wizard/finish/index.js
similarity index 100%
rename from src/controllers/wizard/finish.js
rename to src/controllers/wizard/finish/index.js
diff --git a/src/wizardremoteaccess.html b/src/controllers/wizard/remote/index.html
similarity index 100%
rename from src/wizardremoteaccess.html
rename to src/controllers/wizard/remote/index.html
diff --git a/src/controllers/wizard/remoteaccess.js b/src/controllers/wizard/remote/index.js
similarity index 100%
rename from src/controllers/wizard/remoteaccess.js
rename to src/controllers/wizard/remote/index.js
diff --git a/src/wizardsettings.html b/src/controllers/wizard/settings/index.html
similarity index 100%
rename from src/wizardsettings.html
rename to src/controllers/wizard/settings/index.html
diff --git a/src/controllers/wizard/settings.js b/src/controllers/wizard/settings/index.js
similarity index 100%
rename from src/controllers/wizard/settings.js
rename to src/controllers/wizard/settings/index.js
diff --git a/src/wizardstart.html b/src/controllers/wizard/start/index.html
similarity index 100%
rename from src/wizardstart.html
rename to src/controllers/wizard/start/index.html
diff --git a/src/controllers/wizard/start.js b/src/controllers/wizard/start/index.js
similarity index 100%
rename from src/controllers/wizard/start.js
rename to src/controllers/wizard/start/index.js
diff --git a/src/wizarduser.html b/src/controllers/wizard/user/index.html
similarity index 100%
rename from src/wizarduser.html
rename to src/controllers/wizard/user/index.html
diff --git a/src/controllers/wizard/user.js b/src/controllers/wizard/user/index.js
similarity index 100%
rename from src/controllers/wizard/user.js
rename to src/controllers/wizard/user/index.js
diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html
index e960d97a0f..01636e6019 100644
--- a/src/dlnaprofile.html
+++ b/src/dlnaprofile.html
@@ -5,7 +5,6 @@
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle">${HeaderProfileInformation}</h2>
-                        <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Dlna-profiles">${Help}</a>
                     </div>
                 </div>
                 <div data-role="controlgroup" data-type="horizontal" data-mini="true">
diff --git a/src/dlnaprofiles.html b/src/dlnaprofiles.html
index b47b2fd6bf..615bb59ee8 100644
--- a/src/dlnaprofiles.html
+++ b/src/dlnaprofiles.html
@@ -11,7 +11,6 @@
                         <a is="emby-linkbutton" href="dlnaprofile.html" class="fab submit" style="margin:0 0 0 1em">
                             <span class="material-icons add"></span>
                         </a>
-                        <a is="emby-linkbutton" style="margin-left:2em!important;" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Dlna-profiles">${Help}</a>
                     </div>
 
                     <p>${CustomDlnaProfilesHelp}</p>
diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js
index f980f19af0..c87e73d48f 100644
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/src/elements/emby-collapse/emby-collapse.js
@@ -7,55 +7,54 @@ import 'emby-button';
     const EmbyButtonPrototype = Object.create(HTMLDivElement.prototype);
 
     function slideDownToShow(button, elem) {
-
-        elem.classList.remove('hide');
-        elem.classList.add('expanded');
-        elem.style.height = 'auto';
-        const height = elem.offsetHeight + 'px';
-        elem.style.height = '0';
-
-        // trigger reflow
-        const newHeight = elem.offsetHeight;
-        elem.style.height = height;
-
-        setTimeout(function () {
-            if (elem.classList.contains('expanded')) {
-                elem.classList.remove('hide');
-            } else {
-                elem.classList.add('hide');
-            }
+        requestAnimationFrame(() => {
+            elem.classList.remove('hide');
+            elem.classList.add('expanded');
             elem.style.height = 'auto';
-        }, 300);
+            const height = elem.offsetHeight + 'px';
+            elem.style.height = '0';
+            // trigger reflow
+            // TODO: Find a better way to do this
+            const newHeight = elem.offsetHeight; /* eslint-disable-line no-unused-vars */
+            elem.style.height = height;
 
-        const icon = button.querySelector('.material-icons');
-        //icon.innerHTML = 'expand_less';
-        icon.classList.add('emby-collapse-expandIconExpanded');
+            setTimeout(function () {
+                if (elem.classList.contains('expanded')) {
+                    elem.classList.remove('hide');
+                } else {
+                    elem.classList.add('hide');
+                }
+                elem.style.height = 'auto';
+            }, 300);
+
+            const icon = button.querySelector('.material-icons');
+            icon.classList.add('emby-collapse-expandIconExpanded');
+        });
     }
 
     function slideUpToHide(button, elem) {
+        requestAnimationFrame(() => {
+            elem.style.height = elem.offsetHeight + 'px';
+            // trigger reflow
+            // TODO: Find a better way to do this
+            const newHeight = elem.offsetHeight; /* eslint-disable-line no-unused-vars */
+            elem.classList.remove('expanded');
+            elem.style.height = '0';
 
-        elem.style.height = elem.offsetHeight + 'px';
-        // trigger reflow
-        const newHeight = elem.offsetHeight;
+            setTimeout(function () {
+                if (elem.classList.contains('expanded')) {
+                    elem.classList.remove('hide');
+                } else {
+                    elem.classList.add('hide');
+                }
+            }, 300);
 
-        elem.classList.remove('expanded');
-        elem.style.height = '0';
-
-        setTimeout(function () {
-            if (elem.classList.contains('expanded')) {
-                elem.classList.remove('hide');
-            } else {
-                elem.classList.add('hide');
-            }
-        }, 300);
-
-        const icon = button.querySelector('.material-icons');
-        //icon.innerHTML = 'expand_more';
-        icon.classList.remove('emby-collapse-expandIconExpanded');
+            const icon = button.querySelector('.material-icons');
+            icon.classList.remove('emby-collapse-expandIconExpanded');
+        });
     }
 
     function onButtonClick(e) {
-
         const button = this;
         const collapseContent = button.parentNode.querySelector('.collapseContent');
 
@@ -69,7 +68,6 @@ import 'emby-button';
     }
 
     EmbyButtonPrototype.attachedCallback = function () {
-
         if (this.classList.contains('emby-collapse')) {
             return;
         }
diff --git a/src/elements/emby-input/emby-input.js b/src/elements/emby-input/emby-input.js
index d27cc71564..3a71e29a6f 100644
--- a/src/elements/emby-input/emby-input.js
+++ b/src/elements/emby-input/emby-input.js
@@ -11,7 +11,6 @@ import 'webcomponents';
     let supportsFloatingLabel = false;
 
     if (Object.getOwnPropertyDescriptor && Object.defineProperty) {
-
         const descriptor = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value');
 
         // descriptor returning null in webos
@@ -94,16 +93,13 @@ import 'webcomponents';
                 }
             }
         }
-
     };
 
     function onChange() {
-
         const label = this.labelElement;
         if (this.value) {
             label.classList.remove('inputLabel-float');
         } else {
-
             const instanceSupportsFloat = supportsFloatingLabel && this.type !== 'date' && this.type !== 'time';
 
             if (instanceSupportsFloat) {
diff --git a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
index b1f8c4f4cf..67eacf3db9 100644
--- a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
+++ b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
@@ -7,14 +7,12 @@ import 'webcomponents';
 /* eslint-disable indent */
 
     function addNotificationEvent(instance, name, handler) {
-
         const localHandler = handler.bind(instance);
         events.on(serverNotifications, name, localHandler);
         instance[name] = localHandler;
     }
 
     function removeNotificationEvent(instance, name) {
-
         const handler = instance[name];
         if (handler) {
             events.off(serverNotifications, name, handler);
@@ -23,7 +21,6 @@ import 'webcomponents';
     }
 
     function onRefreshProgress(e, apiClient, info) {
-
         const indicator = this;
 
         if (!indicator.itemId) {
@@ -31,7 +28,6 @@ import 'webcomponents';
         }
 
         if (info.ItemId === indicator.itemId) {
-
             const progress = parseFloat(info.Progress);
 
             if (progress && progress < 100) {
@@ -40,14 +36,13 @@ import 'webcomponents';
                 this.classList.add('hide');
             }
 
-            this.setProgress(progress);
+            this.setAttribute('data-progress', progress);
         }
     }
 
     let EmbyItemRefreshIndicatorPrototype = Object.create(EmbyProgressRing);
 
     EmbyItemRefreshIndicatorPrototype.createdCallback = function () {
-
         // base method
         if (EmbyProgressRing.createdCallback) {
             EmbyProgressRing.createdCallback.call(this);
@@ -57,7 +52,6 @@ import 'webcomponents';
     };
 
     EmbyItemRefreshIndicatorPrototype.attachedCallback = function () {
-
         // base method
         if (EmbyProgressRing.attachedCallback) {
             EmbyProgressRing.attachedCallback.call(this);
@@ -65,7 +59,6 @@ import 'webcomponents';
     };
 
     EmbyItemRefreshIndicatorPrototype.detachedCallback = function () {
-
         // base method
         if (EmbyProgressRing.detachedCallback) {
             EmbyProgressRing.detachedCallback.call(this);
diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js
index 1d4a67717a..691552c074 100644
--- a/src/elements/emby-itemscontainer/emby-itemscontainer.js
+++ b/src/elements/emby-itemscontainer/emby-itemscontainer.js
@@ -18,7 +18,6 @@ import 'webcomponents';
 
     function onClick(e) {
         const itemsContainer = this;
-        const target = e.target;
         let multiSelect = itemsContainer.multiSelect;
 
         if (multiSelect) {
@@ -148,7 +147,6 @@ import 'webcomponents';
     };
 
     function onUserDataChanged(e, apiClient, userData) {
-
         const itemsContainer = this;
 
         import('cardBuilder').then(({default: cardBuilder}) => {
@@ -175,7 +173,6 @@ import 'webcomponents';
     }
 
     function onTimerCreated(e, apiClient, data) {
-
         const itemsContainer = this;
 
         if (getEventsToMonitor(itemsContainer).indexOf('timers') !== -1) {
@@ -361,7 +358,6 @@ import 'webcomponents';
 
         let refreshIntervalEndTime = this.refreshIntervalEndTime;
         if (refreshIntervalEndTime) {
-
             const remainingMs = refreshIntervalEndTime - new Date().getTime();
             if (remainingMs > 0 && !this.needsRefresh) {
                 resetRefreshInterval(this, remainingMs);
diff --git a/src/elements/emby-playstatebutton/emby-playstatebutton.js b/src/elements/emby-playstatebutton/emby-playstatebutton.js
index e1b34318b8..7b5c344095 100644
--- a/src/elements/emby-playstatebutton/emby-playstatebutton.js
+++ b/src/elements/emby-playstatebutton/emby-playstatebutton.js
@@ -21,7 +21,6 @@ import EmbyButtonPrototype from 'emby-button';
     }
 
     function onClick(e) {
-
         const button = this;
         const id = button.getAttribute('data-id');
         const serverId = button.getAttribute('data-serverid');
@@ -70,7 +69,6 @@ import EmbyButtonPrototype from 'emby-button';
     }
 
     function setTitle(button, itemType) {
-
         if (itemType !== 'AudioBook' && itemType !== 'AudioPodcast') {
             button.title = globalize.translate('Watched');
         } else {
@@ -84,13 +82,11 @@ import EmbyButtonPrototype from 'emby-button';
     }
 
     function clearEvents(button) {
-
         button.removeEventListener('click', onClick);
         removeNotificationEvent(button, 'UserDataChanged');
     }
 
     function bindEvents(button) {
-
         clearEvents(button);
 
         button.addEventListener('click', onClick);
@@ -100,7 +96,6 @@ import EmbyButtonPrototype from 'emby-button';
     const EmbyPlaystateButtonPrototype = Object.create(EmbyButtonPrototype);
 
     EmbyPlaystateButtonPrototype.createdCallback = function () {
-
         // base method
         if (EmbyButtonPrototype.createdCallback) {
             EmbyButtonPrototype.createdCallback.call(this);
@@ -108,7 +103,6 @@ import EmbyButtonPrototype from 'emby-button';
     };
 
     EmbyPlaystateButtonPrototype.attachedCallback = function () {
-
         // base method
         if (EmbyButtonPrototype.attachedCallback) {
             EmbyButtonPrototype.attachedCallback.call(this);
@@ -117,7 +111,6 @@ import EmbyButtonPrototype from 'emby-button';
         const itemId = this.getAttribute('data-id');
         const serverId = this.getAttribute('data-serverid');
         if (itemId && serverId) {
-
             setState(this, this.getAttribute('data-played') === 'true', false);
             bindEvents(this);
             setTitle(this, this.getAttribute('data-type'));
@@ -125,7 +118,6 @@ import EmbyButtonPrototype from 'emby-button';
     };
 
     EmbyPlaystateButtonPrototype.detachedCallback = function () {
-
         // base method
         if (EmbyButtonPrototype.detachedCallback) {
             EmbyButtonPrototype.detachedCallback.call(this);
@@ -136,9 +128,7 @@ import EmbyButtonPrototype from 'emby-button';
     };
 
     EmbyPlaystateButtonPrototype.setItem = function (item) {
-
         if (item) {
-
             this.setAttribute('data-id', item.Id);
             this.setAttribute('data-serverid', item.ServerId);
 
@@ -147,9 +137,7 @@ import EmbyButtonPrototype from 'emby-button';
             bindEvents(this);
 
             setTitle(this, item.Type);
-
         } else {
-
             this.removeAttribute('data-id');
             this.removeAttribute('data-serverid');
             this.removeAttribute('data-played');
diff --git a/src/elements/emby-progressring/emby-progressring.js b/src/elements/emby-progressring/emby-progressring.js
index 062f64d78b..10db8b9a27 100644
--- a/src/elements/emby-progressring/emby-progressring.js
+++ b/src/elements/emby-progressring/emby-progressring.js
@@ -6,37 +6,34 @@ import 'webcomponents';
     let EmbyProgressRing = Object.create(HTMLDivElement.prototype);
 
     EmbyProgressRing.createdCallback = function () {
-
         this.classList.add('progressring');
         const instance = this;
 
         import('text!./emby-progressring.template.html').then(({default: template}) => {
             instance.innerHTML = template;
 
-            //if (window.MutationObserver) {
-            //    // create an observer instance
-            //    var observer = new MutationObserver(function (mutations) {
-            //        mutations.forEach(function (mutation) {
+            if (window.MutationObserver) {
+                // create an observer instance
+                var observer = new MutationObserver(function (mutations) {
+                    mutations.forEach(function (mutation) {
+                        instance.setProgress(parseFloat(instance.getAttribute('data-progress') || '0'));
+                    });
+                });
 
-            //            instance.setProgress(parseFloat(instance.getAttribute('data-progress') || '0'));
-            //        });
-            //    });
+                // configuration of the observer:
+                var config = { attributes: true, childList: false, characterData: false };
 
-            //    // configuration of the observer:
-            //    var config = { attributes: true, childList: false, characterData: false };
+                // pass in the target node, as well as the observer options
+                observer.observe(instance, config);
 
-            //    // pass in the target node, as well as the observer options
-            //    observer.observe(instance, config);
-
-            //    instance.observer = observer;
-            //}
+                instance.observer = observer;
+            }
 
             instance.setProgress(parseFloat(instance.getAttribute('data-progress') || '0'));
         });
     };
 
     EmbyProgressRing.setProgress = function (progress) {
-
         progress = Math.floor(progress);
 
         let angle;
@@ -50,7 +47,6 @@ import 'webcomponents';
             this.querySelector('.animate-50-75-b').style.transform = 'rotate(-90deg)';
             this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
         } else if (progress >= 25 && progress < 50) {
-
             angle = -90 + ((progress - 25) / 100) * 360;
 
             this.querySelector('.animate-0-25-b').style.transform = 'none';
@@ -83,7 +79,6 @@ import 'webcomponents';
     };
 
     EmbyProgressRing.detachedCallback = function () {
-
         let observer = this.observer;
 
         if (observer) {
diff --git a/src/elements/emby-radio/emby-radio.js b/src/elements/emby-radio/emby-radio.js
index c8437d77e3..b31d436444 100644
--- a/src/elements/emby-radio/emby-radio.js
+++ b/src/elements/emby-radio/emby-radio.js
@@ -7,7 +7,6 @@ import 'webcomponents';
     let EmbyRadioPrototype = Object.create(HTMLInputElement.prototype);
 
     function onKeyDown(e) {
-
         // Don't submit form on enter
         // Real (non-emulator) Tizen does nothing on Space
         if (e.keyCode === 13 || e.keyCode === 32) {
@@ -37,7 +36,6 @@ import 'webcomponents';
         this.classList.add('mdl-radio__button');
 
         let labelElement = this.parentNode;
-        //labelElement.classList.add('"mdl-radio mdl-js-radio mdl-js-ripple-effect');
         labelElement.classList.add('mdl-radio');
         labelElement.classList.add('mdl-js-radio');
         labelElement.classList.add('mdl-js-ripple-effect');
diff --git a/src/elements/emby-ratingbutton/emby-ratingbutton.js b/src/elements/emby-ratingbutton/emby-ratingbutton.js
index b455495a2e..06a88e6ea1 100644
--- a/src/elements/emby-ratingbutton/emby-ratingbutton.js
+++ b/src/elements/emby-ratingbutton/emby-ratingbutton.js
@@ -7,14 +7,12 @@ import EmbyButtonPrototype from 'emby-button';
 /* eslint-disable indent */
 
     function addNotificationEvent(instance, name, handler) {
-
         const localHandler = handler.bind(instance);
         events.on(serverNotifications, name, localHandler);
         instance[name] = localHandler;
     }
 
     function removeNotificationEvent(instance, name) {
-
         const handler = instance[name];
         if (handler) {
             events.off(serverNotifications, name, handler);
@@ -23,12 +21,10 @@ import EmbyButtonPrototype from 'emby-button';
     }
 
     function showPicker(button, apiClient, itemId, likes, isFavorite) {
-
         return apiClient.updateFavoriteStatus(apiClient.getCurrentUserId(), itemId, !isFavorite);
     }
 
     function onClick(e) {
-
         const button = this;
         const id = button.getAttribute('data-id');
         const serverId = button.getAttribute('data-serverid');
@@ -45,58 +41,44 @@ import EmbyButtonPrototype from 'emby-button';
         }
 
         showPicker(button, apiClient, id, likes, isFavorite).then(function (userData) {
-
             setState(button, userData.Likes, userData.IsFavorite);
         });
     }
 
     function onUserDataChanged(e, apiClient, userData) {
-
         const button = this;
 
         if (userData.ItemId === button.getAttribute('data-id')) {
-
             setState(button, userData.Likes, userData.IsFavorite);
         }
     }
 
     function setState(button, likes, isFavorite, updateAttribute) {
-
         const icon = button.querySelector('.material-icons');
 
         if (isFavorite) {
-
             if (icon) {
                 icon.classList.add('favorite');
                 icon.classList.add('ratingbutton-icon-withrating');
             }
 
             button.classList.add('ratingbutton-withrating');
-
         } else if (likes) {
-
             if (icon) {
                 icon.classList.add('favorite');
                 icon.classList.remove('ratingbutton-icon-withrating');
-                //icon.innerHTML = 'thumb_up';
             }
             button.classList.remove('ratingbutton-withrating');
-
         } else if (likes === false) {
-
             if (icon) {
                 icon.classList.add('favorite');
                 icon.classList.remove('ratingbutton-icon-withrating');
-                //icon.innerHTML = 'thumb_down';
             }
             button.classList.remove('ratingbutton-withrating');
-
         } else {
-
             if (icon) {
                 icon.classList.add('favorite');
                 icon.classList.remove('ratingbutton-icon-withrating');
-                //icon.innerHTML = 'thumbs_up_down';
             }
             button.classList.remove('ratingbutton-withrating');
         }
@@ -118,13 +100,11 @@ import EmbyButtonPrototype from 'emby-button';
     }
 
     function clearEvents(button) {
-
         button.removeEventListener('click', onClick);
         removeNotificationEvent(button, 'UserDataChanged');
     }
 
     function bindEvents(button) {
-
         clearEvents(button);
 
         button.addEventListener('click', onClick);
@@ -134,7 +114,6 @@ import EmbyButtonPrototype from 'emby-button';
     const EmbyRatingButtonPrototype = Object.create(EmbyButtonPrototype);
 
     EmbyRatingButtonPrototype.createdCallback = function () {
-
         // base method
         if (EmbyButtonPrototype.createdCallback) {
             EmbyButtonPrototype.createdCallback.call(this);
@@ -142,7 +121,6 @@ import EmbyButtonPrototype from 'emby-button';
     };
 
     EmbyRatingButtonPrototype.attachedCallback = function () {
-
         // base method
         if (EmbyButtonPrototype.attachedCallback) {
             EmbyButtonPrototype.attachedCallback.call(this);
@@ -151,7 +129,6 @@ import EmbyButtonPrototype from 'emby-button';
         const itemId = this.getAttribute('data-id');
         const serverId = this.getAttribute('data-serverid');
         if (itemId && serverId) {
-
             let likes = this.getAttribute('data-likes');
             const isFavorite = this.getAttribute('data-isfavorite') === 'true';
             if (likes === 'true') {
@@ -170,7 +147,6 @@ import EmbyButtonPrototype from 'emby-button';
     };
 
     EmbyRatingButtonPrototype.detachedCallback = function () {
-
         // base method
         if (EmbyButtonPrototype.detachedCallback) {
             EmbyButtonPrototype.detachedCallback.call(this);
@@ -180,18 +156,14 @@ import EmbyButtonPrototype from 'emby-button';
     };
 
     EmbyRatingButtonPrototype.setItem = function (item) {
-
         if (item) {
-
             this.setAttribute('data-id', item.Id);
             this.setAttribute('data-serverid', item.ServerId);
 
             const userData = item.UserData || {};
             setState(this, userData.Likes, userData.IsFavorite);
             bindEvents(this);
-
         } else {
-
             this.removeAttribute('data-id');
             this.removeAttribute('data-serverid');
             this.removeAttribute('data-likes');
diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
index 239fbcfcda..fcff587392 100644
--- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
+++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
@@ -36,6 +36,7 @@ const EmbyScrollButtonsPrototype = Object.create(HTMLDivElement.prototype);
     }
 
     function updateScrollButtons(scrollButtons, scrollSize, scrollPos, scrollWidth) {
+        // TODO: Check if hack is really needed
         // hack alert add twenty for rounding errors
         if (scrollWidth <= scrollSize + 20) {
             scrollButtons.scrollButtonsLeft.classList.add('hide');
@@ -122,7 +123,6 @@ const EmbyScrollButtonsPrototype = Object.create(HTMLDivElement.prototype);
         const direction = this.getAttribute('data-direction');
         const scrollSize = getScrollSize(scroller);
         const scrollPos = getScrollPosition(scroller);
-        const scrollWidth = getScrollWidth(scroller);
 
         let newPos;
         if (direction === 'left') {
diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js
index d45e7ef7a7..0629a74e52 100644
--- a/src/elements/emby-select/emby-select.js
+++ b/src/elements/emby-select/emby-select.js
@@ -9,7 +9,6 @@ import 'webcomponents';
     const EmbySelectPrototype = Object.create(HTMLSelectElement.prototype);
 
     function enableNativeMenu() {
-
         if (browser.edgeUwp || browser.xboxOne) {
             return true;
         }
@@ -38,12 +37,10 @@ import 'webcomponents';
     }
 
     function setValue(select, value) {
-
         select.value = value;
     }
 
     function showActionSheet(select) {
-
         const labelElem = getLabel(select);
         const title = labelElem ? (labelElem.textContent || labelElem.innerText) : null;
 
@@ -112,7 +109,6 @@ import 'webcomponents';
     let inputId = 0;
 
     EmbySelectPrototype.createdCallback = function () {
-
         if (!this.id) {
             this.id = 'embyselect' + inputId;
             inputId++;
@@ -132,7 +128,6 @@ import 'webcomponents';
     };
 
     EmbySelectPrototype.attachedCallback = function () {
-
         if (this.classList.contains('emby-select')) {
             return;
         }
@@ -151,7 +146,6 @@ import 'webcomponents';
     };
 
     EmbySelectPrototype.setLabel = function (text) {
-
         const label = this.parentNode.querySelector('label');
 
         label.innerHTML = text;
diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js
index e872f6c78b..2439331144 100644
--- a/src/elements/emby-slider/emby-slider.js
+++ b/src/elements/emby-slider/emby-slider.js
@@ -12,10 +12,7 @@ import 'emby-input';
 
     let supportsValueSetOverride = false;
 
-    let enableWidthWithTransform;
-
     if (Object.getOwnPropertyDescriptor && Object.defineProperty) {
-
         const descriptor = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value');
         // descriptor returning null in webos
         if (descriptor && descriptor.configurable) {
@@ -85,7 +82,6 @@ import 'emby-input';
      * @param {boolean} [isValueSet] update by 'valueset' event or by timer
      */
     function updateValues(isValueSet) {
-
         // Do not update values by 'valueset' in case of soft-implemented dragging
         if (!!isValueSet && (!!this.keyboardDragging || !!this.touched)) {
             return;
@@ -98,24 +94,18 @@ import 'emby-input';
         // Keep only one per slider frame request
         cancelAnimationFrame(range.updateValuesFrame);
         range.updateValuesFrame = requestAnimationFrame(function () {
-
             let backgroundLower = range.backgroundLower;
 
             if (backgroundLower) {
                 let fraction = (value - range.min) / (range.max - range.min);
 
-                if (enableWidthWithTransform) {
-                    backgroundLower.style.transform = 'scaleX(' + (fraction) + ')';
-                } else {
-                    fraction *= 100;
-                    backgroundLower.style.width = fraction + '%';
-                }
+                fraction *= 100;
+                backgroundLower.style.width = fraction + '%';
             }
         });
     }
 
     function updateBubble(range, value, bubble, bubbleText) {
-
         requestAnimationFrame(function () {
             const bubbleTrackRect = range.sliderBubbleTrack.getBoundingClientRect();
             const bubbleRect = bubble.getBoundingClientRect();
@@ -141,15 +131,10 @@ import 'emby-input';
     }
 
     EmbySliderPrototype.attachedCallback = function () {
-
         if (this.getAttribute('data-embyslider') === 'true') {
             return;
         }
 
-        if (enableWidthWithTransform == null) {
-            //enableWidthWithTransform = browser.supportsCssAnimation();
-        }
-
         this.setAttribute('data-embyslider', 'true');
 
         this.classList.add('mdl-slider');
@@ -177,11 +162,7 @@ import 'emby-input';
         // the more of these, the more ranges we can display
         htmlToInsert += '<div class="mdl-slider-background-upper"></div>';
 
-        if (enableWidthWithTransform) {
-            htmlToInsert += '<div class="mdl-slider-background-lower mdl-slider-background-lower-withtransform"></div>';
-        } else {
-            htmlToInsert += '<div class="mdl-slider-background-lower"></div>';
-        }
+        htmlToInsert += '<div class="mdl-slider-background-lower"></div>';
 
         htmlToInsert += '</div>';
         htmlToInsert += '</div>';
@@ -225,14 +206,12 @@ import 'emby-input';
 
             sliderBubble.classList.add('hide');
             hasHideClass = true;
-
         }, {
             passive: true
         });
 
         /* eslint-disable-next-line compat/compat */
         dom.addEventListener(this, (window.PointerEvent ? 'pointermove' : 'mousemove'), function (e) {
-
             if (!this.dragging) {
                 const bubbleValue = mapClientToFraction(this, e.clientX) * 100;
 
@@ -243,7 +222,6 @@ import 'emby-input';
                     hasHideClass = false;
                 }
             }
-
         }, {
             passive: true
         });
@@ -422,7 +400,6 @@ import 'emby-input';
     };
 
     function setRange(elem, startPercent, endPercent) {
-
         const style = elem.style;
         style.left = Math.max(startPercent, 0) + '%';
 
@@ -431,13 +408,11 @@ import 'emby-input';
     }
 
     function mapRangesFromRuntimeToPercent(ranges, runtime) {
-
         if (!runtime) {
             return [];
         }
 
         return ranges.map(function (r) {
-
             return {
                 start: (r.start / runtime) * 100,
                 end: (r.end / runtime) * 100
@@ -446,7 +421,6 @@ import 'emby-input';
     }
 
     EmbySliderPrototype.setBufferedRanges = function (ranges, runtime, position) {
-
         const elem = this.backgroundUpper;
         if (!elem) {
             return;
@@ -459,7 +433,6 @@ import 'emby-input';
         }
 
         for (const range in ranges) {
-
             if (position != null) {
                 if (position >= range.end) {
                     continue;
@@ -474,7 +447,6 @@ import 'emby-input';
     };
 
     EmbySliderPrototype.setIsClear = function (isClear) {
-
         const backgroundLower = this.backgroundLower;
         if (backgroundLower) {
             if (isClear) {
@@ -494,7 +466,6 @@ import 'emby-input';
     }
 
     EmbySliderPrototype.detachedCallback = function () {
-
         const interval = this.interval;
         if (interval) {
             clearInterval(interval);
diff --git a/src/elements/emby-tabs/emby-tabs.js b/src/elements/emby-tabs/emby-tabs.js
index f3cd9d38cc..320a14e2cb 100644
--- a/src/elements/emby-tabs/emby-tabs.js
+++ b/src/elements/emby-tabs/emby-tabs.js
@@ -13,12 +13,10 @@ import 'scrollStyles';
     const activeButtonClass = buttonClass + '-active';
 
     function setActiveTabButton(tabs, newButton, oldButton, animate) {
-
         newButton.classList.add(activeButtonClass);
     }
 
     function getTabPanel(tabs, index) {
-
         return null;
     }
 
@@ -29,15 +27,7 @@ import 'scrollStyles';
         }
     }
 
-    function addActivePanelClass(tabs, index) {
-        let tabPanel = getTabPanel(tabs, index);
-        if (tabPanel) {
-            tabPanel.classList.add('is-active');
-        }
-    }
-
     function fadeInRight(elem) {
-
         const pct = browser.mobile ? '4%' : '0.5%';
 
         const keyframes = [
@@ -52,7 +42,6 @@ import 'scrollStyles';
     }
 
     function triggerBeforeTabChange(tabs, index, previousIndex) {
-
         tabs.dispatchEvent(new CustomEvent('beforetabchange', {
             detail: {
                 selectedTabIndex: index,
@@ -76,14 +65,12 @@ import 'scrollStyles';
     }
 
     function onClick(e) {
-
         const tabs = this;
 
         const current = tabs.querySelector('.' + activeButtonClass);
         const tabButton = dom.parentWithClass(e.target, buttonClass);
 
         if (tabButton && tabButton !== current) {
-
             if (current) {
                 current.classList.remove(activeButtonClass);
             }
@@ -98,7 +85,6 @@ import 'scrollStyles';
 
             // If toCenter is called syncronously within the click event, it sometimes ends up canceling it
             setTimeout(function () {
-
                 tabs.selectedTabIndex = index;
 
                 tabs.dispatchEvent(new CustomEvent('tabchange', {
@@ -112,12 +98,10 @@ import 'scrollStyles';
             if (tabs.scroller) {
                 tabs.scroller.toCenter(tabButton, false);
             }
-
         }
     }
 
     function initScroller(tabs) {
-
         if (tabs.scroller) {
             return;
         }
@@ -153,7 +137,6 @@ import 'scrollStyles';
     }
 
     EmbyTabs.createdCallback = function () {
-
         if (this.classList.contains('emby-tabs')) {
             return;
         }
@@ -166,7 +149,6 @@ import 'scrollStyles';
     };
 
     EmbyTabs.focus = function () {
-
         const selected = this.querySelector('.' + activeButtonClass);
 
         if (selected) {
@@ -177,21 +159,18 @@ import 'scrollStyles';
     };
 
     EmbyTabs.refresh = function () {
-
         if (this.scroller) {
             this.scroller.reload();
         }
     };
 
     EmbyTabs.attachedCallback = function () {
-
         initScroller(this);
 
         const current = this.querySelector('.' + activeButtonClass);
         const currentIndex = current ? parseInt(current.getAttribute('data-index')) : parseInt(this.getAttribute('data-index') || '0');
 
         if (currentIndex !== -1) {
-
             this.selectedTabIndex = currentIndex;
 
             const tabButtons = this.querySelectorAll('.' + buttonClass);
@@ -210,7 +189,6 @@ import 'scrollStyles';
     };
 
     EmbyTabs.detachedCallback = function () {
-
         if (this.scroller) {
             this.scroller.destroy();
             this.scroller = null;
@@ -222,16 +200,13 @@ import 'scrollStyles';
     };
 
     function getSelectedTabButton(elem) {
-
         return elem.querySelector('.' + activeButtonClass);
     }
 
     EmbyTabs.selectedIndex = function (selected, triggerEvent) {
-
         const tabs = this;
 
         if (selected == null) {
-
             return tabs.selectedTabIndex || 0;
         }
 
@@ -242,7 +217,6 @@ import 'scrollStyles';
         const tabButtons = tabs.querySelectorAll('.' + buttonClass);
 
         if (current === selected || triggerEvent === false) {
-
             triggerBeforeTabChange(tabs, selected, current);
 
             tabs.dispatchEvent(new CustomEvent('tabchange', {
@@ -257,23 +231,18 @@ import 'scrollStyles';
             if (current !== selected && currentTabButton) {
                 currentTabButton.classList.remove(activeButtonClass);
             }
-
         } else {
-
             onClick.call(tabs, {
                 target: tabButtons[selected]
             });
-            //tabButtons[selected].click();
         }
     };
 
     function getSibling(elem, method) {
-
         let sibling = elem[method];
 
         while (sibling) {
             if (sibling.classList.contains(buttonClass)) {
-
                 if (!sibling.classList.contains('hide')) {
                     return sibling;
                 }
@@ -286,7 +255,6 @@ import 'scrollStyles';
     }
 
     EmbyTabs.selectNext = function () {
-
         const current = getSelectedTabButton(this);
 
         const sibling = getSibling(current, 'nextSibling');
@@ -299,7 +267,6 @@ import 'scrollStyles';
     };
 
     EmbyTabs.selectPrevious = function () {
-
         const current = getSelectedTabButton(this);
 
         const sibling = getSibling(current, 'previousSibling');
@@ -312,14 +279,12 @@ import 'scrollStyles';
     };
 
     EmbyTabs.triggerBeforeTabChange = function (selected) {
-
         const tabs = this;
 
         triggerBeforeTabChange(tabs, tabs.selectedIndex());
     };
 
     EmbyTabs.triggerTabChange = function (selected) {
-
         const tabs = this;
 
         tabs.dispatchEvent(new CustomEvent('tabchange', {
@@ -330,8 +295,6 @@ import 'scrollStyles';
     };
 
     EmbyTabs.setTabEnabled = function (index, enabled) {
-
-        const tabs = this;
         const btn = this.querySelector('.emby-tab-button[data-index="' + index + '"]');
 
         if (enabled) {
diff --git a/src/elements/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js
index d98cc8c07e..c14724346a 100644
--- a/src/elements/emby-textarea/emby-textarea.js
+++ b/src/elements/emby-textarea/emby-textarea.js
@@ -47,7 +47,6 @@ import 'emby-input';
                 return;
             }
             let newHeight = 0;
-            let hasGrown = false;
 
             if ((textarea.scrollHeight - offset) > self.maxAllowedHeight) {
                 textarea.style.overflowY = 'scroll';
@@ -56,7 +55,6 @@ import 'emby-input';
                 textarea.style.overflowY = 'hidden';
                 textarea.style.height = 'auto';
                 newHeight = textarea.scrollHeight/* - offset*/;
-                hasGrown = true;
             }
             $('.customCssContainer').css('height', newHeight + 'px');
             textarea.style.height = newHeight + 'px';
@@ -75,7 +73,6 @@ import 'emby-input';
     let elementId = 0;
 
     if (Object.getOwnPropertyDescriptor && Object.defineProperty) {
-
         const descriptor = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, 'value');
 
         // descriptor returning null in webos
@@ -95,7 +92,6 @@ import 'emby-input';
     }
 
     EmbyTextAreaPrototype.createdCallback = function () {
-
         if (!this.id) {
             this.id = 'embytextarea' + elementId;
             elementId++;
@@ -103,7 +99,6 @@ import 'emby-input';
     };
 
     EmbyTextAreaPrototype.attachedCallback = function () {
-
         if (this.classList.contains('emby-textarea')) {
             return;
         }
diff --git a/src/elements/emby-toggle/emby-toggle.js b/src/elements/emby-toggle/emby-toggle.js
index 8e82160806..5e78b38dd3 100644
--- a/src/elements/emby-toggle/emby-toggle.js
+++ b/src/elements/emby-toggle/emby-toggle.js
@@ -6,7 +6,6 @@ import 'webcomponents';
     const EmbyTogglePrototype = Object.create(HTMLInputElement.prototype);
 
     function onKeyDown(e) {
-
         // Don't submit form on enter
         if (e.keyCode === 13) {
             e.preventDefault();
@@ -22,7 +21,6 @@ import 'webcomponents';
     }
 
     EmbyTogglePrototype.attachedCallback = function () {
-
         if (this.getAttribute('data-embytoggle') === 'true') {
             return;
         }
diff --git a/src/legacy/focusPreventScroll.js b/src/legacy/focusPreventScroll.js
index 93f53dca29..97d6b0b120 100644
--- a/src/legacy/focusPreventScroll.js
+++ b/src/legacy/focusPreventScroll.js
@@ -1,3 +1,4 @@
+// TODO: Move to external library (https://github.com/calvellido/focus-options-polyfill)
 // Polyfill to add support for preventScroll by focus function
 
 if (HTMLElement.prototype.nativeFocus === undefined) {
diff --git a/src/libraries/scroller.js b/src/libraries/scroller.js
index 8c67127eb3..645a8ea85c 100644
--- a/src/libraries/scroller.js
+++ b/src/libraries/scroller.js
@@ -872,13 +872,6 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
         if (item === undefined) {
             this.slideTo(this._pos[location], immediate);
         } else {
-
-            //if (!transform) {
-
-            //    item.scrollIntoView();
-            //    return;
-            //}
-
             var itemPos = this.getPos(item);
 
             if (itemPos) {
diff --git a/src/plugins/backdropScreensaver/plugin.js b/src/plugins/backdropScreensaver/plugin.js
index 88bfa1f4b7..61b5b808a5 100644
--- a/src/plugins/backdropScreensaver/plugin.js
+++ b/src/plugins/backdropScreensaver/plugin.js
@@ -23,9 +23,7 @@ class BackdropScreensaver {
 
             const apiClient = connectionManager.currentApiClient();
             apiClient.getItems(apiClient.getCurrentUserId(), query).then((result) => {
-
                 if (result.Items.length) {
-
                     import('slideshow').then(({default: Slideshow}) => {
                         const newSlideShow = new Slideshow({
                             showTitle: true,
diff --git a/src/plugins/chromecastPlayer/chromecastHelpers.js b/src/plugins/chromecastPlayer/chromecastHelpers.js
index ca2d27c977..3fbff5507b 100644
--- a/src/plugins/chromecastPlayer/chromecastHelpers.js
+++ b/src/plugins/chromecastPlayer/chromecastHelpers.js
@@ -11,7 +11,6 @@ define(['events'], function (events) {
     // This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
     // http://creativecommons.org/licenses/by-sa/4.0/
     (function () {
-
         // Original URL regex from the Android android.text.util.Linkify function, found here:
         // http://stackoverflow.com/a/19696443
         //
@@ -152,14 +151,12 @@ define(['events'], function (events) {
     var cache = {};
 
     function isValidIpAddress(address) {
-
         var links = LinkParser.parse(address);
 
         return links.length == 1;
     }
 
     function isLocalIpAddress(address) {
-
         address = address.toLowerCase();
 
         if (address.indexOf('127.0.0.1') !== -1) {
@@ -173,7 +170,6 @@ define(['events'], function (events) {
     }
 
     function getServerAddress(apiClient) {
-
         var serverAddress = apiClient.serverAddress();
 
         if (isValidIpAddress(serverAddress) && !isLocalIpAddress(serverAddress)) {
@@ -215,7 +211,6 @@ define(['events'], function (events) {
     }
 
     function getCachedValue(key) {
-
         var obj = cache[key];
 
         if (obj && (new Date().getTime() - obj.time) < 180000) {
diff --git a/src/plugins/chromecastPlayer/plugin.js b/src/plugins/chromecastPlayer/plugin.js
index 3d4f293cc8..d3fc8d0ef8 100644
--- a/src/plugins/chromecastPlayer/plugin.js
+++ b/src/plugins/chromecastPlayer/plugin.js
@@ -8,7 +8,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     var PlayerName = 'Google Cast';
 
     function sendConnectionResult(isOk) {
-
         var resolve = currentResolve;
         var reject = currentReject;
 
@@ -60,7 +59,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     var messageNamespace = 'urn:x-cast:com.connectsdk';
 
     var CastPlayer = function () {
-
         /* device variables */
         // @type {DEVICE_STATE} A state for device
         this.deviceState = DEVICE_STATE.IDLE;
@@ -325,7 +323,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     CastPlayer.prototype.sendMessage = function (message) {
-
         var player = this;
 
         var receiverName = null;
@@ -391,7 +388,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
      * @param {Object} mediaSession A new media object.
      */
     CastPlayer.prototype.onMediaDiscovered = function (how, mediaSession) {
-
         console.debug('chromecast new media session ID:' + mediaSession.mediaSessionId + ' (' + how + ')');
         this.currentMediaSession = mediaSession;
 
@@ -453,9 +449,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     function normalizeImages(state) {
-
         if (state && state.NowPlayingItem) {
-
             var item = state.NowPlayingItem;
 
             if (!item.ImageTags || !item.ImageTags.Primary) {
@@ -475,7 +469,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     }
 
     function getItemsForPlayback(apiClient, query) {
-
         var userId = apiClient.getCurrentUserId();
 
         if (query.Ids && query.Ids.split(',').length === 1) {
@@ -486,7 +479,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
                 };
             });
         } else {
-
             query.Limit = query.Limit || 100;
             query.ExcludeLocationTypes = 'Virtual';
             query.EnableTotalRecordCount = false;
@@ -496,9 +488,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     }
 
     function bindEventForRelay(instance, eventName) {
-
         events.on(instance._castPlayer, eventName, function (e, data) {
-
             console.debug('cc: ' + eventName);
             var state = instance.getPlayerStateInternal(data);
 
@@ -507,7 +497,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     }
 
     function initializeChromecast() {
-
         var instance = this;
         instance._castPlayer = new CastPlayer();
 
@@ -519,7 +508,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         }));
 
         events.on(instance._castPlayer, 'connect', function (e) {
-
             if (currentResolve) {
                 sendConnectionResult(true);
             } else {
@@ -532,7 +520,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         });
 
         events.on(instance._castPlayer, 'playbackstart', function (e, data) {
-
             console.debug('cc: playbackstart');
 
             instance._castPlayer.initializeCastPlayer();
@@ -542,7 +529,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         });
 
         events.on(instance._castPlayer, 'playbackstop', function (e, data) {
-
             console.debug('cc: playbackstop');
             var state = instance.getPlayerStateInternal(data);
 
@@ -560,7 +546,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         });
 
         events.on(instance._castPlayer, 'playbackprogress', function (e, data) {
-
             console.debug('cc: positionchange');
             var state = instance.getPlayerStateInternal(data);
 
@@ -575,7 +560,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         bindEventForRelay(instance, 'shufflequeuemodechange');
 
         events.on(instance._castPlayer, 'playstatechange', function (e, data) {
-
             console.debug('cc: playstatechange');
             var state = instance.getPlayerStateInternal(data);
 
@@ -584,7 +568,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     }
 
     function ChromecastPlayer() {
-
         // playbackManager needs this
         this.name = PlayerName;
         this.type = 'mediaplayer';
@@ -624,7 +607,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
 
     // This is a privately used method
     ChromecastPlayer.prototype.getCurrentTargetInfo = function () {
-
         var appName = null;
 
         var castPlayer = this._castPlayer;
@@ -661,7 +643,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.getPlayerStateInternal = function (data) {
-
         var triggerStateChange = false;
         if (data && !this.lastPlayerData) {
             triggerStateChange = true;
@@ -682,13 +663,11 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.playWithCommand = function (options, command) {
-
         if (!options.items) {
             var apiClient = connectionManager.getApiClient(options.serverId);
             var instance = this;
 
             return apiClient.getItem(apiClient.getCurrentUserId(), options.ids[0]).then(function (item) {
-
                 options.items = [item];
                 return instance.playWithCommand(options, command);
             });
@@ -705,7 +684,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.seek = function (position) {
-
         position = parseInt(position);
 
         position = position / 10000000;
@@ -737,7 +715,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.setMaxStreamingBitrate = function (options) {
-
         this._castPlayer.sendMessage({
             options: options,
             command: 'SetMaxStreamingBitrate'
@@ -773,11 +750,9 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         vol = Math.max(vol, 0);
 
         this._castPlayer.session.setReceiverVolumeLevel(vol);
-
     };
 
     ChromecastPlayer.prototype.endSession = function () {
-
         var instance = this;
 
         this.stop().then(function () {
@@ -799,7 +774,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.setVolume = function (vol) {
-
         vol = Math.min(vol, 100);
         vol = Math.max(vol, 0);
         vol = vol / 100;
@@ -836,7 +810,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.displayContent = function (options) {
-
         this._castPlayer.sendMessage({
             options: options,
             command: 'DisplayContent'
@@ -844,7 +817,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.setMute = function (isMuted) {
-
         var castPlayer = this._castPlayer;
 
         if (isMuted) {
@@ -873,7 +845,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.playTrailers = function (item) {
-
         this._castPlayer.sendMessage({
             options: {
                 ItemId: item.Id,
@@ -902,7 +873,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.toggleMute = function () {
-
         this._castPlayer.sendMessage({
             options: {},
             command: 'ToggleMute'
@@ -946,7 +916,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.getVolume = function () {
-
         var state = this.lastPlayerData || {};
         state = state.PlayState || {};
 
@@ -971,7 +940,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.currentTime = function (val) {
-
         if (val != null) {
             return this.seek(val);
         }
@@ -1008,45 +976,36 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.shuffle = function (item) {
-
         var apiClient = connectionManager.getApiClient(item.ServerId);
         var userId = apiClient.getCurrentUserId();
 
         var instance = this;
 
         apiClient.getItem(userId, item.Id).then(function (item) {
-
             instance.playWithCommand({
 
                 items: [item]
 
             }, 'Shuffle');
-
         });
-
     };
 
     ChromecastPlayer.prototype.instantMix = function (item) {
-
         var apiClient = connectionManager.getApiClient(item.ServerId);
         var userId = apiClient.getCurrentUserId();
 
         var instance = this;
 
         apiClient.getItem(userId, item.Id).then(function (item) {
-
             instance.playWithCommand({
 
                 items: [item]
 
             }, 'InstantMix');
-
         });
-
     };
 
     ChromecastPlayer.prototype.canPlayMediaType = function (mediaType) {
-
         mediaType = (mediaType || '').toLowerCase();
         return mediaType === 'audio' || mediaType === 'video';
     };
@@ -1064,13 +1023,9 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.play = function (options) {
-
         if (options.items) {
-
             return this.playWithCommand(options, 'PlayNow');
-
         } else {
-
             if (!options.serverId) {
                 throw new Error('serverId required!');
             }
@@ -1083,10 +1038,8 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
                 Ids: options.ids.join(',')
 
             }).then(function (result) {
-
                 options.items = result.Items;
                 return instance.playWithCommand(options, 'PlayNow');
-
             });
         }
     };
@@ -1119,7 +1072,6 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.getPlayerState = function () {
-
         return this.getPlayerStateInternal() || {};
     };
 
diff --git a/src/plugins/experimentalWarnings/plugin.js b/src/plugins/experimentalWarnings/plugin.js
index 632e38208c..c39612d45b 100644
--- a/src/plugins/experimentalWarnings/plugin.js
+++ b/src/plugins/experimentalWarnings/plugin.js
@@ -1,14 +1,7 @@
 define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (connectionManager, globalize, userSettings, appHost) {
     'use strict';
 
-    function getRequirePromise(deps) {
-
-        return new Promise(function (resolve, reject) {
-
-            require(deps, resolve);
-        });
-    }
-
+    // TODO: Replace with date-fns
     // https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
     function getWeek(date) {
         var d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
@@ -19,13 +12,13 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (
     }
 
     function showMessage(text, userSettingsKey, appHostFeature) {
-
         if (appHost.supports(appHostFeature)) {
             return Promise.resolve();
         }
 
         var now = new Date();
 
+        // TODO: Use date-fns
         userSettingsKey += now.getFullYear() + '-w' + getWeek(now);
 
         if (userSettings.get(userSettingsKey, false) === '1') {
@@ -33,11 +26,9 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (
         }
 
         return new Promise(function (resolve, reject) {
-
             userSettings.set(userSettingsKey, '1', false);
 
             require(['alert'], function (alert) {
-
                 return alert(text).then(resolve, resolve);
             });
         });
@@ -56,14 +47,12 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (
     }
 
     function ExpirementalPlaybackWarnings() {
-
         this.name = 'Experimental playback warnings';
         this.type = 'preplayintercept';
         this.id = 'expirementalplaybackwarnings';
     }
 
     ExpirementalPlaybackWarnings.prototype.intercept = function (options) {
-
         var item = options.item;
         if (!item) {
             return Promise.resolve();
diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index 8265987e28..16fce8c9d1 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -68,7 +68,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
 
         // issue head request to get content type
         return new Promise(function (resolve, reject) {
-
             require(['fetchHelper'], function (fetchHelper) {
                 fetchHelper.ajax({
                     url: url,
@@ -96,7 +95,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         self.priority = 1;
 
         self.play = function (options) {
-
             self._started = false;
             self._timeUpdated = false;
             self._currentTime = null;
@@ -106,7 +104,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         };
 
         function setCurrentSrc(elem, options) {
-
             elem.removeEventListener('error', onError);
 
             unBindEvents(elem);
@@ -131,17 +128,13 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
             }
 
             return enableHlsPlayer(val, options.item, options.mediaSource, 'Audio').then(function () {
-
                 return new Promise(function (resolve, reject) {
-
                     requireHlsPlayer(function () {
                         var hls = new Hls({
                             manifestLoadingTimeOut: 20000,
                             xhrSetup: function(xhr, url) {
                                 xhr.withCredentials = true;
                             }
-                            //appendErrorMaxRetry: 6,
-                            //debug: true
                         });
                         hls.loadSource(val);
                         hls.attachMedia(elem);
@@ -153,16 +146,13 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
                         self._currentSrc = val;
                     });
                 });
-
             }, function () {
-
                 elem.autoplay = true;
 
                 // Safari will not send cookies without this
                 elem.crossOrigin = 'use-credentials';
 
                 return htmlMediaHelper.applySrc(elem, val, options).then(function () {
-
                     self._currentSrc = val;
 
                     return htmlMediaHelper.playWithPromise(elem, onError);
@@ -191,16 +181,13 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         }
 
         self.stop = function (destroyPlayer) {
-
             cancelFadeTimeout();
 
             var elem = self._mediaElement;
             var src = self._currentSrc;
 
             if (elem && src) {
-
                 if (!destroyPlayer || !supportsFade()) {
-
                     elem.pause();
 
                     htmlMediaHelper.onEndedInternal(self, elem, onError);
@@ -214,7 +201,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
                 var originalVolume = elem.volume;
 
                 return fade(self, elem, elem.volume).then(function () {
-
                     elem.pause();
                     elem.volume = originalVolume;
 
@@ -233,7 +219,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         };
 
         function createMediaElement() {
-
             var elem = self._mediaElement;
 
             if (elem) {
@@ -258,12 +243,10 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         }
 
         function onEnded() {
-
             htmlMediaHelper.onEndedInternal(self, this, onError);
         }
 
         function onTimeUpdate() {
-
             // Get the player position + the transcoding offset
             var time = this.currentTime;
 
@@ -275,7 +258,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         }
 
         function onVolumeChange() {
-
             if (!self._isFadingOut) {
                 htmlMediaHelper.saveVolume(this.volume);
                 events.trigger(self, 'volumechange');
@@ -283,7 +265,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         }
 
         function onPlaying(e) {
-
             if (!self._started) {
                 self._started = true;
                 this.removeAttribute('controls');
@@ -294,7 +275,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         }
 
         function onPlay(e) {
-
             events.trigger(self, 'unpause');
         }
 
@@ -307,7 +287,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
         }
 
         function onError() {
-
             var errorCode = this.error ? (this.error.code || 0) : 0;
             var errorMessage = this.error ? (this.error.message || '') : '';
             console.error('media element error: ' + errorCode.toString() + ' ' + errorMessage);
@@ -351,12 +330,10 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
     };
 
     HtmlAudioPlayer.prototype.canPlayMediaType = function (mediaType) {
-
         return (mediaType || '').toLowerCase() === 'audio';
     };
 
     HtmlAudioPlayer.prototype.getDeviceProfile = function (item) {
-
         if (appHost.getDeviceProfile) {
             return appHost.getDeviceProfile(item);
         }
@@ -366,7 +343,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
 
     // Save this for when playback stops, because querying the time at that point might return 0
     HtmlAudioPlayer.prototype.currentTime = function (val) {
-
         var mediaElement = this._mediaElement;
         if (mediaElement) {
             if (val != null) {
@@ -384,7 +360,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
     };
 
     HtmlAudioPlayer.prototype.duration = function (val) {
-
         var mediaElement = this._mediaElement;
         if (mediaElement) {
             var duration = mediaElement.duration;
@@ -399,10 +374,8 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
     HtmlAudioPlayer.prototype.seekable = function () {
         var mediaElement = this._mediaElement;
         if (mediaElement) {
-
             var seekable = mediaElement.seekable;
             if (seekable && seekable.length) {
-
                 var start = seekable.start(0);
                 var end = seekable.end(0);
 
@@ -423,7 +396,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
     HtmlAudioPlayer.prototype.getBufferedRanges = function () {
         var mediaElement = this._mediaElement;
         if (mediaElement) {
-
             return htmlMediaHelper.getBufferedRanges(this, mediaElement);
         }
 
@@ -453,7 +425,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
     };
 
     HtmlAudioPlayer.prototype.paused = function () {
-
         var mediaElement = this._mediaElement;
         if (mediaElement) {
             return mediaElement.paused;
@@ -487,7 +458,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
     HtmlAudioPlayer.prototype.getVolume = function () {
         var mediaElement = this._mediaElement;
         if (mediaElement) {
-
             return Math.min(Math.round(mediaElement.volume * 100), 100);
         }
     };
@@ -501,7 +471,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
     };
 
     HtmlAudioPlayer.prototype.setMute = function (mute) {
-
         var mediaElement = this._mediaElement;
         if (mediaElement) {
             mediaElement.muted = mute;
diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index 8e403e6021..c9c27858e8 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -37,7 +37,6 @@ let mediaManager;
 function tryRemoveElement(elem) {
         const parentNode = elem.parentNode;
         if (parentNode) {
-
             // Seeing crashes in edge webview
             try {
                 parentNode.removeChild(elem);
@@ -48,7 +47,6 @@ function tryRemoveElement(elem) {
     }
 
     function enableNativeTrackSupport(currentSrc, track) {
-
         if (track) {
             if (track.DeliveryMethod === 'Embed') {
                 return true;
@@ -61,13 +59,6 @@ function tryRemoveElement(elem) {
             }
         }
 
-        // subs getting blocked due to CORS
-        if (browser.chromecast) {
-            if ((currentSrc || '').toLowerCase().includes('.m3u8')) {
-                return false;
-            }
-        }
-
         if (browser.ps4) {
             return false;
         }
@@ -141,7 +132,6 @@ function tryRemoveElement(elem) {
     }
 
     function getTextTrackUrl(track, item, format) {
-
         if (itemHelper.isLocalItem(item) && track.Path) {
             return track.Path;
         }
@@ -156,7 +146,6 @@ function tryRemoveElement(elem) {
 
     function getDefaultProfile() {
         return import('browserdeviceprofile').then(({default: profileBuilder}) => {
-
             return profileBuilder({});
         });
     }
@@ -365,7 +354,6 @@ function tryRemoveElement(elem) {
 
                     loading.hide();
                 });
-
             } else {
                 return Promise.resolve();
             }
@@ -425,8 +413,6 @@ function tryRemoveElement(elem) {
                         xhrSetup(xhr) {
                             xhr.withCredentials = true;
                         }
-                        //appendErrorMaxRetry: 6,
-                        //debug: true
                     });
                     hls.loadSource(url);
                     hls.attachMedia(elem);
@@ -780,9 +766,7 @@ function tryRemoveElement(elem) {
             const profiles = deviceProfile.DirectPlayProfiles || [];
 
             return profiles.filter(function (p) {
-
                 if (p.Type === 'Video') {
-
                     if (!p.AudioCodec) {
                         return true;
                     }
@@ -791,7 +775,6 @@ function tryRemoveElement(elem) {
                 }
 
                 return false;
-
             }).length > 0;
         }
 
@@ -1428,7 +1411,6 @@ function tryRemoveElement(elem) {
                 if (selectedTrackEvent && selectedTrackEvent.Text) {
                     subtitleTextElement.innerHTML = normalizeTrackEventText(selectedTrackEvent.Text, true);
                     subtitleTextElement.classList.remove('hide');
-
                 } else {
                     subtitleTextElement.classList.add('hide');
                 }
@@ -1453,7 +1435,6 @@ function tryRemoveElement(elem) {
                 if (streamIndex !== -1) {
                     this.setCueAppearance();
                 }
-
             } else {
                 // null these out to disable the player's native display (handled below)
                 streamIndex = -1;
@@ -1482,10 +1463,6 @@ function tryRemoveElement(elem) {
                         let html = '';
                         let cssClass = 'htmlvideoplayer';
 
-                        if (!browser.chromecast) {
-                            cssClass += ' htmlvideoplayer-moveupsubtitles';
-                        }
-
                         // Can't autoplay in these browsers so we need to use the full controls, at least until playback starts
                         if (!appHost.supports('htmlvideoautoplay')) {
                             html += '<video class="' + cssClass + '" preload="metadata" autoplay="autoplay" controls="controls" webkit-playsinline playsinline>';
@@ -1517,14 +1494,6 @@ function tryRemoveElement(elem) {
                         this.#videoDialog = dlg;
                         this.#mediaElement = videoElement;
 
-                        if (mediaManager) {
-                            if (!mediaManager.embyInit) {
-                                this.initMediaManager();
-                                mediaManager.embyInit = true;
-                            }
-                            mediaManager.setMediaElement(videoElement);
-                        }
-
                         // don't animate on smart tv's, too slow
                         if (options.fullscreen && browser.supportsCssAnimation() && !browser.slow) {
                             return zoomIn(dlg).then(function () {
@@ -2022,10 +1991,6 @@ function tryRemoveElement(elem) {
         });
     }
     }
-
-    if (browser.chromecast) {
-        mediaManager = new cast.receiver.MediaManager(document.createElement('video'));
-    }
 /* eslint-enable indent */
 
 export default HtmlVideoPlayer;
diff --git a/src/plugins/logoScreensaver/plugin.js b/src/plugins/logoScreensaver/plugin.js
index f9dd901982..bdd1d34e79 100644
--- a/src/plugins/logoScreensaver/plugin.js
+++ b/src/plugins/logoScreensaver/plugin.js
@@ -1,7 +1,5 @@
 define(['pluginManager'], function (pluginManager) {
-
     return function () {
-
         var self = this;
 
         self.name = 'Logo ScreenSaver';
@@ -12,7 +10,6 @@ define(['pluginManager'], function (pluginManager) {
         var interval;
 
         function animate() {
-
             var animations = [
 
                 bounceInLeft,
@@ -59,23 +56,6 @@ define(['pluginManager'], function (pluginManager) {
             return elem.animate(keyframes, timing);
         }
 
-        function shake(elem, iterations) {
-            var keyframes = [
-                { transform: 'translate3d(0, 0, 0)', offset: 0 },
-                { transform: 'translate3d(-10px, 0, 0)', offset: 0.1 },
-                { transform: 'translate3d(10px, 0, 0)', offset: 0.2 },
-                { transform: 'translate3d(-10px, 0, 0)', offset: 0.3 },
-                { transform: 'translate3d(10px, 0, 0)', offset: 0.4 },
-                { transform: 'translate3d(-10px, 0, 0)', offset: 0.5 },
-                { transform: 'translate3d(10px, 0, 0)', offset: 0.6 },
-                { transform: 'translate3d(-10px, 0, 0)', offset: 0.7 },
-                { transform: 'translate3d(10px, 0, 0)', offset: 0.8 },
-                { transform: 'translate3d(-10px, 0, 0)', offset: 0.9 },
-                { transform: 'translate3d(0, 0, 0)', offset: 1 }];
-            var timing = { duration: 900, iterations: iterations };
-            return elem.animate(keyframes, timing);
-        }
-
         function swing(elem, iterations) {
             var keyframes = [
                 { transform: 'translate(0%)', offset: 0 },
@@ -118,7 +98,6 @@ define(['pluginManager'], function (pluginManager) {
         }
 
         function rotateIn(elem, iterations) {
-            var transformOrigin = elem.style['transform-origin'];
             var keyframes = [{ transform: 'rotate3d(0, 0, 1, -200deg)', opacity: '0', transformOrigin: 'center', offset: 0 },
                 { transform: 'none', opacity: '1', transformOrigin: 'center', offset: 1 }];
             var timing = { duration: 900, iterations: iterations };
@@ -126,12 +105,10 @@ define(['pluginManager'], function (pluginManager) {
         }
 
         function rotateOut(elem, iterations) {
-            var transformOrigin = elem.style['transform-origin'];
             var keyframes = [{ transform: 'none', opacity: '1', transformOrigin: 'center', offset: 0 },
                 { transform: 'rotate3d(0, 0, 1, 200deg)', opacity: '0', transformOrigin: 'center', offset: 1 }];
             var timing = { duration: 900, iterations: iterations };
             return elem.animate(keyframes, timing);
-
         }
 
         function fadeOut(elem, iterations) {
@@ -150,9 +127,7 @@ define(['pluginManager'], function (pluginManager) {
         }
 
         self.show = function () {
-
             require(['css!' + pluginManager.mapPath(self, 'style.css')], function () {
-
                 var elem = document.querySelector('.logoScreenSaver');
 
                 if (!elem) {
@@ -169,13 +144,11 @@ define(['pluginManager'], function (pluginManager) {
         };
 
         self.hide = function () {
-
             stopInterval();
 
             var elem = document.querySelector('.logoScreenSaver');
 
             if (elem) {
-
                 var onAnimationFinish = function () {
                     elem.parentNode.removeChild(elem);
                 };
diff --git a/src/plugins/sessionPlayer/plugin.js b/src/plugins/sessionPlayer/plugin.js
index 084aa027cf..89a18a96cc 100644
--- a/src/plugins/sessionPlayer/plugin.js
+++ b/src/plugins/sessionPlayer/plugin.js
@@ -7,7 +7,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function sendPlayCommand(apiClient, options, playType) {
-
         var sessionId = getActivePlayerId();
 
         var ids = options.ids || options.items.map(function (i) {
@@ -44,14 +43,12 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function sendPlayStateCommand(apiClient, command, options) {
-
         var sessionId = getActivePlayerId();
 
         apiClient.sendPlayStateCommand(sessionId, command, options);
     }
 
     function getCurrentApiClient(instance) {
-
         var currentServerId = instance.currentServerId;
 
         if (currentServerId) {
@@ -62,7 +59,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function sendCommandByName(instance, name, options) {
-
         var command = {
             Name: name
         };
@@ -75,7 +71,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function unsubscribeFromPlayerUpdates(instance) {
-
         instance.isUpdating = true;
 
         var apiClient = getCurrentApiClient(instance);
@@ -87,7 +82,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function processUpdatedSessions(instance, sessions, apiClient) {
-
         var serverId = apiClient.serverId();
 
         sessions.map(function (s) {
@@ -103,7 +97,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
         })[0];
 
         if (session) {
-
             normalizeImages(session, apiClient);
 
             var eventNames = getChangedEvents(instance.lastPlayerData, session);
@@ -112,9 +105,7 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
             for (var i = 0, length = eventNames.length; i < length; i++) {
                 events.trigger(instance, eventNames[i], [session]);
             }
-
         } else {
-
             instance.lastPlayerData = session;
 
             playbackManager.setDefaultPlayerActive();
@@ -122,7 +113,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function getChangedEvents(state1, state2) {
-
         var names = [];
 
         if (!state1) {
@@ -142,11 +132,9 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function onPollIntervalFired() {
-
         var instance = this;
         var apiClient = getCurrentApiClient(instance);
         if (!apiClient.isMessageChannelOpen()) {
-
             apiClient.getSessions().then(function (sessions) {
                 processUpdatedSessions(instance, sessions, apiClient);
             });
@@ -154,7 +142,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function subscribeToPlayerUpdates(instance) {
-
         instance.isUpdating = true;
 
         var apiClient = getCurrentApiClient(instance);
@@ -167,9 +154,7 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function normalizeImages(state, apiClient) {
-
         if (state && state.NowPlayingItem) {
-
             var item = state.NowPlayingItem;
 
             if (!item.ImageTags || !item.ImageTags.Primary) {
@@ -192,7 +177,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     function SessionPlayer() {
-
         var self = this;
 
         this.name = 'Remote Control';
@@ -206,11 +190,9 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     }
 
     SessionPlayer.prototype.beginPlayerUpdates = function () {
-
         this.playerListenerCount = this.playerListenerCount || 0;
 
         if (this.playerListenerCount <= 0) {
-
             this.playerListenerCount = 0;
 
             subscribeToPlayerUpdates(this);
@@ -220,24 +202,20 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     };
 
     SessionPlayer.prototype.endPlayerUpdates = function () {
-
         this.playerListenerCount = this.playerListenerCount || 0;
         this.playerListenerCount--;
 
         if (this.playerListenerCount <= 0) {
-
             unsubscribeFromPlayerUpdates(this);
             this.playerListenerCount = 0;
         }
     };
 
     SessionPlayer.prototype.getPlayerState = function () {
-
         return this.lastPlayerData || {};
     };
 
     SessionPlayer.prototype.getTargets = function () {
-
         var apiClient = getCurrentApiClient(this);
 
         var sessionQuery = {
@@ -245,14 +223,11 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
         };
 
         if (apiClient) {
-
             var name = this.name;
 
             return apiClient.getSessions(sessionQuery).then(function (sessions) {
-
                 return sessions.filter(function (s) {
                     return s.DeviceId !== apiClient.deviceId();
-
                 }).map(function (s) {
                     return {
                         name: s.DeviceName,
@@ -273,16 +248,13 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
                         } : null
                     };
                 });
-
             });
-
         } else {
             return Promise.resolve([]);
         }
     };
 
     SessionPlayer.prototype.sendCommand = function (command) {
-
         var sessionId = getActivePlayerId();
 
         var apiClient = getCurrentApiClient(this);
@@ -290,7 +262,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     };
 
     SessionPlayer.prototype.play = function (options) {
-
         options = Object.assign({}, options);
 
         if (options.items) {
@@ -305,27 +276,22 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     };
 
     SessionPlayer.prototype.shuffle = function (item) {
-
         sendPlayCommand(getCurrentApiClient(this), { ids: [item.Id] }, 'PlayShuffle');
     };
 
     SessionPlayer.prototype.instantMix = function (item) {
-
         sendPlayCommand(getCurrentApiClient(this), { ids: [item.Id] }, 'PlayInstantMix');
     };
 
     SessionPlayer.prototype.queue = function (options) {
-
         sendPlayCommand(getCurrentApiClient(this), options, 'PlayNext');
     };
 
     SessionPlayer.prototype.queueNext = function (options) {
-
         sendPlayCommand(getCurrentApiClient(this), options, 'PlayLast');
     };
 
     SessionPlayer.prototype.canPlayMediaType = function (mediaType) {
-
         mediaType = (mediaType || '').toLowerCase();
         return mediaType === 'audio' || mediaType === 'video';
     };
@@ -354,7 +320,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     };
 
     SessionPlayer.prototype.currentTime = function (val) {
-
         if (val != null) {
             return this.seek(val);
         }
@@ -401,7 +366,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     };
 
     SessionPlayer.prototype.setMute = function (isMuted) {
-
         if (isMuted) {
             sendCommandByName(this, 'Mute');
         } else {
@@ -500,14 +464,12 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     };
 
     SessionPlayer.prototype.setRepeatMode = function (mode) {
-
         sendCommandByName(this, 'SetRepeatMode', {
             RepeatMode: mode
         });
     };
 
     SessionPlayer.prototype.setQueueShuffleMode = function (mode) {
-
         sendCommandByName(this, 'SetShuffleQueue', {
             ShuffleMode: mode
         });
@@ -518,7 +480,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     };
 
     SessionPlayer.prototype.displayContent = function (options) {
-
         sendCommandByName(this, 'DisplayContent', options);
     };
 
@@ -555,7 +516,6 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
     };
 
     SessionPlayer.prototype.tryPair = function (target) {
-
         return Promise.resolve();
     };
 
diff --git a/src/plugins/youtubePlayer/plugin.js b/src/plugins/youtubePlayer/plugin.js
index fc7c33f87f..eed75a8116 100644
--- a/src/plugins/youtubePlayer/plugin.js
+++ b/src/plugins/youtubePlayer/plugin.js
@@ -1,4 +1,3 @@
-import require from 'require';
 import events from 'events';
 import browser from 'browser';
 import appRouter from 'appRouter';
@@ -17,15 +16,11 @@ function zoomIn(elem, iterations) {
 }
 
 function createMediaElement(instance, options) {
-
     return new Promise(function (resolve, reject) {
-
         const dlg = document.querySelector('.youtubePlayerContainer');
 
         if (!dlg) {
-
             import('css!./style').then(() => {
-
                 loading.show();
 
                 const dlg = document.createElement('div');
@@ -49,9 +44,7 @@ function createMediaElement(instance, options) {
                 } else {
                     resolve(videoElement);
                 }
-
             });
-
         } else {
             resolve(dlg.querySelector('#player'));
         }
@@ -75,7 +68,6 @@ function clearTimeUpdateInterval(instance) {
 }
 
 function onEndedInternal(instance) {
-
     clearTimeUpdateInterval(instance);
     const resizeListener = instance.resizeListener;
     if (resizeListener) {
@@ -103,43 +95,34 @@ function onPlayerReady(event) {
 }
 
 function onTimeUpdate(e) {
-
     events.trigger(this, 'timeupdate');
 }
 
 function onPlaying(instance, playOptions, resolve) {
-
     if (!instance.started) {
-
         instance.started = true;
         resolve();
         clearTimeUpdateInterval(instance);
         instance.timeUpdateInterval = setInterval(onTimeUpdate.bind(instance), 500);
 
         if (playOptions.fullscreen) {
-
             appRouter.showVideoOsd().then(function () {
                 instance.videoDialog.classList.remove('onTop');
             });
-
         } else {
             appRouter.setTransparency('backdrop');
             instance.videoDialog.classList.remove('onTop');
         }
 
         import('loading').then(({default: loading}) => {
-
             loading.hide();
         });
     }
 }
 
 function setCurrentSrc(instance, elem, options) {
-
     return new Promise(function (resolve, reject) {
-
         import('queryString').then(({default: queryString}) => {
-
             instance._currentSrc = options.url;
             const params = queryString.parse(options.url.split('?')[1]);
             // 3. This function creates an <iframe> (and YouTube player)
@@ -193,13 +176,11 @@ function setCurrentSrc(instance, elem, options) {
                 window.onYouTubeIframeAPIReady();
             }
         });
-
     });
 }
 
 class YoutubePlayer {
     constructor() {
-
         this.name = 'Youtube Player';
         this.type = 'mediaplayer';
         this.id = 'youtubeplayer';
@@ -208,21 +189,17 @@ class YoutubePlayer {
         this.priority = 1;
     }
     play(options) {
-
         this.started = false;
         const instance = this;
 
         return createMediaElement(this, options).then(function (elem) {
-
             return setCurrentSrc(instance, elem, options);
         });
     }
     stop(destroyPlayer) {
-
         const src = this._currentSrc;
 
         if (src) {
-
             if (this.currentYoutubePlayer) {
                 this.currentYoutubePlayer.stopVideo();
             }
@@ -236,34 +213,28 @@ class YoutubePlayer {
         return Promise.resolve();
     }
     destroy() {
-
         appRouter.setTransparency('none');
 
         const dlg = this.videoDialog;
         if (dlg) {
-
             this.videoDialog = null;
 
             dlg.parentNode.removeChild(dlg);
         }
     }
     canPlayMediaType(mediaType) {
-
         mediaType = (mediaType || '').toLowerCase();
 
         return mediaType === 'audio' || mediaType === 'video';
     }
     canPlayItem(item) {
-
         // Does not play server items
         return false;
     }
     canPlayUrl(url) {
-
         return url.toLowerCase().indexOf('youtube.com') !== -1;
     }
     getDeviceProfile() {
-
         return Promise.resolve({});
     }
     currentSrc() {
@@ -278,7 +249,6 @@ class YoutubePlayer {
     }
     // Save this for when playback stops, because querying the time at that point might return 0
     currentTime(val) {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (currentYoutubePlayer) {
@@ -291,7 +261,6 @@ class YoutubePlayer {
         }
     }
     duration(val) {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (currentYoutubePlayer) {
@@ -300,7 +269,6 @@ class YoutubePlayer {
         return null;
     }
     pause() {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (currentYoutubePlayer) {
@@ -315,7 +283,6 @@ class YoutubePlayer {
         }
     }
     unpause() {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (currentYoutubePlayer) {
@@ -330,7 +297,6 @@ class YoutubePlayer {
         }
     }
     paused() {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (currentYoutubePlayer) {
@@ -347,7 +313,6 @@ class YoutubePlayer {
         return this.getVolume();
     }
     setVolume(val) {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (currentYoutubePlayer) {
@@ -357,7 +322,6 @@ class YoutubePlayer {
         }
     }
     getVolume() {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (currentYoutubePlayer) {
@@ -365,7 +329,6 @@ class YoutubePlayer {
         }
     }
     setMute(mute) {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (mute) {
@@ -373,14 +336,12 @@ class YoutubePlayer {
                 currentYoutubePlayer.mute();
             }
         } else {
-
             if (currentYoutubePlayer) {
                 currentYoutubePlayer.unMute();
             }
         }
     }
     isMuted() {
-
         const currentYoutubePlayer = this.currentYoutubePlayer;
 
         if (currentYoutubePlayer) {
diff --git a/src/scripts/alphanumericshortcuts.js b/src/scripts/alphanumericshortcuts.js
index a69f3bcd4d..e76d5b11f6 100644
--- a/src/scripts/alphanumericshortcuts.js
+++ b/src/scripts/alphanumericshortcuts.js
@@ -6,7 +6,6 @@ let currentDisplayText = '';
 let currentDisplayTextContainer;
 
 function onKeyDown(e) {
-
     if (e.ctrlKey) {
         return;
     }
@@ -21,7 +20,6 @@ function onKeyDown(e) {
     let chr = key ? alphanumeric(key) : null;
 
     if (chr) {
-
         chr = chr.toString().toUpperCase();
 
         if (chr.length === 1) {
@@ -82,12 +80,10 @@ function onAlphanumericShortcutTimeout() {
 }
 
 function selectByShortcutValue(container, value) {
-
     value = value.toUpperCase();
 
     let focusElem;
     if (value === '#') {
-
         focusElem = container.querySelector('*[data-prefix]');
     }
 
@@ -102,7 +98,6 @@ function selectByShortcutValue(container, value) {
 
 class AlphaNumericShortcuts {
     constructor(options) {
-
         this.options = options;
 
         const keyDownHandler = onKeyDown.bind(this);
@@ -114,7 +109,6 @@ class AlphaNumericShortcuts {
         this.keyDownHandler = keyDownHandler;
     }
     destroy() {
-
         const keyDownHandler = this.keyDownHandler;
 
         if (keyDownHandler) {
diff --git a/src/scripts/browser.js b/src/scripts/browser.js
index a377f08fdb..5ce823f8e8 100644
--- a/src/scripts/browser.js
+++ b/src/scripts/browser.js
@@ -2,7 +2,6 @@ define([], function () {
     'use strict';
 
     function isTv() {
-
         // This is going to be really difficult to get right
         var userAgent = navigator.userAgent.toLowerCase();
 
@@ -50,7 +49,6 @@ define([], function () {
     }
 
     function hasKeyboard(browser) {
-
         if (browser.touch) {
             return true;
         }
@@ -101,10 +99,7 @@ define([], function () {
         }
 
         var animation = false;
-        var animationstring = 'animation';
-        var keyframeprefix = '';
         var domPrefixes = ['Webkit', 'O', 'Moz'];
-        var pfx = '';
         var elm = document.createElement('div');
 
         if (elm.style.animationName !== undefined) {
@@ -114,9 +109,6 @@ define([], function () {
         if (animation === false && allowPrefix) {
             for (var i = 0; i < domPrefixes.length; i++) {
                 if (elm.style[domPrefixes[i] + 'AnimationName'] !== undefined) {
-                    pfx = domPrefixes[i];
-                    animationstring = pfx + 'Animation';
-                    keyframeprefix = '-' + pfx.toLowerCase() + '-';
                     animation = true;
                     break;
                 }
@@ -259,7 +251,5 @@ define([], function () {
         }
     }
 
-    browser.chromecast = browser.chrome && userAgent.toLowerCase().indexOf('crkey') !== -1;
-
     return browser;
 });
diff --git a/src/scripts/browserDeviceProfile.js b/src/scripts/browserDeviceProfile.js
index fcbe002549..a96ee8b460 100644
--- a/src/scripts/browserDeviceProfile.js
+++ b/src/scripts/browserDeviceProfile.js
@@ -323,7 +323,6 @@ define(['browser'], function (browser) {
         // Otherwise with HLS and mp3 audio we're seeing some browsers
         // safari is lying
         if (supportsAc3(videoTestElement)) {
-
             videoAudioCodecs.push('ac3');
 
             var eAc3 = supportsEac3(videoTestElement);
@@ -505,7 +504,6 @@ define(['browser'], function (browser) {
         });
 
         ['opus', 'mp3', 'mp2', 'aac', 'flac', 'alac', 'webma', 'wma', 'wav', 'ogg', 'oga'].filter(canPlayAudioFormat).forEach(function (audioFormat) {
-
             if (audioFormat === 'mp2') {
                 profile.DirectPlayProfiles.push({
                     Container: 'mp2,mp3',
@@ -703,7 +701,6 @@ define(['browser'], function (browser) {
 
         if (browser.tizen ||
             videoTestElement.canPlayType('video/mp4; codecs="avc1.6e0033"').replace(/no/, '')) {
-
             // These tests are passing in safari, but playback is failing
             if (!browser.safari && !browser.iOS && !browser.web0s && !browser.edge && !browser.mobile) {
                 h264Profiles += '|high 10';
diff --git a/src/scripts/datetime.js b/src/scripts/datetime.js
index cab59299ad..dcac41089e 100644
--- a/src/scripts/datetime.js
+++ b/src/scripts/datetime.js
@@ -3,7 +3,6 @@ import globalize from 'globalize';
 /* eslint-disable indent */
 
     export function parseISO8601Date(s, toLocal) {
-
         // parenthese matches:
         // year month day    hours minutes seconds
         // dotmilliseconds
@@ -20,7 +19,6 @@ import globalize from 'globalize';
         //     "00", "00", ".000", "Z", undefined, undefined, undefined]
 
         if (!d) {
-
             throw "Couldn't parse ISO 8601 date string '" + s + "'";
         }
 
@@ -106,7 +104,6 @@ import globalize from 'globalize';
     }();
 
     function getOptionList(options) {
-
         const list = [];
 
         for (const i in options) {
@@ -120,7 +117,6 @@ import globalize from 'globalize';
     }
 
     export function toLocaleString(date, options) {
-
         if (!date) {
             throw new Error('date cannot be null');
         }
@@ -128,7 +124,6 @@ import globalize from 'globalize';
         options = options || {};
 
         if (toLocaleTimeStringSupportsLocales) {
-
             const currentLocale = globalize.getCurrentDateTimeLocale();
 
             if (currentLocale) {
@@ -140,7 +135,6 @@ import globalize from 'globalize';
     }
 
     export function toLocaleDateString(date, options) {
-
         if (!date) {
             throw new Error('date cannot be null');
         }
@@ -148,7 +142,6 @@ import globalize from 'globalize';
         options = options || {};
 
         if (toLocaleTimeStringSupportsLocales) {
-
             const currentLocale = globalize.getCurrentDateTimeLocale();
 
             if (currentLocale) {
@@ -174,7 +167,6 @@ import globalize from 'globalize';
     }
 
     export function toLocaleTimeString(date, options) {
-
         if (!date) {
             throw new Error('date cannot be null');
         }
@@ -182,7 +174,6 @@ import globalize from 'globalize';
         options = options || {};
 
         if (toLocaleTimeStringSupportsLocales) {
-
             const currentLocale = globalize.getCurrentDateTimeLocale();
 
             if (currentLocale) {
@@ -194,16 +185,13 @@ import globalize from 'globalize';
     }
 
     export function getDisplayTime(date) {
-
         if (!date) {
             throw new Error('date cannot be null');
         }
 
         if ((typeof date).toString().toLowerCase() === 'string') {
             try {
-
                 date = parseISO8601Date(date, true);
-
             } catch (err) {
                 return date;
             }
@@ -223,7 +211,6 @@ import globalize from 'globalize';
         const timeLower = time.toLowerCase();
 
         if (timeLower.indexOf('am') !== -1 || timeLower.indexOf('pm') !== -1) {
-
             time = timeLower;
             let hour = date.getHours() % 12;
             const suffix = date.getHours() > 11 ? 'pm' : 'am';
@@ -239,12 +226,10 @@ import globalize from 'globalize';
             minutes = ':' + minutes;
             time = hour + minutes + suffix;
         } else {
-
             const timeParts = time.split(':');
 
             // Trim off seconds
             if (timeParts.length > 2) {
-
                 // setting to 2 also handles '21:00:28 GMT+9:30'
                 timeParts.length = 2;
                 time = timeParts.join(':');
@@ -255,7 +240,6 @@ import globalize from 'globalize';
     }
 
     export function isRelativeDay(date, offsetInDays) {
-
         if (!date) {
             throw new Error('date cannot be null');
         }
diff --git a/src/scripts/deleteHelper.js b/src/scripts/deleteHelper.js
index fc5ffe059f..e10a1568c7 100644
--- a/src/scripts/deleteHelper.js
+++ b/src/scripts/deleteHelper.js
@@ -4,9 +4,7 @@ import appRouter from 'appRouter';
 import globalize from 'globalize';
 
 function alertText(options) {
-
     return new Promise(function (resolve, reject) {
-
         import('alert').then(({default: alert}) => {
             alert(options).then(resolve, resolve);
         });
@@ -14,7 +12,6 @@ function alertText(options) {
 }
 
 export function deleteItem(options) {
-
     const item = options.item;
     const parentId = item.SeasonId || item.SeriesId || item.ParentId;
 
@@ -28,9 +25,7 @@ export function deleteItem(options) {
         primary: 'delete'
 
     }).then(function () {
-
         return apiClient.deleteItem(item.Id).then(function () {
-
             if (options.navigate) {
                 if (parentId) {
                     appRouter.showItem(parentId, item.ServerId);
@@ -39,7 +34,6 @@ export function deleteItem(options) {
                 }
             }
         }, function (err) {
-
             let result = function () {
                 return Promise.reject(err);
             };
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index 5d0e237a0d..2489335969 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -1,4 +1,3 @@
-import datetime from 'datetime';
 import $ from 'jQuery';
 import globalize from 'globalize';
 import 'material-icons';
@@ -303,6 +302,7 @@ import 'material-icons';
     $(document).on('itemsaved', '.metadataEditorPage', function (e, item) {
         updateEditorNode(this, item);
     }).on('pagebeforeshow', '.metadataEditorPage', function () {
+        /* eslint-disable-next-line no-unused-expressions */
         import('css!assets/css/metadataeditor.css');
     }).on('pagebeforeshow', '.metadataEditorPage', function () {
         var page = this;
diff --git a/src/scripts/fileDownloader.js b/src/scripts/fileDownloader.js
index f2ca42211f..f4179dcef8 100644
--- a/src/scripts/fileDownloader.js
+++ b/src/scripts/fileDownloader.js
@@ -1,7 +1,6 @@
 import multiDownload from 'multi-download';
 
 export function download(items) {
-
     if (window.NativeShell) {
         items.map(function (item) {
             window.NativeShell.downloadFile(item);
diff --git a/src/scripts/gamepadtokey.js b/src/scripts/gamepadtokey.js
index 089e5c81e9..870429ee09 100644
--- a/src/scripts/gamepadtokey.js
+++ b/src/scripts/gamepadtokey.js
@@ -182,7 +182,6 @@ require(['apphost'], function (appHost) {
 
     var isElectron = navigator.userAgent.toLowerCase().indexOf('electron') !== -1;
     function allowInput() {
-
         // This would be nice but always seems to return true with electron
         if (!isElectron && document.hidden) { /* eslint-disable-line compat/compat */
             return false;
@@ -196,7 +195,6 @@ require(['apphost'], function (appHost) {
     }
 
     function raiseEvent(name, key, keyCode) {
-
         if (!allowInput()) {
             return;
         }
@@ -209,7 +207,6 @@ require(['apphost'], function (appHost) {
     }
 
     function clickElement(elem) {
-
         if (!allowInput()) {
             return;
         }
@@ -218,10 +215,8 @@ require(['apphost'], function (appHost) {
     }
 
     function raiseKeyEvent(oldPressedState, newPressedState, key, keyCode, enableRepeatKeyDown, clickonKeyUp) {
-
         // No-op if oldPressedState === newPressedState
         if (newPressedState === true) {
-
             // button down
             var fire = false;
 
@@ -236,9 +231,7 @@ require(['apphost'], function (appHost) {
             if (fire && keyCode) {
                 raiseEvent('keydown', key, keyCode);
             }
-
         } else if (newPressedState === false && oldPressedState === true) {
-
             resetThrottle(key);
 
             // button up
@@ -406,5 +399,4 @@ require(['apphost'], function (appHost) {
         // and provide input to the DOM navigator.getGamepads API.
         window.navigator.gamepadInputEmulation = 'gamepad';
     }
-
 });
diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js
index be3fd2834e..03039e1428 100644
--- a/src/scripts/imagehelper.js
+++ b/src/scripts/imagehelper.js
@@ -1,6 +1,5 @@
-/* eslint-disable indent */
 
-import browser from 'browser';
+/* eslint-disable indent */
 
     export function getDeviceIcon(device) {
         var baseUrl = 'assets/img/devices/';
diff --git a/src/scripts/inputManager.js b/src/scripts/inputManager.js
index 43fa150750..aa2c2945c0 100644
--- a/src/scripts/inputManager.js
+++ b/src/scripts/inputManager.js
@@ -41,7 +41,6 @@ import appHost from 'apphost';
     let commandTimes = {};
 
     function checkCommandTime(command) {
-
         const last = commandTimes[command] || 0;
         const now = new Date().getTime();
 
@@ -54,7 +53,6 @@ import appHost from 'apphost';
     }
 
     export function handleCommand(commandName, options) {
-
         lastInputTime = new Date().getTime();
 
         let sourceElement = (options ? options.sourceElement : null);
diff --git a/src/scripts/keyboardNavigation.js b/src/scripts/keyboardNavigation.js
index 7cc4df9553..10a9611c33 100644
--- a/src/scripts/keyboardNavigation.js
+++ b/src/scripts/keyboardNavigation.js
@@ -155,6 +155,7 @@ export function enable() {
 function attachGamepadScript(e) {
     console.log('Gamepad connected! Attaching gamepadtokey.js script');
     window.removeEventListener('gamepadconnected', attachGamepadScript);
+    /* eslint-disable-next-line no-unused-expressions */
     import('scripts/gamepadtokey');
 }
 
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index f228b46cec..961d89dc05 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -229,7 +229,6 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
 
     function openMainDrawer() {
         navDrawerInstance.open();
-        lastOpenTime = new Date().getTime();
     }
 
     function onMainDrawerOpened() {
@@ -575,15 +574,12 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
     }
 
     function updateLibraryMenu(user) {
-        // FIXME: Potential equivalent might be
-        // showBySelector(".lnkSyncToOtherDevices", !!user.Policy.EnableContentDownloading);
         if (!user) {
             showBySelector('.libraryMenuDownloads', false);
             showBySelector('.lnkSyncToOtherDevices', false);
             return void showBySelector('.userMenuOptions', false);
         }
 
-        // FIXME: Potentially the same as above
         if (user.Policy.EnableContentDownloading) {
             showBySelector('.lnkSyncToOtherDevices', true);
         } else {
@@ -838,7 +834,6 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
     var enableLibraryNavDrawerHome = !layoutManager.tv;
     var skinHeader = document.querySelector('.skinHeader');
     var requiresUserRefresh = true;
-    var lastOpenTime = new Date().getTime();
     window.LibraryMenu = {
         getTopParentId: getTopParentId,
         onHardwareMenuButtonClick: function () {
diff --git a/src/scripts/livetvcomponents.js b/src/scripts/livetvcomponents.js
index fd4a46c0f1..fd1b48d0eb 100644
--- a/src/scripts/livetvcomponents.js
+++ b/src/scripts/livetvcomponents.js
@@ -64,10 +64,7 @@ define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layout
 
         for (i = 0, length = groups.length; i < length; i++) {
             var group = groups[i];
-            var supportsImageAnalysis = appHost.supports('imageanalysis');
-            var cardLayout = appHost.preferVisualCards || supportsImageAnalysis;
 
-            cardLayout = true;
             if (group.name) {
                 html += '<div class="verticalSection">';
                 html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + group.name + '</h2>';
@@ -86,21 +83,21 @@ define(['layoutManager', 'datetime', 'cardBuilder', 'apphost'], function (layout
 
             html += cardBuilder.getCardsHtml({
                 items: group.items,
-                shape: cardLayout ? getBackdropShape() : enableScrollX() ? 'autoOverflow' : 'autoVertical',
+                shape: getBackdropShape(),
                 showParentTitleOrTitle: true,
                 showAirTime: true,
                 showAirEndTime: true,
-                showChannelName: !cardLayout,
-                cardLayout: cardLayout,
-                centerText: !cardLayout,
+                showChannelName: false,
+                cardLayout: true,
+                centerText: false,
                 action: 'edit',
                 cardFooterAside: 'none',
-                preferThumb: !!cardLayout || 'auto',
-                defaultShape: cardLayout ? null : 'portrait',
+                preferThumb: true,
+                defaultShape: null,
                 coverImage: true,
                 allowBottomPadding: false,
                 overlayText: false,
-                showChannelLogo: cardLayout
+                showChannelLogo: true
             });
             html += '</div>';
 
diff --git a/src/scripts/mouseManager.js b/src/scripts/mouseManager.js
index 84fe58e7e5..4fc174381a 100644
--- a/src/scripts/mouseManager.js
+++ b/src/scripts/mouseManager.js
@@ -11,12 +11,10 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
     }
 
     function notifyApp() {
-
         inputManager.notifyMouseMove();
     }
 
     function removeIdleClasses() {
-
         var classList = document.body.classList;
 
         classList.remove('mouseIdle');
@@ -24,7 +22,6 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
     }
 
     function addIdleClasses() {
-
         var classList = document.body.classList;
 
         classList.add('mouseIdle');
@@ -36,7 +33,6 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
 
     var lastPointerMoveData;
     function onPointerMove(e) {
-
         var eventX = e.screenX;
         var eventY = e.screenY;
 
@@ -73,7 +69,6 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
     }
 
     function onPointerEnter(e) {
-
         var pointerType = e.pointerType || (layoutManager.mobile ? 'touch' : 'mouse');
 
         if (pointerType === 'mouse') {
@@ -87,7 +82,6 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
     }
 
     function enableFocusWithMouse() {
-
         if (!layoutManager.tv) {
             return false;
         }
@@ -104,7 +98,6 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
     }
 
     function onMouseInterval() {
-
         if (!isMouseIdle && mouseIdleTime() >= 5000) {
             isMouseIdle = true;
             addIdleClasses();
@@ -114,14 +107,12 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
 
     var mouseInterval;
     function startMouseInterval() {
-
         if (!mouseInterval) {
             mouseInterval = setInterval(onMouseInterval, 5000);
         }
     }
 
     function stopMouseInterval() {
-
         var interval = mouseInterval;
 
         if (interval) {
@@ -133,7 +124,6 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
     }
 
     function initMouse() {
-
         stopMouseInterval();
 
         /* eslint-disable-next-line compat/compat */
diff --git a/src/scripts/playlists.js b/src/scripts/playlists.js
index 6944660f0c..123d1c7859 100644
--- a/src/scripts/playlists.js
+++ b/src/scripts/playlists.js
@@ -3,7 +3,6 @@ import listView from 'listView';
 import cardBuilder from 'cardBuilder';
 import libraryMenu from 'libraryMenu';
 import libraryBrowser from 'libraryBrowser';
-import appHost from 'apphost';
 import imageLoader from 'imageLoader';
 import userSettings from 'userSettings';
 import 'emby-itemscontainer';
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index ab12b53abf..1d735e3018 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -13,7 +13,6 @@ define([
     'listViewStyle',
     'dashboardcss',
     'detailtablecss'], function () {
-
     function defineRoute(newRoute) {
         var path = newRoute.alias ? newRoute.alias : newRoute.path;
         console.debug('defining route: ' + path);
@@ -24,77 +23,88 @@ define([
     console.debug('defining core routes');
 
     defineRoute({
-        path: '/addserver.html',
+        alias: '/addserver.html',
+        path: '/controllers/session/addServer/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/addserver'
+        controller: 'session/addServer/index'
     });
     defineRoute({
-        path: '/selectserver.html',
+        alias: '/selectserver.html',
+        path: '/controllers/session/selectServer/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/selectserver',
+        controller: 'session/selectServer/index',
         type: 'selectserver'
     });
     defineRoute({
-        path: '/login.html',
+        alias: '/login.html',
+        path: '/controllers/session/login/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/login',
+        controller: 'session/login/index',
         type: 'login'
     });
     defineRoute({
-        path: '/forgotpassword.html',
+        alias: '/forgotpassword.html',
+        path: '/controllers/session/forgotPassword/index.html',
         anonymous: true,
         startup: true,
-        controller: 'auth/forgotpassword'
+        controller: 'session/forgotPassword/index'
     });
     defineRoute({
-        path: '/forgotpasswordpin.html',
+        alias: '/forgotpasswordpin.html',
+        path: '/controllers/session/redeemPassword/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/forgotpasswordpin'
+        controller: 'session/redeemPassword/index'
     });
 
     defineRoute({
-        path: '/mypreferencesmenu.html',
+        alias: '/mypreferencesmenu.html',
+        path: '/controllers/user/menu/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/menu'
+        controller: 'user/menu/index'
     });
     defineRoute({
-        path: '/myprofile.html',
+        alias: '/myprofile.html',
+        path: '/controllers/user/profile/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/profile'
+        controller: 'user/profile/index'
     });
     defineRoute({
-        path: '/mypreferencesdisplay.html',
+        alias: '/mypreferencesdisplay.html',
+        path: '/controllers/user/display/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/display'
+        controller: 'user/display/index'
     });
     defineRoute({
-        path: '/mypreferenceshome.html',
+        alias: '/mypreferenceshome.html',
+        path: '/controllers/user/home/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/home'
+        controller: 'user/home/index'
     });
     defineRoute({
-        path: '/mypreferencesplayback.html',
+        alias: '/mypreferencesplayback.html',
+        path: '/controllers/user/playback/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/playback'
+        controller: 'user/playback/index'
     });
     defineRoute({
-        path: '/mypreferencessubtitles.html',
+        alias: '/mypreferencessubtitles.html',
+        path: '/controllers/user/subtitles/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/subtitles'
+        controller: 'user/subtitles/index'
     });
 
     defineRoute({
@@ -140,10 +150,11 @@ define([
         controller: 'dashboard/dlna/profiles'
     });
     defineRoute({
-        path: '/addplugin.html',
+        alias: '/addplugin.html',
+        path: '/controllers/dashboard/plugins/add/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/add'
+        controller: 'dashboard/plugins/add/index'
     });
     defineRoute({
         path: '/library.html',
@@ -192,14 +203,16 @@ define([
         controller: 'dashboard/metadatanfo'
     });
     defineRoute({
-        path: '/notificationsetting.html',
+        alias: '/notificationsetting.html',
+        path: '/controllers/dashboard/notifications/notification/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/notifications/notification'
+        controller: 'dashboard/notifications/notification/index'
     });
     defineRoute({
-        path: '/notificationsettings.html',
-        controller: 'dashboard/notifications/notifications',
+        alias: '/notificationsettings.html',
+        path: '/controllers/dashboard/notifications/notifications/index.html',
+        controller: 'dashboard/notifications/notifications/index',
         autoFocus: false,
         roles: 'admin'
     });
@@ -210,16 +223,18 @@ define([
         controller: 'dashboard/playback'
     });
     defineRoute({
-        path: '/availableplugins.html',
+        alias: '/availableplugins.html',
+        path: '/controllers/dashboard/plugins/available/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/available'
+        controller: 'dashboard/plugins/available/index'
     });
     defineRoute({
-        path: '/repositories.html',
+        alias: '/repositories.html',
+        path: '/controllers/dashboard/plugins/repositories/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/repositories'
+        controller: 'dashboard/plugins/repositories/index'
     });
 
     defineRoute({
@@ -288,10 +303,11 @@ define([
         transition: 'fade'
     });
     defineRoute({
-        path: '/installedplugins.html',
+        alias: '/installedplugins.html',
+        path: '/controllers/dashboard/plugins/installed/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/installed'
+        controller: 'dashboard/plugins/installed/index'
     });
     defineRoute({
         path: '/scheduledtask.html',
@@ -367,16 +383,18 @@ define([
     });
 
     defineRoute({
-        path: '/wizardremoteaccess.html',
+        alias: '/wizardremoteaccess.html',
+        path: '/controllers/wizard/remote/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/remoteaccess'
+        controller: 'wizard/remote/index'
     });
     defineRoute({
-        path: '/wizardfinish.html',
+        alias: '/wizardfinish.html',
+        path: '/controllers/wizard/finish/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/finish'
+        controller: 'wizard/finish/index'
     });
     defineRoute({
         path: '/wizardlibrary.html',
@@ -385,28 +403,32 @@ define([
         controller: 'dashboard/mediaLibrary'
     });
     defineRoute({
-        path: '/wizardsettings.html',
+        alias: '/wizardsettings.html',
+        path: '/controllers/wizard/settings/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/settings'
+        controller: 'wizard/settings/index'
     });
     defineRoute({
-        path: '/wizardstart.html',
+        alias: '/wizardstart.html',
+        path: '/controllers/wizard/start/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/start'
+        controller: 'wizard/start/index'
     });
     defineRoute({
-        path: '/wizarduser.html',
-        controller: 'wizard/user',
+        alias: '/wizarduser.html',
+        path: '/controllers/wizard/user/index.html',
+        controller: 'wizard/user/index',
         autoFocus: false,
         anonymous: true
     });
 
     defineRoute({
-        path: '/videoosd.html',
+        alias: '/video',
+        path: '/controllers/playback/video/index.html',
         transition: 'fade',
-        controller: 'playback/videoosd',
+        controller: 'playback/video/index',
         autoFocus: false,
         type: 'video-osd',
         supportsThemeMedia: true,
@@ -414,8 +436,9 @@ define([
         enableMediaControl: false
     });
     defineRoute({
-        path: '/nowplaying.html',
-        controller: 'playback/nowplaying',
+        alias: '/queue',
+        path: '/controllers/playback/queue/index.html',
+        controller: 'playback/queue/index',
         autoFocus: false,
         transition: 'fade',
         fullscreen: true,
diff --git a/src/scripts/scrollHelper.js b/src/scripts/scrollHelper.js
index 1a36594026..82413fe9cf 100644
--- a/src/scripts/scrollHelper.js
+++ b/src/scripts/scrollHelper.js
@@ -2,7 +2,6 @@ define(['focusManager', 'dom', 'scrollStyles'], function (focusManager, dom) {
     'use strict';
 
     function getBoundingClientRect(elem) {
-
         // Support: BlackBerry 5, iOS 3 (original iPhone)
         // If we don't have gBCR, just use 0,0 rather than error
         if (elem.getBoundingClientRect) {
@@ -13,7 +12,6 @@ define(['focusManager', 'dom', 'scrollStyles'], function (focusManager, dom) {
     }
 
     function getPosition(scrollContainer, item, horizontal) {
-
         var slideeOffset = getBoundingClientRect(scrollContainer);
         var itemOffset = getBoundingClientRect(item);
 
diff --git a/src/scripts/shell.js b/src/scripts/shell.js
index 4f1aa0c8de..5a2afd9fd4 100644
--- a/src/scripts/shell.js
+++ b/src/scripts/shell.js
@@ -8,7 +8,6 @@ define([], function () {
             } else {
                 window.open(url, target || '_blank');
             }
-
         },
         enableFullscreen: function () {
             if (window.NativeShell) {
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 6e1af0c493..cddf2506a0 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -14,7 +14,7 @@ function getWindowLocationSearch(win) {
     return search || '';
 }
 
-function getParameterByName(name, url) {
+window.getParameterByName = function (name, url) {
     'use strict';
 
     name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
@@ -27,7 +27,7 @@ function getParameterByName(name, url) {
     }
 
     return decodeURIComponent(results[1].replace(/\+/g, ' '));
-}
+};
 
 function pageClassOn(eventName, className, fn) {
     'use strict';
@@ -41,7 +41,7 @@ function pageClassOn(eventName, className, fn) {
     });
 }
 
-function pageIdOn(eventName, id, fn) {
+window.pageIdOn = function(eventName, id, fn) {
     'use strict';
 
     document.addEventListener(eventName, function (event) {
@@ -51,7 +51,7 @@ function pageIdOn(eventName, id, fn) {
             fn.call(target, event);
         }
     });
-}
+};
 
 var Dashboard = {
     getCurrentUser: function () {
@@ -236,9 +236,7 @@ var Dashboard = {
 
 var AppInfo = {};
 
-!function () {
-    'use strict';
-
+function initClient() {
     function defineConnectionManager(connectionManager) {
         window.ConnectionManager = connectionManager;
         define('connectionManager', [], function () {
@@ -679,7 +677,6 @@ var AppInfo = {};
                     'howler',
                     'native-promise-only',
                     'resize-observer-polyfill',
-                    'shaka',
                     'swiper',
                     'queryString',
                     'sortable',
@@ -785,7 +782,6 @@ var AppInfo = {};
         define('multiSelect', [componentsPath + '/multiSelect/multiSelect'], returnFirstDependency);
         define('alphaPicker', [componentsPath + '/alphaPicker/alphaPicker'], returnFirstDependency);
         define('tabbedView', [componentsPath + '/tabbedview/tabbedview'], returnFirstDependency);
-        define('itemsTab', [componentsPath + '/tabbedview/itemstab'], returnFirstDependency);
         define('collectionEditor', [componentsPath + '/collectionEditor/collectionEditor'], returnFirstDependency);
         define('playlistEditor', [componentsPath + '/playlisteditor/playlisteditor'], returnFirstDependency);
         define('recordingCreator', [componentsPath + '/recordingcreator/recordingcreator'], returnFirstDependency);
@@ -890,7 +886,7 @@ var AppInfo = {};
             };
 
             appRouter.showVideoOsd = function () {
-                return Dashboard.navigate('videoosd.html');
+                return Dashboard.navigate('video');
             };
 
             appRouter.showSelectServer = function () {
@@ -1127,7 +1123,9 @@ var AppInfo = {};
     })();
 
     return onWebComponentsReady();
-}();
+}
+
+initClient();
 
 pageClassOn('viewshow', 'standalonePage', function () {
     document.querySelector('.skinHeader').classList.add('noHeaderRight');
diff --git a/src/scripts/taskbutton.js b/src/scripts/taskbutton.js
index 85062fdaa5..6df7ee848d 100644
--- a/src/scripts/taskbutton.js
+++ b/src/scripts/taskbutton.js
@@ -1,5 +1,5 @@
+
 import events from 'events';
-import * as userSettings from 'userSettings';
 import serverNotifications from 'serverNotifications';
 import connectionManager from 'connectionManager';
 import globalize from 'globalize';
diff --git a/src/scripts/touchHelper.js b/src/scripts/touchHelper.js
index c12cf79513..fa05c83d90 100644
--- a/src/scripts/touchHelper.js
+++ b/src/scripts/touchHelper.js
@@ -7,7 +7,6 @@ function getTouches(e) {
 
 class TouchHelper {
     constructor(elem, options) {
-
         options = options || {};
         let touchTarget;
         let touchStartX;
@@ -24,7 +23,6 @@ class TouchHelper {
         const excludeTagNames = options.ignoreTagNames || [];
 
         const touchStart = function (e) {
-
             const touch = getTouches(e)[0];
             touchTarget = null;
             touchStartX = 0;
@@ -34,7 +32,6 @@ class TouchHelper {
             thresholdYMet = false;
 
             if (touch) {
-
                 const currentTouchTarget = touch.target;
 
                 if (dom.parentWithTag(currentTouchTarget, excludeTagNames)) {
@@ -48,7 +45,6 @@ class TouchHelper {
         };
 
         const touchEnd = function (e) {
-
             const isTouchMove = e.type === 'touchmove';
 
             if (touchTarget) {
@@ -81,7 +77,6 @@ class TouchHelper {
                 } else if (deltaX < (0 - swipeXThreshold) && Math.abs(deltaY) < swipeXMaxY) {
                     events.trigger(self, 'swipeleft', [touchTarget]);
                 } else if ((deltaY < (0 - swipeYThreshold) || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
-
                     thresholdYMet = true;
 
                     events.trigger(self, 'swipeup', [touchTarget, {
@@ -139,7 +134,6 @@ class TouchHelper {
         });
     }
     destroy() {
-
         const elem = this.elem;
 
         if (elem) {
diff --git a/src/selectserver.html b/src/selectserver.html
deleted file mode 100644
index 3318a6b80e..0000000000
--- a/src/selectserver.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage pageContainer fullWidthContent vertical flex flex-direction-column align-items-center justify-content-center">
-    <div class="verticalSection flex-shrink-zero w-100 flex flex-direction-column">
-        <div class="padded-left padded-right flex align-items-center justify-content-center">
-            <h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
-        </div>
-        <div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
-            <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>
-        </div>
-    </div>
-    <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap" style="margin-left:auto;margin-right:auto;">
-        <a is="emby-linkbutton" href="addserver.html" class="raised block cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
-            <span>${ButtonAddServer}</span>
-        </a>
-    </div>
-</div>
diff --git a/src/strings/ar.json b/src/strings/ar.json
index e7217b425b..b069301f92 100644
--- a/src/strings/ar.json
+++ b/src/strings/ar.json
@@ -227,7 +227,6 @@
     "HeaderPassword": "كلمة السر",
     "HeaderPasswordReset": "إعادة تهيئة كلمة السر",
     "HeaderPaths": "مسارات",
-    "HeaderPendingInvitations": "الدعوات المعلقة",
     "HeaderPeople": "الناس",
     "HeaderPinCodeReset": "أعد تهيئة الرمز الشخصي",
     "HeaderPlayAll": "تشغيل الكل",
diff --git a/src/strings/bg-bg.json b/src/strings/bg-bg.json
index 71fdf80e32..619ccbe825 100644
--- a/src/strings/bg-bg.json
+++ b/src/strings/bg-bg.json
@@ -224,7 +224,6 @@
     "HeaderParentalRatings": "Родителска оценка",
     "HeaderPassword": "Парола",
     "HeaderPaths": "Пътища",
-    "HeaderPendingInvitations": "Чакащи покани",
     "HeaderPeople": "Хора",
     "HeaderPlayAll": "Пускане на всичко",
     "HeaderPlayOn": "Пускане на",
diff --git a/src/strings/ca.json b/src/strings/ca.json
index 680be3ef77..8c0fa300cc 100644
--- a/src/strings/ca.json
+++ b/src/strings/ca.json
@@ -212,7 +212,6 @@
     "HeaderPassword": "Contrasenya",
     "HeaderPasswordReset": "Reiniciar Contrasenya",
     "HeaderPaths": "Directoris",
-    "HeaderPendingInvitations": "Invitacions Pendents",
     "HeaderPeople": "Gent",
     "HeaderPlayAll": "Reprodueix Tot",
     "HeaderPlaybackError": "Error de Reproducció",
diff --git a/src/strings/cs.json b/src/strings/cs.json
index 5299165415..d0e8f83a98 100644
--- a/src/strings/cs.json
+++ b/src/strings/cs.json
@@ -341,7 +341,6 @@
     "HeaderPassword": "Heslo",
     "HeaderPasswordReset": "Obnova hesla",
     "HeaderPaths": "Cesty",
-    "HeaderPendingInvitations": "Čekající pozvánky",
     "HeaderPeople": "Lidé",
     "HeaderPinCodeReset": "Obnovit Pin kód",
     "HeaderPlayAll": "Přehrát vše",
diff --git a/src/strings/da.json b/src/strings/da.json
index 5e29e1574c..fce7ba8551 100644
--- a/src/strings/da.json
+++ b/src/strings/da.json
@@ -296,7 +296,6 @@
     "HeaderPassword": "Adgangskode",
     "HeaderPasswordReset": "Nulstil adgangskode",
     "HeaderPaths": "Stier",
-    "HeaderPendingInvitations": "Ventende invitationer",
     "HeaderPeople": "Mennesker",
     "HeaderPinCodeReset": "Nulstil pinkode",
     "HeaderPlayAll": "Afspil Alle",
diff --git a/src/strings/de.json b/src/strings/de.json
index eda47a1c0d..d7ef74e942 100644
--- a/src/strings/de.json
+++ b/src/strings/de.json
@@ -381,7 +381,6 @@
     "HeaderPassword": "Passwort",
     "HeaderPasswordReset": "Passwort zurücksetzen",
     "HeaderPaths": "Pfade",
-    "HeaderPendingInvitations": "Ausstehende Einladungen",
     "HeaderPeople": "Personen",
     "HeaderPhotoAlbums": "Fotoalben",
     "HeaderPinCodeReset": "PIN Code zurücksetzen",
@@ -1577,7 +1576,7 @@
     "EnableDecodingColorDepth10Hevc": "Aktiviere 10-Bit-Hardware-Dekodierung für HEVC",
     "MessageNoGenresAvailable": "Aktiviere einige Metadaten-Anbieter um Genres aus dem Internet zu holen.",
     "EnableFasterAnimationsHelp": "Benutze schnellere Animationen und Übergänge",
-    "ButtonCast": "Besetzung",
+    "ButtonCast": "Wiedergabe auf Gerät",
     "ButtonSyncPlay": "SyncPlay",
     "TabRepositories": "Repositories",
     "MessageAddRepository": "Wenn Sie ein Repository hinzufügen möchten, klicken Sie auf die Schaltfläche neben der Kopfzeile und füllen Sie die angeforderten Informationen aus.",
diff --git a/src/strings/el.json b/src/strings/el.json
index 24fd7c0934..43caa0975c 100644
--- a/src/strings/el.json
+++ b/src/strings/el.json
@@ -350,7 +350,6 @@
     "HeaderPassword": "Κωδικός",
     "HeaderPasswordReset": "Επαναφορά του κωδικού πρόσβασης",
     "HeaderPaths": "Διαδρομή",
-    "HeaderPendingInvitations": "Εκκρεμείς προσκλήσεις",
     "HeaderPhotoAlbums": "Άλμπουμ φωτογραφιών",
     "HeaderPinCodeReset": "Επαναφορά Pin Code",
     "HeaderPlayAll": "Αναπαραγωγή Όλων",
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index a357f5c15e..7a25a5a822 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -446,7 +446,6 @@
     "HeaderPassword": "Password",
     "HeaderPasswordReset": "Password Reset",
     "HeaderPaths": "Paths",
-    "HeaderPendingInvitations": "Pending Invitations",
     "CopyStreamURL": "Copy Stream URL",
     "CopyStreamURLSuccess": "URL copied successfully.",
     "XmlDocumentAttributeListHelp": "These attributes are applied to the root element of every XML response.",
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index c1ea50431d..6024363f05 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -438,7 +438,6 @@
     "HeaderPassword": "Password",
     "HeaderPasswordReset": "Password Reset",
     "HeaderPaths": "Paths",
-    "HeaderPendingInvitations": "Pending Invitations",
     "HeaderPeople": "People",
     "HeaderPhotoAlbums": "Photo Albums",
     "HeaderPinCodeReset": "Reset Pin Code",
diff --git a/src/strings/es-ar.json b/src/strings/es-ar.json
index d4030f13ff..2b1dbd1a9e 100644
--- a/src/strings/es-ar.json
+++ b/src/strings/es-ar.json
@@ -534,7 +534,6 @@
     "HeaderPinCodeReset": "Restablecer código PIN",
     "HeaderPhotoAlbums": "Álbumes de fotos",
     "HeaderPeople": "Personas",
-    "HeaderPendingInvitations": "Invitaciones pendientes",
     "HeaderPaths": "Rutas",
     "HeaderPasswordReset": "Restablecer contraseña",
     "HeaderPassword": "Contraseña",
diff --git a/src/strings/es-mx.json b/src/strings/es-mx.json
index ca4973bd71..68e9136aff 100644
--- a/src/strings/es-mx.json
+++ b/src/strings/es-mx.json
@@ -392,7 +392,6 @@
     "HeaderPassword": "Contraseña",
     "HeaderPasswordReset": "Restablecer contraseña",
     "HeaderPaths": "Rutas",
-    "HeaderPendingInvitations": "Invitaciones pendientes",
     "HeaderPeople": "Personas",
     "HeaderPhotoAlbums": "Álbumes de fotos",
     "HeaderPinCodeReset": "Restablecer código PIN",
diff --git a/src/strings/es.json b/src/strings/es.json
index 640a51d634..038d34ea1e 100644
--- a/src/strings/es.json
+++ b/src/strings/es.json
@@ -340,7 +340,6 @@
     "HeaderPassword": "Contraseña",
     "HeaderPasswordReset": "Reestablecer contraseña",
     "HeaderPaths": "Ruta",
-    "HeaderPendingInvitations": "Invitaciones pendientes",
     "HeaderPeople": "Gente",
     "HeaderPinCodeReset": "Restablecer código PIN",
     "HeaderPlayAll": "Reproducir todo",
diff --git a/src/strings/es_419.json b/src/strings/es_419.json
index 871f43a372..d730a75b9e 100644
--- a/src/strings/es_419.json
+++ b/src/strings/es_419.json
@@ -1096,7 +1096,6 @@
     "HeaderPinCodeReset": "Restablecer código PIN",
     "HeaderPhotoAlbums": "Álbumes de fotos",
     "HeaderPeople": "Personas",
-    "HeaderPendingInvitations": "Invitaciones pendientes",
     "HeaderPaths": "Rutas",
     "HeaderPasswordReset": "Restablecer contraseña",
     "HeaderPassword": "Contraseña",
diff --git a/src/strings/fa.json b/src/strings/fa.json
index 877c0af490..f2719b5be4 100644
--- a/src/strings/fa.json
+++ b/src/strings/fa.json
@@ -329,7 +329,6 @@
     "HeaderPinCodeReset": "بازنشانی پین کد",
     "HeaderPhotoAlbums": "آلبوم‌های عکس",
     "HeaderPeople": "افراد",
-    "HeaderPendingInvitations": "دعوت‌های در انتظار",
     "HeaderPasswordReset": "بازنشانی گذرواژه",
     "HeaderPassword": "گذرواژه",
     "HeaderParentalRatings": "رتبه بندی والدین",
diff --git a/src/strings/fi.json b/src/strings/fi.json
index b50ed369e1..a6a072ea16 100644
--- a/src/strings/fi.json
+++ b/src/strings/fi.json
@@ -480,7 +480,6 @@
     "HeaderPreferredMetadataLanguage": "Ensisijainen metadatan kieli",
     "HeaderPinCodeReset": "Nollaa PIN-koodi",
     "HeaderPhotoAlbums": "Kuva-albumit",
-    "HeaderPendingInvitations": "Odottavat kutsut",
     "HeaderPaths": "Polut",
     "HeaderPasswordReset": "Salasanan nollaus",
     "HeaderNextVideoPlayingInValue": "Seuraava video alkaa {0}",
diff --git a/src/strings/fr.json b/src/strings/fr.json
index c71afef661..a7b2549108 100644
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@@ -387,7 +387,6 @@
     "HeaderPassword": "Mot de passe",
     "HeaderPasswordReset": "Mot de passe réinitialisé",
     "HeaderPaths": "Chemins",
-    "HeaderPendingInvitations": "Invitations en attente",
     "HeaderPeople": "Personnes",
     "HeaderPhotoAlbums": "Albums photo",
     "HeaderPinCodeReset": "Réinitialiser le code PIN",
diff --git a/src/strings/he.json b/src/strings/he.json
index 31bc228bb2..3231737657 100644
--- a/src/strings/he.json
+++ b/src/strings/he.json
@@ -616,7 +616,6 @@
     "HeaderPinCodeReset": "איפוס קוד סיכה",
     "HeaderPhotoAlbums": "אלבומי תמונות",
     "HeaderPeople": "אנשים",
-    "HeaderPendingInvitations": "הזמנות ממתינות",
     "HeaderPasswordReset": "איפוס סיסמה",
     "HeaderPassword": "סיסמה",
     "HeaderOtherItems": "פריטים אחרים",
diff --git a/src/strings/hr.json b/src/strings/hr.json
index 1693302c67..f7f6978d39 100644
--- a/src/strings/hr.json
+++ b/src/strings/hr.json
@@ -256,7 +256,6 @@
     "HeaderPassword": "Lozinka",
     "HeaderPasswordReset": "Poništenje lozinke",
     "HeaderPaths": "Putanje",
-    "HeaderPendingInvitations": "Neriješeni pozivi",
     "HeaderPinCodeReset": "Poništi PIN",
     "HeaderPlayback": "Reprodukcija medija",
     "HeaderPleaseSignIn": "Molim, prijavite se",
diff --git a/src/strings/hu.json b/src/strings/hu.json
index 5559e2f10a..7aa44d906e 100644
--- a/src/strings/hu.json
+++ b/src/strings/hu.json
@@ -762,7 +762,6 @@
     "HeaderNextVideoPlayingInValue": "Következő videó lejátszása {0}",
     "HeaderOtherItems": "Egyéb elemek",
     "HeaderPasswordReset": "Jelszó visszaállítása",
-    "HeaderPendingInvitations": "Függő meghívók",
     "HeaderPhotoAlbums": "Fényképalbumok",
     "HeaderPlaybackError": "Lejátszási hiba",
     "HeaderProfileInformation": "Profil információ",
diff --git a/src/strings/it.json b/src/strings/it.json
index 69919fbd76..854e5fa489 100644
--- a/src/strings/it.json
+++ b/src/strings/it.json
@@ -371,7 +371,6 @@
     "HeaderParentalRatings": "Valutazioni genitori",
     "HeaderPasswordReset": "Reset della Password",
     "HeaderPaths": "Percorsi",
-    "HeaderPendingInvitations": "Inviti in sospeso",
     "HeaderPeople": "Persone",
     "HeaderPhotoAlbums": "Album foto",
     "HeaderPinCodeReset": "Resetta il codice PIN",
diff --git a/src/strings/ja.json b/src/strings/ja.json
index b93b3175e4..118bd739e6 100644
--- a/src/strings/ja.json
+++ b/src/strings/ja.json
@@ -412,7 +412,6 @@
     "HeaderPassword": "パスワード",
     "HeaderPasswordReset": "パスワードリセット",
     "HeaderPaths": "パス",
-    "HeaderPendingInvitations": "保留中の招待状",
     "HeaderPeople": "人",
     "HeaderPhotoAlbums": "フォトアルバム",
     "HeaderPinCodeReset": "PINコードのリセット",
diff --git a/src/strings/kk.json b/src/strings/kk.json
index 5532af90f5..0757d71def 100644
--- a/src/strings/kk.json
+++ b/src/strings/kk.json
@@ -409,7 +409,6 @@
     "HeaderPassword": "Paról",
     "HeaderPasswordReset": "Paróldi ysyrý",
     "HeaderPaths": "Joldar",
-    "HeaderPendingInvitations": "Bógelis shaqyrýlar",
     "HeaderPeople": "Adamdar",
     "HeaderPhotoAlbums": "Fotoálbomdar",
     "HeaderPinCodeReset": "PIN-kodty ysyrý",
diff --git a/src/strings/ko.json b/src/strings/ko.json
index 660b3d34a0..8e68c4fb48 100644
--- a/src/strings/ko.json
+++ b/src/strings/ko.json
@@ -195,7 +195,6 @@
     "HeaderPassword": "비밀번호",
     "HeaderPasswordReset": "비밀번호 재설정",
     "HeaderPaths": "경로",
-    "HeaderPendingInvitations": "초대 보류",
     "HeaderPinCodeReset": "PIN 코드 초기화",
     "HeaderPlayAll": "모두 재생",
     "HeaderPlayback": "미디어 재생",
diff --git a/src/strings/lt-lt.json b/src/strings/lt-lt.json
index c8c2b6e448..af8962c474 100644
--- a/src/strings/lt-lt.json
+++ b/src/strings/lt-lt.json
@@ -985,7 +985,6 @@
     "HeaderOnNow": "Gyvai dabar",
     "HeaderOtherItems": "Kiti elementai",
     "HeaderParentalRatings": "Amžiaus kategorijos",
-    "HeaderPendingInvitations": "Laukiantys kvietimai",
     "HeaderPeople": "Žmonės",
     "HeaderPhotoAlbums": "Nuotraukų albumai",
     "HeaderPinCodeReset": "Nustatyti PIN kodą iš naujo",
diff --git a/src/strings/lv.json b/src/strings/lv.json
index 18346bbda0..693d4e50cb 100644
--- a/src/strings/lv.json
+++ b/src/strings/lv.json
@@ -1112,7 +1112,6 @@
     "LabelAirsBeforeEpisode": "Tiešraidē pirms epizodes:",
     "LabelAirsAfterSeason": "Tiešraidē pēc sezonas:",
     "HeaderSubtitleProfilesHelp": "Subtitru profili apraksta ierīces atbalstītos subtitru formātus.",
-    "HeaderPendingInvitations": "Gaidošie Uzaicinājumi",
     "HeaderKeepSeries": "Paturēt Sēriju",
     "HeaderFavoritePlaylists": "Atskaņošanas Sarakstu Favorīti",
     "ApiKeysCaption": "Saraksts ar pašlaik iespējotajām API atslēgām",
diff --git a/src/strings/nb.json b/src/strings/nb.json
index d729b0c025..96405b31e0 100644
--- a/src/strings/nb.json
+++ b/src/strings/nb.json
@@ -304,7 +304,6 @@
     "HeaderPassword": "Passord",
     "HeaderPasswordReset": "Tilbakestill passord",
     "HeaderPaths": "Filbaner",
-    "HeaderPendingInvitations": "Ventende invitasjoner",
     "HeaderPeople": "Personer",
     "HeaderPinCodeReset": "Tilbakestill PIN-kode",
     "HeaderPlayAll": "Spill alle",
diff --git a/src/strings/nl.json b/src/strings/nl.json
index 6e3adba10f..c407f81680 100644
--- a/src/strings/nl.json
+++ b/src/strings/nl.json
@@ -372,7 +372,6 @@
     "HeaderPassword": "Wachtwoord",
     "HeaderPasswordReset": "Wachtwoord resetten",
     "HeaderPaths": "Paden",
-    "HeaderPendingInvitations": "Uitstaande uitnodigingen",
     "HeaderPeople": "Personen",
     "HeaderPhotoAlbums": "Foto-albums",
     "HeaderPinCodeReset": "Reset Pincode",
diff --git a/src/strings/pl.json b/src/strings/pl.json
index 8ced01561c..9e21c5113d 100644
--- a/src/strings/pl.json
+++ b/src/strings/pl.json
@@ -398,7 +398,6 @@
     "HeaderPassword": "Hasło",
     "HeaderPasswordReset": "Czyszczenie hasła",
     "HeaderPaths": "Foldery",
-    "HeaderPendingInvitations": "Oczekujące Zaproszenia",
     "HeaderPeople": "Osoby",
     "HeaderPhotoAlbums": "Albumy fotografii",
     "HeaderPinCodeReset": "Wyczyść kod PIN",
diff --git a/src/strings/pt-br.json b/src/strings/pt-br.json
index 1f3c160c12..c8690bd742 100644
--- a/src/strings/pt-br.json
+++ b/src/strings/pt-br.json
@@ -385,7 +385,6 @@
     "HeaderPassword": "Senha",
     "HeaderPasswordReset": "Redefinição de Senha",
     "HeaderPaths": "Locais",
-    "HeaderPendingInvitations": "Convites pendentes",
     "HeaderPeople": "Pessoas",
     "HeaderPhotoAlbums": "Álbuns de Fotos",
     "HeaderPinCodeReset": "Redefinir Código Pin",
diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json
index b482189ffb..07b1f1aceb 100644
--- a/src/strings/pt-pt.json
+++ b/src/strings/pt-pt.json
@@ -192,7 +192,6 @@
     "HeaderPassword": "Palavra-passe",
     "HeaderPasswordReset": "Redefinição de Palavra-Passe",
     "HeaderPaths": "Localizações",
-    "HeaderPendingInvitations": "Convites Pendentes",
     "HeaderPeople": "Pessoas",
     "HeaderPinCodeReset": "Redefinir Código PIN",
     "HeaderPlayAll": "Reproduzir Todos",
diff --git a/src/strings/pt.json b/src/strings/pt.json
index 9d6f3faf37..dba5a7ab52 100644
--- a/src/strings/pt.json
+++ b/src/strings/pt.json
@@ -568,7 +568,6 @@
     "HeaderPinCodeReset": "Redefinir Código PIN",
     "HeaderPhotoAlbums": "Álbuns de Fotografias",
     "HeaderPeople": "Pessoas",
-    "HeaderPendingInvitations": "Convites Pendentes",
     "HeaderPaths": "Localizações",
     "HeaderPasswordReset": "Redefinição de Palavra-Passe",
     "HeaderPassword": "Palavra-passe",
diff --git a/src/strings/ro.json b/src/strings/ro.json
index 5ed9fda846..ff443fae68 100644
--- a/src/strings/ro.json
+++ b/src/strings/ro.json
@@ -476,7 +476,6 @@
     "HeaderParentalRatings": "Evaluări parentale",
     "HeaderPassword": "Parolă",
     "HeaderPasswordReset": "Resetare Parolă",
-    "HeaderPendingInvitations": "Invitații in așteptare",
     "HeaderPeople": "Persoane",
     "HeaderPhotoAlbums": "Albume Fotografii",
     "HeaderPinCodeReset": "Resetare cod PIN",
diff --git a/src/strings/ru.json b/src/strings/ru.json
index 9212ee4fb4..29fb03210a 100644
--- a/src/strings/ru.json
+++ b/src/strings/ru.json
@@ -402,7 +402,6 @@
     "HeaderPassword": "Пароль",
     "HeaderPasswordReset": "Сброс пароля",
     "HeaderPaths": "Пути",
-    "HeaderPendingInvitations": "Отложенные приглашения",
     "HeaderPeople": "Люди",
     "HeaderPhotoAlbums": "Фотоальбомы",
     "HeaderPinCodeReset": "Сброс PIN-кода",
diff --git a/src/strings/sk.json b/src/strings/sk.json
index a99d686523..581bd128ff 100644
--- a/src/strings/sk.json
+++ b/src/strings/sk.json
@@ -252,7 +252,6 @@
     "HeaderPassword": "Heslo",
     "HeaderPasswordReset": "Obnoviť heslo",
     "HeaderPaths": "Cesty",
-    "HeaderPendingInvitations": "Čakajúce pozvánky",
     "HeaderPeople": "Ľudia",
     "HeaderPhotoAlbums": "Albumy fotografií",
     "HeaderPinCodeReset": "Obnoviť PIN kód",
@@ -1224,7 +1223,7 @@
     "RefreshDialogHelp": "Metadáta sa obnovujú na základe nastavení a internetových služieb, ktoré sú povolené v dashboarde Jellyfin Serveru.",
     "RecordingPathChangeMessage": "Zmenou priečinku pre nahrávanie sa existujúce nahrávky automaticky nepresunú zo starej lokácie na na novú. Budete ich musieť presunúť ručne, pokiaľ budete chcieť.",
     "RecordSeries": "Nahrať sériu",
-    "Raised": "Vyvolané",
+    "Raised": "Vystupujúce",
     "QueueAllFromHere": "Všetko odtiaľto zaradiť do fronty",
     "Primary": "Primárna",
     "PreferEmbeddedTitlesOverFileNamesHelp": "Toto určuje východzí názov zobrazenia, pokiaľ nie sú k dispozícií internetové metadáta alebo lokálne metadáta.",
diff --git a/src/strings/sl-si.json b/src/strings/sl-si.json
index b6059809be..ee28cbec81 100644
--- a/src/strings/sl-si.json
+++ b/src/strings/sl-si.json
@@ -332,7 +332,6 @@
     "HeaderPinCodeReset": "Ponastavi PIN kodo",
     "HeaderPhotoAlbums": "Foto albumi",
     "HeaderPeople": "Osebe",
-    "HeaderPendingInvitations": "Povabila na čakanju",
     "HeaderPasswordReset": "Ponastavi geslo",
     "HeaderPassword": "Geslo",
     "HeaderParentalRatings": "Ocena za starše",
diff --git a/src/strings/sv.json b/src/strings/sv.json
index 621172f7ea..0ca152dcc5 100644
--- a/src/strings/sv.json
+++ b/src/strings/sv.json
@@ -363,7 +363,6 @@
     "HeaderPassword": "Lösenord",
     "HeaderPasswordReset": "Återställning av lösenordet",
     "HeaderPaths": "Sökvägar",
-    "HeaderPendingInvitations": "Väntande inbjudningar",
     "HeaderPeople": "Personer",
     "HeaderPhotoAlbums": "Fotoalbum",
     "HeaderPinCodeReset": "Återställ pinkod",
diff --git a/src/strings/tr.json b/src/strings/tr.json
index 3e3c94d742..169a71cea8 100644
--- a/src/strings/tr.json
+++ b/src/strings/tr.json
@@ -582,7 +582,6 @@
     "HeaderPinCodeReset": "Pin Kodunu Sıfırla",
     "HeaderPhotoAlbums": "Fotoğraf Albümleri",
     "HeaderPeople": "Kişiler",
-    "HeaderPendingInvitations": "Bekleyen Davetiyeler",
     "HeaderPasswordReset": "Şifre Sıfırlama",
     "HeaderPassword": "Şifre",
     "HeaderParentalRatings": "Ebeveyn Derecelendirmeleri",
diff --git a/src/strings/vi.json b/src/strings/vi.json
index a5b319a86f..4e51ce8d2d 100644
--- a/src/strings/vi.json
+++ b/src/strings/vi.json
@@ -443,7 +443,6 @@
     "HeaderPinCodeReset": "Đặt Lại Mã PIN",
     "HeaderPhotoAlbums": "Album Ảnh",
     "HeaderPeople": "Nhân Vật",
-    "HeaderPendingInvitations": "Những Lời Mời Đang Chờ",
     "HeaderPaths": "Đường Dẫn",
     "HeaderPasswordReset": "Đặt Lại Mật Khẩu",
     "HeaderPassword": "Mật Khẩu",
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index 0b2767fda3..06acfddab5 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -367,7 +367,6 @@
     "HeaderPassword": "密码",
     "HeaderPasswordReset": "密码重置",
     "HeaderPaths": "路径",
-    "HeaderPendingInvitations": "等待邀请",
     "HeaderPeople": "人物",
     "HeaderPhotoAlbums": "相册",
     "HeaderPinCodeReset": "重置PIN码",
diff --git a/src/strings/zh-tw.json b/src/strings/zh-tw.json
index 4c090dcf25..18b4a9f097 100644
--- a/src/strings/zh-tw.json
+++ b/src/strings/zh-tw.json
@@ -3,7 +3,7 @@
     "All": "全部",
     "AllowRemoteAccessHelp": "如果未勾選，所有連線都將被阻擋。",
     "Browse": "瀏覽",
-    "BrowsePluginCatalogMessage": "瀏覽我們的插件目錄來查看可用的模組。",
+    "BrowsePluginCatalogMessage": "瀏覽我們的模組目錄來查看可用的模組。",
     "ButtonAdd": "新增",
     "ButtonAddServer": "新增伺服器",
     "ButtonAddUser": "新增使用者",
@@ -20,7 +20,7 @@
     "ButtonNew": "建立",
     "ButtonOk": "確定",
     "ButtonPlay": "播放",
-    "ButtonQuickStartGuide": "快速開始指南",
+    "ButtonQuickStartGuide": "快速入門指南",
     "ButtonRefresh": "重新整理",
     "ButtonRefreshGuideData": "更新電視節目表",
     "ButtonRemove": "清除",
@@ -34,8 +34,8 @@
     "ButtonSort": "排序",
     "ConfirmDeleteItem": "刪除此項目時，也會一併從檔案系統及媒體櫃中刪除。確定要刪除嗎？",
     "ConfirmDeletion": "確定刪除",
-    "Continuing": "持續",
-    "CustomDlnaProfilesHelp": "為新的設備新增自訂設定檔或覆蓋原有系統設定。",
+    "Continuing": "繼續",
+    "CustomDlnaProfilesHelp": "為新設備新增自訂設定檔或覆蓋原有系統設定。",
     "Delete": "刪除",
     "DeleteImage": "刪除圖像",
     "DeleteImageConfirmation": "你確定要刪除這張圖像？",
@@ -91,7 +91,7 @@
     "HeaderPaths": "路徑",
     "HeaderPlayAll": "全部播放",
     "HeaderPleaseSignIn": "請登入",
-    "HeaderPreferredMetadataLanguage": "首選媒體資料語言",
+    "HeaderPreferredMetadataLanguage": "首選中繼資料資料語言",
     "HeaderRecentlyPlayed": "最近播放",
     "HeaderScenes": "場景",
     "HeaderSelectServer": "選擇伺服器",
@@ -314,17 +314,17 @@
     "Albums": "專輯",
     "Alerts": "警示",
     "AllChannels": "所有節目",
-    "AllComplexFormats": "所有複雜格式 (ASS, SSA, VOBSUB, PGS, SUB/IDX, 等)",
+    "AllComplexFormats": "所有複雜字幕格式 (ASS、SSA、 VOBSUB、PGS 與 SUB/IDX 等)",
     "AllLanguages": "所有語言",
     "AllLibraries": "所有媒體",
     "AllowMediaConversion": "允許媒體轉檔",
     "AllowMediaConversionHelp": "授予或拒絕存取媒體轉檔功能。",
-    "AllowRemoteAccess": "允許遠端存取這個Jellyfin 伺服器。",
+    "AllowRemoteAccess": "允許遠端存取該 Jellyfin 伺服器。",
     "AlwaysPlaySubtitles": "總是顯示字幕",
-    "AlwaysPlaySubtitlesHelp": "將會載符合語音設定的字幕，無論語音是哪一個語言。",
+    "AlwaysPlaySubtitlesHelp": "將會載入符合語音設定的字幕，無論語音是哪一個語言。",
     "AnyLanguage": "任何語言",
     "Anytime": "任何時間",
-    "AroundTime": "大概在 {0} 左右",
+    "AroundTime": "大概",
     "Art": "圖像",
     "Artists": "演出者",
     "AsManyAsPossible": "越多越好",
@@ -333,13 +333,13 @@
     "AttributeNew": "新增",
     "Audio": "音訊",
     "Auto": "自動",
-    "AutoBasedOnLanguageSetting": "自動(根據語言設定)",
+    "AutoBasedOnLanguageSetting": "自動（根據語言設定）",
     "Backdrop": "背景",
     "Backdrops": "背景",
     "Banner": "橫幅",
-    "BirthDateValue": "生於: {0}",
+    "BirthDateValue": "生於：{0}",
     "BirthLocation": "出生地",
-    "BirthPlaceValue": "出生地: {0}",
+    "BirthPlaceValue": "出生地：{0}",
     "Blacklist": "黑名單",
     "Books": "圖書",
     "ButtonAccept": "接受",
@@ -348,7 +348,7 @@
     "ButtonArrowRight": "右",
     "ButtonArrowUp": "上",
     "ButtonAudioTracks": "音軌",
-    "ButtonBack": "回去",
+    "ButtonBack": "返回",
     "ButtonChangeServer": "更換伺服器",
     "AddItemToCollectionHelp": "利用搜尋並使用右鍵或點擊目錄將項目新增到收藏中。",
     "AddToCollection": "加入收藏",
@@ -357,17 +357,17 @@
     "AllEpisodes": "所有集數",
     "AllowHWTranscodingHelp": "若啟用，將會允許調諧器同步轉檔，這會減少 Jellyfin 伺服器轉檔必要。",
     "AllowOnTheFlySubtitleExtraction": "允許同步字幕截取",
-    "AllowOnTheFlySubtitleExtractionHelp": "可以從影片中提取內建字幕並以純文字的形式給 Jellyfin 應用程式以避免影片轉碼。在某些系統中這個提取的進程可能會花費較長時間並導致影片播放出現停滯。若停用這個選項，當內置字幕不被播放端設備支援時，字幕將透過影片轉碼燒進影片中。",
-    "AllowedRemoteAddressesHelp": "可以從非本地連線的IP位址，用冒號分隔，若留白，則允許所有IP。",
-    "BookLibraryHelp": "支援有聲書和電子書。請瀏覽 Jellyfin 書籍命名指南。",
+    "AllowOnTheFlySubtitleExtractionHelp": "可以從影片中提取內建字幕並以純文字的形式給 Jellyfin 應用程式以避免影片轉檔。某些系統中提取的過程可能會花費較長時間並導致影片播放出現停滯。若停用這個選項，當內建字幕不被播放端設備支援時，字幕將透過轉檔嵌入影片中。",
+    "AllowedRemoteAddressesHelp": "可以從非本地連線的IP位址，用冒號分隔，留白則允許所有IP。",
+    "BookLibraryHelp": "支援有聲書和電子書。請瀏覽 {0}書籍命名指南{1}。",
     "Box": "盒子",
     "BoxRear": "盒子（背面）",
-    "BurnSubtitlesHelp": "根據字幕格式決定伺服器在轉換影片時是否燒錄字幕。避免燒錄字幕會提高伺服器性能。選擇「自動」以燒錄基於圖片的字幕格式（如 VOBSUB, PGS, SUB/IDX 等）和一些複雜的 ASS/SSA 字幕。",
+    "BurnSubtitlesHelp": "根據字幕格式決定伺服器在影片轉檔時是否燒錄字幕。避免燒錄字幕時消耗過多伺服器資源。選擇「自動」以燒錄基於圖片的字幕格式（如 VOBSUB、PGS 或 SUB/IDX 等）和一些複雜的 ASS/SSA 字幕。",
     "ButtonArrowDown": "下",
     "ButtonConnect": "連結",
     "ButtonDown": "下",
     "ButtonDownload": "下載",
-    "ButtonEditOtherUserPreferences": "編輯此使用者的內容、大頭貼和個人設定。",
+    "ButtonEditOtherUserPreferences": "編輯使用者個人檔案、大頭貼和個人設定。",
     "ButtonFullscreen": "全螢幕",
     "ButtonHelp": "幫助",
     "ButtonInfo": "詳細資料",
@@ -379,13 +379,13 @@
     "ButtonNextTrack": "下一首",
     "ButtonOff": "關",
     "ButtonOpen": "開",
-    "ButtonParentalControl": "家庭管理",
+    "ButtonParentalControl": "家長控制",
     "ButtonPause": "暫停",
     "ButtonPreviousTrack": "上一首",
     "ButtonProfile": "個人首頁",
     "ButtonRename": "重新命名",
     "ButtonRepeat": "重覆播放",
-    "ButtonResetEasyPassword": "重設簡單PIN碼",
+    "ButtonResetEasyPassword": "重設簡單 PIN 碼",
     "ButtonRestart": "重新啟動",
     "ButtonResume": "繼續播放",
     "ButtonRevoke": "撤銷",
@@ -397,7 +397,7 @@
     "ButtonShutdown": "關機",
     "ButtonStart": "開始",
     "ButtonStop": "停止",
-    "ButtonSubmit": "提交",
+    "ButtonSubmit": "送出",
     "ButtonSubtitles": "字幕",
     "ButtonTrailer": "預告片",
     "ButtonUninstall": "解除安裝",
@@ -407,17 +407,17 @@
     "CancelRecording": "取消錄影",
     "CancelSeries": "取消系列",
     "Categories": "類別",
-    "ChangingMetadataImageSettingsNewContent": "更改影片詳細資料或媒體圖像像的下載設定僅對以後添加至媒體庫中的新内容生效，若要更改已存在的資料，您需要手動更新中繼資料。",
-    "ChannelAccessHelp": "選擇此使用者之共享頻道。管理員將能夠使用資料管理器編輯所有資料夾。",
+    "ChangingMetadataImageSettingsNewContent": "更改影片中繼資料或媒體圖像的下載設定僅對以後添加至媒體庫中的新内容生效，若需更改已存在的資料，請手動更新中繼資料。",
+    "ChannelAccessHelp": "選擇與此使用者共享之頻道。管理員將能夠使用中繼資料管理器編輯所有資料夾。",
     "ChannelNameOnly": "只在頻道 {0}",
     "ChannelNumber": "頻道號碼",
     "Channels": "頻道",
-    "CinemaModeConfigurationHelp": "劇影院模式直接為您的客廳帶來劇場級體驗，同時還可以播放預告片和自定開場白。",
+    "CinemaModeConfigurationHelp": "劇院模式直接為您的客廳帶來劇院級體驗，同時還可以播放預告片和自定開場白。",
     "CinemaModeFeatureDescription": "劇院模式用預告片和自定開場白帶給您最真實的劇院體驗。",
     "CloudSyncFeatureDescription": "將您的媒體備份到雲端當作簡單的備份，收藏和轉檔。",
     "Collections": "合輯",
     "Composer": "作曲家",
-    "ConfigureDateAdded": "調整伺服器怎麼判定媒體庫的「新增日期」",
+    "ConfigureDateAdded": "調整伺服器如何判定媒體庫的「新增日期」",
     "ConfirmDeleteImage": "刪除圖片？",
     "ConfirmDeleteItems": "刪除這些項目會將檔案從系統和媒體庫中刪除。你真的要繼續嗎？",
     "ConfirmEndPlayerSession": "您要在 {0} 秒後將 Jellyfin關機嗎？",
@@ -428,16 +428,16 @@
     "DatePlayed": "播放日期",
     "DeathDateValue": "死於： {0}",
     "Default": "預設",
-    "ButtonAddScheduledTaskTrigger": "新增觸發",
+    "ButtonAddScheduledTaskTrigger": "新增觸發器",
     "CategoryPlugin": "外掛元件",
     "ColorPrimaries": "三原色",
     "ColorSpace": "色彩空間",
     "ColorTransfer": "色彩傳輸",
-    "CommunityRating": "公眾評分",
+    "CommunityRating": "社群評分",
     "DefaultCameraUploadPathHelp": "請選擇自訂上傳路徑。若留白, 將會使用預設資料夾。如果使用自訂路徑，則還需要在Jellyfin庫設置中作為“媒體庫”添加。",
     "DefaultErrorMessage": "處理請求時發生錯誤。請稍後再試。",
     "DefaultMetadataLangaugeDescription": "這些預設設定可以在你的媒體庫中單獨設定。",
-    "DefaultSubtitlesHelp": "字幕將基於內建資料中的「預設」標記和「強制」標記來載入，當有多個選項可用時，將根據語言偏好決定。",
+    "DefaultSubtitlesHelp": "字幕將基於中繼資料中的「預設」標記和「強制」標記來載入，當有多個選項可用時，將根據語言偏好決定。",
     "DeleteDeviceConfirmation": "你確定你要刪除這個裝置嗎？當有使用者用這個裝置登入時，這個裝置會再次出現。",
     "DeleteMedia": "刪除媒體",
     "DeleteUserConfirmation": "你確定要刪除此使用者？",
@@ -448,21 +448,21 @@
     "DeviceLastUsedByUserName": "最後被 {0} 使用",
     "DirectPlayError": "直接播放錯誤",
     "DirectPlaying": "直接播放",
-    "DirectStreamHelp1": "媒體在畫質和媒體類型（H.264，AC3等）方面與裝置相容。但是在不相容的檔案格式（.mkv，.avi，.wmv等）中，在影片傳輸到裝置之前，將會重新轉檔。",
+    "DirectStreamHelp1": "媒體在畫質和媒體類型（H.264、AC3 等）方面與裝置相容。但是在不相容的檔案格式（.mkv、.avi、.wmv 等）中，在影片傳輸到裝置之前，將會重新轉檔。",
     "DirectStreamHelp2": "直接串流檔案會占用非常少的處理效能並且影片的品質不會有任何損失。",
     "DirectStreaming": "直接串流",
     "Director": "導演",
     "Directors": "導演",
     "Disabled": "已停用",
     "Disc": "光碟",
-    "Disconnect": "斷開連結",
+    "Disconnect": "中斷連接",
     "Display": "顯示",
     "DisplayInMyMedia": "在主畫面顯示",
-    "DisplayInOtherHomeScreenSections": "在“最新媒體”和“繼續觀看“等主畫面區塊中顯示",
+    "DisplayInOtherHomeScreenSections": "在「最新媒體」和「繼續觀看」等主畫面區塊中顯示",
     "DisplayMissingEpisodesWithinSeasons": "顯示每季缺少的劇集",
     "DisplayMissingEpisodesWithinSeasonsHelp": "必須在 Jellyfin 伺服器的電視媒體庫設定中啟用該功能。",
-    "DisplayModeHelp": "選擇您想要的界面樣式。",
-    "DoNotRecord": "不要錄",
+    "DisplayModeHelp": "選擇您想要的介面樣式。",
+    "DoNotRecord": "不錄製",
     "Down": "下",
     "DownloadItemLimitHelp": "非必要。 設置要下載的項目數限制。",
     "Downloaded": "已下載",
@@ -474,7 +474,7 @@
     "DropShadow": "背景投影",
     "DvrFeatureDescription": "使用Jellyfin DVR安排個人直播電視錄製，系列錄製等。",
     "EasyPasswordHelp": "你的簡易 PIN 碼將會用於在支援的 Jellyfin 應用上進行離線存取，同時也可被用於區域網路的登入。",
-    "EditMetadata": "編輯數據",
+    "EditMetadata": "編輯中繼資料",
     "EditSubtitles": "編輯字幕",
     "EnableBackdrops": "背景",
     "EnableBackdropsHelp": "瀏覽媒體庫時背景圖將作為頁面的背景。",
@@ -674,7 +674,7 @@
     "HeaderItems": "項目",
     "HeaderKeepRecording": "繼續錄製",
     "HeaderKeepSeries": "保存系列",
-    "HeaderKodiMetadataHelp": "要啟用或禁用 NFO 元數據, 請在 Jellyfin “建立媒體庫”頁面中編輯該媒體庫, 然後找到“元數據儲存”部分。",
+    "HeaderKodiMetadataHelp": "要啟用或停用 NFO 中繼資料，請在 Jellyfin「建立媒體庫」頁面中編輯該媒體庫「中繼資料儲存」部分。",
     "HeaderLanguage": "語言",
     "HeaderLatestChannelItems": "最近節目項目",
     "HeaderLatestChannelMedia": "最近節目項目",
@@ -699,7 +699,7 @@
     "HeaderMediaInfo": "媒體資訊",
     "HeaderMediaLocations": "媒體位址",
     "HeaderMenu": "目錄",
-    "HeaderMetadataSettings": "數據設定",
+    "HeaderMetadataSettings": "中繼資料設定",
     "HeaderMissing": "不見了",
     "HeaderMoreLikeThis": "更多類似的",
     "HeaderMovies": "電影",
@@ -821,7 +821,6 @@
     "ValueSpecialEpisodeName": "特典 - {0}",
     "AuthProviderHelp": "選擇用於驗證使用者密碼的身份驗證提供者。",
     "HeaderParentalRatings": "家長評級",
-    "HeaderPendingInvitations": "等待邀請",
     "HeaderProfile": "設定檔",
     "HeaderProfileInformation": "設定檔信息",
     "HeaderProfileServerSettingsHelp": "這些數值將控制 Jellyfin 伺服器如何呈現給設備。",
@@ -892,9 +891,9 @@
     "LabelArtistsHelp": "分開多重使用 ;",
     "LabelAudio": "音頻",
     "LabelAuthProvider": "認證提供者：",
-    "LabelAutomaticallyRefreshInternetMetadataEvery": "從網路自動刷新數據：",
-    "LabelBindToLocalNetworkAddress": "聯結本地網絡地址:",
-    "LabelBindToLocalNetworkAddressHelp": "(選用）覆蓋 HTTP 服務器綁定的本地 IP 地址。如果留空，服務器將會監聽所有可用的地址。改變這個值需要重啟 Jellyfin 伺服器。",
+    "LabelAutomaticallyRefreshInternetMetadataEvery": "從網路自動抓取中繼資料：",
+    "LabelBindToLocalNetworkAddress": "綁定本地網絡地址：",
+    "LabelBindToLocalNetworkAddressHelp": "(選用）覆蓋 HTTP 伺服器綁定的本地 IP 地址。如果留空，伺服器將會監聽所有可用的地址。改變此欄位需重啟 Jellyfin 伺服器。",
     "LabelBirthDate": "出生日期：",
     "LabelBirthYear": "出生年：",
     "LabelBlastMessageInterval": "活動信號的時間間隔（秒）",
@@ -1015,7 +1014,7 @@
     "LabelEnableDlnaServerHelp": "允許網絡上的 UPnP 設備瀏覽和播放內容。",
     "LabelEnableHardwareDecodingFor": "為以下啟用硬體解碼：",
     "LabelEpisodeNumber": "集：",
-    "LabelBaseUrlHelp": "您可以在此處自訂伺服器URL路徑的子目錄。",
+    "LabelBaseUrlHelp": "您可以在此處自訂伺服器 URL 路徑的子目錄，如：<code>http://example.com/<b>&lt;baseurl&gt;</b></code>",
     "LabelExtractChaptersDuringLibraryScan": "於媒體庫掃描時擷取章節圖片",
     "LabelHttpsPort": "本地 HTTPS 端口：",
     "LabelFailed": "失敗",
@@ -1259,7 +1258,7 @@
     "LinksValue": "連結：{0}",
     "OptionAllowMediaPlaybackTranscodingHelp": "由於不支持的媒體格式，限制轉檔可能會導致 Jellyfin 應用程式播放失敗。",
     "MediaInfoLevel": "等級",
-    "MessageNoTrailersFound": "沒有任何預告片，安裝 Trailer channel 來優化你的電影體驗。",
+    "MessageNoTrailersFound": "安裝 Trailer channel 來新增網路上預告片，以增進你的電影體驗。",
     "OptionHasSpecialFeatures": "特色",
     "RecommendationStarring": "主演 {0}",
     "Rewind": "倒帶",
@@ -1465,7 +1464,7 @@
     "PluginInstalledMessage": "這個模組安裝成功，但 Jellyfin 伺服器需要重啟以使模組生效。",
     "RecordingPathChangeMessage": "更改錄製資料夾不會將現有錄製從舊位置遷移到新的，您需要手動移動它們。",
     "LabelEmbedAlbumArtDidl": "於 Didl 中嵌入專輯封面",
-    "LabelEnableAutomaticPortMapHelp": "自動嘗試映射公共連接埠到 UPnP 本地連接埠。這可能無法用於某些路由器。需重新啓動伺服器。",
+    "LabelEnableAutomaticPortMapHelp": "透過 UPnP 自動將路由器上的公共埠轉發到伺服器上的本地埠。這可能不適用於某些路由器型號或網路設定。在伺服器重新啟動後才會進行更改。",
     "LabelEmbedAlbumArtDidlHelp": "有些裝置使用這個方式來取得專輯封面，啟用這個選項可能導致其他設備播放失敗。",
     "SettingsWarning": "更改這些值可能會導致不穩定或連線故障。如果您遇到任何問題，建議將它們重新更改為預設值。",
     "LabelEnableSingleImageInDidlLimitHelp": "若在 Didl 中嵌入多個圖片，某些裝置可能無法正常顯示。",
@@ -1530,7 +1529,7 @@
     "LabelModelUrl": "型號網址",
     "LabelMusicStreamingTranscodingBitrate": "音樂轉檔比特率：",
     "LabelMusicStreamingTranscodingBitrateHelp": "指定音樂串流時的最大比特率。",
-    "LabelOptionalNetworkPathHelp": "如果這個資料夾在網路上分享，提供網路分享路徑可以供其他 Jellyfin 應用程式直接存取媒體檔案。",
+    "LabelOptionalNetworkPathHelp": "如果這個資料夾在網路上分享，提供網路分享路徑可以供其他 Jellyfin 應用程式直接存取媒體檔案，例如 {0} 或者 {1}。",
     "LabelOriginalAspectRatio": "原始長寬比：",
     "LabelOverview": "內容概述：",
     "LabelParentalRating": "家長分級：",
@@ -1600,7 +1599,7 @@
     "XmlDocumentAttributeListHelp": "這些屬性會在每一個XML回應的根元素上應用。",
     "SkipEpisodesAlreadyInMyLibraryHelp": "劇集將使用季和劇集編號進行比較。",
     "SelectAdminUsername": "請為管理員賬戶選擇一個用戶名。",
-    "CopyStreamURLError": "複製網址的時候發生錯誤.",
+    "CopyStreamURLError": "複製連結的時候發生錯誤。",
     "OptionSaveMetadataAsHiddenHelp": "更改此項將應用於以後保存的元數據。現有元數據文件將在下一次 Jellyfin 伺服器保存它們時被更新。",
     "OptionAllowRemoteSharedDevicesHelp": "DLNA裝置將被視為共享中，直至有使用者控制。",
     "OptionForceRemoteSourceTranscoding": "强制遠端轉碼（像電視直播一樣）",
@@ -1612,16 +1611,16 @@
     "LabelDroppedFrames": "丟棄的幀：",
     "LabelCorruptedFrames": "損壞的幀：",
     "ButtonSplit": "分割",
-    "AskAdminToCreateLibrary": "如要建立資料庫，請求管理員。",
+    "AskAdminToCreateLibrary": "如要建立資料庫，請聯繫管理員。",
     "NoCreatedLibraries": "看來您還未創任何媒體庫。{0}立刻創一個新的嗎？{1}",
-    "ClientSettings": "用戶設定",
+    "ClientSettings": "客戶端設定",
     "AllowFfmpegThrottlingHelp": "當轉檔或重組進度大量超前目前播放進度時，將暫停轉檔節省消耗的資源。在不常跳播的時候最有效。如果遇到播放問題，請關閉此功能。",
     "AllowFfmpegThrottling": "限制轉檔",
     "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "這將會使用內建劇集資料。",
     "PlaybackErrorNoCompatibleStream": "用戶端與該媒體不相容，伺服器也未傳送相容的媒體格式。",
     "PreferEmbeddedEpisodeInfosOverFileNames": "優先使用內建劇集資訊而不是檔案名稱",
     "OtherArtist": "其他歌手",
-    "Artist": "歌手",
+    "Artist": "演出者",
     "AlbumArtist": "專輯歌手",
     "Album": "專輯",
     "YadifBob": "YADIF Bob",
@@ -1657,20 +1656,72 @@
     "ButtonTogglePlaylist": "播放清單",
     "ButtonToggleContextMenu": "更多",
     "ButtonSyncPlay": "SyncPlay",
-    "LabelRequireHttpsHelp": "如果選中，伺服器將自動將所有通過HTTP的請求重定向到HTTPS。 如果伺服器未在HTTPS上偵聽則此項無效。",
-    "EnableFasterAnimationsHelp": "使用更快的動畫和過渡效果",
+    "LabelRequireHttpsHelp": "開啟後伺服器將自動將所有 HTTP 請求導向 HTTPS。如果伺服器沒有啟用 HTTPS 則不生效。",
+    "EnableFasterAnimationsHelp": "使用更快的動畫與過渡效果",
     "EnableFasterAnimations": "更快的動畫",
-    "LabelRequireHttps": "要求HTTPS",
-    "LabelNightly": "每日更新版",
+    "LabelRequireHttps": "強制 HTTPS",
+    "LabelNightly": "開發版",
     "LabelStable": "穩定版",
-    "LabelChromecastVersion": "Chromecast版本",
-    "LabelEnableHttpsHelp": "使伺服器能夠偵聽已配置的HTTPS端口。 要使其生效，必須配置一個有效的證書。",
+    "LabelChromecastVersion": "Chromecast 版本",
+    "LabelEnableHttpsHelp": "讓伺服器監聽指定的 HTTPS 端口。須設定有效的證書以便使其生效。",
     "LabelEnableHttps": "啟用HTTPS",
-    "HeaderServerAddressSettings": "伺服器地址設定",
-    "HeaderRemoteAccessSettings": "遠程訪問設定",
-    "HeaderHttpsSettings": "HTTPS設定",
-    "EnableDetailsBannerHelp": "在項目詳細信息頁面的頂部顯示橫幅圖像。",
+    "HeaderServerAddressSettings": "伺服器位置設定",
+    "HeaderRemoteAccessSettings": "遠端存取設定",
+    "HeaderHttpsSettings": "HTTPS 設定",
+    "EnableDetailsBannerHelp": "在項目詳細訊息頁面的頂部顯示橫幅。",
     "EnableDetailsBanner": "詳情橫幅",
-    "EnableDecodingColorDepth10Vp9": "啟用10比特VP9硬體解碼",
-    "EnableDecodingColorDepth10Hevc": "啟用10比特HEVC硬體解碼"
+    "EnableDecodingColorDepth10Vp9": "啟用 VP9 10-Bit 硬體解碼",
+    "EnableDecodingColorDepth10Hevc": "啟用 HEVC 10-Bit 硬體解碼",
+    "LabelSyncPlayPlaybackDiff": "播放時間差距：",
+    "LabelSyncPlayTimeOffset": "伺服器時間延遲：",
+    "LabelRepositoryUrlHelp": "儲存庫的位置。",
+    "MessageSyncPlayEnabled": "已啟用同步播放。",
+    "MessageNoGenresAvailable": "啟用中繼資料提供者以便從網路抓取媒體類型。",
+    "MessageSyncPlayErrorNoActivePlayer": "同步播放因無使用者而被關閉。",
+    "MessageSyncPlayErrorMissingSession": "同步播放因遺失會話導致啟用失敗。",
+    "MessageSyncPlayErrorMedia": "同步播放因媒體錯誤導致啟用失敗。",
+    "SaveChanges": "儲存",
+    "ShowLess": "顯示更少",
+    "ShowMore": "顯示更多",
+    "SyncPlayAccessHelp": "選取該使用者對同步播放的存取權。此功能能讓你與其他裝置同步播放進度。",
+    "EnableBlurhash": "啟用模糊的占位圖片",
+    "EnableBlurhashHelp": "尚未讀取完畢的圖片會先顯示模糊的版本",
+    "ClearQueue": "清空佇列",
+    "StopPlayback": "停止播放",
+    "ButtonPlayer": "播放器",
+    "ButtonCast": "投放",
+    "Writers": "作者",
+    "ViewAlbumArtist": "檢視專輯演出者",
+    "TabDVR": "DVR",
+    "TabRepositories": "儲存庫",
+    "MessageSyncPlayErrorAccessingGroups": "存取群組列表時發生錯誤。",
+    "MessageSyncPlayLibraryAccessDenied": "存取受限。",
+    "MessageSyncPlayJoinGroupDenied": "需要同步播放之權限。",
+    "MessageSyncPlayCreateGroupDenied": "需要建立群組之權限。",
+    "MessageSyncPlayGroupDoesNotExist": "無法加入不存在的群組。",
+    "MessageSyncPlayPlaybackPermissionRequired": "需要播放權限。",
+    "MessageSyncPlayNoGroupsAvailable": "請先播放媒體以建立群組。",
+    "MessageSyncPlayGroupWait": "<b>{0}</b> 正在串流…",
+    "MessageSyncPlayUserLeft": "<b>{0}</b> 離開了群組。",
+    "MessageSyncPlayUserJoined": "<b>{0}</b> 加入群組。",
+    "MessageSyncPlayDisabled": "同步播放已停用。",
+    "MessageAddRepository": "欲新增儲存庫，請點擊旁邊的按鈕來填寫相關資訊。",
+    "LabelRepositoryNameHelp": "取一個能讓你辨識的名稱。",
+    "LabelRepositoryName": "儲存庫名稱",
+    "LabelRepositoryUrl": "儲存庫 URL",
+    "HeaderNewRepository": "新增儲存庫",
+    "MessageNoRepositories": "尚無儲存庫。",
+    "LabelSyncPlayAccess": "同步播放存取控制",
+    "LabelSyncPlayAccessNone": "禁止該使用者",
+    "LabelSyncPlayAccessJoinGroups": "允許使用者加入群組",
+    "LabelSyncPlayAccessCreateAndJoinGroups": "允許使用者建立與加入群組",
+    "LabelSyncPlayLeaveGroupDescription": "停用同步播放",
+    "LabelSyncPlayLeaveGroup": "離開群組",
+    "LabelSyncPlayNewGroupDescription": "建立新的群組",
+    "LabelSyncPlayNewGroup": "建立群組",
+    "LabelSyncPlaySyncMethod": "同步方式：",
+    "MillisecondsUnit": "毫秒",
+    "HeaderSyncPlayEnabled": "已啟用同步播放",
+    "HeaderSyncPlaySelectGroup": "加入群組",
+    "HeaderDVR": "DVR"
 }
diff --git a/src/userprofiles.html b/src/userprofiles.html
index 98237645dd..0a72f40ed7 100644
--- a/src/userprofiles.html
+++ b/src/userprofiles.html
@@ -1,5 +1,4 @@
 <div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage fullWidthContent">
-
     <div>
         <div class="content-primary">
             <div class="verticalSection verticalSection-extrabottompadding">
@@ -12,13 +11,6 @@
                 </div>
                 <div class="localUsers itemsContainer vertical-wrap"></div>
             </div>
-            <div class="sectionPendingGuests verticalSection hide">
-                <div class="sectionTitleContainer">
-                    <h2 class="sectionTitle">${HeaderPendingInvitations}</h2>
-                </div>
-                <div class="itemsContainer vertical-wrap pending" style="margin-top:.5em;"></div>
-            </div>
         </div>
-
     </div>
 </div>
diff --git a/yarn.lock b/yarn.lock
index f3672ee5a5..063de5e762 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1902,20 +1902,20 @@ brorand@^1.0.1:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
-browser-sync-client@^2.26.10:
-  version "2.26.10"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.10.tgz#ca9309ba19f9695e7945b95062da8a7ef3156711"
-  integrity sha512-8pYitKwpVva7hzXJI8lTljNDbA9fjMEobHSxWqegIUon/GjJAG3UgHB/+lBWnOLzTY8rGX66MvGqL1Aknyrj7g==
+browser-sync-client@^2.26.12:
+  version "2.26.12"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.12.tgz#b6c81335c6a9f1a79bca1951438800d3e7f170c8"
+  integrity sha512-bEBDRkufKxrIfjOsIB1FN9itUEXr2oLtz1AySgSSr80K2AWzmtoYnxtVASx/i40qFrSdeI31pNvdCjHivihLVA==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
     rxjs "^5.5.6"
 
-browser-sync-ui@^2.26.10:
-  version "2.26.10"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.10.tgz#7b4b378de204b3913d4b8a6f93b16b1ba769d4bc"
-  integrity sha512-UfNSBItlXcmEvJ9RE4JooNtIsiIfHowp+7/52Jz4VFfQD4v78QK5/NV9DVrG41oMM3zLyhW4f/RliOb4ysStZg==
+browser-sync-ui@^2.26.12:
+  version "2.26.12"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.12.tgz#6a309644d3ae0fe743906558a94caf6fd118719f"
+  integrity sha512-PkAJNf/TfCFTCkQUfXplR2Kp/+/lbCWFO9lrgLZsmxIhvMLx2pYZFBbTBIaem8qjXhld9ZcESUC8EdU5VWFJgQ==
   dependencies:
     async-each-series "0.1.1"
     connect-history-api-fallback "^1"
@@ -1924,13 +1924,13 @@ browser-sync-ui@^2.26.10:
     socket.io-client "^2.0.4"
     stream-throttle "^0.1.3"
 
-browser-sync@^2.26.10:
-  version "2.26.10"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.10.tgz#f03c043f615cf53c9294ccb2a5a5e25cfe11a230"
-  integrity sha512-JeVQP3CARvNA1DELj+ZGWj+/0pzE8+Omvq1WNgzaTXVdP3lNEbGxZbkjvLK7hHpQywjQ1sDJWlJQZT6V59XDTg==
+browser-sync@^2.26.12:
+  version "2.26.12"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.12.tgz#2724df702ef8880e711c1bf62afd7c93a3a80462"
+  integrity sha512-1GjAe+EpZQJgtKhWsxklEjpaMV0DrRylpHRvZWgOphDQt+bfLZjfynl/j1WjSFIx8ozj9j78g6Yk4TqD3gKaMA==
   dependencies:
-    browser-sync-client "^2.26.10"
-    browser-sync-ui "^2.26.10"
+    browser-sync-client "^2.26.12"
+    browser-sync-ui "^2.26.12"
     bs-recipes "1.3.4"
     bs-snippet-injector "^2.0.1"
     chokidar "^3.4.1"
@@ -2968,24 +2968,24 @@ css-has-pseudo@^0.10.0:
     postcss "^7.0.6"
     postcss-selector-parser "^5.0.0-rc.4"
 
-css-loader@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
-  integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
+css-loader@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.0.0.tgz#814434d4e1e2d5f430c70e85e78268db7f3cced1"
+  integrity sha512-/7d5slKnmY2S39FNifJ7JQ8MhcMM/rDIjAZ2Sc/Z8lnOWOmc10hijg28ovBtljY364pQaF01O2nj5AIBDnJ9vQ==
   dependencies:
-    camelcase "^5.3.1"
+    camelcase "^6.0.0"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
-    loader-utils "^1.2.3"
+    loader-utils "^2.0.0"
     normalize-path "^3.0.0"
     postcss "^7.0.32"
     postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
+    postcss-modules-local-by-default "^3.0.3"
     postcss-modules-scope "^2.2.0"
     postcss-modules-values "^3.0.0"
     postcss-value-parser "^4.1.0"
     schema-utils "^2.7.0"
-    semver "^6.3.0"
+    semver "^7.3.2"
 
 css-prefers-color-scheme@^3.1.1:
   version "3.1.1"
@@ -3643,11 +3643,6 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
-eme-encryption-scheme-polyfill@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.0.1.tgz#b080b01bffd74c75c9cf8044c1cabedf3b83954f"
-  integrity sha512-Wz+Ro1c0/2Wsx2RLFvTOO0m4LvYn+7cSnq3XOvRvLLBq8jbvUACH/zpU9s0/5+mQa5oaelkU69x+q0z/iWYrFA==
-
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -8640,15 +8635,15 @@ postcss-modules-extract-imports@^2.0.0:
   dependencies:
     postcss "^7.0.5"
 
-postcss-modules-local-by-default@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
-  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+postcss-modules-local-by-default@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
+  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
   dependencies:
     icss-utils "^4.1.1"
-    postcss "^7.0.16"
+    postcss "^7.0.32"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.0"
+    postcss-value-parser "^4.1.0"
 
 postcss-modules-scope@^2.2.0:
   version "2.2.0"
@@ -9015,7 +9010,7 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
@@ -9039,7 +9034,7 @@ postcss@^5.0.0, postcss@^5.0.18:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
   version "7.0.32"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
   integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -9968,7 +9963,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.2:
+semver@7.3.2, semver@^7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
@@ -10085,13 +10080,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shaka-player@^2.5.13:
-  version "2.5.13"
-  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-2.5.13.tgz#f8c493b825c735fc86d619cba8b2eb2f2a382233"
-  integrity sha512-rEh7juGlTvvF10oD7+EukS12EysZXI2fiGvNLqO7GsBQ5R/sFwcTGEB8A6lWlHQXeGVbT+MxZWKMZwFE805G6A==
-  dependencies:
-    eme-encryption-scheme-polyfill "^2.0.1"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"