diff --git a/src/components/accessSchedule/accessSchedule.template.html b/src/components/accessSchedule/accessSchedule.template.html
index e209fbc1ff..c0f83ccec6 100644
--- a/src/components/accessSchedule/accessSchedule.template.html
+++ b/src/components/accessSchedule/accessSchedule.template.html
@@ -12,13 +12,13 @@
 
             <div class="selectContainer">
                 <select is="emby-select" id="selectDay" label="${LabelAccessDay}">
-                    <option value="Sunday">${OptionSunday}</option>
-                    <option value="Monday">${OptionMonday}</option>
-                    <option value="Tuesday">${OptionTuesday}</option>
-                    <option value="Wednesday">${OptionWednesday}</option>
-                    <option value="Thursday">${OptionThursday}</option>
-                    <option value="Friday">${OptionFriday}</option>
-                    <option value="Saturday">${OptionSaturday}</option>
+                    <option value="Sunday">${Sunday}</option>
+                    <option value="Monday">${Monday}</option>
+                    <option value="Tuesday">${Tuesday}</option>
+                    <option value="Wednesday">${Wednesday}</option>
+                    <option value="Thursday">${Thursday}</option>
+                    <option value="Friday">${Friday}</option>
+                    <option value="Saturday">${Saturday}</option>
                     <option value="Everyday">${OptionEveryday}</option>
                     <option value="Weekday">${OptionWeekdays}</option>
                     <option value="Weekend">${OptionWeekends}</option>
diff --git a/src/components/homeScreenSettings/homeScreenSettings.template.html b/src/components/homeScreenSettings/homeScreenSettings.template.html
index 8515f3f0ad..19f79ea5da 100644
--- a/src/components/homeScreenSettings/homeScreenSettings.template.html
+++ b/src/components/homeScreenSettings/homeScreenSettings.template.html
@@ -25,7 +25,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -38,7 +38,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -51,7 +51,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -64,7 +64,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -77,7 +77,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -90,7 +90,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
@@ -103,7 +103,7 @@
                 <option value="resume">${HeaderContinueWatching}</option>
                 <option value="resumeaudio">${HeaderContinueListening}</option>
                 <option value="latestmedia">${HeaderLatestMedia}</option>
-                <option value="nextup">${HeaderNextUp}</option>
+                <option value="nextup">${NextUp}</option>
                 <option value="livetv">${LiveTV}</option>
                 <option value="none">${None}</option>
             </select>
diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js
index 6198894088..e933cf2c3a 100644
--- a/src/components/homesections/homesections.js
+++ b/src/components/homesections/homesections.js
@@ -696,12 +696,12 @@ import 'css!./homesections';
                 serverId: apiClient.serverId()
             }) + '" class="button-flat button-flat-mini sectionTitleTextButton">';
             html += '<h2 class="sectionTitle sectionTitle-cards">';
-            html += globalize.translate('HeaderNextUp');
+            html += globalize.translate('NextUp');
             html += '</h2>';
             html += '<span class="material-icons chevron_right"></span>';
             html += '</a>';
         } else {
-            html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('HeaderNextUp') + '</h2>';
+            html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('NextUp') + '</h2>';
         }
         html += '</div>';
 
diff --git a/src/controllers/dashboard/plugins/available/index.js b/src/controllers/dashboard/plugins/available/index.js
index 22b28e0f5a..b7c3505aa1 100644
--- a/src/controllers/dashboard/plugins/available/index.js
+++ b/src/controllers/dashboard/plugins/available/index.js
@@ -28,7 +28,7 @@ function getHeaderText(category) {
     } else if (category === 'Theme') {
         category = 'Themes';
     } else if (category === 'LiveTV') {
-        category = 'HeaderLiveTV';
+        category = 'LiveTV';
     } else if (category === 'ScreenSaver') {
         category = 'HeaderScreenSavers';
     }
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.html b/src/controllers/dashboard/scheduledtasks/scheduledtask.html
index 4dab484905..dc17d9bf07 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtask.html
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.html
@@ -31,18 +31,18 @@
                         <option value="DailyTrigger">${OptionDaily}</option>
                         <option value="WeeklyTrigger">${OptionWeekly}</option>
                         <option value="IntervalTrigger">${OptionOnInterval}</option>
-                        <option value="StartupTrigger">${OptionOnAppStartup}</option>
+                        <option value="StartupTrigger">${OnApplicationStartup}</option>
                     </select>
                 </div>
                 <div id="fldDayOfWeek" class="selectContainer">
                     <select is="emby-select" id="selectDayOfWeek" name="selectDayOfWeek" label="${LabelDay}">
