diff --git a/.eslintrc.yml b/.eslintrc.yml
index 943b958ec..4110862a1 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,3 +1,4 @@
 env:
+  es6: true
   browser: true
   amd: true
diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css
index ebdeffe1d..64ce965da 100644
--- a/src/components/cardbuilder/card.css
+++ b/src/components/cardbuilder/card.css
@@ -46,9 +46,9 @@ button {
     flex-wrap: wrap;
 }
 
-    .vertical-wrap.centered {
-        justify-content: center;
-    }
+.vertical-wrap.centered {
+    justify-content: center;
+}
 
 .cardScalable {
     position: relative;
@@ -226,10 +226,6 @@ button {
     box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37);
 }
 
-/*.card:focus .cardContent-shadow {
-    box-shadow: 0 .63em 1.26em rgba(0, 0, 0, 0.37);
-}*/
-
 .cardImageContainer {
     display: flex;
 }
@@ -767,7 +763,7 @@ button {
 }
 
 .cardOverlayContainer {
-    background: radial-gradient(farthest-corner at 50% 50%,rgba(30,30,30,.5) 50%,#2c2c2c 100%);
+    background: rgba(0,0,0,0.5);
     opacity: 0;
     transition: opacity .2s;
     position: absolute;
@@ -810,7 +806,7 @@ button {
     left: 50%;
 }
 
-    .cardOverlayFab-primary i {
-        border: .07em solid rgba(255,255,255,.9);
-        color: #fff;
-    }
+.cardOverlayFab-primary i {
+    border: .07em solid rgba(255,255,255,.9);
+    color: #fff;
+}
diff --git a/src/components/cardbuilder/cardbuilder.js b/src/components/cardbuilder/cardbuilder.js
index 2885d7f75..d1e502e76 100644
--- a/src/components/cardbuilder/cardbuilder.js
+++ b/src/components/cardbuilder/cardbuilder.js
@@ -1537,18 +1537,11 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
             var btnCssClass = 'cardOverlayButton cardOverlayButton-hover itemAction';
 
             if (playbackManager.canPlay(item)) {
-
                 html += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayFab-primary" data-action="resume"><i class="md-icon cardOverlayButtonIcon">&#xE037;</i></button>';
             }
 
             html += '<div class="cardOverlayButton-br">';
 
-            //if (itemHelper.canEdit({ Policy: { IsAdministrator: true } }, item)) {
-
-            //    //require(['emby-playstatebutton']);
-            //    html += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="edit"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE254;</i></button>';
-            //}
-
             var userData = item.UserData || {};
 
             if (itemHelper.canMarkPlayed(item)) {
diff --git a/src/components/displaysettings/displaysettings.js b/src/components/displaysettings/displaysettings.js
index 680c6b634..fea7d9bd3 100644
--- a/src/components/displaysettings/displaysettings.js
+++ b/src/components/displaysettings/displaysettings.js
@@ -2,25 +2,19 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', '
     "use strict";
 
     function fillThemes(select, isDashboard) {
-
         select.innerHTML = skinManager.getThemes().map(function (t) {
-
             var value = t.id;
-
             if (t.isDefault && !isDashboard) {
                 value = '';
-            }
-            else if (t.isDefaultServerDashboard && isDashboard) {
+            } else if (t.isDefaultServerDashboard && isDashboard) {
                 value = '';
             }
 
             return '<option value="' + value + '">' + t.name + '</option>';
-
         }).join('');
     }
 
     function loadScreensavers(context, userSettings) {
-
         var selectScreensaver = context.querySelector('.selectScreensaver');
         var options = pluginManager.ofType('screensaver').map(function (plugin) {
             return {
diff --git a/src/components/emby-slider/emby-slider.css b/src/components/emby-slider/emby-slider.css
index 179270e22..4a0457141 100644
--- a/src/components/emby-slider/emby-slider.css
+++ b/src/components/emby-slider/emby-slider.css
@@ -158,8 +158,6 @@ _:-ms-input-placeholder {
 }
 
 .mdl-slider-background-flex-container {
-    padding-left: 10px;
-    padding-right: 10px;
     width: 100%;
     box-sizing: border-box;
     margin-top: -.05em;
diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js
index fa7b5aee1..e50bc1c53 100644
--- a/src/components/favoriteitems.js
+++ b/src/components/favoriteitems.js
@@ -111,7 +111,7 @@ define(["loading", "libraryBrowser", "cardBuilder", "dom", "apphost", "imageLoad
             var html = "";
             if (result.Items.length) {
                 if (html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">', !layoutManager.tv && options.Limit && result.Items.length >= options.Limit) {
-                    html += '<a is="emby-linkbutton" href="' + ("list/list.html?serverId=" + ApiClient.serverId() + "&type=" + section.types + "&IsFavorite=true") + '" class="more button-flat button-flat-mini sectionTitleTextButton">', html += '<h2 class="sectionTitle sectionTitle-cards">', html += globalize.translate(section.name), html += "</h2>", html += '<i class="md-icon">&#xE5CC;</i>', html += "</a>"
+                    html += '<a is="emby-linkbutton" href="' + ("list.html?serverId=" + ApiClient.serverId() + "&type=" + section.types + "&IsFavorite=true") + '" class="more button-flat button-flat-mini sectionTitleTextButton">', html += '<h2 class="sectionTitle sectionTitle-cards">', html += globalize.translate(section.name), html += "</h2>", html += '<i class="md-icon">&#xE5CC;</i>', html += "</a>"
                 } else html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>";
                 if (html += "</div>", enableScrollX()) {
                     var scrollXClass = "scrollX hiddenScrollX";
diff --git a/src/components/homescreensettings/homescreensettings.template.html b/src/components/homescreensettings/homescreensettings.template.html
index 6295af0df..2cb1dcbe1 100644
--- a/src/components/homescreensettings/homescreensettings.template.html
+++ b/src/components/homescreensettings/homescreensettings.template.html
@@ -1,10 +1,6 @@
 <form style="margin:0 auto;">
-
     <div class="verticalSection verticalSection-extrabottompadding">
-
-        <h2 class="sectionTitle">
-            ${HeaderHomeScreen}
-        </h2>
+        <h2 class="sectionTitle">${HeaderHome}</h2>
 
         <div class="selectContainer hide selectTVHomeScreenContainer">
             <select is="emby-select" class="selectTVHomeScreen" label="${LabelTVHomeScreen}">
diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js
index 0c30a015c..2f4f51e39 100644
--- a/src/components/homesections/homesections.js
+++ b/src/components/homesections/homesections.js
@@ -183,28 +183,19 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function getLibraryButtonsHtml(items) {
-
         var html = "";
 
         html += '<div class="verticalSection verticalSection-extrabottompadding">';
         html += '<div class="sectionTitleContainer sectionTitleContainer-cards">';
         html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + globalize.translate('HeaderMyMedia') + '</h2>';
-
-        if (!layoutManager.tv) {
-            html += '<button type="button" is="paper-icon-button-light" class="sectionTitleIconButton btnHomeScreenSettings"><i class="md-icon">&#xE5D3;</i></button>';
-        }
-
         html += '</div>';
 
         html += '<div is="emby-itemscontainer" class="itemsContainer padded-left padded-right vertical-wrap focuscontainer-x" data-multiselect="false">';
 
         // "My Library" backgrounds
         for (var i = 0, length = items.length; i < length; i++) {
-
             var item = items[i];
-
             var icon;
-
             switch (item.CollectionType) {
                 case "movies":
                     icon = "local_movies";
@@ -258,7 +249,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         var html = getLibraryButtonsHtml(userViews);
 
         elem.innerHTML = html;
-        bindHomeScreenSettingsIcon(elem, apiClient, user.Id, userSettings);
         imageLoader.lazyChildren(elem);
     }
 
@@ -410,42 +400,11 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
     }
 
     function getRequirePromise(deps) {
-
         return new Promise(function (resolve, reject) {
-
             require(deps, resolve);
         });
     }
 
-    function showHomeScreenSettings(elem, options) {
-        return getRequirePromise(['homescreenSettingsDialog']).then(function (homescreenSettingsDialog) {
-
-            return homescreenSettingsDialog.show(options).then(function () {
-
-                dom.parentWithClass(elem, 'homeSectionsContainer').dispatchEvent(new CustomEvent('settingschange', {
-                    cancelable: false
-                }));
-            });
-        });
-    }
-
-    function bindHomeScreenSettingsIcon(elem, apiClient, userId, userSettings) {
-
-        var btnHomeScreenSettings = elem.querySelector('.btnHomeScreenSettings');
-        if (!btnHomeScreenSettings) {
-            return;
-        }
-
-        btnHomeScreenSettings.addEventListener('click', function () {
-            showHomeScreenSettings(elem, {
-                serverId: apiClient.serverId(),
-                userId: userId,
-                userSettings: userSettings
-
-            });
-        });
-    }
-
     function loadLibraryTiles(elem, apiClient, user, userSettings, shape, userViews, allSections) {
 
         elem.classList.remove('verticalSection');
@@ -460,11 +419,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
             html += '<div class="sectionTitleContainer sectionTitleContainer-cards">';
             html += '<h2 class="sectionTitle sectionTitle-cards padded-left">' + globalize.translate('HeaderMyMedia') + '</h2>';
-
-            if (!layoutManager.tv) {
-                html += '<button type="button" is="paper-icon-button-light" class="sectionTitleIconButton btnHomeScreenSettings"><i class="md-icon">&#xE5D3;</i></button>';
-            }
-
             html += '</div>';
 
             if (scrollX) {
@@ -492,7 +446,6 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
         }
 
         elem.innerHTML = html;
-        bindHomeScreenSettingsIcon(elem, apiClient, user.Id, userSettings);
         imageLoader.lazyChildren(elem);
     }
 
diff --git a/src/components/itemhelper.js b/src/components/itemhelper.js
index 19845ca4a..f8bdb28ac 100644
--- a/src/components/itemhelper.js
+++ b/src/components/itemhelper.js
@@ -16,16 +16,13 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
         var name = ((item.Type === 'Program' || item.Type === 'Recording') && (item.IsSeries || item.EpisodeTitle) ? item.EpisodeTitle : item.Name) || '';
 
         if (item.Type === "TvChannel") {
-
             if (item.ChannelNumber) {
                 return item.ChannelNumber + ' ' + name;
             }
             return name;
         }
-        if (/*options.isInlineSpecial &&*/ item.Type === "Episode" && item.ParentIndexNumber === 0) {
-
+        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;
@@ -104,7 +101,7 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
 
         var itemType = item.Type;
 
-        if (itemType === "UserRootFolder" || /*itemType == "CollectionFolder" ||*/ itemType === "UserView") {
+        if (itemType === "UserRootFolder" || itemType === "UserView") {
             return false;
         }
 
diff --git a/src/components/nowplayingbar/nowplayingbar.css b/src/components/nowplayingbar/nowplayingbar.css
index 80f078d88..14b08a20a 100644
--- a/src/components/nowplayingbar/nowplayingbar.css
+++ b/src/components/nowplayingbar/nowplayingbar.css
@@ -119,7 +119,6 @@
     height: 1.2em !important;
 }
 
-
 @media all and (max-width: 70em) {
 
     .nowPlayingBarRight .nowPlayingBarUserDataButtons {
@@ -133,52 +132,32 @@
     }
 }
 
-
 @media all and (max-width: 62em) {
-
     .nowPlayingBarCenter .nowPlayingBarCurrentTime {
         display: none !important;
     }
-
 }
 
 @media all and (max-width: 56em) {
-
     .nowPlayingBarCenter {
         display: none !important;
     }
-
 }
 
-
 @media all and (min-width: 56em) {
-
     .nowPlayingBarRight .playPauseButton {
         display: none;
     }
-
-}
-
-@media all and (max-width: 40em) {
-
-    .nowPlayingBarInfoContainer .nowPlayingImage {
-        display: none;
-    }
-
 }
 
 @media all and (max-width: 36em) {
-
     .nowPlayingBarRight .nowPlayingBarVolumeSliderContainer {
         display: none !important;
     }
-
 }
 
 @media all and (max-width: 24em) {
-
-  .nowPlayingBar .muteButton, .nowPlayingBar .unmuteButton {
-    display: none;
-  }
-
+    .nowPlayingBar .muteButton, .nowPlayingBar .unmuteButton {
+        display: none;
+    }
 }
diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js
index b51027fe0..acfba8181 100644
--- a/src/components/playback/playersettingsmenu.js
+++ b/src/components/playback/playersettingsmenu.js
@@ -16,7 +16,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
         });
 
         var menuItems = options.map(function (o) {
-
             var opt = {
                 name: o.name,
                 id: o.bitrate,
@@ -39,25 +38,19 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
         return actionsheet.show({
             items: menuItems,
             positionTo: btn
-
         }).then(function (id) {
             var bitrate = parseInt(id);
             if (bitrate !== selectedId) {
-
                 playbackManager.setMaxStreamingBitrate({
-
                     enableAutomaticBitrateDetection: bitrate ? false : true,
                     maxBitrate: bitrate
-
                 }, player);
             }
         });
     }
 
     function showRepeatModeMenu(player, btn) {
-
         var menuItems = [];
-
         var currentValue = playbackManager.getRepeatMode(player);
 
         menuItems.push({
@@ -65,6 +58,7 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
             id: 'RepeatAll',
             selected: currentValue === 'RepeatAll'
         });
+
         menuItems.push({
             name: globalize.translate('RepeatOne'),
             id: 'RepeatOne',
@@ -80,9 +74,7 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
         return actionsheet.show({
             items: menuItems,
             positionTo: btn
-
         }).then(function (mode) {
-
             if (mode) {
                 playbackManager.setRepeatMode(mode, player);
             }
@@ -90,15 +82,14 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
     }
 
     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";
         })[0];
+
         var videoWidth = videoStream ? videoStream.Width : null;
 
         var options = qualityoptions.getVideoQualityOptions({
@@ -109,7 +100,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
         });
 
         var menuItems = options.map(function (o) {
-
             var opt = {
                 name: o.name,
                 id: o.bitrate,
@@ -132,7 +122,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
         }
 
         selectedOption = selectedOption[0];
-
         var text = selectedOption.name;
 
         if (selectedOption.autoText) {
@@ -196,11 +185,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
             });
         }
 
-        menuItems.push({
-            name: globalize.translate('PlaybackSettings'),
-            id: 'playbacksettings'
-        });
-
         if (user && user.Policy.EnableVideoPlaybackTranscoding) {
             var secondaryQualityText = getQualitySecondaryText(player);
 
@@ -214,7 +198,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
         var repeatMode = playbackManager.getRepeatMode(player);
 
         if (supportedCommands.indexOf('SetRepeatMode') !== -1 && playbackManager.currentMediaSource(player).RunTimeTicks) {
-
             menuItems.push({
                 name: globalize.translate('RepeatMode'),
                 id: 'repeatmode',
@@ -223,34 +206,23 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
         }
 
         if (options.stats) {
-
             menuItems.push({
-                name: globalize.translate('StatsForNerds'),
+                name: globalize.translate('PlaybackData'),
                 id: 'stats',
                 asideText: null
             });
         }
 
-        menuItems.push({
-            name: globalize.translate('SubtitleSettings'),
-            id: 'subtitlesettings'
-        });
-
         return actionsheet.show({
-
             items: menuItems,
             positionTo: options.positionTo
-
         }).then(function (id) {
-
             return handleSelectedOption(id, options, player);
         });
     }
 
     function show(options) {
-
         var player = options.player;
-
         var currentItem = playbackManager.currentItem(player);
 
         if (!currentItem || !currentItem.ServerId) {
@@ -258,45 +230,19 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
         }
 
         var apiClient = connectionManager.getApiClient(currentItem.ServerId);
-
         return apiClient.getCurrentUser().then(function (user) {
             return showWithUser(options, player, user);
         });
     }
 
-    function alertText(text) {
-
-        return new Promise(function (resolve, reject) {
-
-            require(['alert'], function (alert) {
-
-                alert(text).then(resolve);
-            });
-        });
-    }
-
-    function showSubtitleSettings(player, btn) {
-        return alertText(globalize.translate('SubtitleSettingsIntro'));
-    }
-
-    function showPlaybackSettings(player, btn) {
-        return alertText(globalize.translate('PlaybackSettingsIntro'));
-    }
-
     function handleSelectedOption(id, options, player) {
-
         switch (id) {
-
             case 'quality':
                 return showQualityMenu(player, options.positionTo);
             case 'aspectratio':
                 return showAspectRatioMenu(player, options.positionTo);
             case 'repeatmode':
                 return showRepeatModeMenu(player, options.positionTo);
-            case 'subtitlesettings':
-                return showSubtitleSettings(player, options.positionTo);
-            case 'playbacksettings':
-                return showPlaybackSettings(player, options.positionTo);
             case 'stats':
                 if (options.onOption) {
                     options.onOption('stats');
diff --git a/src/components/skinManager.js b/src/components/skinManager.js
index d5dd0aa07..a9af80a87 100644
--- a/src/components/skinManager.js
+++ b/src/components/skinManager.js
@@ -7,7 +7,6 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
     function unloadTheme() {
         var elem = themeStyleElement;
         if (elem) {
-
             elem.parentNode.removeChild(elem);
             themeStyleElement = null;
             currentThemeId = null;
@@ -16,7 +15,6 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
 
     function loadUserSkin(options) {
         options = options || {};
-
         if (options.start) {
             Emby.Page.invokeShortcut(options.start);
         } else {
@@ -37,28 +35,34 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
             isDefault: true,
             isDefaultServerDashboard: true
         }, {
-            name: "Dark (green accent)",
+            name: "Dark Classic",
+            id: "dark-classic",
+        }, {
+            name: "Dark (Green Accent)",
             id: "dark-green"
         }, {
-            name: "Dark (red accent)",
+            name: "Dark (Red Accent)",
             id: "dark-red"
         }, {
             name: "Light",
             id: "light"
         }, {
-            name: "Light (blue accent)",
+            name: "Light Classic",
+            id: "light-classic"
+        }, {
+            name: "Light (Blue Accent)",
             id: "light-blue"
         }, {
-            name: "Light (green accent)",
+            name: "Light (Green Accent)",
             id: "light-green"
         }, {
-            name: "Light (pink accent)",
+            name: "Light (Pink Accent)",
             id: "light-pink"
         }, {
-            name: "Light (purple accent)",
+            name: "Light (Purple Accent)",
             id: "light-purple"
         }, {
-            name: "Light (red accent)",
+            name: "Light (Red Accent)",
             id: "light-red"
         }, {
             name: "Windows Media Center",
@@ -71,7 +75,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
         loadUserSkin: loadUserSkin
     };
 
-    function getThemeStylesheetInfo(id, requiresRegistration, isDefaultProperty) {
+    function getThemeStylesheetInfo(id, isDefaultProperty) {
         var themes = skinManager.getThemes();
         var defaultTheme;
         var selectedTheme;
@@ -122,14 +126,13 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
 
     skinManager.setTheme = function (id, context) {
         return new Promise(function (resolve, reject) {
-            var requiresRegistration = true;
             if (currentThemeId && currentThemeId === id) {
                 resolve();
                 return;
             }
 
             var isDefaultProperty = context === 'serverdashboard' ? 'isDefaultServerDashboard' : 'isDefault';
-            var info = getThemeStylesheetInfo(id, requiresRegistration, isDefaultProperty);
+            var info = getThemeStylesheetInfo(id, isDefaultProperty);
             if (currentThemeId && currentThemeId === info.themeId) {
                 resolve();
                 return;
@@ -181,21 +184,16 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
     document.addEventListener('viewshow', onViewBeforeShow);
 
     function playSound(path, volume) {
-
         lastSound = new Date().getTime();
-
         require(['howler'], function (howler) {
-
             try {
                 var sound = new Howl({
                     src: [path],
                     volume: volume || 0.1
                 });
-
                 sound.play();
                 currentSound = sound;
-            }
-            catch (err) {
+            } catch (err) {
                 console.log('Error playing sound: ' + err);
             }
         });
diff --git a/src/components/userdatabuttons/emby-playstatebutton.js b/src/components/userdatabuttons/emby-playstatebutton.js
index 7480cd0d7..eaed12893 100644
--- a/src/components/userdatabuttons/emby-playstatebutton.js
+++ b/src/components/userdatabuttons/emby-playstatebutton.js
@@ -2,14 +2,12 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
     'use strict';
 
     function addNotificationEvent(instance, name, handler) {
-
         var localHandler = handler.bind(instance);
         events.on(serverNotifications, name, localHandler);
         instance[name] = localHandler;
     }
 
     function removeNotificationEvent(instance, name) {
-
         var handler = instance[name];
         if (handler) {
             events.off(serverNotifications, name, handler);
@@ -25,31 +23,22 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         var apiClient = connectionManager.getApiClient(serverId);
 
         if (!button.classList.contains('playstatebutton-played')) {
-
             apiClient.markPlayed(apiClient.getCurrentUserId(), id, new Date());
-
             setState(button, true);
-
         } else {
-
             apiClient.markUnplayed(apiClient.getCurrentUserId(), id, new Date());
-
             setState(button, false);
         }
     }
 
     function onUserDataChanged(e, apiClient, userData) {
-
         var button = this;
-
         if (userData.ItemId === button.getAttribute('data-id')) {
-
             setState(button, userData.Played);
         }
     }
 
     function setState(button, played, updateAttribute) {
-
         var icon = button.iconElement;
         if (!icon) {
             button.iconElement = button.querySelector('i');
@@ -57,18 +46,13 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         }
 
         if (played) {
-
             button.classList.add('playstatebutton-played');
-
             if (icon) {
                 icon.classList.add('playstatebutton-icon-played');
                 icon.classList.remove('playstatebutton-icon-unplayed');
             }
-
         } else {
-
             button.classList.remove('playstatebutton-played');
-
             if (icon) {
                 icon.classList.remove('playstatebutton-icon-played');
                 icon.classList.add('playstatebutton-icon-unplayed');
diff --git a/src/controllers/devices.js b/src/controllers/devices.js
index e4c2f6b44..d85b6e901 100644
--- a/src/controllers/devices.js
+++ b/src/controllers/devices.js
@@ -43,7 +43,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "humanedate", "emby-button
                 callback: function(id) {
                     switch (id) {
                         case "open":
-                            Dashboard.navigate("devices/device.html?id=" + deviceId);
+                            Dashboard.navigate("device.html?id=" + deviceId);
                             break;
                         case "delete":
                             deleteDevice(view, deviceId)
@@ -57,7 +57,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "humanedate", "emby-button
         var html = "";
         html += devices.map(function(device) {
             var deviceHtml = "";
-            deviceHtml += "<div data-id='" + device.Id + "' class='card backdropCard'>", deviceHtml += '<div class="cardBox visualCardBox">', deviceHtml += '<div class="cardScalable">', deviceHtml += '<div class="cardPadder cardPadder-backdrop"></div>', deviceHtml += '<a is="emby-linkbutton" href="' + (canEdit ? "devices/device.html?id=" + device.Id : "#") + '" class="cardContent cardImageContainer">';
+            deviceHtml += "<div data-id='" + device.Id + "' class='card backdropCard'>", deviceHtml += '<div class="cardBox visualCardBox">', deviceHtml += '<div class="cardScalable">', deviceHtml += '<div class="cardPadder cardPadder-backdrop"></div>', deviceHtml += '<a is="emby-linkbutton" href="' + (canEdit ? "device.html?id=" + device.Id : "#") + '" class="cardContent cardImageContainer">';
             var iconUrl = device.IconUrl;
             return iconUrl && -1 === iconUrl.indexOf("://") && (iconUrl = ApiClient.getUrl(iconUrl)), iconUrl ? (deviceHtml += '<div class="cardImage" style="background-image:url(\'' + iconUrl + "');background-size: auto 64%;background-position:center center;\">", deviceHtml += "</div>") : deviceHtml += '<i class="cardImageIcon md-icon">tablet_android</i>', deviceHtml += "</a>", deviceHtml += "</div>", deviceHtml += '<div class="cardFooter">', (canEdit || canDelete(device.Id)) && (deviceHtml += '<div style="text-align:right; float:right;padding-top:5px;">', deviceHtml += '<button type="button" is="paper-icon-button-light" data-id="' + device.Id + '" title="' + globalize.translate("Menu") + '" class="btnDeviceMenu"><i class="md-icon">&#xE5D3;</i></button>', deviceHtml += "</div>"), deviceHtml += "<div class='cardText'>", deviceHtml += device.Name, deviceHtml += "</div>", deviceHtml += "<div class='cardText cardText-secondary'>", deviceHtml += device.AppName + " " + device.AppVersion, deviceHtml += "</div>", deviceHtml += "<div class='cardText cardText-secondary'>", device.LastUserName && (deviceHtml += device.LastUserName, deviceHtml += ", " + humane_date(device.DateLastActivity)), deviceHtml += "&nbsp;", deviceHtml += "</div>", deviceHtml += "</div>", deviceHtml += "</div>", deviceHtml += "</div>"
         }).join(""), page.querySelector(".devicesList").innerHTML = html
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index 3a0e776d3..f352f71c0 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -967,7 +967,25 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             var stream = version.MediaStreams[i];
             if ("Data" != stream.Type) {
                 html += '<div class="mediaInfoStream">';
-                html += '<h3 class="mediaInfoStreamType">' + globalize.translate("MediaInfoStreamType" + stream.Type) + "</h3>";
+                html += '<h3 class="mediaInfoStreamType">';
+                switch (stream.Type) {
+                    case 'Audio':
+                        html += globalize.translate("MediaInfoStreamTypeAudio");
+                        break;
+                    case 'Subtitle':
+                        html += globalize.translate("MediaInfoStreamTypeSubtitle");
+                        break;
+                    case 'Video':
+                        html += globalize.translate("MediaInfoStreamTypeVideo");
+                        break;
+                    case 'Data':
+                        html += globalize.translate("MediaInfoStreamTypeData");
+                        break;
+                    case 'EmbeddedImage':
+                        html += globalize.translate("MediaInfoStreamTypeEmbeddedImage");
+                        break;
+                }
+                html += "</h3>";
                 var attributes = [];
                 stream.DisplayTitle && attributes.push(createAttribute("Title", stream.DisplayTitle)), stream.Language && "Video" != stream.Type && attributes.push(createAttribute(globalize.translate("MediaInfoLanguage"), stream.Language)), stream.Codec && attributes.push(createAttribute(globalize.translate("MediaInfoCodec"), stream.Codec.toUpperCase())), stream.CodecTag && attributes.push(createAttribute(globalize.translate("MediaInfoCodecTag"), stream.CodecTag)), null != stream.IsAVC && attributes.push(createAttribute("AVC", stream.IsAVC ? "Yes" : "No")), stream.Profile && attributes.push(createAttribute(globalize.translate("MediaInfoProfile"), stream.Profile)), stream.Level && attributes.push(createAttribute(globalize.translate("MediaInfoLevel"), stream.Level)), (stream.Width || stream.Height) && attributes.push(createAttribute(globalize.translate("MediaInfoResolution"), stream.Width + "x" + stream.Height)), stream.AspectRatio && "mjpeg" != stream.Codec && attributes.push(createAttribute(globalize.translate("MediaInfoAspectRatio"), stream.AspectRatio)), "Video" == stream.Type && (null != stream.IsAnamorphic && attributes.push(createAttribute(globalize.translate("MediaInfoAnamorphic"), stream.IsAnamorphic ? "Yes" : "No")), attributes.push(createAttribute(globalize.translate("MediaInfoInterlaced"), stream.IsInterlaced ? "Yes" : "No"))), (stream.AverageFrameRate || stream.RealFrameRate) && attributes.push(createAttribute(globalize.translate("MediaInfoFramerate"), stream.AverageFrameRate || stream.RealFrameRate)), stream.ChannelLayout && attributes.push(createAttribute(globalize.translate("MediaInfoLayout"), stream.ChannelLayout)), stream.Channels && attributes.push(createAttribute(globalize.translate("MediaInfoChannels"), stream.Channels + " ch")), stream.BitRate && "mjpeg" != stream.Codec && attributes.push(createAttribute(globalize.translate("MediaInfoBitrate"), parseInt(stream.BitRate / 1e3) + " kbps")), stream.SampleRate && attributes.push(createAttribute(globalize.translate("MediaInfoSampleRate"), stream.SampleRate + " Hz")), stream.VideoRange && "SDR" !== stream.VideoRange && attributes.push(createAttribute(globalize.translate("VideoRange"), stream.VideoRange)), stream.ColorPrimaries && attributes.push(createAttribute(globalize.translate("ColorPrimaries"), stream.ColorPrimaries)), stream.ColorSpace && attributes.push(createAttribute(globalize.translate("ColorSpace"), stream.ColorSpace)), stream.ColorTransfer && attributes.push(createAttribute(globalize.translate("ColorTransfer"), stream.ColorTransfer)), stream.BitDepth && attributes.push(createAttribute(globalize.translate("MediaInfoBitDepth"), stream.BitDepth + " bit")), stream.PixelFormat && attributes.push(createAttribute(globalize.translate("MediaInfoPixelFormat"), stream.PixelFormat)), stream.RefFrames && attributes.push(createAttribute(globalize.translate("MediaInfoRefFrames"), stream.RefFrames)), stream.NalLengthSize && attributes.push(createAttribute("NAL", stream.NalLengthSize)), "Video" != stream.Type && attributes.push(createAttribute(globalize.translate("MediaInfoDefault"), stream.IsDefault ? "Yes" : "No")), "Subtitle" == stream.Type && (attributes.push(createAttribute(globalize.translate("MediaInfoForced"), stream.IsForced ? "Yes" : "No")), attributes.push(createAttribute(globalize.translate("MediaInfoExternal"), stream.IsExternal ? "Yes" : "No"))), "Video" == stream.Type && version.Timestamp && attributes.push(createAttribute(globalize.translate("MediaInfoTimestamp"), version.Timestamp)), html += attributes.join("<br/>"), html += "</div>"
             }
diff --git a/src/controllers/mypreferencescommon.js b/src/controllers/mypreferencescommon.js
index e52fcc1b3..51e9c1086 100644
--- a/src/controllers/mypreferencescommon.js
+++ b/src/controllers/mypreferencescommon.js
@@ -31,7 +31,7 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
             });
 
             Dashboard.getCurrentUser().then(function(user) {
-                page.querySelector(".headerUser").innerHTML = user.Name;
+                page.querySelector(".headerUsername").innerHTML = user.Name;
                 if (user.Policy.IsAdministrator) {
                     page.querySelector(".adminSection").classList.remove("hide");
                 } else {
diff --git a/src/css/dashboard.css b/src/css/dashboard.css
index 6568f7637..47ccacf1c 100644
--- a/src/css/dashboard.css
+++ b/src/css/dashboard.css
@@ -63,10 +63,6 @@ progress[aria-valuenow]:before {
     }
 }
 
-.dashboardDocument {
-    font-size: 94.1%
-}
-
 .dashboardDocument .dashboardEntryHeaderButton,
 .dashboardDocument .lnkManageServer {
     display: none !important
diff --git a/src/dashboard.html b/src/dashboard.html
index ba973280e..71c4bf5e1 100644
--- a/src/dashboard.html
+++ b/src/dashboard.html
@@ -33,7 +33,7 @@
                 </div>
 
                 <div class="dashboardSection" style="padding-left: 0;">
-                    <a is="emby-linkbutton" href="devices/devices.html" style="margin-left:.8em!important;" class="button-flat sectionTitleTextButton">
+                    <a is="emby-linkbutton" href="devices.html" style="margin-left:.8em!important;" class="button-flat sectionTitleTextButton">
                         <h3 style="margin:0;">${HeaderActiveDevices}</h3>
                         <i class="md-icon">&#xE5CC;</i>
                     </a>
diff --git a/src/devices/device.html b/src/device.html
similarity index 100%
rename from src/devices/device.html
rename to src/device.html
diff --git a/src/devices/devices.html b/src/devices.html
similarity index 100%
rename from src/devices/devices.html
rename to src/devices.html
diff --git a/src/img/logindefault.png b/src/img/logindefault.png
index d88cc2805..0453f2489 100644
Binary files a/src/img/logindefault.png and b/src/img/logindefault.png differ
diff --git a/src/list/list.html b/src/list.html
similarity index 98%
rename from src/list/list.html
rename to src/list.html
index 929c1596f..516170424 100644
--- a/src/list/list.html
+++ b/src/list.html
@@ -1,10 +1,7 @@
 <div data-role="page" class="view flex flex-direction-column page libraryPage noSecondaryNavPage" data-backbutton="true">
-
-    <div class="alphaPicker alphaPicker-vertical alphaPicker-fixed focuscontainer-y hide"></div>
-
-
+    <div class="alphaPicker alphaPicker-vertical alphaPicker-fixed focuscontainer-y hide">
+    </div>
     <div class="flex-grow padded-left padded-right pageContainerTopPadding">
-
         <div class="flex align-items-center focuscontainer-x itemsViewSettingsContainer padded-top padded-bottom flex-wrap-wrap">
             <button is="emby-button" class="btnPlay button-flat hide listTextButton-autohide">
                 <span>${HeaderPlayAll}</span>
@@ -51,7 +48,6 @@
                 <i class="md-icon">&#xE5D3;</i>
             </button>
         </div>
-
         <div is="emby-itemscontainer" class="vertical-wrap itemsContainer centered" style="padding: 0 0 10vh 0;">
         </div>
     </div>
diff --git a/src/livetv.html b/src/livetv.html
index b4ef35d9b..2bc99b2b8 100644
--- a/src/livetv.html
+++ b/src/livetv.html
@@ -5,7 +5,7 @@
         <div class="pageTabContent" id="suggestionsTab" data-index="0">
             <div id="activePrograms" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
-                    <a href="list/list.html?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
+                    <a href="list.html?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderOnNow}</h2>
                         <i class="md-icon">&#xE5CC;</i>
                     </a>
@@ -14,7 +14,7 @@
             </div>
             <div id="upcomingEpisodes" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
-                    <a href="list/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
+                    <a href="list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${TabShows}</h2>
                         <i class="md-icon">&#xE5CC;</i>
                     </a>
@@ -23,7 +23,7 @@
             </div>
             <div id="upcomingTvMovies" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
-                    <a href="list/list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
+                    <a href="list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderMovies}</h2>
                         <i class="md-icon">&#xE5CC;</i>
                     </a>
@@ -32,7 +32,7 @@
             </div>
             <div id="upcomingSports" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
-                    <a href="list/list.html?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
+                    <a href="list.html?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Sports}</h2>
                         <i class="md-icon">&#xE5CC;</i>
                     </a>
@@ -41,7 +41,7 @@
             </div>
             <div id="upcomingKids" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
-                    <a href="list/list.html?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
+                    <a href="list.html?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderForKids}</h2>
                         <i class="md-icon">&#xE5CC;</i>
                     </a>
@@ -50,7 +50,7 @@
             </div>
             <div id="upcomingNews" class="verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
-                    <a href="list/list.html?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
+                    <a href="list.html?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${News}</h2>
                         <i class="md-icon">&#xE5CC;</i>
                     </a>
diff --git a/src/mypreferenceshome.html b/src/mypreferenceshome.html
index 371cf7fc3..d20539109 100644
--- a/src/mypreferenceshome.html
+++ b/src/mypreferenceshome.html
@@ -1,5 +1,4 @@
-<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-backbutton="true">
-
+<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeSettings}" data-backbutton="true">
     <div class="homeScreenSettingsContainer padded-left padded-right padded-bottom-page">
     </div>
 </div>
\ No newline at end of file
diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html
index 7269fe352..eda9d4208 100644
--- a/src/mypreferencesmenu.html
+++ b/src/mypreferencesmenu.html
@@ -3,6 +3,7 @@
     <div class="padded-left padded-right padded-bottom-page padded-top">
         <div class="readOnlyContent" style="margin: 0 auto;">
             <div class="verticalSection verticalSection-extrabottompadding">
+                <h2 class="sectionTitle headerUsername" style="padding-left:.25em;"></h2>
                 <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="lnkMyProfile listItem-border">
                     <div class="listItem">
                         <i class="md-icon listItemIcon listItemIcon-transparent">person</i>
@@ -25,7 +26,7 @@
                     <div class="listItem">
                         <i class="md-icon listItemIcon listItemIcon-transparent">home</i>
                         <div class="listItemBody">
-                            <div class="listItemBodyText">${TabHomeScreen}</div>
+                            <div class="listItemBodyText">${HeaderHome}</div>
                         </div>
                     </div>
                 </a>
@@ -49,28 +50,6 @@
                 </a>
             </div>
             <div class="verticalSection verticalSection-extrabottompadding">
-                <h2 class="sectionTitle headerUser" style="padding-left:.25em;"></h2>
-                <div>
-                    <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="selectserver.html" class="selectServer hide listItem-border">
-                        <div class="listItem">
-                            <i class="md-icon listItemIcon listItemIcon-transparent">wifi</i>
-                            <div class="listItemBody">
-                                <div class="listItemBodyText">${HeaderSelectServer}</div>
-                            </div>
-                        </div>
-                    </a>
-                    <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="btnLogout hide listItem-border">
-                        <div class="listItem">
-                            <i class="md-icon listItemIcon listItemIcon-transparent">exit_to_app</i>
-                            <div class="listItemBody">
-                                <div class="listItemBodyText">${ButtonSignOut}</div>
-                            </div>
-                        </div>
-                    </a>
-                </div>
-            </div>
-
-            <div class="adminSection hide verticalSection verticalSection-extrabottompadding">
                 <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderAdmin}</h2>
                 <div>
                     <a is="emby-linkbutton" href="dashboard.html" style="display: block; padding: 0; margin:0;" class="listItem-border">
@@ -93,6 +72,30 @@
                     </a>
                 </div>
             </div>
+
+            <div class="adminSection hide verticalSection verticalSection-extrabottompadding">
+                <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderUser}</h2>
+                <div>
+                    <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="selectserver.html" class="selectServer hide listItem-border">
+                        <div class="listItem">
+                            <i class="md-icon listItemIcon listItemIcon-transparent">wifi</i>
+                            <div class="listItemBody">
+                                <div class="listItemBodyText">${HeaderSelectServer}</div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div>
+                    <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="btnLogout hide listItem-border">
+                        <div class="listItem">
+                            <i class="md-icon listItemIcon listItemIcon-transparent">exit_to_app</i>
+                            <div class="listItemBody">
+                                <div class="listItemBodyText">${ButtonSignOut}</div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js
index 727532a38..a80792d17 100644
--- a/src/scripts/itembynamedetailpage.js
+++ b/src/scripts/itembynamedetailpage.js
@@ -210,7 +210,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
     }
 
     function getMoreItemsHref(item, type) {
-        return "Genre" == item.Type ? "list/list.html?type=" + type + "&genreId=" + item.Id + "&serverId=" + item.ServerId : "MusicGenre" == item.Type ? "list/list.html?type=" + type + "&musicGenreId=" + item.Id + "&serverId=" + item.ServerId : "Studio" == item.Type ? "list/list.html?type=" + type + "&studioId=" + item.Id + "&serverId=" + item.ServerId : "MusicArtist" == item.Type ? "list/list.html?type=" + type + "&artistId=" + item.Id + "&serverId=" + item.ServerId : "Person" == item.Type ? "list/list.html?type=" + type + "&personId=" + item.Id + "&serverId=" + item.ServerId : "list/list.html?type=" + type + "&parentId=" + item.Id + "&serverId=" + item.ServerId
+        return "Genre" == item.Type ? "list.html?type=" + type + "&genreId=" + item.Id + "&serverId=" + item.ServerId : "MusicGenre" == item.Type ? "list.html?type=" + type + "&musicGenreId=" + item.Id + "&serverId=" + item.ServerId : "Studio" == item.Type ? "list.html?type=" + type + "&studioId=" + item.Id + "&serverId=" + item.ServerId : "MusicArtist" == item.Type ? "list.html?type=" + type + "&artistId=" + item.Id + "&serverId=" + item.ServerId : "Person" == item.Type ? "list.html?type=" + type + "&personId=" + item.Id + "&serverId=" + item.ServerId : "list.html?type=" + type + "&parentId=" + item.Id + "&serverId=" + item.ServerId
     }
 
     function addCurrentItemToQuery(query, item) {
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index 9f21b81c1..ba8b2d306 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -193,12 +193,11 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
             html += "</div>";
         }
 
-        html += '<div class="userMenuOptions">';
-        html += '<h3 class="sidebarHeader">';
-        html += globalize.translate("HeaderUser");
-        html += "</h3>";
         if (user.localUser) {
-            html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkMySettings" href="mypreferencesmenu.html"><i class="md-icon navMenuOptionIcon">settings</i><span class="navMenuOptionText">' + globalize.translate("ButtonSettings") + "</span></a>";
+            html += '<div class="userMenuOptions">';
+            html += '<h3 class="sidebarHeader">';
+            html += globalize.translate("HeaderUser");
+            html += "</h3>";
             if (appHost.supports("multiserver")) {
                 html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">wifi</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>";
             }
@@ -308,7 +307,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
         });
         links.push({
             name: globalize.translate("TabDevices"),
-            href: "devices/devices.html",
+            href: "devices.html",
             pageIds: ["devicesPage", "devicePage"],
             icon: "devices"
         });
diff --git a/src/scripts/livetvrecordings.js b/src/scripts/livetvrecordings.js
index c56956314..aac880ebd 100644
--- a/src/scripts/livetvrecordings.js
+++ b/src/scripts/livetvrecordings.js
@@ -45,7 +45,7 @@ define(["layoutManager", "loading", "cardBuilder", "apphost", "imageLoader", "sc
             serverId = ApiClient.serverId();
         switch (type) {
             case "latest":
-                Dashboard.navigate("list/list.html?type=Recordings&serverId=" + serverId)
+                Dashboard.navigate("list.html?type=Recordings&serverId=" + serverId)
         }
     }
     return function(view, params, tabContent) {
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index bd735877f..9d98e8a93 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -62,13 +62,13 @@ define([
         controller: "dashboardhosting"
     });
     defineRoute({
-        path: "/devices/devices.html",
+        path: "/devices.html",
         autoFocus: false,
         roles: "admin",
         controller: "devices"
     });
     defineRoute({
-        path: "/devices/device.html",
+        path: "/device.html",
         autoFocus: false,
         roles: "admin",
         controller: "device"
@@ -119,7 +119,7 @@ define([
         type: "home"
     });
     defineRoute({
-        path: "/list/list.html",
+        path: "/list.html",
         autoFocus: false,
         controller: "list",
         transition: "fade"
diff --git a/src/scripts/site.js b/src/scripts/site.js
index f984f20eb..d60666b3a 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -992,11 +992,11 @@ var AppInfo = {};
                 }
 
                 if ("nextup" === item) {
-                    return "list/list.html?type=nextup&serverId=" + options.serverId;
+                    return "list.html?type=nextup&serverId=" + options.serverId;
                 }
 
                 if ("list" === item) {
-                    var url = "list/list.html?serverId=" + options.serverId + "&type=" + options.itemTypes;
+                    var url = "list.html?serverId=" + options.serverId + "&type=" + options.itemTypes;
 
                     if (options.isFavorite) {
                         url += "&IsFavorite=true";
@@ -1011,27 +1011,27 @@ var AppInfo = {};
                     }
 
                     if ("movies" === options.section) {
-                        return "list/list.html?type=Programs&IsMovie=true&serverId=" + options.serverId;
+                        return "list.html?type=Programs&IsMovie=true&serverId=" + options.serverId;
                     }
 
                     if ("shows" === options.section) {
-                        return "list/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=" + options.serverId;
+                        return "list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=" + options.serverId;
                     }
 
                     if ("sports" === options.section) {
-                        return "list/list.html?type=Programs&IsSports=true&serverId=" + options.serverId;
+                        return "list.html?type=Programs&IsSports=true&serverId=" + options.serverId;
                     }
 
                     if ("kids" === options.section) {
-                        return "list/list.html?type=Programs&IsKids=true&serverId=" + options.serverId;
+                        return "list.html?type=Programs&IsKids=true&serverId=" + options.serverId;
                     }
 
                     if ("news" === options.section) {
-                        return "list/list.html?type=Programs&IsNews=true&serverId=" + options.serverId;
+                        return "list.html?type=Programs&IsNews=true&serverId=" + options.serverId;
                     }
 
                     if ("onnow" === options.section) {
-                        return "list/list.html?type=Programs&IsAiring=true&serverId=" + options.serverId;
+                        return "list.html?type=Programs&IsAiring=true&serverId=" + options.serverId;
                     }
 
                     if ("dvrschedule" === options.section) {
@@ -1050,7 +1050,7 @@ var AppInfo = {};
                 }
 
                 if ("Genre" === item.Type) {
-                    url = "list/list.html?genreId=" + item.Id + "&serverId=" + serverId;
+                    url = "list.html?genreId=" + item.Id + "&serverId=" + serverId;
 
                     if ("livetv" === context) {
                         url += "&type=Programs";
@@ -1064,7 +1064,7 @@ var AppInfo = {};
                 }
 
                 if ("MusicGenre" === item.Type) {
-                    url = "list/list.html?musicGenreId=" + item.Id + "&serverId=" + serverId;
+                    url = "list.html?musicGenreId=" + item.Id + "&serverId=" + serverId;
 
                     if (options.parentId) {
                         url += "&parentId=" + options.parentId;
@@ -1074,7 +1074,7 @@ var AppInfo = {};
                 }
 
                 if ("Studio" === item.Type) {
-                    url = "list/list.html?studioId=" + item.Id + "&serverId=" + serverId;
+                    url = "list.html?studioId=" + item.Id + "&serverId=" + serverId;
 
                     if (options.parentId) {
                         url += "&parentId=" + options.parentId;
@@ -1123,7 +1123,7 @@ var AppInfo = {};
 
                 if (item.IsFolder) {
                     if (id) {
-                        return "list/list.html?parentId=" + id + "&serverId=" + serverId;
+                        return "list.html?parentId=" + id + "&serverId=" + serverId;
                     }
 
                     return "#";
diff --git a/src/strings/ar.json b/src/strings/ar.json
index 4ca4e3770..0a46953f7 100644
--- a/src/strings/ar.json
+++ b/src/strings/ar.json
@@ -202,7 +202,6 @@
     "HeaderFrequentlyPlayed": "تم تشغيله مراراً",
     "HeaderGenres": "أنواع الأفلام",
     "HeaderGuideProviders": "مزودو الأدلة",
-    "HeaderHomeScreenSettings": "إعدادات الصفحة الرئيسية",
     "HeaderHttpHeaders": "رؤوس http",
     "HeaderIdentification": "التعريفة",
     "HeaderIdentificationCriteriaHelp": "أدخل على الأقل معيار واحد للتعريف",
@@ -845,7 +844,6 @@
     "TabFavorites": "المفضلة",
     "TabGenres": "أنواع الأفلام",
     "TabGuide": "الدليل",
-    "TabHomeScreen": "الشاشة الرئيسية",
     "TabHosting": "الاستضافة",
     "TabInfo": "معلومات",
     "TabLatest": "الاخير",
diff --git a/src/strings/bg-bg.json b/src/strings/bg-bg.json
index 583a0bdb3..de817d0eb 100644
--- a/src/strings/bg-bg.json
+++ b/src/strings/bg-bg.json
@@ -198,8 +198,6 @@
   "HeaderFrequentlyPlayed": "Често пускани",
   "HeaderGenres": "Жанрове",
   "HeaderGuideProviders": "Доставчици на справочници",
-  "HeaderHomeScreen": "Начален екран",
-  "HeaderHomeScreenSettings": "Настройки на началния екран",
   "HeaderIdentification": "Идентификация",
   "HeaderImageSettings": "Настройки на картината",
   "HeaderInstall": "Инсталиране",
@@ -723,7 +721,6 @@
   "TabFavorites": "Любими",
   "TabGenres": "Жанрове",
   "TabGuide": "Ръководство",
-  "TabHomeScreen": "Начален екран",
   "TabHosting": "Хостинг",
   "TabInfo": "Информация",
   "TabLatest": "Последни",
diff --git a/src/strings/ca.json b/src/strings/ca.json
index 4b80ce853..e126df504 100644
--- a/src/strings/ca.json
+++ b/src/strings/ca.json
@@ -178,8 +178,6 @@
   "HeaderForgotPassword": "He oblidat la contrasenya",
   "HeaderFrequentlyPlayed": "Reproduït Freqüentment",
   "HeaderGenres": "Gèneres",
-  "HeaderHomeScreen": "Pàgina d'Inici",
-  "HeaderHomeScreenSettings": "Preferències de la pàgina d'inici",
   "HeaderHttpHeaders": "Capçaleres Http",
   "HeaderIdentification": "Identificació",
   "HeaderIdentificationCriteriaHelp": "Insereix al menys un criteri d'identificació.",
@@ -688,7 +686,6 @@
   "TabFavorites": "Preferits",
   "TabGenres": "Gèneres",
   "TabGuide": "Guia",
-  "TabHomeScreen": "Pàgina d'Inici",
   "TabInfo": "Informació",
   "TabLatest": "Novetats",
   "TabLibrary": "Biblioteca",
diff --git a/src/strings/cs.json b/src/strings/cs.json
index a16879447..3bb8b4de5 100644
--- a/src/strings/cs.json
+++ b/src/strings/cs.json
@@ -297,8 +297,6 @@
     "HeaderFrequentlyPlayed": "Nejčastěji přehráváno",
     "HeaderGenres": "Žánry",
     "HeaderGuideProviders": "Průvodce poskytovatelů",
-    "HeaderHomeScreen": "Domovská obrazovka",
-    "HeaderHomeScreenSettings": "Nastavení domovské obrazovky",
     "HeaderHttpHeaders": "HTTP hlavičky",
     "HeaderIdentification": "Identifikace",
     "HeaderIdentificationCriteriaHelp": "Zadejte alespoň jedno identifikační kritérium.",
@@ -1117,7 +1115,6 @@
     "TabFavorites": "Oblíbené",
     "TabGenres": "Žánry",
     "TabGuide": "Průvodce",
-    "TabHomeScreen": "Domovská obrazovka",
     "TabHosting": "Hostování",
     "TabLatest": "Nejnovější",
     "TabLibrary": "Knihovna",
diff --git a/src/strings/da.json b/src/strings/da.json
index 9bbda656e..17431e018 100644
--- a/src/strings/da.json
+++ b/src/strings/da.json
@@ -264,7 +264,6 @@
     "HeaderFrequentlyPlayed": "Ofte afspillet",
     "HeaderGenres": "Genrer",
     "HeaderGuideProviders": "Guide Udbydere",
-    "HeaderHomeScreenSettings": "Indstillinger for Hjemmeskærm",
     "HeaderHttpHeaders": "HTTP Headers",
     "HeaderIdentification": "Identifikation",
     "HeaderIdentificationCriteriaHelp": "Indtast mindst et indetifikationskriterie.",
@@ -1029,7 +1028,6 @@
     "TabExpert": "Ekspert",
     "TabFavorites": "Favoritter",
     "TabGenres": "Genre",
-    "TabHomeScreen": "Hjemmeskærm",
     "TabLatest": "Seneste",
     "TabLibrary": "Bibliotek",
     "TabMovies": "Film",
diff --git a/src/strings/de.json b/src/strings/de.json
index 6c93871eb..a7f846040 100644
--- a/src/strings/de.json
+++ b/src/strings/de.json
@@ -335,8 +335,6 @@
     "HeaderForgotPassword": "Passwort vergessen",
     "HeaderFrequentlyPlayed": "Oft gesehen",
     "HeaderGuideProviders": "Fernsehprogramm Quellen",
-    "HeaderHomeScreen": "Startseite",
-    "HeaderHomeScreenSettings": "Startbildschirm EInstellungen",
     "HeaderIdentification": "Identifizierung",
     "HeaderIdentificationCriteriaHelp": "Gebe mindestens ein Identifikationskriterium an.",
     "HeaderIdentificationHeader": "Identfikations Header",
@@ -1077,7 +1075,6 @@
     "PlayFromBeginning": "Von Beginn abspielen",
     "PlayNext": "Spiele als Nächstes ab",
     "PlayNextEpisodeAutomatically": "Starte nächste Episode automatisch",
-    "PlaybackSettingsIntro": "Um die Wiedergabeeinstellungen zu ändern, stoppen Sie die Wiedergabe und klicken Sie auf Ihr Benutzer-Icon in der oberen rechten Ecke der App.",
     "Played": "Gesehen",
     "Playlists": "Wiedergabelisten",
     "PleaseAddAtLeastOneFolder": "Bitte fügen Sie mindestens ein Verzeichniss zur Bibliothek durch Klicken der \"Hinzufügen\"-Schaltfläche hinzu.",
@@ -1178,12 +1175,10 @@
     "SortChannelsBy": "Sortiere Kanäle nach:",
     "SortName": "Sortiername",
     "Sports": "Sport",
-    "StatsForNerds": "Statistiken für Tüftler",
     "StopRecording": "Aufnahme stoppen",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Diese Einstellungen werden auch auf jede Chromecast-Wiedergabe angewendet, die von diesem Gerät gestartet wird.",
     "SubtitleAppearanceSettingsDisclaimer": "Diese Einstellungen werden nicht auf grafische Untertitel (PGS, DVD, etc.) oder Untertitel mit eingebettetem Style-Elementen (ASS/SSA) angewendet.",
     "SubtitleDownloadersHelp": "Aktiviere und bewerte Deine bevorzugten Untertitel Downloader in der Reihenfolge der Priorität.",
-    "SubtitleSettingsIntro": "Um das Aussehen der Untertitel und die Spracheinstellungen zu ändern, stoppen Sie die Wiedergabe und klicken Sie auf Ihr Benutzer-Icon in der oberen rechten Ecke der App.",
     "Subtitles": "Untertitel",
     "Suggestions": "Empfehlungen",
     "Sunday": "Sonntag",
@@ -1206,7 +1201,6 @@
     "TabExpert": "Experte",
     "TabFavorites": "Favoriten",
     "TabGuide": "Programm",
-    "TabHomeScreen": "Startseite",
     "TabLatest": "Neueste",
     "TabLibrary": "Bibliothek",
     "TabLiveTV": "Live-TV",
@@ -1387,10 +1381,8 @@
     "OptionRegex": "Reguläre Ausdrücke",
     "OptionSpecialEpisode": "Extras",
     "OptionTrackName": "Spurname",
-    "PlaybackSettings": "Wiedergabeeinstellungen",
     "Screenshots": "Bildschirmfotos",
     "Studios": "Studios",
-    "SubtitleSettings": "Untertiteleinstellungen",
     "TV": "TV",
     "TabCodecs": "Codecs",
     "TabGenres": "Genres",
diff --git a/src/strings/el.json b/src/strings/el.json
index 325ab2fbc..3dfb00604 100644
--- a/src/strings/el.json
+++ b/src/strings/el.json
@@ -315,8 +315,6 @@
     "HeaderForgotPassword": "Ξέχασα τον κωδικό",
     "HeaderFrequentlyPlayed": "Συχνά έπαιξε",
     "HeaderGenres": "Είδη",
-    "HeaderHomeScreen": "Αρχική οθόνη",
-    "HeaderHomeScreenSettings": "Ρυθμίσεις αρχικής οθόνης",
     "HeaderIdentificationCriteriaHelp": "Καταχωρήστε τουλάχιστον ένα κριτήριο αναγνώρισης.",
     "HeaderIdentificationHeader": "Αναγνωριστικό Header",
     "HeaderIdentifyItemHelp": "Πληκτρολογήστε ένα ή περισσότερα κριτήρια αναζήτησης. Κατάργηση κριτηρίων για την αύξηση των αποτελεσμάτων αναζήτησης.",
@@ -970,7 +968,6 @@
     "PlayFromBeginning": "Αναπαραγωγή από την αρχή",
     "PlayNext": "Επόμενη Αναπαραγωγή",
     "PlayNextEpisodeAutomatically": "Αναπαραγωγή του επόμενου επεισοδίου αυτόματα",
-    "PlaybackSettingsIntro": "Για να ρυθμίσετε τις προεπιλεγμένες ρυθμίσεις αναπαραγωγής, σταματήστε την αναπαραγωγή βίντεο και στη συνέχεια, κάντε κλικ στο εικονίδιο χρήστη στην επάνω δεξιά ενότητα της εφαρμογής.",
     "Played": "Έγινε Αναπαραγωγή",
     "Playlists": "Λίστες αναπαραγωγής",
     "PleaseConfirmPluginInstallation": "Παρακαλώ κάντε κλικ στο OK για να επιβεβαιώσετε ότι έχετε διαβάσει τα ανωτέρω και επιθυμείτε να προχωρήσετε με την εγκατάσταση του πρόσθετου.",
@@ -1062,12 +1059,10 @@
     "SortChannelsBy": "Στοίχιση καναλιών με:",
     "SortName": "Σύντομος τίτλος",
     "Sports": "Σπόρ",
-    "StatsForNerds": "Στατιστικά για κορίτσια",
     "StopRecording": "Ακύρωση Εγγραφής",
     "Studios": "Στούντιο",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Αυτές οι ρυθμίσεις ισχύουν επίσης για οποιαδήποτε αναπαραγωγή του Chromecast που ξεκίνησε από αυτήν τη συσκευή.",
     "SubtitleAppearanceSettingsDisclaimer": "Αυτές οι ρυθμίσεις δεν θα ισχύουν για γραφικούς υποτίτλους (PGS, DVD, κ.λπ.) ή για υπότιτλους που έχουν ενσωματωμένο το δικό τους στυλ (ASS / SSA).",
-    "SubtitleSettingsIntro": "Για να ρυθμίσετε την προεπιλεγμένη εμφάνιση υπότιτλων και τις ρυθμίσεις γλώσσας, σταματήστε την αναπαραγωγή βίντεο και, στη συνέχεια, κάντε κλικ στο εικονίδιο χρήστη στην επάνω δεξιά ενότητα της εφαρμογής.",
     "Subtitles": "Υπότιτλοι",
     "Suggestions": "Προτάσεις",
     "Sunday": "Κυριακή",
@@ -1091,7 +1086,6 @@
     "TabFavorites": "Αγαπημένα",
     "TabGenres": "Είδη",
     "TabGuide": "Οδηγός",
-    "TabHomeScreen": "Αρχική Οθόνη",
     "TabHosting": "Φιλοξενία",
     "TabInfo": "Πληροφορία",
     "TabLatest": "Τελευταία",
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index d39c7f9ea..d5bb7d574 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -367,8 +367,8 @@
     "HeaderFrequentlyPlayed": "Frequently Played",
     "HeaderGenres": "Genres",
     "HeaderGuideProviders": "TV Guide Data Providers",
-    "HeaderHomeScreen": "Home Screen",
-    "HeaderHomeScreenSettings": "Home Screen Settings",
+    "HeaderHome": "Home",
+    "HeaderHomeSettings": "Home Settings",
     "HeaderHttpHeaders": "Http Headers",
     "HeaderIdentification": "Identification",
     "HeaderIdentificationCriteriaHelp": "Enter at least one identification criteria.",
@@ -1187,12 +1187,11 @@
     "PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
     "Play": "Play",
     "PlayAllFromHere": "Play all from here",
+    "PlaybackData": "Playback Data",
     "PlayCount": "Play count",
     "PlayFromBeginning": "Play from beginning",
     "PlayNext": "Play next",
     "PlayNextEpisodeAutomatically": "Play next episode automatically",
-    "PlaybackSettings": "Playback settings",
-    "PlaybackSettingsIntro": "To configure default playback settings, stop video playback, then click your user icon in the top right section of the app.",
     "Played": "Played",
     "Playlists": "Playlists",
     "PleaseAddAtLeastOneFolder": "Please add at least one folder to this library by clicking the Add button.",
@@ -1297,14 +1296,11 @@
     "SortChannelsBy": "Sort channels by:",
     "SortName": "Sort name",
     "Sports": "Sports",
-    "StatsForNerds": "Stats for nerds",
     "StopRecording": "Stop recording",
     "Studios": "Studios",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "These settings also apply to any Chromecast playback started by this device.",
     "SubtitleAppearanceSettingsDisclaimer": "These settings will not apply to graphical subtitles (PGS, DVD, etc), or subtitles that have their own styles embedded (ASS/SSA).",
     "SubtitleDownloadersHelp": "Enable and rank your preferred subtitle downloaders in order of priority.",
-    "SubtitleSettings": "Subtitle settings",
-    "SubtitleSettingsIntro": "To configure default subtitle appearance and language settings, stop video playback, then click your user icon in the top right section of the app.",
     "Subtitles": "Subtitles",
     "Suggestions": "Suggestions",
     "Sunday": "Sunday",
@@ -1330,7 +1326,6 @@
     "TabFavorites": "Favorites",
     "TabGenres": "Genres",
     "TabGuide": "Guide",
-    "TabHomeScreen": "Home Screen",
     "TabHosting": "Hosting",
     "TabInfo": "Info",
     "TabLatest": "Latest",
diff --git a/src/strings/es-mx.json b/src/strings/es-mx.json
index 445ba02c6..473b7fb5b 100644
--- a/src/strings/es-mx.json
+++ b/src/strings/es-mx.json
@@ -352,8 +352,6 @@
     "HeaderFrequentlyPlayed": "Reproducido Frecuentemente",
     "HeaderGenres": "Géneros",
     "HeaderGuideProviders": "Proveedores de Guías de TV",
-    "HeaderHomeScreen": "Pantalla de Inicio",
-    "HeaderHomeScreenSettings": "Configuración de pantalla de inicio",
     "HeaderHttpHeaders": "Encabezados Http",
     "HeaderIdentification": "Identificación",
     "HeaderIdentificationCriteriaHelp": "Introduzca, al menos, un criterio de identificación.",
@@ -1141,8 +1139,6 @@
     "PlayFromBeginning": "Reproducir desde el inicio",
     "PlayNext": "Reproducir siguiente",
     "PlayNextEpisodeAutomatically": "Reproducir el siguiente episodio automáticamente",
-    "PlaybackSettings": "Configuraciones de Reproducción",
-    "PlaybackSettingsIntro": "Para configurar las opciones de reproducción predeterminadas, detenga la reproducción de video. entonces de clic en su icono de usuario en la esquina superior derecha de la aplicación.",
     "Played": "Reproducido",
     "Playlists": "Listas de reproducción",
     "PleaseAddAtLeastOneFolder": "Por favor agregue al menos una carpeta a esta biblioteca dando clic al botón de Agregar.",
@@ -1246,14 +1242,11 @@
     "SortChannelsBy": "Ordenar canales por:",
     "SortName": "Nombre para ordenar",
     "Sports": "Deportes",
-    "StatsForNerds": "Estadísticas para los nerds",
     "StopRecording": "Detener grabación",
     "Studios": "Estudios",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Estos ajustes también aplican a cualquier reproducción de Chromecast iniciada por este dispositivo.",
     "SubtitleAppearanceSettingsDisclaimer": "Estas configuraciones no se aplicaran a subtitulos gráficos (PGS, DVD, etc.) o a subtitulos que tienen sus propias fuentes embebidas (ASS/SSA).",
     "SubtitleDownloadersHelp": "Habilite y priorice sus recolectores de subtitulos en orden de preferencia.",
-    "SubtitleSettings": "Configuraciones de Subtitulos",
-    "SubtitleSettingsIntro": "Para configurar la apariencia predeterminada de los subtitulos e idioma, detenga la reproducción de video, entonces de clic en su icono de usuario en la parte superior derecha de la aplicación.",
     "Subtitles": "Subtítulos",
     "Suggestions": "Sugerencias",
     "Sunday": "Domingo",
@@ -1277,7 +1270,6 @@
     "TabFavorites": "Favoritos",
     "TabGenres": "Géneros",
     "TabGuide": "Guía",
-    "TabHomeScreen": "Pantalla de Inicio",
     "TabHosting": "Hospedaje",
     "TabLatest": "Recientes",
     "TabLibrary": "Biblioteca",
diff --git a/src/strings/es.json b/src/strings/es.json
index 9130571ee..7afe8817c 100644
--- a/src/strings/es.json
+++ b/src/strings/es.json
@@ -303,8 +303,6 @@
     "HeaderFrequentlyPlayed": "Reproducido frecuentemente",
     "HeaderGenres": "Géneros",
     "HeaderGuideProviders": "Proveedores de guías",
-    "HeaderHomeScreen": "Pantalla de inicio",
-    "HeaderHomeScreenSettings": "Ajustes de la pantalla de inicio",
     "HeaderHttpHeaders": "Cabeceras Http",
     "HeaderIdentification": "Identificación",
     "HeaderIdentificationCriteriaHelp": "Entre al menos un criterio de identificación.",
@@ -1139,7 +1137,6 @@
     "SortChannelsBy": "Ordenar canales por:",
     "SortName": "Ordenar por nombre",
     "Sports": "Deportes",
-    "StatsForNerds": "Estadísticas para Frikis",
     "StopRecording": "Parar grabación",
     "Studios": "Estudios",
     "SubtitleDownloadersHelp": "Habilita y clasifica tus descargadores de subtítulos preferidos por orden de prioridad.",
@@ -1167,7 +1164,6 @@
     "TabFavorites": "Favoritos",
     "TabGenres": "Géneros",
     "TabGuide": "Guía",
-    "TabHomeScreen": "Pantalla de inicio",
     "TabHosting": "Servidor",
     "TabLatest": "Novedades",
     "TabLibrary": "Biblioteca",
diff --git a/src/strings/fr.json b/src/strings/fr.json
index 171837cce..4d496b961 100644
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@@ -351,8 +351,6 @@
     "HeaderForgotPassword": "Mot de passe oublié",
     "HeaderFrequentlyPlayed": "Fréquemment lus",
     "HeaderGuideProviders": "Fournisseurs de données de guides TV",
-    "HeaderHomeScreen": "Écran d'accueil",
-    "HeaderHomeScreenSettings": "Paramètres de l'écran d'accueil",
     "HeaderHttpHeaders": "En-têtes HTTP",
     "HeaderIdentificationCriteriaHelp": "Saisissez au moins un critère d'identification.",
     "HeaderIdentificationHeader": "En-tête d'identification",
@@ -1135,8 +1133,6 @@
     "PlayFromBeginning": "Lire depuis le début",
     "PlayNext": "Lire le suivant",
     "PlayNextEpisodeAutomatically": "Lancer l'épisode suivant automatiquement",
-    "PlaybackSettings": "Paramètres de lecture",
-    "PlaybackSettingsIntro": "Pour configurer les réglages de lecture par défaut, arrêtez la lecture de la vidéo, puis cliquez sur votre icône utilisateur située en haut à droite dans l'application.",
     "Played": "Lu",
     "Playlists": "Listes de lecture",
     "PleaseAddAtLeastOneFolder": "Veuillez ajouter au moins un dossier à cette médiathèque en cliquant sur le bouton Ajouter.",
@@ -1239,13 +1235,10 @@
     "SortByValue": "Trier par {0}",
     "SortChannelsBy": "Trier les chaînes par :",
     "SortName": "Nom de tri",
-    "StatsForNerds": "Statistiques pour les geeks",
     "StopRecording": "Arrêter l'enregistrement",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Ces paramètres s'appliquent également à toute lecture Chromecast démarrée par cet appareil.",
     "SubtitleAppearanceSettingsDisclaimer": "Ces paramètres ne s'appliqueront pas aux sous-titres graphiques (PGS, DVD etc) ou aux sous-titres qui ont leurs propres styles incorporés (ASS/SSA).",
     "SubtitleDownloadersHelp": "Activer et ranger vos outils de téléchargement de sous-titres favoris par ordre de priorité.",
-    "SubtitleSettings": "Paramètres des sous-titres",
-    "SubtitleSettingsIntro": "Pour configurer l'apparence des sous-titres et la langue par défaut, arrêtez la lecture de la vidéo, puis cliquez sur votre icône utilisateur située en haut à droite dans l'application.",
     "Subtitles": "Sous-titres",
     "Sunday": "Dimanche",
     "Sync": "Synchroniser",
@@ -1263,7 +1256,6 @@
     "TabDisplay": "Affichage",
     "TabEpisodes": "Épisodes",
     "TabFavorites": "Favoris",
-    "TabHomeScreen": "Écran d'accueil",
     "TabHosting": "Hébergement",
     "TabLatest": "Derniers",
     "TabLibrary": "Médiathèque",
diff --git a/src/strings/hr.json b/src/strings/hr.json
index 7fa4a990f..4b32942d1 100644
--- a/src/strings/hr.json
+++ b/src/strings/hr.json
@@ -230,7 +230,6 @@
     "HeaderForgotPassword": "Zaboravili ste lozinku",
     "HeaderFrequentlyPlayed": "Često izvođeno",
     "HeaderGuideProviders": "Pružatelji vodiča",
-    "HeaderHomeScreenSettings": "Postavke početne stranice",
     "HeaderHttpHeaders": "Http zaglavlja",
     "HeaderIdentification": "Identifikacija",
     "HeaderIdentificationCriteriaHelp": "Unesite barem jedan kriterij za identifikaciju.",
@@ -945,7 +944,6 @@
     "TabFavorites": "Omiljeni",
     "TabGenres": "Žanrovi",
     "TabGuide": "Vodič",
-    "TabHomeScreen": "Početni zaslon",
     "TabHosting": "Posluživanje",
     "TabLatest": "Zadnje",
     "TabLibrary": "Biblioteka",
diff --git a/src/strings/hu.json b/src/strings/hu.json
index ac181eee6..226c09c09 100644
--- a/src/strings/hu.json
+++ b/src/strings/hu.json
@@ -163,8 +163,6 @@
     "HeaderForgotPassword": "Elfelejtett Jelszó",
     "HeaderFrequentlyPlayed": "Gyakran játszott",
     "HeaderGenres": "Műfajok",
-    "HeaderHomeScreen": "Kezdőképernyő",
-    "HeaderHomeScreenSettings": "Kezdőképernyő beállítások",
     "HeaderIdentifyItemHelp": "Adj meg egy vagy több keresési kritériumot. Távolítsd el a kritériumokat a keresési eredmények növelése érdekében.",
     "HeaderImageSettings": "Kép beállítások",
     "HeaderInstall": "Telepítés",
@@ -515,7 +513,6 @@
     "SkipEpisodesAlreadyInMyLibraryHelp": "Az epizódokat összehasonlítjuk az évad és az epizód számával, ha rendelkezésre állnak.",
     "Sort": "Rendezés:",
     "SortByValue": "Rendezés {0}",
-    "StatsForNerds": "Szakértői statisztika",
     "Studios": "Stúdiók",
     "Subtitles": "Feliratok",
     "Suggestions": "Javaslatok",
@@ -539,7 +536,6 @@
     "TabFavorites": "Kedvencek",
     "TabGenres": "Műfajok",
     "TabGuide": "Leírás",
-    "TabHomeScreen": "Kezdőképernyő",
     "TabHosting": "Szerver",
     "TabInfo": "Infó",
     "TabLatest": "Legújabb",
@@ -1208,8 +1204,6 @@
     "PlaceFavoriteChannelsAtBeginning": "Helyezd el a kedvenc csatornákat az elején",
     "PlayFromBeginning": "Lejátszás az elejétől",
     "PlayNext": "Következő lejátszása",
-    "PlaybackSettings": "Lejátszási beállítások",
-    "PlaybackSettingsIntro": "Az alapértelmezett lejátszási beállítások konfigurálásához állítsd le a videót, majd kattints a felhasználói ikonra az alkalmazás jobb felső részén.",
     "PleaseAddAtLeastOneFolder": "Adj hozzá legalább egy mappát ehhez a könyvtárhoz a Hozzáad gombra kattintva.",
     "PleaseConfirmPluginInstallation": "Kérlek kattints az OK gombra, hogy megerősítsd, hogy elolvastad a fentieket és folytatni kívánod a bővítmény telepítését.",
     "PleaseEnterNameOrId": "Kérlek adj meg egy nevet vagy egy külső ID-t.",
@@ -1269,8 +1263,6 @@
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Ezek a beállítások a készülék által elindított összes Chromecast lejátszásra is vonatkoznak.",
     "SubtitleAppearanceSettingsDisclaimer": "Ezek a beállítások nem vonatkoznak a grafikus feliratokra (PGS, DVD, stb.) Vagy a saját stílusokkal ellátott feliratokra (ASS / SSA).",
     "SubtitleDownloadersHelp": "Engedélyezd és rangsorold az előnyben részesített feliratok letöltőket sorrendben.",
-    "SubtitleSettings": "Felirat beállítások",
-    "SubtitleSettingsIntro": "Az alapértelmezett felirat megjelenésének és nyelvi beállításainak konfigurálásához állítsd le a videót, majd kattints a felhasználói ikonra az alkalmazás jobb felső részén.",
     "SystemDlnaProfilesHelp": "A rendszerprofilok csak olvashatóak. A rendszerprofil módosításai egy új egyéni profilba kerülnek.",
     "TV": "TV",
     "TabDirectPlay": "Közvetlen lejátszás",
diff --git a/src/strings/it.json b/src/strings/it.json
index ec7741627..cabc14a5d 100644
--- a/src/strings/it.json
+++ b/src/strings/it.json
@@ -339,8 +339,6 @@
     "HeaderFrequentlyPlayed": "Visti di frequente",
     "HeaderGenres": "Generi",
     "HeaderGuideProviders": "Provider Guida",
-    "HeaderHomeScreen": "Pagina iniziale",
-    "HeaderHomeScreenSettings": "Impostazioni schermata principale",
     "HeaderHttpHeaders": "Intestazioni Http",
     "HeaderIdentification": "Identificazione",
     "HeaderIdentificationCriteriaHelp": "Inserire almeno un criterio di identificazione.",
@@ -1191,7 +1189,6 @@
     "SortChannelsBy": "Ordina canali per:",
     "SortName": "Nome ordinamento",
     "Sports": "Sport",
-    "StatsForNerds": "Statistiche per nerds",
     "StopRecording": "Ferma registrazione",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Queste impostazioni si applicano anche a qualsiasi riproduzione di Chromecast avviata da questo dispositivo.",
     "SubtitleAppearanceSettingsDisclaimer": "Queste impostazioni non si applicano a sottotitoli grafici (PGS, DVD, ecc.), o sottotitoli che hanno i propri stili incorporati (ASS / SSA).",
@@ -1220,7 +1217,6 @@
     "TabFavorites": "Preferiti",
     "TabGenres": "Generi",
     "TabGuide": "Guida",
-    "TabHomeScreen": "Pagina iniziale",
     "TabLatest": "Novità",
     "TabLibrary": "Librerie",
     "TabLiveTV": "Tv in Diretta",
diff --git a/src/strings/kk.json b/src/strings/kk.json
index 6e19e43eb..854aa7707 100644
--- a/src/strings/kk.json
+++ b/src/strings/kk.json
@@ -364,8 +364,6 @@
     "HeaderFrequentlyPlayed": "Jıi oınatylǵandar",
     "HeaderGenres": "Janrlar",
     "HeaderGuideProviders": "Telegıd derekterin jetkizýshileri",
-    "HeaderHomeScreen": "Basqy ekran",
-    "HeaderHomeScreenSettings": "Basqy ekran parametrleri",
     "HeaderHttpHeaders": "HTTP ústińgi derektemeleri",
     "HeaderIdentification": "Anyqtaý",
     "HeaderIdentificationCriteriaHelp": "Eń keminde anyqtaýdyń bir shartyn engizińiz.",
@@ -1165,7 +1163,6 @@
     "PlayFromBeginning": "Basynan oınatý",
     "PlayNext": "Kelesini oınatý",
     "PlayNextEpisodeAutomatically": "Kelesi bólimdi avtomatty júktep alý",
-    "PlaybackSettingsIntro": "Ádepki oınatý parametrlerin teńsheý úshin beıne oınatýdy toqtatyńyz, sodan keıin qoldanbanyń joǵarǵy oń jaq bóligindegi paıdalanýshy belgishesin basyńyz.",
     "Played": "Oınatylǵan",
     "Playlists": "Oınatý tizimderi",
     "PleaseAddAtLeastOneFolder": "Qosý túımeshigin basý arqyly, osy tasyǵyshhanaǵa kem degende bir qalta qosyńyz.",
@@ -1270,13 +1267,11 @@
     "SortChannelsBy": "Arnalardy suryptaý tásili:",
     "SortName": "Suryptalatyn aty",
     "Sports": "Sport",
-    "StatsForNerds": "Aqylgóıler úshin sanaq",
     "StopRecording": "Jazýdy toqtatý",
     "Studios": "Stýdıalar",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Bul parametrler osy qurylǵy arqyly iske qosylǵan kez-kelgen Chromecast oınatýyna qoldanylady.",
     "SubtitleAppearanceSettingsDisclaimer": "Bul parametrler grafıkalyq sýbtıtrlerge (PGS, DVD j.t.b.) nemese óz máneri bar endirilgen sýbtıtrlerge (ASS/SSA) qoldanylmaıdy.",
     "SubtitleDownloadersHelp": "Teńshelgen sýbtıtrler júkteýshilerin qosyńyz jáne basymdylyq reti boıynsha dáreje berińiz.",
-    "SubtitleSettingsIntro": "Ádepki sýbtıtr kórinisin jáne til parametrlerin teńsheý úshin beıne oınatýdy toqtatyńyz, sodan keıin qoldanbanyń joǵarǵy oń jaq bóligindegi paıdalanýshy belgishesin basyńyz.",
     "Subtitles": "Sýbtıtrler",
     "Suggestions": "Usynystar",
     "Sunday": "jeksenbi",
@@ -1302,7 +1297,6 @@
     "TabFavorites": "Tańdaýlylar",
     "TabGenres": "Janrlar",
     "TabGuide": "Telegıd",
-    "TabHomeScreen": "Basqy ekran",
     "TabHosting": "Ornalasý",
     "TabInfo": "Profaıl týraly",
     "TabLatest": "Eń keıingi",
@@ -1417,7 +1411,5 @@
     "LeaveBlankToNotSetAPassword": "Mindetti emes - bos qaldyrsańyz, paról paıdalanylmaıdy",
     "MessageImageFileTypeAllowed": "Tek qana JPEG jáne PNG faıldary qoldaýda.",
     "MessageImageTypeNotSelected": "Sýret túrin ashylmaly mázirden tandańyz.",
-    "OptionResElement": "res elementi",
-    "PlaybackSettings": "Oınatý parametrleri",
-    "SubtitleSettings": "Sýbtıtrler parametrleri"
+    "OptionResElement": "res elementi"
 }
diff --git a/src/strings/ko.json b/src/strings/ko.json
index 530277bb8..dcb69f755 100644
--- a/src/strings/ko.json
+++ b/src/strings/ko.json
@@ -171,7 +171,6 @@
     "HeaderFrequentlyPlayed": "자주 재생",
     "HeaderGenres": "장르",
     "HeaderGuideProviders": "가이드 제공자",
-    "HeaderHomeScreenSettings": "홈 화면 설정",
     "HeaderIdentification": "식별",
     "HeaderImageSettings": "이미지 설정",
     "HeaderInstall": "설치",
@@ -724,7 +723,6 @@
     "TabFavorites": "즐겨찾기",
     "TabGenres": "장르",
     "TabGuide": "가이드",
-    "TabHomeScreen": "홈 화면",
     "TabHosting": "호스팅",
     "TabInfo": "정보",
     "TabLatest": "최근",
diff --git a/src/strings/nb.json b/src/strings/nb.json
index e0bdcaaa0..cea70c993 100644
--- a/src/strings/nb.json
+++ b/src/strings/nb.json
@@ -271,8 +271,6 @@
     "HeaderFrequentlyPlayed": "Ofte avspilt",
     "HeaderGenres": "Sjanger",
     "HeaderGuideProviders": "Guide leverandører",
-    "HeaderHomeScreen": "Hjemskjerm",
-    "HeaderHomeScreenSettings": "Innstillinger for Hjemskjerm",
     "HeaderHttpHeaders": "Http Headere",
     "HeaderIdentification": "Identifisering",
     "HeaderIdentificationCriteriaHelp": "Skriv minst ett identifiserings kriterie",
@@ -1036,7 +1034,6 @@
     "TabExpert": "Ekspert",
     "TabFavorites": "Favoritter",
     "TabGenres": "Sjangre",
-    "TabHomeScreen": "Hjemskjerm",
     "TabHosting": "Hoster",
     "TabLatest": "Siste",
     "TabLibrary": "Bibliotek",
diff --git a/src/strings/nl.json b/src/strings/nl.json
index f6b8e4597..4f76437d3 100644
--- a/src/strings/nl.json
+++ b/src/strings/nl.json
@@ -341,8 +341,6 @@
     "HeaderForgotPassword": "Wachtwoord vergeten",
     "HeaderFrequentlyPlayed": "Vaak afgespeeld",
     "HeaderGuideProviders": "TV Gids data aanbieders",
-    "HeaderHomeScreen": "Begin Scherm",
-    "HeaderHomeScreenSettings": "Begin scherm instellingen",
     "HeaderIdentification": "Identificatie",
     "HeaderIdentificationCriteriaHelp": "Voer tenminste één identificatiecriterium in.",
     "HeaderIdentificationHeader": "Identificatie Header",
@@ -1075,7 +1073,6 @@
     "PlayFromBeginning": "Afspelen vanaf begin",
     "PlayNext": "Volgende afspelen",
     "PlayNextEpisodeAutomatically": "Speel volgende aflevering automatisch",
-    "PlaybackSettingsIntro": "Om de standaard afspeelinstellingen te configureren, stopt u het afspelen van de video. Vervolgens klikt u op het gebruikersicoon in de rechterbovenhoek van de app.",
     "Played": "Afgespeeld",
     "Playlists": "Afspeellijsten",
     "PleaseAddAtLeastOneFolder": "Voeg tenminste 1 map aan deze bibliotheek toe door op de Toevoegen knop te klikken.",
@@ -1177,13 +1174,11 @@
     "SortChannelsBy": "Sorteer kanalen op:",
     "SortName": "Sorteerbaar",
     "Sports": "Sport",
-    "StatsForNerds": "Statistieken voor nerds",
     "StopRecording": "Stop opname",
     "Studios": "Studio's",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Deze instellingen hebben ook effect op afspelen naar een Chromecast wanneer deze vanaf dit apparaat worden gestart.",
     "SubtitleAppearanceSettingsDisclaimer": "Deze instellingen hebben geen invloed op grafische ondertitels (PGS, DVD etc.) en ondertitels die hun eigen stijl ingebouwd hebben (ASS/SSA).",
     "SubtitleDownloadersHelp": "Schakel de gewenste ondertiteldownloaders in en rangschik ze in volgorde van prioritieit.",
-    "SubtitleSettingsIntro": "Om de standaard ondertiteling- en taalinstellingen te configureren, stopt u het afspelen van de video. Vervolgens klikt u op het gebruikersicoon in de rechterbovenhoek van de app.",
     "Subtitles": "Ondertiteling",
     "Suggestions": "Suggesties",
     "Sunday": "Zondag",
@@ -1202,7 +1197,6 @@
     "TabEpisodes": "Afleveringen",
     "TabFavorites": "Favorieten",
     "TabGuide": "Gids",
-    "TabHomeScreen": "Begin scherm",
     "TabLatest": "Nieuw",
     "TabLibrary": "Bibliotheek",
     "TabLogs": "Logboeken",
diff --git a/src/strings/pl.json b/src/strings/pl.json
index 7e41d6ca9..398a6990e 100644
--- a/src/strings/pl.json
+++ b/src/strings/pl.json
@@ -362,8 +362,6 @@
     "HeaderFrequentlyPlayed": "Często odtwarzane",
     "HeaderGenres": "Gatunki",
     "HeaderGuideProviders": "Dostawcy danych przewodnika telewizyjnego",
-    "HeaderHomeScreen": "Ekran startowy",
-    "HeaderHomeScreenSettings": "Ustawienia ekranu startowego",
     "HeaderHttpHeaders": "Nagłówki Http",
     "HeaderIdentification": "Identyfikacja",
     "HeaderIdentificationCriteriaHelp": "Wprowadź przynajmniej jedno kryterium identyfikacji.",
@@ -1156,8 +1154,6 @@
     "PlayFromBeginning": "Odtwarzaj od początku",
     "PlayNext": "Odtwarzaj następne",
     "PlayNextEpisodeAutomatically": "Odtwarzaj następny odcinek automatycznie",
-    "PlaybackSettings": "Ustawienia odtwarzania",
-    "PlaybackSettingsIntro": "W celu skonfigurowania domyślnych ustawień odtwarzania, zatrzymaj odtwarzanie, a następnie naciśnij ikonę użytkownika w górnej prawej sekcji aplikacji.",
     "Played": "Odtworzone",
     "Playlists": "Listy",
     "PleaseAddAtLeastOneFolder": "Proszę dodaj przynajmniej jeden folder do tej listy poprzez kliknięcie guzika Dodaj",
@@ -1262,14 +1258,11 @@
     "SortChannelsBy": "Sortuj kanały wg:",
     "SortName": "Tytuł sortowania",
     "Sports": "Wydarzenia sportowe",
-    "StatsForNerds": "Statystyki dla maniaków",
     "StopRecording": "Zatrzymaj nagrywanie",
     "Studios": "Wytwórnie",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Powyższe ustawienia dotyczą także odtwarzania Chromecast rozpoczętego przez to urządzenie.",
     "SubtitleAppearanceSettingsDisclaimer": "Te ustawienia nie mają zastosowania do napisów graficznych (PGS, DVD, etc) lub napisów, które posiadają swoje własne wbudowane style (ASS/SSA).",
     "SubtitleDownloadersHelp": "Umożliwia aktywowanie i używanie dostawców napisów w preferowanej kolejności.",
-    "SubtitleSettings": "Ustawienia napisów",
-    "SubtitleSettingsIntro": "W celu skonfigurowania domyślnych ustawień napisów i  języka, zatrzymaj odtwarzanie, a następnie naciśnij ikonę użytkownika w górnej prawej sekcji aplikacji.",
     "Subtitles": "Napisy",
     "Suggestions": "Polecane",
     "Sunday": "Niedziela",
@@ -1295,7 +1288,6 @@
     "TabFavorites": "Ulubione",
     "TabGenres": "Gatunki",
     "TabGuide": "Przewodnik",
-    "TabHomeScreen": "Ekran startowy",
     "TabHosting": "Usługa",
     "TabInfo": "Informacje",
     "TabLatest": "Ostatnio dodane",
diff --git a/src/strings/pt-br.json b/src/strings/pt-br.json
index 68aba833c..75d155009 100644
--- a/src/strings/pt-br.json
+++ b/src/strings/pt-br.json
@@ -349,8 +349,6 @@
     "HeaderFrequentlyPlayed": "Reproduzido Frequentemente",
     "HeaderGenres": "Gêneros",
     "HeaderGuideProviders": "Provedores de Dados de Guia de TV",
-    "HeaderHomeScreen": "Tela Início",
-    "HeaderHomeScreenSettings": "Ajustes da Tela Inicial",
     "HeaderHttpHeaders": "Cabeçalhos de Http",
     "HeaderIdentification": "Identificação",
     "HeaderIdentificationCriteriaHelp": "Digite, ao menos, um critério de identificação.",
@@ -1220,7 +1218,6 @@
     "SortChannelsBy": "Ordenar canais por:",
     "SortName": "Nome para ordenação",
     "Sports": "Esportes",
-    "StatsForNerds": "Estatísticas para nerds",
     "StopRecording": "Parar gravação",
     "Studios": "Estúdios",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Estas configurações também se aplicam para qualquer reprodução do Chromecast para este dispositivo.",
@@ -1248,7 +1245,6 @@
     "TabFavorites": "Favoritos",
     "TabGenres": "Gêneros",
     "TabGuide": "Guia",
-    "TabHomeScreen": "Tela Início",
     "TabHosting": "Hospedagem",
     "TabLatest": "Recentes",
     "TabLibrary": "Biblioteca",
diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json
index b45874af3..67b09042c 100644
--- a/src/strings/pt-pt.json
+++ b/src/strings/pt-pt.json
@@ -165,7 +165,6 @@
   "HeaderFrequentlyPlayed": "Reproduzido frequentemente",
   "HeaderGenres": "Gêneros",
   "HeaderGuideProviders": "Provedores de Guia",
-  "HeaderHomeScreenSettings": "Ajustes do Ecrã Inicial",
   "HeaderHttpHeaders": "Cabeçalhos de Http",
   "HeaderIdentification": "Identificação",
   "HeaderIdentificationCriteriaHelp": "Digite, pelo menos, um critério de identificação.",
@@ -719,7 +718,6 @@
   "TabFavorites": "Favoritos",
   "TabGenres": "Géneros",
   "TabGuide": "Guia",
-  "TabHomeScreen": "Tela Início",
   "TabHosting": "Hospedagem",
   "TabLatest": "Mais recente",
   "TabLibrary": "Biblioteca",
diff --git a/src/strings/ru.json b/src/strings/ru.json
index 673942bc0..2b180ec87 100644
--- a/src/strings/ru.json
+++ b/src/strings/ru.json
@@ -364,8 +364,6 @@
     "HeaderFrequentlyPlayed": "Воспроизведённые часто",
     "HeaderGenres": "Жанры",
     "HeaderGuideProviders": "Поставщики данных телегида",
-    "HeaderHomeScreen": "Главный экран",
-    "HeaderHomeScreenSettings": "Параметры главного экрана",
     "HeaderHttpHeaders": "HTTP-заголовки",
     "HeaderIdentification": "Распознание",
     "HeaderIdentificationCriteriaHelp": "Введите хотя бы одно условие распознания.",
@@ -1165,7 +1163,6 @@
     "PlayFromBeginning": "Воспр. с начала",
     "PlayNext": "Воспроизвести следующее",
     "PlayNextEpisodeAutomatically": "Воспроизводить последующий эпизод автоматически",
-    "PlaybackSettingsIntro": "Чтобы конфигурировать параметры воспроизведения по умолчанию, остановите воспроизведение видео, затем щелкните значок пользователя в правой верхней части приложения.",
     "Played": "Воспроизведено",
     "Playlists": "Плей-листы",
     "PleaseAddAtLeastOneFolder": "Добавьте, по крайней мере, одну папку к данной медиатеке, нажав кнопку Добавить.",
@@ -1270,13 +1267,11 @@
     "SortChannelsBy": "Сортировать каналы по:",
     "SortName": "Сорт. по названию",
     "Sports": "Спорт",
-    "StatsForNerds": "Статистика для экспертов",
     "StopRecording": "Остановить запись",
     "Studios": "Студии",
     "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "Эти параметры также применимы к любому Chromecast-воспроизведению запущенному данным устройством.",
     "SubtitleAppearanceSettingsDisclaimer": "Данные параметры не применимы к графическим субтитрам (PGS, DVD и т.д.) или к субтитрам, которые имеют внедрённые свои собственные стили (ASS/SSA).",
     "SubtitleDownloadersHelp": "Включите и ранжируйте предпочитаемые загрузчики субтитров в порядке приоритета.",
-    "SubtitleSettingsIntro": "Чтобы конфигурировать внешний вид субтитров и языковые настройки, остановите воспроизведение видео, затем щелкните значок пользователя в правой верхней части приложения.",
     "Subtitles": "Субтитры",
     "Suggestions": "Предлагаемое",
     "Sunday": "воскресенье",
@@ -1302,7 +1297,6 @@
     "TabFavorites": "Избранное",
     "TabGenres": "Жанры",
     "TabGuide": "Телегид",
-    "TabHomeScreen": "Главный экран",
     "TabHosting": "Размещение",
     "TabInfo": "Инфо",
     "TabLatest": "Новейшее",
@@ -1418,7 +1412,5 @@
     "LeaveBlankToNotSetAPassword": "Необязательно - оставьте пустым, чтобы не назначать пароль",
     "MessageImageFileTypeAllowed": "Поддерживаются только файлы JPEG и PNG.",
     "MessageImageTypeNotSelected": "Выберите тип рисунка из выпадающего меню.",
-    "PlaybackSettings": "Параметры воспроизведения",
-    "SubtitleSettings": "Параметры субтитров",
     "OptionResElement": "res-элемент"
 }
diff --git a/src/strings/sk.json b/src/strings/sk.json
index 534622699..9b9efd9d7 100644
--- a/src/strings/sk.json
+++ b/src/strings/sk.json
@@ -222,8 +222,6 @@
     "HeaderForgotPassword": "Zabudnuté heslo",
     "HeaderFrequentlyPlayed": "Často hrané",
     "HeaderGenres": "Žánre",
-    "HeaderHomeScreen": "Domáca obrazovka",
-    "HeaderHomeScreenSettings": "Nastavenia domácej obrazovky",
     "HeaderHttpHeaders": "HTTP hlavičky",
     "HeaderIdentification": "Identifikácia",
     "HeaderIdentificationCriteriaHelp": "Zadajte aspoň jedno identifikačné kritérium.",
@@ -809,7 +807,6 @@
     "TabFavorites": "Obľúbené",
     "TabGenres": "Žánre",
     "TabGuide": "Sprievodca",
-    "TabHomeScreen": "Domovská obrazovka",
     "TabLatest": "Najnovšie",
     "TabLibrary": "Knižnica",
     "TabLiveTV": "Živá TV",
diff --git a/src/strings/sv.json b/src/strings/sv.json
index 58d8ffed1..a76ec28e1 100644
--- a/src/strings/sv.json
+++ b/src/strings/sv.json
@@ -329,8 +329,6 @@
     "HeaderFrequentlyPlayed": "Ofta spelade",
     "HeaderGenres": "Genrer",
     "HeaderGuideProviders": "Källor för programguide",
-    "HeaderHomeScreen": "Hemskärm",
-    "HeaderHomeScreenSettings": "Hemskärmsalternativ",
     "HeaderHttpHeaders": "Http-rubriker",
     "HeaderIdentification": "Identifiering",
     "HeaderIdentificationCriteriaHelp": "Var god skriv in minst ett identifieringskriterium",
@@ -1202,7 +1200,6 @@
     "TabFavorites": "Favoriter",
     "TabGenres": "Genrer",
     "TabGuide": "TV-guide",
-    "TabHomeScreen": "Hemskärm",
     "TabHosting": "Värd",
     "TabLatest": "Nytillkommet",
     "TabLibrary": "Bibliotek",
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index 362e9cf39..5aca09e1c 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -334,8 +334,6 @@
     "HeaderFrequentlyPlayed": "多次播放",
     "HeaderGenres": "风格",
     "HeaderGuideProviders": "电视指南数据提供方",
-    "HeaderHomeScreen": "主屏幕",
-    "HeaderHomeScreenSettings": "主屏幕设置",
     "HeaderHttpHeaders": "HTTP 标头",
     "HeaderIdentification": "身份识别",
     "HeaderIdentificationCriteriaHelp": "至少输入一个识别标准。",
@@ -1231,7 +1229,6 @@
     "TabFavorites": "我的最爱",
     "TabGenres": "风格",
     "TabGuide": "指南",
-    "TabHomeScreen": "主屏幕",
     "TabHosting": "主机",
     "TabInfo": "信息",
     "TabLatest": "最新",