-                        <option value="Sunday">${OptionSunday}</option>
-                        <option value="Monday">${OptionMonday}</option>
-                        <option value="Tuesday">${OptionTuesday}</option>
-                        <option value="Wednesday">${OptionWednesday}</option>
-                        <option value="Thursday">${OptionThursday}</option>
-                        <option value="Friday">${OptionFriday}</option>
-                        <option value="Saturday">${OptionSaturday}</option>
+                        <option value="Sunday">${Sunday}</option>
+                        <option value="Monday">${Monday}</option>
+                        <option value="Tuesday">${Tuesday}</option>
+                        <option value="Wednesday">${Wednesday}</option>
+                        <option value="Thursday">${Thursday}</option>
+                        <option value="Friday">${Friday}</option>
+                        <option value="Saturday">${Saturday}</option>
                     </select>
                 </div>
                 <div id="fldTimeOfDay" class="selectContainer">
diff --git a/src/controllers/dashboard/users/useredit.html b/src/controllers/dashboard/users/useredit.html
index a097144cc3..400c0c35bf 100644
--- a/src/controllers/dashboard/users/useredit.html
+++ b/src/controllers/dashboard/users/useredit.html
@@ -14,7 +14,7 @@
                 <a href="#" is="emby-linkbutton" data-role="button" class="ui-btn-active">${TabProfile}</a>
                 <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
                 <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
-                <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${TabPassword}</a>
+                <a href="#" is="emby-linkbutton" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>
             </div>
             <p class="lnkEditUserPreferencesContainer">
                 <a class="lnkEditUserPreferences button-link" href="#" is="emby-linkbutton">${ButtonEditOtherUserPreferences}</a>
diff --git a/src/controllers/dashboard/users/userlibraryaccess.html b/src/controllers/dashboard/users/userlibraryaccess.html
index f0a239c6a6..363e52a716 100644
--- a/src/controllers/dashboard/users/userlibraryaccess.html
+++ b/src/controllers/dashboard/users/userlibraryaccess.html
@@ -14,7 +14,7 @@
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);" class="ui-btn-active">${TabAccess}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
-                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${TabPassword}</a>
+                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>
             </div>
             <form class="userLibraryAccessForm">
 
diff --git a/src/controllers/dashboard/users/userparentalcontrol.html b/src/controllers/dashboard/users/userparentalcontrol.html
index fd763ca26d..ffbd183a29 100644
--- a/src/controllers/dashboard/users/userparentalcontrol.html
+++ b/src/controllers/dashboard/users/userparentalcontrol.html
@@ -12,7 +12,7 @@
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);" class="ui-btn-active">${TabParentalControl}</a>
-                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${TabPassword}</a>
+                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);">${HeaderPassword}</a>
             </div>
 
             <form class="userParentalControlForm">
diff --git a/src/controllers/dashboard/users/userpassword.html b/src/controllers/dashboard/users/userpassword.html
index 51df2e2cb0..0f6ea2d78e 100644
--- a/src/controllers/dashboard/users/userpassword.html
+++ b/src/controllers/dashboard/users/userpassword.html
@@ -12,7 +12,7 @@
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('useredit.html', true);">${TabProfile}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userlibraryaccess.html', true);">${TabAccess}</a>
                 <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userparentalcontrol.html', true);">${TabParentalControl}</a>
-                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);" class="ui-btn-active">${TabPassword}</a>
+                <a is="emby-linkbutton" href="#" data-role="button" onclick="Dashboard.navigate('userpassword.html', true);" class="ui-btn-active">${HeaderPassword}</a>
             </div>
 
             <div class="readOnlyContent">
diff --git a/src/controllers/itemDetails/index.html b/src/controllers/itemDetails/index.html
index 8c16daba99..bd0821eebe 100644
--- a/src/controllers/itemDetails/index.html
+++ b/src/controllers/itemDetails/index.html
@@ -147,14 +147,14 @@
                 </div>
 
                 <div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top:-3em;">
-                    <h2 class="sectionTitle">${HeaderSchedule}</h2>
+                    <h2 class="sectionTitle">${Schedule}</h2>
                     <div class="seriesTimerSchedule padded-right"></div>
                 </div>
 
                 <div class="collectionItems hide"></div>
 
                 <div class="nextUpSection verticalSection detailVerticalSection hide">
-                    <h2 class="sectionTitle sectionTitle-cards">${HeaderNextUp}</h2>
+                    <h2 class="sectionTitle sectionTitle-cards">${NextUp}</h2>
                     <div is="emby-itemscontainer" class="nextUpItems vertical-wrap padded-right"></div>
                 </div>
 
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 9d4ba09392..c57190139f 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -785,7 +785,7 @@ import 'emby-select';
 
     function setPeopleHeader(page, item) {
         if (item.MediaType == 'Audio' || item.Type == 'MusicAlbum' || item.MediaType == 'Book' || item.MediaType == 'Photo') {
-            page.querySelector('#peopleHeader').innerHTML = globalize.translate('HeaderPeople');
+            page.querySelector('#peopleHeader').innerHTML = globalize.translate('People');
         } else {
             page.querySelector('#peopleHeader').innerHTML = globalize.translate('HeaderCastAndCrew');
         }
@@ -1432,7 +1432,7 @@ import 'emby-select';
                     name: globalize.translate('HeaderVideos'),
                     mediaType: 'Video'
                 }, {
-                    name: globalize.translate('HeaderSeries'),
+                    name: globalize.translate('Series'),
                     type: 'Series'
                 }, {
                     name: globalize.translate('Albums'),
diff --git a/src/controllers/livetv.html b/src/controllers/livetv.html
index 0e02947c12..753521f40b 100644
--- a/src/controllers/livetv.html
+++ b/src/controllers/livetv.html
@@ -1,4 +1,4 @@
-<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs withTabs" data-title="${HeaderLiveTv}" data-backdroptype="series,movie">
+<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs withTabs" data-title="${LiveTV}" data-backdroptype="series,movie">
 
     <div class="liveTvContainer">
 
diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js
index 9fec9a2707..346630012a 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/src/controllers/livetv/livetvsuggested.js
@@ -172,11 +172,11 @@ function getTabs() {
     }, {
         name: globalize.translate('Channels')
     }, {
-        name: globalize.translate('TabRecordings')
+        name: globalize.translate('Recordings')
     }, {
-        name: globalize.translate('HeaderSchedule')
+        name: globalize.translate('Schedule')
     }, {
-        name: globalize.translate('TabSeries')
+        name: globalize.translate('Series')
     }];
 }
 
diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js
index 4a04f9e827..65ecd79f65 100644
--- a/src/controllers/music/musicrecommended.js
+++ b/src/controllers/music/musicrecommended.js
@@ -185,7 +185,7 @@ import 'flexStyles';
         }, {
             name: globalize.translate('Artists')
         }, {
-            name: globalize.translate('TabPlaylists')
+            name: globalize.translate('Playlists')
         }, {
             name: globalize.translate('Songs')
         }, {
diff --git a/src/controllers/shows/tvrecommended.html b/src/controllers/shows/tvrecommended.html
index bdc21fdc81..2302279ed7 100644
--- a/src/controllers/shows/tvrecommended.html
+++ b/src/controllers/shows/tvrecommended.html
@@ -26,7 +26,7 @@
 
         <div class="verticalSection">
             <div class="sectionTitleContainer sectionTitleContainer-cards">
-                <h2 class="sectionTitle sectionTitle-cards padded-left nextUpHeader">${HeaderNextUp}</h2>
+                <h2 class="sectionTitle sectionTitle-cards padded-left nextUpHeader">${NextUp}</h2>
             </div>
             <div is="emby-itemscontainer" id="nextUpItems" class="itemsContainer vertical-wrap padded-left padded-right">
             </div>
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index 2489335969..7c15eae221 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -86,7 +86,7 @@ import 'material-icons';
             if (result.TotalRecordCount) {
                 nodes.push({
                     id: 'livetv',
-                    text: globalize.translate('HeaderLiveTV'),
+                    text: globalize.translate('LiveTV'),
                     state: {
                         opened: false
                     },
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 5ee485e815..d237eead9d 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -377,7 +377,7 @@ import 'flexStyles';
             pageIds: ['dashboardGeneralPage'],
             icon: 'settings'
         }, {
-            name: globalize.translate('TabUsers'),
+            name: globalize.translate('HeaderUsers'),
             href: 'userprofiles.html',
             pageIds: ['userProfilesPage', 'newUserPage', 'editUserPage', 'userLibraryAccessPage', 'userParentalControlPage', 'userPasswordPage'],
             icon: 'people'
@@ -417,10 +417,10 @@ import 'flexStyles';
         });
         links.push({
             divider: true,
-            name: globalize.translate('TabLiveTV')
+            name: globalize.translate('LiveTV')
         });
         links.push({
-            name: globalize.translate('TabLiveTV'),
+            name: globalize.translate('LiveTV'),
             href: 'livetvstatus.html',
             pageIds: ['liveTvStatusPage', 'liveTvTunerPage'],
             icon: 'live_tv'